Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-11-03 18:53:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed broken response models

Browse Source
This commit is contained in:
Hayden
2021-01-07 21:13:31 -09:00
parent 3cb7c9c0b2
commit 12f7ed46ea
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/src/components/Admin/Theme.vue
View File

@@ -16,17 +16,11 @@
mandatory mandatory
@change="setStoresDarkMode" @change="setStoresDarkMode"
> >
<v-btn value="system"> <v-btn value="system"> Default to system </v-btn>
Default to system
</v-btn>
<v-btn value="light"> <v-btn value="light"> Light </v-btn>
Light
</v-btn>
<v-btn value="dark"> <v-btn value="dark"> Dark </v-btn>
Dark
</v-btn>
</v-btn-toggle> </v-btn-toggle>
</v-col> </v-col>
</v-row></v-card-text </v-row></v-card-text
@@ -50,7 +44,7 @@
return-object return-object
v-model="selectedTheme" v-model="selectedTheme"
@change="themeSelected" @change="themeSelected"
:rules="[v => !!v || 'Theme is required']" :rules="[(v) => !!v || 'Theme is required']"
required required
> >
</v-select> </v-select>
@@ -140,19 +134,20 @@ export default {
components: { components: {
ColorPicker, ColorPicker,
Confirmation, Confirmation,
NewTheme NewTheme,
}, },
data() { data() {
return { return {
selectedTheme: {}, selectedTheme: {},
selectedDarkMode: "system", selectedDarkMode: "system",
availableThemes: [] availableThemes: [],
}; };
}, },
async mounted() { async mounted() {
this.availableThemes = await api.themes.requestAll(); this.availableThemes = await api.themes.requestAll();
this.selectedTheme = this.$store.getters.getActiveTheme; this.selectedTheme = this.$store.getters.getActiveTheme;
this.selectedDarkMode = this.$store.getters.getDarkMode; this.selectedDarkMode = this.$store.getters.getDarkMode;
console.log(this.selectedDarkMode);
}, },
methods: { methods: {
@@ -181,7 +176,7 @@ export default {
//Change to default if deleting current theme. //Change to default if deleting current theme.
if ( if (
!this.availableThemes.some( !this.availableThemes.some(
theme => theme.name === this.selectedTheme.name (theme) => theme.name === this.selectedTheme.name
) )
) { ) {
await this.$store.dispatch("resetTheme"); await this.$store.dispatch("resetTheme");
@@ -203,6 +198,7 @@ export default {
}, },
setStoresDarkMode() { setStoresDarkMode() {
console.log(this.selectedDarkMode);
this.$store.commit("setDarkMode", this.selectedDarkMode); this.$store.commit("setDarkMode", this.selectedDarkMode);
}, },
/** /**
@@ -216,8 +212,8 @@ export default {
this.selectedTheme.colors this.selectedTheme.colors
); );
} }
} },
} },
}; };
</script> </script>

6
mealie/routes/setting_routes.py
View File

@@ -13,7 +13,7 @@ scheduler = Scheduler()
scheduler.startup_scheduler() scheduler.startup_scheduler()
@router.get("/api/site-settings/", tags=["Settings"], response_model=SiteSettings) @router.get("/api/site-settings/", tags=["Settings"])
async def get_main_settings(): async def get_main_settings():
""" Returns basic site settings """ """ Returns basic site settings """
@@ -43,7 +43,7 @@ async def update_settings(data: SiteSettings):
@router.get( @router.get(
"/api/site-settings/themes/", tags=["Themes"], response_model=List[SiteTheme] "/api/site-settings/themes/", tags=["Themes"]
) )
async def get_all_themes(): async def get_all_themes():
""" Returns all site themes """ """ Returns all site themes """
@@ -52,7 +52,7 @@ async def get_all_themes():
@router.get( @router.get(
"/api/site-settings/themes/{theme_name}/", tags=["Themes"], response_model=SiteTheme "/api/site-settings/themes/{theme_name}/", tags=["Themes"]
) )
async def get_single_theme(theme_name: str): async def get_single_theme(theme_name: str):
""" Returns a named theme """ """ Returns a named theme """