+
-
-
-
-
-
-
- {{ $globals.icons.primary }}
-
+
+ {{ $globals.icons.primary }}
+
diff --git a/frontend/src/components/UI/Buttons/TheButton.vue b/frontend/src/components/UI/Buttons/TheButton.vue
new file mode 100644
index 000000000..cc9fce06b
--- /dev/null
+++ b/frontend/src/components/UI/Buttons/TheButton.vue
@@ -0,0 +1,158 @@
+
+
+
+
+ {{ btnAttrs.icon }}
+
+
+
+ {{ btnAttrs.text }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue b/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue
index 817991228..75c362270 100644
--- a/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue
+++ b/frontend/src/components/UI/Dialogs/NewCategoryTagDialog.vue
@@ -24,13 +24,9 @@
+
-
- {{ $t("general.cancel") }}
-
-
- {{ $t("general.create") }}
-
+
diff --git a/frontend/src/components/UI/TheRecipeFab.vue b/frontend/src/components/UI/TheRecipeFab.vue
index 2971d1bb4..2403b491c 100644
--- a/frontend/src/components/UI/TheRecipeFab.vue
+++ b/frontend/src/components/UI/TheRecipeFab.vue
@@ -50,7 +50,7 @@
- {{ $globals.icons.create }}
+ {{ $globals.icons.createAlt }}
diff --git a/frontend/src/components/UI/TheSidebar.vue b/frontend/src/components/UI/TheSidebar.vue
index d3f9462b8..100739ef7 100644
--- a/frontend/src/components/UI/TheSidebar.vue
+++ b/frontend/src/components/UI/TheSidebar.vue
@@ -127,7 +127,7 @@ export default {
return pages.map(x => ({
title: x.name,
to: `/pages/${x.slug}`,
- icon: this.$globals.icons.tags,
+ icon: this.$globals.icons.pages,
}));
}
return [];
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1f53a7238..90ce10f91 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -11,6 +11,7 @@ import "typeface-roboto/index.css";
Vue.config.productionTip = false;
Vue.use(VueRouter);
+Vue.component("TheButton", () => import("@/components/UI/Buttons/TheButton.vue"));
Vue.prototype.$globals = globals;
diff --git a/frontend/src/pages/Admin/Profile/APITokenCard.vue b/frontend/src/pages/Admin/Profile/APITokenCard.vue
index 3a39bee6b..9af383747 100644
--- a/frontend/src/pages/Admin/Profile/APITokenCard.vue
+++ b/frontend/src/pages/Admin/Profile/APITokenCard.vue
@@ -72,10 +72,7 @@
-
- {{ $globals.icons.create }}
- {{ $t("general.create") }}
-
+
diff --git a/frontend/src/pages/Admin/Profile/ProfileGroupCard.vue b/frontend/src/pages/Admin/Profile/ProfileGroupCard.vue
index d7ffbb85b..6f1ea9fdd 100644
--- a/frontend/src/pages/Admin/Profile/ProfileGroupCard.vue
+++ b/frontend/src/pages/Admin/Profile/ProfileGroupCard.vue
@@ -105,10 +105,7 @@
{{ $t("settings.webhooks.test-webhooks") }}
-
- {{ $globals.icons.save }}
- {{ $t("general.update") }}
-
+
diff --git a/frontend/src/pages/Admin/Profile/ProfileThemeCard.vue b/frontend/src/pages/Admin/Profile/ProfileThemeCard.vue
index 672286166..882773fd8 100644
--- a/frontend/src/pages/Admin/Profile/ProfileThemeCard.vue
+++ b/frontend/src/pages/Admin/Profile/ProfileThemeCard.vue
@@ -73,10 +73,8 @@
-
-
- {{ $globals.icons.create }} {{ $t("general.create") }}
-
+
+
diff --git a/frontend/src/pages/Admin/Profile/UserCard.vue b/frontend/src/pages/Admin/Profile/UserCard.vue
index 5a47fb7fb..73e659f0a 100644
--- a/frontend/src/pages/Admin/Profile/UserCard.vue
+++ b/frontend/src/pages/Admin/Profile/UserCard.vue
@@ -89,10 +89,7 @@
file-name="profile_image"
/>
-
- {{ $globals.icons.save }}
- {{ $t("general.update") }}
-
+
diff --git a/frontend/src/pages/Admin/Settings/CustomPageCreator.vue b/frontend/src/pages/Admin/Settings/CustomPageCreator.vue
index e500ecfab..9b6bca969 100644
--- a/frontend/src/pages/Admin/Settings/CustomPageCreator.vue
+++ b/frontend/src/pages/Admin/Settings/CustomPageCreator.vue
@@ -5,9 +5,7 @@
{{ $t("settings.custom-pages") }}
-
- {{ $t("general.create") }}
-
+
@@ -33,13 +31,9 @@
-
- {{ $t("general.delete") }}
-
+
-
- {{ $t("general.edit") }}
-
+
@@ -47,9 +41,7 @@
-
- {{ $t("general.save") }}
-
+
diff --git a/frontend/src/pages/Admin/Settings/HomePageSettings.vue b/frontend/src/pages/Admin/Settings/HomePageSettings.vue
index 4f442f724..268bdb0db 100644
--- a/frontend/src/pages/Admin/Settings/HomePageSettings.vue
+++ b/frontend/src/pages/Admin/Settings/HomePageSettings.vue
@@ -126,10 +126,7 @@
-
- {{ $globals.icons.save }}
- {{ $t("general.save") }}
-
+
diff --git a/frontend/src/pages/Admin/ToolBox/CategoryTagEditor/index.vue b/frontend/src/pages/Admin/ToolBox/CategoryTagEditor/index.vue
index 42b612360..e27fd469a 100644
--- a/frontend/src/pages/Admin/ToolBox/CategoryTagEditor/index.vue
+++ b/frontend/src/pages/Admin/ToolBox/CategoryTagEditor/index.vue
@@ -36,11 +36,11 @@
-
+
{{ $t("general.create") }}
-
+
@@ -72,15 +72,12 @@
+ {{ item.name }}
+
- {{ item.name }}
+
-
- {{ $t("general.edit") }}
-
-
- {{ $t("general.delete") }}
-
+
diff --git a/frontend/src/pages/Admin/ToolBox/EventNotification.vue b/frontend/src/pages/Admin/ToolBox/EventNotification.vue
index 298bfe680..015273b26 100644
--- a/frontend/src/pages/Admin/ToolBox/EventNotification.vue
+++ b/frontend/src/pages/Admin/ToolBox/EventNotification.vue
@@ -10,12 +10,7 @@
@submit="createNotification"
>
-
-
- {{ $globals.icons.create }}
-
- {{ $t("events.notification") }}
-
+ {{ $t("events.notification") }}
@@ -134,14 +129,13 @@
{{ item.user ? "mdi-check" : "" }}
-
- {{ $globals.icons.delete }}
- {{ $t("general.delete") }}
-
-
- mdi-test-tube
+
+
+
+ mdi-test-tube
+
{{ $t("general.test") }}
-
+
|
diff --git a/frontend/src/pages/MealPlan/Planner.vue b/frontend/src/pages/MealPlan/Planner.vue
index 7e7d25a93..4b1f19095 100644
--- a/frontend/src/pages/MealPlan/Planner.vue
+++ b/frontend/src/pages/MealPlan/Planner.vue
@@ -69,13 +69,9 @@
-
- {{ $t("general.delete") }}
-
+
-
- {{ $t("general.edit") }}
-
+
diff --git a/frontend/src/pages/Recipe/ViewRecipe.vue b/frontend/src/pages/Recipe/ViewRecipe.vue
index 849a2b2c0..201e42a38 100644
--- a/frontend/src/pages/Recipe/ViewRecipe.vue
+++ b/frontend/src/pages/Recipe/ViewRecipe.vue
@@ -5,7 +5,13 @@
-
+
-
-
- {{ $globals.icons.tags }}-multiple-outline
- {{ page.name }}
-
+
+ {{ $globals.icons.pages }}
+ {{ page.name }}
+
-
-
-
- {{ item.name }}
-
-
+
+
+
+ {{ item.name }}
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/frontend/src/pages/SearchPage/index.vue b/frontend/src/pages/SearchPage/index.vue
index 6e5057392..87b45dc4c 100644
--- a/frontend/src/pages/SearchPage/index.vue
+++ b/frontend/src/pages/SearchPage/index.vue
@@ -1,53 +1,45 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
- {{ $t("category.category-filter") }}
-
-
-
-
-
-
- {{ $t("search.tag-filter") }}
-
-
-
-
-
+
+
+
+ {{ $t("category.category-filter") }}
+
+
+
+
+
+
+ {{ $t("search.tag-filter") }}
+
+
+
+
+
-
-
+
diff --git a/frontend/src/pages/ShoppingList/index.vue b/frontend/src/pages/ShoppingList/index.vue
index 10c2416eb..567f0aa9f 100644
--- a/frontend/src/pages/ShoppingList/index.vue
+++ b/frontend/src/pages/ShoppingList/index.vue
@@ -14,14 +14,8 @@
-
-
- {{ $globals.icons.create }}
-
- New List
-
+
-
@@ -37,12 +31,7 @@
-
-
- {{ $globals.icons.delete }}
-
- Delete
-
+
@@ -63,12 +52,8 @@
{{ activeList.name }}
-
- Save
-
-
- Edit
-
+
+
@@ -276,5 +261,8 @@ export default {
};
-
\ No newline at end of file
diff --git a/frontend/src/utils/globals.js b/frontend/src/utils/globals.js
index c1c3d4a11..44841fec8 100644
--- a/frontend/src/utils/globals.js
+++ b/frontend/src/utils/globals.js
@@ -2,13 +2,17 @@ const icons = {
primary: "mdi-silverware-variant",
// Crud
- create: "mdi-plus",
+ createAlt: "mdi-plus",
+ create: "mdi-plus-circle",
delete: "mdi-delete",
save: "mdi-content-save",
+ update: "mdi-content-save-edit",
edit: "mdi-square-edit-outline",
+ close: "mdi-close",
// Organization
tags: "mdi-tag-multiple-outline",
+ pages: "mdi-book-outline",
// Admin
user: "mdi-account",