Dropping Mongo From Dev Branch (#89)

* Fix link to Docker Hub

Found an extra s. DESTROYED it.

* initial pass

* second pass cleanup

* backup card framework

* backup card functionality

* translation

* upload button vile creation

* Release v0.1.0 Candidate (#85)

* Changed uvicorn port to 80

* Changed port in docker-compose to match dockerfile

* Readded environment variables in docker-compose

* production image rework

* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available

* fixed instrucitons on parse

* add last_recipe

* automated testing

* roadmap update

* Sqlite (#75)

* file structure

* auto-test

* take 2

* refactor ap scheduler and startup process

* fixed scraper error

* database abstraction

* database abstraction

* port recipes over to new schema

* meal migration

* start settings migration

* finale mongo port

* backup improvements

* migration imports to new DB structure

* unused import cleanup

* docs strings

* settings and theme import logic

* cleanup

* fixed tinydb error

* requirements

* fuzzy search

* remove scratch file

* sqlalchemy models

* improved search ui

* recipe models almost done

* sql modal population

* del scratch

* rewrite database model mixins

* mostly grabage

* recipe updates

* working sqllite

* remove old files and reorganize

* final cleanup

Co-authored-by: Hayden <hay-kot@pm.me>

* Backup card (#78)

* backup / import dialog

* upgrade to new tag method

* New import card

* rename settings.py to app_config.py

* migrate to poetry for development

* fix failing test

Co-authored-by: Hayden <hay-kot@pm.me>

* added mkdocs to docker-compose

* Translations (#72)

* Translations + danish

* changed back proxy target to use ENV

* Resolved more merge conflicts

* Removed test in translation

* Documentation of translations

* Updated translations

* removed old packages

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>

* fail to start bug fixes

* feature: prep/cook/total time slots (#80)

Co-authored-by: Hayden <hay-kot@pm.me>

* missing bind attributes

* Bug fixes (#81)

* fix: url remains after succesful import

* docs: changelog + update todos

* arm image

* arm compose

* compose updates

* update poetry

* arm support

Co-authored-by: Hayden <hay-kot@pm.me>

* dockerfile hotfix

* dockerfile hotfix

* Version Release Final Touches (#84)

* Remove slim

* bug: opacity issues

* bug: startup failure with no database

* ci/cd on dev branch

* formatting

* v0.1.0 documentation

Co-authored-by: Hayden <hay-kot@pm.me>

* db init hotfix

* bug: fix crash in mongo

* fix mongo bug

* fixed version notifier

* finale changelog

Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>

* build container

* webscraper hotfix

* dev bug: change data location to prevent reloads

* api docs

* api docs bug

* workflow update

Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>

frontend/src/components/Settings/Backup/AvailableBackupCard.vue

@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <ImportDialog
+      :name="selectedName"
+      :date="selectedDate"
+      ref="import_dialog"
+      @import="importBackup"
+      @delete="deleteBackup"
+    />
+    <v-row>
+      <v-col
+        :sm="6"
+        :md="6"
+        :lg="4"
+        :xl="4"
+        v-for="backup in backups"
+        :key="backup.name"
+      >
+        <v-card @click="openDialog(backup)">
+          <v-card-text>
+            <v-row align="center">
+              <v-col cols="12" sm="2">
+                <v-icon color="primary"> mdi-backup-restore </v-icon>
+              </v-col>
+              <v-col cols="12" sm="10">
+                <div>
+                  <strong>{{ backup.name }}</strong>
+                </div>
+                <div>{{ readableTime(backup.date) }}</div>
+              </v-col>
+            </v-row>
+          </v-card-text>
+        </v-card>
+      </v-col>
+    </v-row>
+  </div>
+</template>
+
+<script>
+import ImportDialog from "./ImportDialog";
+import api from "../../../api";
+import utils from "../../../utils";
+export default {
+  props: {
+    backups: Array,
+  },
+  components: {
+    ImportDialog,
+  },
+  data() {
+    return {
+      selectedName: "",
+      selectedDate: "",
+      loading: false,
+    };
+  },
+  methods: {
+    openDialog(backup) {
+      this.selectedDate = this.readableTime(backup.date);
+      this.selectedName = backup.name;
+      this.$refs.import_dialog.open();
+    },
+    readableTime(timestamp) {
+      let date = new Date(timestamp);
+      return utils.getDateAsText(date);
+    },
+    async importBackup(data) {
+      this.$emit("loading");
+      let response = await api.backups.import(data.name, data);
+
+      let failed = response.data.failed;
+      let succesful = response.data.successful;
+
+      this.$emit("finished", succesful, failed);
+    },
+    deleteBackup(data) {
+      this.$emit("loading");
+
+      api.backups.delete(data.name);
+      this.selectedBackup = null;
+      this.backupLoading = false;
+
+      this.$emit("finished");
+    },
+  },
+};
+</script>
+
+<style>
+</style>

frontend/src/components/Settings/Backup/ImportDialog.vue

@@ -8,7 +8,7 @@
 
         <v-card-text>
           <v-row>
-            <v-col>
+            <v-col >
               <v-checkbox
                 class="mb-n4 mt-1"
                 dense

frontend/src/components/Settings/Backup/NewBackupCard.vue

@@ -0,0 +1,124 @@
+<template>
+  <v-card :loading="loading">
+    <v-card-title> {{ $t("settings.backup.create-heading") }} </v-card-title>
+    <v-card-text class="mt-n3">
+      <v-text-field
+        dense
+        :label="$t('settings.backup.backup-tag')"
+        v-model="tag"
+      ></v-text-field>
+    </v-card-text>
+    <v-card-actions class="mt-n9">
+      <v-switch v-model="fullBackup" :label="switchLabel"></v-switch>
+      <v-spacer></v-spacer>
+      <v-btn color="success" text @click="createBackup()">
+        {{ $t("general.create") }}
+      </v-btn>
+    </v-card-actions>
+
+    <v-card-text v-if="!fullBackup" class="mt-n6">
+      <v-row>
+        <v-col sm="4">
+          <p>{{ $t("general.options") }}:</p>
+          <v-checkbox
+            v-for="option in options"
+            :key="option.text"
+            class="mb-n4 mt-n3"
+            dense
+            :label="option.text"
+            v-model="option.value"
+          ></v-checkbox>
+        </v-col>
+        <v-col>
+          <p>{{ $t("general.templates") }}:</p>
+          <v-checkbox
+            v-for="template in availableTemplates"
+            :key="template"
+            class="mb-n4 mt-n3"
+            dense
+            :label="template"
+            @click="appendTemplate(template)"
+          ></v-checkbox>
+        </v-col>
+      </v-row>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script>
+import api from "../../../api";
+export default {
+  data() {
+    return {
+      tag: null,
+      fullBackup: true,
+      loading: false,
+      options: {
+        recipes: {
+          value: true,
+          text: this.$t("general.recipes"),
+        },
+        settings: {
+          value: true,
+          text: this.$t("general.settings"),
+        },
+        themes: {
+          value: true,
+          text: this.$t("general.themes"),
+        },
+      },
+      availableTemplates: [],
+      selectedTemplates: [],
+    };
+  },
+  mounted() {
+    this.getAvailableBackups();
+  },
+  computed: {
+    switchLabel() {
+      if (this.fullBackup) {
+        return "Full Backup";
+      } else return "Partial Backup";
+    },
+  },
+  methods: {
+    async getAvailableBackups() {
+      let response = await api.backups.requestAvailable();
+      response.templates.forEach((element) => {
+        this.availableTemplates.push(element);
+      });
+    },
+    async createBackup() {
+      this.loading = true;
+
+      let data = {
+        tag: this.tag,
+        options: {
+          recipes: this.options.recipes.value,
+          settings: this.options.settings.value,
+          themes: this.options.themes.value,
+        },
+        templates: this.selectedTemplates,
+      };
+
+      console.log(data);
+
+      await api.backups.create(data);
+      this.loading = false;
+
+      this.$emit("created");
+    },
+    appendTemplate(templateName) {
+      if (this.selectedTemplates.includes(templateName)) {
+        let index = this.selectedTemplates.indexOf(templateName);
+        if (index !== -1) {
+          this.selectedTemplates.splice(index, 1);
+        }
+      } else this.selectedTemplates.push(templateName);
+    },
+  },
+};
+</script>
+
+<style>
+</style>

frontend/src/components/Settings/Backup/index.vue

@@ -1,34 +1,33 @@
 <template>
   <v-card :loading="backupLoading" class="mt-3">
     <v-card-title class="headline">
-      {{$t('settings.backup-and-exports')}}
+      {{ $t("settings.backup-and-exports") }}
     </v-card-title>
     <v-divider></v-divider>
 
     <v-card-text>
-      <p>
-        {{$t('settings.backup-info')}}
-      </p>
-
-      <v-row dense align="center">
-        <v-col dense cols="12" sm="12" md="4">
-          <v-text-field v-model="backupTag" :label="$t('settings.backup-tag')"></v-text-field>
+      <v-row>
+        <v-col cols="12" md="6" ss="12">
+          <NewBackupCard @created="processFinished" />
         </v-col>
-        <v-col cols="12" sm="12" md="3">
-          <v-combobox
-            auto-select-first
-            :label="$t('settings.markdown-template')"
-            :items="availableTemplates"
-            v-model="selectedTemplate"
-          ></v-combobox>
-        </v-col>
-        <v-col dense cols="12" sm="12" md="2">
-          <v-btn block text color="accent" @click="createBackup" width="165">
-            {{$t('settings.backup-recipes')}}
-          </v-btn>
+        <v-col cols="12" md="6" sm="12">
+          <p>
+            {{ $t("settings.backup-info") }}
+          </p>
         </v-col>
       </v-row>
-      <BackupCard
+      <v-divider class="my-3"></v-divider>
+      <v-card-title class="mt-n6">
+        Available Backups
+        <v-spacer></v-spacer>
+        <span>
+          <v-btn color="success" text class="ma-2 white--text">
+            Upload
+            <v-icon right dark> mdi-cloud-upload </v-icon>
+          </v-btn>
+        </span>
+      </v-card-title>
+      <AvailableBackupCard
         @loading="backupLoading = true"
         @finished="processFinished"
         :backups="availableBackups"
@@ -46,23 +45,21 @@
 <script>
 import api from "../../../api";
 import SuccessFailureAlert from "../../UI/SuccessFailureAlert";
-import BackupCard from "./BackupCard";
+import AvailableBackupCard from "./AvailableBackupCard";
+import NewBackupCard from "./NewBackupCard";
 
 export default {
   components: {
     SuccessFailureAlert,
-    BackupCard,
+    AvailableBackupCard,
+    NewBackupCard,
   },
   data() {
     return {
       failedImports: [],
       successfulImports: [],
       backupLoading: false,
-      backupTag: null,
-      selectedBackup: null,
-      selectedTemplate: null,
       availableBackups: [],
-      availableTemplates: [],
     };
   },
   mounted() {
@@ -85,17 +82,6 @@ export default {
         this.backupLoading = false;
       }
     },
-    async createBackup() {
-      this.backupLoading = true;
-
-      let response = await api.backups.create(this.backupTag, this.templates);
-
-      if (response.status == 201) {
-        this.selectedBackup = null;
-        this.getAvailableBackups();
-        this.backupLoading = false;
-      }
-    },
     processFinished(successful = null, failed = null) {
       this.getAvailableBackups();
       this.backupLoading = false;

frontend/src/components/Settings/Migration/UploadMigrationButton.vue

@@ -11,7 +11,7 @@
     >
     </v-file-input>
   </v-form>
-</template>
+</template>c
 
 <script>
 import api from "../../../api";

frontend/src/components/UI/UploadBtn.vue

@@ -0,0 +1,25 @@
+<template>
+  <v-form ref="file">
+    <v-file-input
+      :loading="loading"
+      :label="$t('migration.upload-an-archive')"
+      v-model="file"
+      accept=".zip"
+      @change="upload"
+      :prepend-icon="icon"
+      class="file-icon"
+    >
+    </v-file-input>
+    <v-btn color="success" text class="ma-2 white--text">
+      Upload
+      <v-icon right dark> mdi-cloud-upload </v-icon>
+    </v-btn>
+  </v-form>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>