Merge branch 'master' of https://github.com/hay-kot/mealie into dev

This commit is contained in:
hay-kot 2021-02-20 17:21:35 -09:00
commit 1210e8e9f3
9 changed files with 12 additions and 7 deletions

View file

@ -1,6 +1,6 @@
# Release Notes
## v0.3.0 - Draft!
## v0.3.0
### Bug Fixes
- Fixed open search on `/` when in input. - Closes #174

View file

@ -151,4 +151,10 @@ export default {
background: grey;
}
.notify-base {
color: white !important;
margin-right: 60px;
margin-bottom: -5px;
opacity: 0.9 !important;
}
</style>

View file

@ -33,6 +33,7 @@ export default {
colors: colors,
};
let response = await apiReq.put(settingsURLs.updateTheme(themeName), body);
console.log(response.data);
return response.data;
},

View file

@ -61,7 +61,6 @@ api_routers()
start_scheduler()
init_settings()
if __name__ == "__main__":
logger.info("-----SYSTEM STARTUP-----")

View file

@ -3,7 +3,6 @@ from typing import List, Optional
from pydantic import BaseModel
class Webhooks(BaseModel):
webhookTime: str = "00:00"
webhookURLs: Optional[List[str]] = []

View file

@ -5,6 +5,8 @@ from models.category_models import RecipeCategoryResponse
from sqlalchemy.orm.session import Session
from utils.snackbar import SnackResponse
from utils.snackbar import SnackResponse
router = APIRouter(
prefix="/api/categories",
tags=["Recipe Categories"],

View file

@ -4,6 +4,8 @@ from fastapi import APIRouter, Depends
from sqlalchemy.orm.session import Session
from utils.snackbar import SnackResponse
from utils.snackbar import SnackResponse
router = APIRouter(tags=["Recipes"])
router = APIRouter(

View file

@ -19,14 +19,12 @@ def get_main_settings(session: Session = Depends(generate_session)):
except:
default_settings_init(session)
data = db.settings.get(session, "main")
print(data)
return data
@router.put("")
def update_settings(data: SiteSettings, session: Session = Depends(generate_session)):
""" Returns Site Settings """
print("Categories", data.planCategories)
db.settings.update(session, "main", data.dict())
return SnackResponse.success("Settings Updated")

View file

@ -1,7 +1,6 @@
import json
import shutil
import zipfile
from logging import error, exception
from pathlib import Path
from typing import List
@ -10,7 +9,6 @@ from db.database import db
from models.import_models import RecipeImport, SettingsImport, ThemeImport
from models.theme_models import SiteTheme
from services.recipe_services import Recipe
from services.settings_services import SiteSettings
from sqlalchemy.orm.session import Session
from utils.logger import logger