diff --git a/docs/docs/contributors/developers-guide/general-guidelines.md b/docs/docs/contributors/developers-guide/general-guidelines.md index 4a707283aa24..5604f766d918 100644 --- a/docs/docs/contributors/developers-guide/general-guidelines.md +++ b/docs/docs/contributors/developers-guide/general-guidelines.md @@ -2,4 +2,6 @@ ## Python -## Vue \ No newline at end of file +## Vue + +[See The Style Guide](/mealie/contributors/developers-guide/style-guide/) \ No newline at end of file diff --git a/docs/docs/contributors/developers-guide/starting-dev-server.md b/docs/docs/contributors/developers-guide/starting-dev-server.md index 42583e50b110..6b0db38c9768 100644 --- a/docs/docs/contributors/developers-guide/starting-dev-server.md +++ b/docs/docs/contributors/developers-guide/starting-dev-server.md @@ -18,20 +18,29 @@ Prerequisites - Nodejs - npm -Once the prerequisites are installed you can cd into the project base directory and run `make setup` to install the python and node dependencies. Once that is complete you can run `make backend` and `make vue` to start the backend and frontend servers. +Once the prerequisites are installed you can cd into the project base directory and run `make setup` to install the python and node dependencies. Once that is complete you can run `make backend` and `make frontend` to start the backend and frontend servers. ## Make File Reference -`make setup` installs python and node dependencies -`make backend` Starts the backend server on port `9000` +Run `make help` for reference -`make vue` Starts the frontend server on port `8080` - -`make mdocs` Starts the documentation server on port `8000` - -`make docker-dev` Builds docker-compose.dev.yml - -`make docker-prod` Builds docker-compose.yml to test for production +``` +clean remove all build, test, coverage and Python artifacts +clean-pyc remove Python file artifacts +clean-test remove test and coverage artifacts +test run tests quickly with the default Python +lint check style with flake8 +test-all Check Lint Format and Testing +setup Setup Development Instance +backend Start Mealie Backend Development Server +frontend Start Mealie Frontend Development Server +frontend-build Build Frontend in frontend/dist +docs Start Mkdocs Development Server +docker-dev Build and Start Docker Development Stack +docker-prod Build and Start Docker Production Stack +code-gen Run Code-Gen Scripts +coverage check code coverage quickly with the default Python +``` ## Before you Commit! diff --git a/docs/docs/contributors/developers-guide/style-guide.md b/docs/docs/contributors/developers-guide/style-guide.md new file mode 100644 index 000000000000..342374c64507 --- /dev/null +++ b/docs/docs/contributors/developers-guide/style-guide.md @@ -0,0 +1,33 @@ +# Style Guide + +!!! note + Unifying styles across the application is an ongoing process, we are working on making the site more consistent. + +## Button Guidelines + +1. Buttons should follow the general color/icon scheme as outlined. +2. All buttons should have an icon on the left side of the button and text on the right. +3. Primary action buttons should be the default Vuetify styling. +4. Primary action buttons should be right aligned +5. Secondary buttons should be `text` or `outlined`. Text is preferred +6. Other buttons should generally be "info" or "primary" color and can take any style type depending on context + +### Button Colors and Icons + +| Type | Color | Icon | +| ----------- | :------------------ | :------------------------------------------------- | +| Default | `info` or `primary` | None | +| Create/New | `success` | `mdi-plus` or `$globals.icons.create` | +| Update/Save | `success` | `mdi-save-content` or `$globals.icons.save` | +| Edit | `info` | `mdi-square-edit-outline` or `$globals.icons.edit` | + +### Example +```html + + mdi-plus + Primary Button + + +``` + + diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html index 1b051eda4e89..fbb71d9fc315 100644 --- a/docs/docs/overrides/api.html +++ b/docs/docs/overrides/api.html @@ -14,7 +14,7 @@
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b47bcc4f01c8..68685fa9d76c 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -76,6 +76,7 @@ nav: - Code Contributions: "contributors/developers-guide/code-contributions.md" - Dev Getting Started: "contributors/developers-guide/starting-dev-server.md" - Guidelines: "contributors/developers-guide/general-guidelines.md" + - Style Guide: "contributors/developers-guide/style-guide.md" - Development Road Map: "roadmap.md" - Change Log: - v0.5.0 General Upgrades: "changelog/v0.5.0.md" diff --git a/frontend/src/components/Fallbacks/The404.vue b/frontend/src/components/Fallbacks/The404.vue index 01e57e372851..cf88a33c102c 100644 --- a/frontend/src/components/Fallbacks/The404.vue +++ b/frontend/src/components/Fallbacks/The404.vue @@ -9,7 +9,7 @@

4

- mdi-silverware-variant + {{ $globals.icons.primary }}

4

@@ -33,7 +33,7 @@ export default { return { buttons: [ { icon: "mdi-home", to: "/", text: "Home" }, - { icon: "mdi-silverware-variant", to: "/recipes/all", text: "All Recipes" }, + { icon: this.$globals.icons.primary, to: "/recipes/all", text: "All Recipes" }, { icon: "mdi-magnify", to: "/search", text: "Search" }, ], }; diff --git a/frontend/src/components/Login/LoginForm.vue b/frontend/src/components/Login/LoginForm.vue index 18ddc4d561ac..2499457e69b5 100644 --- a/frontend/src/components/Login/LoginForm.vue +++ b/frontend/src/components/Login/LoginForm.vue @@ -3,7 +3,7 @@ - mdi-account + {{ $globals.icons.user }} {{ $t("user.login") }} diff --git a/frontend/src/components/Login/SignUpForm.vue b/frontend/src/components/Login/SignUpForm.vue index d3f651774d36..c8904594a891 100644 --- a/frontend/src/components/Login/SignUpForm.vue +++ b/frontend/src/components/Login/SignUpForm.vue @@ -3,7 +3,7 @@ - mdi-account + {{ $globals.icons.user }} @@ -18,7 +18,7 @@ - mdi-square-edit-outline + {{ $globals.icons.edit }} No Recipe @@ -38,14 +38,14 @@ - mdi-square-edit-outline + {{ $globals.icons.edit }} No Recipe - mdi-plus + {{ $globals.icons.create }} Side @@ -65,7 +65,7 @@ - mdi-delete + {{ $globals.icons.delete }} diff --git a/frontend/src/components/Recipe/CardImage.vue b/frontend/src/components/Recipe/CardImage.vue index d37f1661911f..061d704130fe 100644 --- a/frontend/src/components/Recipe/CardImage.vue +++ b/frontend/src/components/Recipe/CardImage.vue @@ -14,7 +14,7 @@ - mdi-silverware-variant + {{ $globals.icons.primary }} diff --git a/frontend/src/components/Recipe/ContextMenu.vue b/frontend/src/components/Recipe/ContextMenu.vue index c78b06847ec4..f280b08030a9 100644 --- a/frontend/src/components/Recipe/ContextMenu.vue +++ b/frontend/src/components/Recipe/ContextMenu.vue @@ -75,13 +75,13 @@ export default { return [ { title: this.$t("general.delete"), - icon: "mdi-delete", + icon: this.$globals.icons.delete, color: "error", action: "delete", }, { title: this.$t("general.edit"), - icon: "mdi-square-edit-outline", + icon: this.$globals.icons.edit, color: "accent", action: "edit", }, diff --git a/frontend/src/components/Recipe/EditorButtonRow.vue b/frontend/src/components/Recipe/EditorButtonRow.vue index 6c043d156fbb..54ac4a38906f 100644 --- a/frontend/src/components/Recipe/EditorButtonRow.vue +++ b/frontend/src/components/Recipe/EditorButtonRow.vue @@ -19,18 +19,18 @@
- mdi-delete + {{ $globals.icons.delete }} - mdi-content-save + {{ $globals.icons.save }} mdi-code-braces
- mdi-square-edit-outline + {{ $globals.icons.edit }} diff --git a/frontend/src/components/Recipe/MobileRecipeCard.vue b/frontend/src/components/Recipe/MobileRecipeCard.vue index a982d3d4e8ef..f1941012cdfc 100644 --- a/frontend/src/components/Recipe/MobileRecipeCard.vue +++ b/frontend/src/components/Recipe/MobileRecipeCard.vue @@ -9,7 +9,7 @@ @error="fallBackImage = true" > - mdi-silverware-variant + {{ $globals.icons.primary }} diff --git a/frontend/src/components/Recipe/Parts/Assets.vue b/frontend/src/components/Recipe/Parts/Assets.vue index 1abada0b0d6c..dc0ec12de287 100644 --- a/frontend/src/components/Recipe/Parts/Assets.vue +++ b/frontend/src/components/Recipe/Parts/Assets.vue @@ -19,7 +19,7 @@
- mdi-delete + {{ $globals.icons.delete }} mdi-content-copy @@ -34,7 +34,7 @@ diff --git a/frontend/src/components/Recipe/Parts/Helpers/ExtrasEditor.vue b/frontend/src/components/Recipe/Parts/Helpers/ExtrasEditor.vue index c0351e51d7b2..2327ab3044b0 100644 --- a/frontend/src/components/Recipe/Parts/Helpers/ExtrasEditor.vue +++ b/frontend/src/components/Recipe/Parts/Helpers/ExtrasEditor.vue @@ -12,7 +12,7 @@ - mdi-delete + {{ $globals.icons.delete }} diff --git a/frontend/src/components/Recipe/Parts/Ingredients.vue b/frontend/src/components/Recipe/Parts/Ingredients.vue index 4634502421e0..9df5d5d68ff1 100644 --- a/frontend/src/components/Recipe/Parts/Ingredients.vue +++ b/frontend/src/components/Recipe/Parts/Ingredients.vue @@ -20,7 +20,7 @@ mdi-arrow-up-down - mdi-delete + {{ $globals.icons.delete }} @@ -31,7 +31,7 @@
- mdi-plus + {{ $globals.icons.create }}
diff --git a/frontend/src/components/Recipe/Parts/Instructions.vue b/frontend/src/components/Recipe/Parts/Instructions.vue index ae63196179b6..0242bf13e10b 100644 --- a/frontend/src/components/Recipe/Parts/Instructions.vue +++ b/frontend/src/components/Recipe/Parts/Instructions.vue @@ -37,7 +37,7 @@ elevation="0" @click="removeByIndex(value, index)" > - mdi-delete + {{ $globals.icons.delete }} {{ $t("recipe.step-index", { step: index + 1 }) }} diff --git a/frontend/src/components/Recipe/Parts/Notes.vue b/frontend/src/components/Recipe/Parts/Notes.vue index 02be7ce3e4f2..0c1eeb26955e 100644 --- a/frontend/src/components/Recipe/Parts/Notes.vue +++ b/frontend/src/components/Recipe/Parts/Notes.vue @@ -6,7 +6,7 @@ - mdi-delete + {{ $globals.icons.delete }} @@ -27,7 +27,7 @@
- mdi-plus + {{ $globals.icons.create }}
diff --git a/frontend/src/components/Recipe/RecipeEditor/index.vue b/frontend/src/components/Recipe/RecipeEditor/index.vue index bdc153ff8772..6629ec742261 100644 --- a/frontend/src/components/Recipe/RecipeEditor/index.vue +++ b/frontend/src/components/Recipe/RecipeEditor/index.vue @@ -69,7 +69,7 @@
- mdi-plus + {{ $globals.icons.create }}
diff --git a/frontend/src/components/UI/CardSection.vue b/frontend/src/components/UI/CardSection.vue index da98e3b6be38..54ceb4c84c03 100644 --- a/frontend/src/components/UI/CardSection.vue +++ b/frontend/src/components/UI/CardSection.vue @@ -2,7 +2,7 @@
- {{ titleIcon }} + {{ displayTitleIcon }} {{ title }} @@ -120,7 +120,7 @@ export default { default: false, }, titleIcon: { - default: "mdi-tag-multiple-outline", + default: null, }, title: { default: null, @@ -170,6 +170,9 @@ export default { effectiveHardLimit() { return Math.min(this.hardLimit, this.recipes.length); }, + displayTitleIcon() { + return this.titleIcon || this.$globals.icons.tags; + }, }, methods: { bumpList() { diff --git a/frontend/src/components/UI/Dialogs/BackupDialog.vue b/frontend/src/components/UI/Dialogs/BackupDialog.vue index 3bd3d04162a9..74aa645b1387 100644 --- a/frontend/src/components/UI/Dialogs/BackupDialog.vue +++ b/frontend/src/components/UI/Dialogs/BackupDialog.vue @@ -9,7 +9,7 @@ > @@ -128,7 +128,6 @@ export default { templates: this.selectedTemplates, }; - if (await api.backups.create(data)) { this.$emit("created"); } diff --git a/frontend/src/components/UI/Dialogs/BaseDialog.vue b/frontend/src/components/UI/Dialogs/BaseDialog.vue index 7eae2236c18a..dd2181e06650 100644 --- a/frontend/src/components/UI/Dialogs/BaseDialog.vue +++ b/frontend/src/components/UI/Dialogs/BaseDialog.vue @@ -10,7 +10,7 @@ - {{ titleIcon }} + {{ displayTitleIcon }} {{ title }} @@ -55,7 +55,7 @@ export default { default: "Modal Title", }, titleIcon: { - default: "mdi-account", + default: null, }, modalWidth: { default: "500", @@ -83,6 +83,9 @@ export default { determineClose() { return this.submitted && !this.loading && !this.keepOpen; }, + displayTitleIcon() { + return this.titleIcon || this.$globals.icons.user; + }, }, watch: { determineClose() { diff --git a/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue b/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue index fc64f342f814..8179912289cf 100644 --- a/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue +++ b/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue @@ -2,14 +2,14 @@
- mdi-plus + {{ $globals.icons.create }} - mdi-tag + {{ $globals.icons.tags }} diff --git a/frontend/src/components/UI/TheAppBar.vue b/frontend/src/components/UI/TheAppBar.vue index b3bc0f93a752..582a6c23f9b1 100644 --- a/frontend/src/components/UI/TheAppBar.vue +++ b/frontend/src/components/UI/TheAppBar.vue @@ -7,7 +7,7 @@ - mdi-silverware-variant + {{ $globals.icons.primary }} diff --git a/frontend/src/components/UI/TheRecipeFab.vue b/frontend/src/components/UI/TheRecipeFab.vue index e810e13257b4..2971d1bb4eb6 100644 --- a/frontend/src/components/UI/TheRecipeFab.vue +++ b/frontend/src/components/UI/TheRecipeFab.vue @@ -50,14 +50,14 @@ mdi-link - mdi-square-edit-outline + {{ $globals.icons.edit }}
diff --git a/frontend/src/components/UI/TheSidebar.vue b/frontend/src/components/UI/TheSidebar.vue index 016f02964548..d3f9462b8dc5 100644 --- a/frontend/src/components/UI/TheSidebar.vue +++ b/frontend/src/components/UI/TheSidebar.vue @@ -98,15 +98,25 @@ export default { to: "/", title: this.$t("page.home-page"), }, + { + icon: "mdi-magnify", + to: "/search", + title: this.$t("search.search"), + }, { icon: "mdi-view-module", to: "/recipes/all", title: this.$t("page.all-recipes"), }, { - icon: "mdi-magnify", - to: "/search", - title: this.$t("search.search"), + icon: this.$globals.icons.tags, + to: "/recipes/category", + title: this.$t("recipe.categories"), + }, + { + icon: this.$globals.icons.tags, + to: "/recipes/tag", + title: this.$t("tag.tags"), }, ]; }, @@ -117,16 +127,10 @@ export default { return pages.map(x => ({ title: x.name, to: `/pages/${x.slug}`, - icon: "mdi-tag", - })); - } else { - const categories = this.$store.getters.getAllCategories; - return categories.map(x => ({ - title: x.name, - to: `/recipes/category/${x.slug}`, - icon: "mdi-tag", + icon: this.$globals.icons.tags, })); } + return []; }, mainMenu() { return [...this.baseMainLinks, ...this.customPages]; @@ -134,7 +138,7 @@ export default { settingsLinks() { return [ { - icon: "mdi-account", + icon: this.$globals.icons.user, to: "/admin/profile", title: this.$t("settings.profile"), }, @@ -158,7 +162,7 @@ export default { title: this.$t("settings.toolbox.toolbox"), }, { - icon: "mdi-account-group", + icon: this.$globals.icons.group, to: "/admin/manage-users", title: this.$t("user.manage-users"), }, diff --git a/frontend/src/components/UI/TheSiteMenu.vue b/frontend/src/components/UI/TheSiteMenu.vue index 1b4d41bc8d43..f24541f413b0 100644 --- a/frontend/src/components/UI/TheSiteMenu.vue +++ b/frontend/src/components/UI/TheSiteMenu.vue @@ -4,7 +4,7 @@ @@ -40,7 +40,7 @@ export default { items() { return [ { - icon: "mdi-account", + icon: this.$globals.icons.user, title: this.$t("user.login"), restricted: false, login: true, diff --git a/frontend/src/locales/messages/af-ZA.json b/frontend/src/locales/messages/af-ZA.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/af-ZA.json +++ b/frontend/src/locales/messages/af-ZA.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ar-SA.json b/frontend/src/locales/messages/ar-SA.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ar-SA.json +++ b/frontend/src/locales/messages/ar-SA.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ca-ES.json b/frontend/src/locales/messages/ca-ES.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ca-ES.json +++ b/frontend/src/locales/messages/ca-ES.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/cs-CZ.json b/frontend/src/locales/messages/cs-CZ.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/cs-CZ.json +++ b/frontend/src/locales/messages/cs-CZ.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/da-DK.json b/frontend/src/locales/messages/da-DK.json index 63e63e905c32..258b122f84ec 100644 --- a/frontend/src/locales/messages/da-DK.json +++ b/frontend/src/locales/messages/da-DK.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Migrering af opskrifter" }, "new-recipe": { diff --git a/frontend/src/locales/messages/el-GR.json b/frontend/src/locales/messages/el-GR.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/el-GR.json +++ b/frontend/src/locales/messages/el-GR.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/en-US.json b/frontend/src/locales/messages/en-US.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/en-US.json +++ b/frontend/src/locales/messages/en-US.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/fi-FI.json b/frontend/src/locales/messages/fi-FI.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/fi-FI.json +++ b/frontend/src/locales/messages/fi-FI.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/he-IL.json b/frontend/src/locales/messages/he-IL.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/he-IL.json +++ b/frontend/src/locales/messages/he-IL.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/hu-HU.json b/frontend/src/locales/messages/hu-HU.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/hu-HU.json +++ b/frontend/src/locales/messages/hu-HU.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ja-JP.json b/frontend/src/locales/messages/ja-JP.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ja-JP.json +++ b/frontend/src/locales/messages/ja-JP.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ko-KR.json b/frontend/src/locales/messages/ko-KR.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ko-KR.json +++ b/frontend/src/locales/messages/ko-KR.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/no-NO.json b/frontend/src/locales/messages/no-NO.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/no-NO.json +++ b/frontend/src/locales/messages/no-NO.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/pt-BR.json b/frontend/src/locales/messages/pt-BR.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/pt-BR.json +++ b/frontend/src/locales/messages/pt-BR.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ro-RO.json b/frontend/src/locales/messages/ro-RO.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ro-RO.json +++ b/frontend/src/locales/messages/ro-RO.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/ru-RU.json b/frontend/src/locales/messages/ru-RU.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/ru-RU.json +++ b/frontend/src/locales/messages/ru-RU.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/sr-SP.json b/frontend/src/locales/messages/sr-SP.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/sr-SP.json +++ b/frontend/src/locales/messages/sr-SP.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/sv-SE.json b/frontend/src/locales/messages/sv-SE.json index caef75729a3b..d2fde94c9dd9 100644 --- a/frontend/src/locales/messages/sv-SE.json +++ b/frontend/src/locales/messages/sv-SE.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Migrera recept" }, "new-recipe": { diff --git a/frontend/src/locales/messages/tr-TR.json b/frontend/src/locales/messages/tr-TR.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/tr-TR.json +++ b/frontend/src/locales/messages/tr-TR.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/uk-UA.json b/frontend/src/locales/messages/uk-UA.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/uk-UA.json +++ b/frontend/src/locales/messages/uk-UA.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/locales/messages/vi-VN.json b/frontend/src/locales/messages/vi-VN.json index 0a86d022df78..85886f1a1f74 100644 --- a/frontend/src/locales/messages/vi-VN.json +++ b/frontend/src/locales/messages/vi-VN.json @@ -164,10 +164,10 @@ }, "migration-data-removed": "Migration data removed", "nextcloud": { - "description": "Migrate data from a Nextcloud Cookbook intance", + "description": "Migrate data from a Nextcloud Cookbook instance", "title": "Nextcloud Cookbook" }, - "no-migration-data-available": "No Migration Data Avaiable", + "no-migration-data-available": "No Migration Data Available", "recipe-migration": "Recipe Migration" }, "new-recipe": { diff --git a/frontend/src/main.js b/frontend/src/main.js index 874b7ff19192..1f53a7238979 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -4,6 +4,7 @@ import vuetify from "./plugins/vuetify"; import store from "./store"; import VueRouter from "vue-router"; import { router } from "./routes"; +import { globals } from "@/utils/globals"; import i18n from "./i18n"; import "@mdi/font/css/materialdesignicons.css"; import "typeface-roboto/index.css"; @@ -11,6 +12,8 @@ import "typeface-roboto/index.css"; Vue.config.productionTip = false; Vue.use(VueRouter); +Vue.prototype.$globals = globals; + const vueApp = new Vue({ vuetify, store, diff --git a/frontend/src/pages/Admin/About/index.vue b/frontend/src/pages/Admin/About/index.vue index b410b3bfec8e..eabfcc7fbab0 100644 --- a/frontend/src/pages/Admin/About/index.vue +++ b/frontend/src/pages/Admin/About/index.vue @@ -9,7 +9,7 @@ - {{ property.icon || "mdi-account" }} + {{ property.icon || $globals.icons.user }} @@ -92,7 +92,7 @@ export default { }, { name: this.$t("about.default-group"), - icon: "mdi-account-group", + icon: this.$globals.icons.group, value: debugInfo.defaultGroup, }, ]; diff --git a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue index 6ddc63330cf4..63770f0f6da6 100644 --- a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue +++ b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue @@ -31,7 +31,7 @@ - mdi-plus {{ $t("general.create") }} + {{ $globals.icons.create }} {{ $t("general.create") }}