From 856ef9b709a054ecff724e0e1f09d42db40705e4 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Tue, 30 Mar 2021 21:53:37 -0800 Subject: [PATCH] demo code --- docs/docs/overrides/home.html | 4 ++-- frontend/src/App.vue | 13 ++++++++++++- frontend/src/api/meta.js | 9 ++++++++- mealie/core/config.py | 1 + mealie/routes/debug_routes.py | 16 +++++++++++----- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/docs/docs/overrides/home.html b/docs/docs/overrides/home.html index de118b70d..bf1991973 100644 --- a/docs/docs/overrides/home.html +++ b/docs/docs/overrides/home.html @@ -239,8 +239,8 @@ Get started - - Go to GitHub + + View the Demo diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a186c07f3..69b2e3c0f 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -31,6 +31,12 @@ +
+ This is a Demo | Username: changeme@email.com | Password: demo +
+ @@ -47,6 +53,7 @@ import AddRecipeFab from "@/components/UI/AddRecipeFab"; import LanguageMenu from "@/components/UI/LanguageMenu"; import Vuetify from "./plugins/vuetify"; import { user } from "@/mixins/user"; +import { api } from "./api"; export default { name: "App", @@ -80,7 +87,7 @@ export default { this.$store.dispatch("initLang", { currentVueComponent: this }); }, - mounted() { + async mounted() { this.$store.dispatch("initTheme"); this.$store.dispatch("requestRecentRecipes"); this.$store.dispatch("refreshToken"); @@ -89,10 +96,14 @@ export default { this.$store.dispatch("requestTags"); this.darkModeSystemCheck(); this.darkModeAddEventListener(); + + const api_status = await api.meta.getIsDemo(); + this.demo = api_status.demoStatus; }, data: () => ({ search: false, + demo: false, }), methods: { // For Later! diff --git a/frontend/src/api/meta.js b/frontend/src/api/meta.js index f96b8222a..bcf6470fc 100644 --- a/frontend/src/api/meta.js +++ b/frontend/src/api/meta.js @@ -6,9 +6,10 @@ const prefix = baseURL + "debug"; const debugURLs = { version: `${prefix}/version`, lastRecipe: `${prefix}/last-recipe-json`, + demo: `${prefix}/is-demo`, }; -export const metaAPI = { +export const metaAPI = { async get_version() { let response = await apiReq.get(debugURLs.version); return response.data; @@ -17,4 +18,10 @@ export const metaAPI = { let response = await apiReq.get(debugURLs.lastRecipe); return response.data; }, + + async getIsDemo() { + let response = await apiReq.get(debugURLs.demo); + console.log(response); + return response.data; + }, }; diff --git a/mealie/core/config.py b/mealie/core/config.py index c8f8f499e..e1a7fb8b1 100644 --- a/mealie/core/config.py +++ b/mealie/core/config.py @@ -78,6 +78,7 @@ class AppSettings: def __init__(self, app_dirs: AppDirectories) -> None: global DB_VERSION self.PRODUCTION = bool(os.environ.get("ENV")) + self.IS_DEMO = os.getenv("DEMO", "False") == "True" self.API_PORT = int(os.getenv("API_PORT", 9000)) self.API = os.getenv("API_DOCS", "False") == "True" self.DOCS_URL = "/docs" if self.API else None diff --git a/mealie/routes/debug_routes.py b/mealie/routes/debug_routes.py index ed37744af..1a0332b7a 100644 --- a/mealie/routes/debug_routes.py +++ b/mealie/routes/debug_routes.py @@ -1,20 +1,26 @@ import json from fastapi import APIRouter, Depends -from mealie.core.config import APP_VERSION, LOGGER_FILE, app_dirs +from mealie.core.config import APP_VERSION, LOGGER_FILE, app_dirs, settings from mealie.routes.deps import get_current_user -router = APIRouter(prefix="/api/debug", tags=["Debug"], dependencies=[Depends(get_current_user)]) +router = APIRouter(prefix="/api/debug", tags=["Debug"]) @router.get("/version") -async def get_mealie_version(): +async def get_mealie_version(current_user=Depends(get_current_user)): """ Returns the current version of mealie""" return {"version": APP_VERSION} +@router.get("/is-demo") +async def get_demo_status(): + print(settings.IS_DEMO) + return {"demoStatus": settings.IS_DEMO} + + @router.get("/last-recipe-json") -async def get_last_recipe_json(): +async def get_last_recipe_json(current_user=Depends(get_current_user)): """ Doc Str """ with open(app_dirs.DEBUG_DIR.joinpath("last_recipe.json"), "r") as f: @@ -22,7 +28,7 @@ async def get_last_recipe_json(): @router.get("/log/{num}") -async def get_log(num: int): +async def get_log(num: int, current_user=Depends(get_current_user)): """ Doc Str """ with open(LOGGER_FILE, "rb") as f: log_text = tail(f, num)