From 2900b2d40101980810e5453b491388d7d8b1e1c6 Mon Sep 17 00:00:00 2001 From: Megarolo Date: Fri, 25 Oct 2024 14:50:21 -0400 Subject: [PATCH 01/14] co --- nuxt.config.ts | 15 +++++++++++++-- pages/index.vue | 44 ++++++++++++++++++++++++++++++++++++++++++++ pages/settings.vue | 31 ++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index d2585eb..5c0cfe5 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,12 +1,15 @@ // https://nuxt.com/docs/api/configuration/nuxt-config import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify' - var sw = true; + export default defineNuxtConfig({ modules: [ '@nuxt/image', '@vite-pwa/nuxt', '@nuxt/ui', + '@nuxtjs/color-mode', + + (_options, nuxt) => { nuxt.hooks.hook('vite:extendConfig', (config) => { // @ts-expect-error @@ -188,7 +191,15 @@ export default defineNuxtConfig({ client: true }, colorMode: { - preference: 'light' //eventually we will add color mode preference + preference: 'dark', // default value of $colorMode.preference + fallback: 'dark', // fallback value if not system preference found + hid: 'nuxt-color-mode-script', + globalName: '__NUXT_COLOR_MODE__', + componentName: 'ColorScheme', + classPrefix: '', + classSuffix: '-mode', + storage: 'localStorage', // or 'sessionStorage' or 'cookie' + storageKey: 'nuxt-color-mode' }, tailwindcss:{ config:{ diff --git a/pages/index.vue b/pages/index.vue index 0b2cea6..0dfc496 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -2,6 +2,9 @@ /* Base page of the website. This really shouldn't be seen during normal use atm. */ +const colorMode = useColorMode() +console.log(colorMode.preference) + + + + \ No newline at end of file diff --git a/pages/settings.vue b/pages/settings.vue index f4ca38a..df025a7 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -15,7 +15,7 @@ const isDark = computed({ return colorMode.value === 'dark'; }, set() { - colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'; + colorMode.preference = colorMode.value === 'light' ? 'dark' : 'light'; }, }); @@ -57,3 +57,32 @@ const isDark = computed({ + + \ No newline at end of file From 51e91b4da565ea7673487d29a3c0988168172774 Mon Sep 17 00:00:00 2001 From: Megarolo Date: Tue, 29 Oct 2024 14:23:18 -0400 Subject: [PATCH 02/14] I made differences to the style of certain pages but it didn't work --- pages/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pages/index.vue b/pages/index.vue index 0dfc496..23e7709 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -29,7 +29,7 @@ console.log(colorMode.preference) \ No newline at end of file From 6848c1556a70b2ad2829c0f558a6dc9be08ec744 Mon Sep 17 00:00:00 2001 From: Megarolo Date: Tue, 29 Oct 2024 14:27:45 -0400 Subject: [PATCH 03/14] I made differences to the style of certain pages but it didn't work --- nuxt.config.ts | 4 ++-- pages/index.vue | 4 ++-- pages/settings.vue | 30 ++---------------------------- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index 5c0cfe5..60a9dfb 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -191,8 +191,8 @@ export default defineNuxtConfig({ client: true }, colorMode: { - preference: 'dark', // default value of $colorMode.preference - fallback: 'dark', // fallback value if not system preference found + preference: 'Darc', // default value of $colorMode.preference + fallback: 'Darc', // fallback value if not system preference found hid: 'nuxt-color-mode-script', globalName: '__NUXT_COLOR_MODE__', componentName: 'ColorScheme', diff --git a/pages/index.vue b/pages/index.vue index 23e7709..a78d576 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -20,7 +20,7 @@ console.log(colorMode.preference) qw - + @@ -42,7 +42,7 @@ body { background-color: #f1e7d0; color: #433422; } -.Darc-mode body { +.darc-mode body { --color: #ebf4f1; --color-primary: #41b38a; diff --git a/pages/settings.vue b/pages/settings.vue index df025a7..91f944c 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -12,10 +12,10 @@ const colorMode = useColorMode(); */ const isDark = computed({ get() { - return colorMode.value === 'dark'; + return colorMode.value === 'darc'; }, set() { - colorMode.preference = colorMode.value === 'light' ? 'dark' : 'light'; + colorMode.preference = colorMode.value === 'darc' ? 'light' : 'darc'; }, }); @@ -59,30 +59,4 @@ const isDark = computed({ \ No newline at end of file From 4039552fec03e5ddb454582449fcf2e5db8191c1 Mon Sep 17 00:00:00 2001 From: Megarolo Date: Tue, 29 Oct 2024 18:57:56 -0400 Subject: [PATCH 04/14] I made dark mode work but it has some text that blends in with the background that I need to fix --- components/website-utils/OuterComponents.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/website-utils/OuterComponents.vue b/components/website-utils/OuterComponents.vue index 6f99805..82dbd52 100644 --- a/components/website-utils/OuterComponents.vue +++ b/components/website-utils/OuterComponents.vue @@ -55,6 +55,7 @@ if ( - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/settings.vue b/pages/settings.vue index 91f944c..46106d0 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -12,10 +12,10 @@ const colorMode = useColorMode(); */ const isDark = computed({ get() { - return colorMode.value === 'darc'; + return colorMode.value === 'dark'; }, set() { - colorMode.preference = colorMode.value === 'darc' ? 'light' : 'darc'; + colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'; }, }); @@ -59,4 +59,30 @@ const isDark = computed({ \ No newline at end of file From 0c0812460a1338eb85324faef4b3840e2bf10e0a Mon Sep 17 00:00:00 2001 From: Megarolo Date: Thu, 9 Jan 2025 16:32:25 -0500 Subject: [PATCH 06/14] Made ui changes in the dashboard, teams, matches, and users page. Still debating between having the text be coral or white. Is functional --- pages/dashboard.vue | 16 ++--- pages/index.vue | 2 +- pages/matches.vue | 5 +- pages/predict.vue | 4 +- pages/teams/index.vue | 135 ++++++++++++++++++++++-------------------- pages/users.vue | 1 + 6 files changed, 85 insertions(+), 78 deletions(-) diff --git a/pages/dashboard.vue b/pages/dashboard.vue index 0c32e59..a4d642d 100644 --- a/pages/dashboard.vue +++ b/pages/dashboard.vue @@ -353,10 +353,10 @@ async function updateTeamData() {
-

{{ event.name }}

+

{{ event.name }}

-

+

{{ months.at(event.start_date.split('-')[1] - 1) + ' ' + @@ -416,7 +416,7 @@ async function updateTeamData() { class="rounded-full mx-0.5 mr-1" color="primary" /> -

+

{{ placeify(teamEventData[index].rank) }} Place with a Record of {{ diff --git a/pages/index.vue b/pages/index.vue index 9cf1d74..0b2cea6 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -12,4 +12,4 @@ Base page of the website. This really shouldn't be seen during normal use atm.

Thanks!

- \ No newline at end of file + diff --git a/pages/matches.vue b/pages/matches.vue index d6d4379..ce8503c 100644 --- a/pages/matches.vue +++ b/pages/matches.vue @@ -102,13 +102,14 @@ async function setup() {