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

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 chmod +x /app/mealie/run.sh
-RUN ["poetry", "run", "python", "mealie/services/image/minify.py"]
+CMD /app/mealie/run.sh reload
-CMD ["poetry", "run", "python", "mealie/app.py"]

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

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"

mealie/app.py

@@ -51,7 +51,7 @@ start_scheduler()
 
 
 def main():
-
+    
     uvicorn.run(
         "app:app",
         host="0.0.0.0",

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)
 
-
+def main():
-if __name__ == "__main__":
     if sql_exists:
         print("Database Exists")
-        exit()
     else:
         print("Database Doesn't Exists, Initializing...")
         init_db()
+
+if __name__ == "__main__":
+    main()

mealie/run.sh

@@ -3,7 +3,7 @@
 # Get Reload Arg `run.sh reload` for dev server
 ARG1=${1:-production}
 
-# Set Script Directory
+# Set Script Directory - Used for running the script from a different directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 # # Initialize Database Prerun
@@ -12,6 +12,8 @@ poetry run python $DIR/services/image/minify.py
 
 # Migrations
 # TODO
+    # Migrations
+    # Set Port from ENV Variable
 
 if [[ "$ARG1" = "reload" ]]
 then