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

docs/docs/changelog.md

@@ -7,6 +7,7 @@
   - Fixed Images saved with no way to delete when add recipe via URL fails - Closes Issue #43
 
 ### Features
+  - Additional Language Support
   - Improved deployment documentation
   - Additional database! SQlite is now supported! - Closes #48
   - All site data is now backed up.
@@ -24,6 +25,8 @@
 
 ### Break Changes
 
+- Internal docker port is now 80 instead of 9000. You MUST remap the internal port to connect to the UI. 
+
 !!! error "Breaking Changes"
     As I've adopted the SQL database model I find that using 2 different types of databases will inevitably hinder development. As such after release v0.1.0 support for mongoDB will no longer be available. Prior to upgrading to v0.2.0 you will need to export your site and import after updating. This should be a painless process and require minimal intervention on the users part. Moving forward we will do our best to minimize changes that require user intervention like this and make updates a smooth process. 
 

frontend/src/locales/da.json

@@ -95,7 +95,8 @@
     "new-version-available": "En ny version af Mealie er tilgængelig. <a {aContents}> Besøg repoen </a>",
     "set-new-time": "Indstil ny tid",
     "swatches": "Prøver",
-    "version-latest": "Version: {current} | Seneste: {latest}",
+    "current": "Version:",
+    "latest": "Seneste:",
     "theme": {
       "accent": "Accent",
       "dark-mode": "Mørk tilstand",
@@ -130,4 +131,4 @@
       "import-themes": "Importer temaer"
     }
   }
-}
+}

frontend/src/locales/en.json

@@ -77,7 +77,8 @@
     "swatches": "Swatches",
     "add-a-new-theme": "Add a New Theme",
     "set-new-time": "Set New Time",
-    "version-latest": "Version: { current } | Latest: { latest }",
+    "current": "Version:",
+    "latest": "Latest",
     "explore-the-docs": "Explore the Docs",
     "contribute": "Contribute",
     "backup-and-exports": "Backups",

frontend/src/pages/SettingsPage.vue

@@ -1,23 +1,37 @@
 <template>
   <v-container>
-    <v-alert v-if="newVersion" color="green" type="success" outlined v-html="$t('settings.new-version-available', { aContents: 'target=\'_blank\' href=\'https://github.com/hay-kot/mealie\' class=\'green--text\''})">
-      
+    <v-alert
+      v-if="newVersion"
+      color="green"
+      type="success"
+      outlined
+      v-html="
+        $t('settings.new-version-available', {
+          aContents:
+            'target=\'_blank\' href=\'https://github.com/hay-kot/mealie\' class=\'green--text\'',
+        })
+      "
+    >
     </v-alert>
     <Theme />
     <Backup class="mt-2" />
     <Webhooks class="mt-2" />
     <Migration class="mt-2" />
     <p class="text-center my-2">
-      {{$t('settings.version-latest', {current: version, latest: latestVersion})}} ·
+      {{ $t("settings.current") }}
+      {{ version }} |
+      {{ $t("settings.latest") }}
+      {{ latestVersion }}
+      ·
       <a href="https://hay-kot.github.io/mealie/" target="_blank">
-        {{$t('settings.explore-the-docs')}}
+        {{ $t("settings.explore-the-docs") }}
       </a>
       ·
       <a
-        href="https://hay-kot.github.io/mealie/2.1%20-%20Contributions/"
+        href="https://hay-kot.github.io/mealie/contributors/non-coders/"
         target="_blank"
       >
-        {{$t('settings.contribute')}}
+        {{ $t("settings.contribute") }}
       </a>
     </p>
   </v-container>
@@ -40,7 +54,7 @@ export default {
   data() {
     return {
       latestVersion: null,
-      version: "v0.0.2",
+      version: "v0.1.0",
     };
   },
   mounted() {

mealie/app.py

@@ -15,7 +15,6 @@ from routes import (
 )
 from utils.api_docs import generate_api_docs
 from utils.logger import logger
-from utils.startup import post_start
 
 app = FastAPI(
     title="Mealie",
@@ -53,7 +52,6 @@ def invalid_api():
 
 app.include_router(static_routes.router)
 
-# post_start()
 
 # Generate API Documentation
 if not PRODUCTION:

mealie/app_config.py

@@ -50,7 +50,7 @@ else:
     docs_url = None
     redoc_url = None
 
-
+SQLITE_FILE = None
 # DATABASE ENV
 DATABASE_TYPE = os.getenv("db_type", "sqlite")  # mongo, sqlite
 if DATABASE_TYPE == "sqlite":

mealie/db/db_setup.py

@@ -2,9 +2,10 @@ from app_config import SQLITE_FILE, USE_SQL
 
 from db.sql.db_session import globa_init as sql_global_init
 
-sql_exists = SQLITE_FILE.is_file()
+sql_exists = True
 
 if USE_SQL:
+    sql_exists = SQLITE_FILE.is_file()
     sql_global_init(SQLITE_FILE)
 
     pass

mealie/services/settings_services.py

@@ -140,4 +140,4 @@ def default_settings_init():
 
 if not sql_exists:
     default_settings_init()
-    default_theme_init
+    default_theme_init()