diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 4fd96bc..cfbe0e3 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -657,17 +657,7 @@ export default { } }, friendlyName(index) { - if (index === "calendarNormalActivity") { - return "Standard Class" - } else if (index === "calendarActivityType7") { - return "Relief Event" - } else if (index === "calendarActivityType8") { - return "Generic Type 8" - } else if (index === "calendarActivityType10") { - return "Learning Task" - } else if (index === "calendarExternalActivity") { - return "External Activity" - } else if (index === "bg") { + if (index === "bg") { return "Background" } else if (index === "dark") { return "Sidebar & Header" diff --git a/frontend/src/assets/images/cookieInstructions.png b/frontend/src/assets/images/cookieInstructions.png deleted file mode 100644 index 9069103..0000000 Binary files a/frontend/src/assets/images/cookieInstructions.png and /dev/null differ diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index d8100e8..6368ea5 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -144,6 +144,12 @@ const routes = [ component: () => import(/* webpackChunkName: "admin" */ "../views/Admin/Admin.vue") }, + { + path: "/about", + name: "About", + component: () => + import(/* webpackChunkName: "about" */ "../views/About.vue") + }, { path: "*", name: "Not Found", diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 58d58a2..9423848 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -172,12 +172,7 @@ export default new Vuex.Store({ sheet: "#181818", text: "#000000", dark: "#151515", - bg: "#151515", - calendarNormalActivity: "#3f51b5", - calendarActivityType7: "#f44336", - calendarActivityType8: "#4caf50", - calendarActivityType10: "#ff9800", - calendarExternalActivity: "#2196f3" + bg: "#151515" }, light: { primary: "#0190ea", @@ -192,12 +187,7 @@ export default new Vuex.Store({ sheet: "#f8f8f8", text: "#000000", dark: "#f8f8f8", - bg: "#f8f8f8", - calendarNormalActivity: "#3f51b5", - calendarActivityType7: "#f44336", - calendarActivityType8: "#4caf50", - calendarActivityType10: "#ff9800", - calendarExternalActivity: "#2196f3" + bg: "#f8f8f8" } } context.state.themeEngine.type = "create" diff --git a/frontend/src/views/Settings/SettingsSite.vue b/frontend/src/views/Settings/SettingsSite.vue index 01e5a42..216fc4c 100644 --- a/frontend/src/views/Settings/SettingsSite.vue +++ b/frontend/src/views/Settings/SettingsSite.vue @@ -160,18 +160,7 @@ export default { sheet: "#" + Math.floor(Math.random() * 16777215).toString(16), text: "#" + Math.floor(Math.random() * 16777215).toString(16), dark: "#" + Math.floor(Math.random() * 16777215).toString(16), - bg: "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarNormalActivity: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType7: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType8: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType10: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarExternalActivity: Math.floor( - Math.random() * 16777215 - ).toString(16) + bg: "#" + Math.floor(Math.random() * 16777215).toString(16) } this.$vuetify.theme.themes.dark = { primary: "#" + Math.floor(Math.random() * 16777215).toString(16), @@ -186,18 +175,7 @@ export default { sheet: "#" + Math.floor(Math.random() * 16777215).toString(16), text: "#" + Math.floor(Math.random() * 16777215).toString(16), dark: "#" + Math.floor(Math.random() * 16777215).toString(16), - bg: "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarNormalActivity: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType7: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType8: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarActivityType10: - "#" + Math.floor(Math.random() * 16777215).toString(16), - calendarExternalActivity: Math.floor( - Math.random() * 16777215 - ).toString(16) + bg: "#" + Math.floor(Math.random() * 16777215).toString(16) } }, this.slider) },