From 67069187369f4d3a7fcd5941e91b7394cd381308 Mon Sep 17 00:00:00 2001
From: sephrat <34862846+sephrat@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:45:19 +0200
Subject: [PATCH 1/2] Do not force theme settings on login form (#260)

---
 frontend/src/components/Login/LoginForm.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/components/Login/LoginForm.vue b/frontend/src/components/Login/LoginForm.vue
index b2cc18981..1cb48b729 100644
--- a/frontend/src/components/Login/LoginForm.vue
+++ b/frontend/src/components/Login/LoginForm.vue
@@ -22,13 +22,11 @@
         <v-text-field
           v-if="!options.isLoggingIn"
           v-model="user.name"
-          light="light"
           prepend-icon="person"
           :label="$t('general.name')"
         ></v-text-field>
         <v-text-field
           v-model="user.email"
-          light="light"
           prepend-icon="mdi-email"
           validate-on-blur
           :label="$t('user.email')"
@@ -36,7 +34,6 @@
         ></v-text-field>
         <v-text-field
           v-model="user.password"
-          light="light"
           class="mb-2s"
           prepend-icon="mdi-lock"
           :label="$t('user.password')"
@@ -47,7 +44,6 @@
         <v-card-actions>
           <v-btn
             v-if="options.isLoggingIn"
-            dark
             color="primary"
             block="block"
             type="submit"

From a3966045207e9eb50a31dad6e1a9f1936130d9ee Mon Sep 17 00:00:00 2001
From: sephrat <34862846+sephrat@users.noreply.github.com>
Date: Tue, 6 Apr 2021 23:10:05 +0200
Subject: [PATCH 2/2] Fix docker dev db persistence (#264)

* Fix docker dev db persistence

* Make run.sh the only startup script for prod + dev

Credits to @hay-kot for run.sh script logic

* Restore dev backend initialization in non-docker setup

* Make run.sh POSIX-friendly

* Allow dev backend to auto-reload in Docker
---
 Dockerfile.dev         |  7 ++-----
 docker-compose.dev.yml |  2 +-
 mealie/app.py          |  2 +-
 mealie/db/init_db.py   |  7 ++++---
 mealie/run.sh          | 20 ++++++++++++++++----
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 918a7c432..7c0745479 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -14,12 +14,9 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-
 # Copy poetry.lock* in case it doesn't exist in the repo
 COPY ./pyproject.toml /app/
 
-# RUN poetry install 
-
 COPY ./mealie /app/mealie
 
 RUN poetry install 
 
-RUN ["poetry", "run", "python", "mealie/db/init_db.py"]
-RUN ["poetry", "run", "python", "mealie/services/image/minify.py"]
-CMD ["poetry", "run", "python", "mealie/app.py"]
\ No newline at end of file
+RUN chmod +x /app/mealie/run.sh
+CMD /app/mealie/run.sh reload
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a55b1f07f..6e1aac0a9 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -29,7 +29,7 @@ services:
       db_type: sqlite
       TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly.
     volumes:
-      - ./app_data:/app_data
+      - ./dev/data:/app/dev/data
       - ./mealie:/app/mealie
 
   # Mkdocs
diff --git a/mealie/app.py b/mealie/app.py
index dc664f961..e6223d503 100644
--- a/mealie/app.py
+++ b/mealie/app.py
@@ -51,7 +51,7 @@ start_scheduler()
 
 
 def main():
-
+    
     uvicorn.run(
         "app:app",
         host="0.0.0.0",
diff --git a/mealie/db/init_db.py b/mealie/db/init_db.py
index 11c63bd3b..2dacbf438 100644
--- a/mealie/db/init_db.py
+++ b/mealie/db/init_db.py
@@ -47,11 +47,12 @@ def default_user_init(session: Session):
     logger.info("Generating Default User")
     db.users.create(session, default_user)
 
-
-if __name__ == "__main__":
+def main():
     if sql_exists:
         print("Database Exists")
-        exit()
     else:
         print("Database Doesn't Exists, Initializing...")
         init_db()
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/mealie/run.sh b/mealie/run.sh
index a6f5fc967..a29b4b189 100755
--- a/mealie/run.sh
+++ b/mealie/run.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Get Reload Arg `run.sh reload` for dev server
+ARG1=${1:-production}
+
 # Initialize Database Prerun
 python mealie/db/init_db.py
 python mealie/services/image/minify.py
@@ -7,8 +10,17 @@ python mealie/services/image/minify.py
 ## Migrations
 # TODO
 
-## Web Server
-caddy start --config ./Caddyfile
+if [ "$ARG1" = "reload" ] 
+then
+    echo "Hot reload"
 
-# Start API
-uvicorn mealie.app:app --host 0.0.0.0 --port 9000
\ No newline at end of file
+    # Start API
+    uvicorn mealie.app:app --host 0.0.0.0 --port 9000 --reload
+else
+    echo "Production config"
+    # Web Server
+    caddy start --config ./Caddyfile
+
+    # Start API
+    uvicorn mealie.app:app --host 0.0.0.0 --port 9000
+fi
\ No newline at end of file