mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused feature toggles

Browse source
This commit is contained in:
Deluan 2020-06-11 22:11:59 -04:00
parent 0033966c25
commit c742ae0843
5 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
conf/configuration.go
View file

@ -36,15 +36,13 @@ type nd struct {
// DevFlags. These are used to enable/disable debugging and incomplete features // DevFlags. These are used to enable/disable debugging and incomplete features
DevLogSourceLine bool `default:"false"` DevLogSourceLine bool `default:"false"`
DevAutoCreateAdminPassword string `default:""` DevAutoCreateAdminPassword string `default:""`
DevEnableUIPlaylists bool `default:"true"`
DevEnableUIStarred bool `default:"true"`
} }
var Server = &nd{} var Server = &nd{}
// TODO refactor configuration and use something different. Maybe https://github.com/spf13/cobra // TODO refactor configuration and use something different. Maybe https://github.com/spf13/cobra
// This function loads the config just load the ConfigFile. This is very cumbersome, but doesn't // This function loads the whole config just to get the ConfigFile. This is very cumbersome, but doesn't
// seem there's a simpler way to do thiswith multiconfig. Time to replace this library? // seem there's a simpler way to do this with multiconfig. Time to replace this library?
func configFile() string { func configFile() string {
conf := &nd{} conf := &nd{}
loader := multiconfig.MultiLoader( loader := multiconfig.MultiLoader(

2
server/app/serve_index.go
View file

@ -30,8 +30,6 @@ func ServeIndex(ds model.DataStore, fs http.FileSystem) http.HandlerFunc {
"baseURL": strings.TrimSuffix(conf.Server.BaseURL, "/"), "baseURL": strings.TrimSuffix(conf.Server.BaseURL, "/"),
"loginBackgroundURL": conf.Server.UILoginBackgroundURL, "loginBackgroundURL": conf.Server.UILoginBackgroundURL,
"enableTranscodingConfig": conf.Server.EnableTranscodingConfig, "enableTranscodingConfig": conf.Server.EnableTranscodingConfig,
"enablePlaylists": conf.Server.DevEnableUIPlaylists,
"enableStarred": conf.Server.DevEnableUIStarred,
} }
j, err := json.Marshal(appConfig) j, err := json.Marshal(appConfig)
if err != nil { if err != nil {

13
ui/src/App.js
View file

@ -14,7 +14,6 @@ import artist from './artist'
import playlist from './playlist' import playlist from './playlist'
import { Player, playQueueReducer } from './audioplayer' import { Player, playQueueReducer } from './audioplayer'
import { albumViewReducer } from './album/albumState' import { albumViewReducer } from './album/albumState'
import config from './config'
import customRoutes from './routes' import customRoutes from './routes'
import themeReducer from './personal/themeReducer' import themeReducer from './personal/themeReducer'
import { addToPlaylistDialogReducer } from './dialogs/dialogState' import { addToPlaylistDialogReducer } from './dialogs/dialogState'
@ -50,13 +49,11 @@ const App = () => (
<Resource name="album" {...album} options={{ subMenu: 'library' }} />, <Resource name="album" {...album} options={{ subMenu: 'library' }} />,
<Resource name="artist" {...artist} options={{ subMenu: 'library' }} />, <Resource name="artist" {...artist} options={{ subMenu: 'library' }} />,
<Resource name="song" {...song} options={{ subMenu: 'library' }} />, <Resource name="song" {...song} options={{ subMenu: 'library' }} />,
config.enablePlaylists && ( <Resource
<Resource name="playlist"
name="playlist" {...playlist}
{...playlist} options={{ subMenu: 'library' }}
options={{ subMenu: 'library' }} />,
/>
),
permissions === 'admin' ? ( permissions === 'admin' ? (
<Resource name="user" {...user} options={{ subMenu: 'settings' }} /> <Resource name="user" {...user} options={{ subMenu: 'settings' }} />
) : null, ) : null,

3
ui/src/common/SongContextMenu.js
View file

@ -8,7 +8,6 @@ import MoreVertIcon from '@material-ui/icons/MoreVert'
import StarIcon from '@material-ui/icons/Star' import StarIcon from '@material-ui/icons/Star'
import StarBorderIcon from '@material-ui/icons/StarBorder' import StarBorderIcon from '@material-ui/icons/StarBorder'
import { addTracks, setTrack } from '../audioplayer' import { addTracks, setTrack } from '../audioplayer'
import config from '../config'
import { openAddToPlaylist } from '../dialogs/dialogState' import { openAddToPlaylist } from '../dialogs/dialogState'
const useStyles = makeStyles({ const useStyles = makeStyles({
@ -100,7 +99,7 @@ const SongContextMenu = ({
return ( return (
<span className={classes.noWrap}> <span className={classes.noWrap}>
{config.enableStarred && showStar && ( {showStar && (
<IconButton <IconButton
onClick={handleToggleStar} onClick={handleToggleStar}
size={'small'} size={'small'}

2
ui/src/config.js
View file

@ -7,8 +7,6 @@ const defaultConfig = {
baseURL: '', baseURL: '',
loginBackgroundURL: 'https://source.unsplash.com/random/1600x900?music', loginBackgroundURL: 'https://source.unsplash.com/random/1600x900?music',
enableTranscodingConfig: true, enableTranscodingConfig: true,
enablePlaylists: true,
enableStarred: true,
} }
let config let config