Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

198 make dark mode work #277

Merged
merged 15 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions app.config.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
export default defineAppConfig({
ui: {
primary: 'coral',
gray: 'cool'
ui: {
primary: 'coral',
gray: 'cool',
},
buildModules: ['@nuxtjs/pwa'],
pwa: {
manifest: {
name: 'DARC SIDE ChocoChip Scouting',
short_name: 'ChocoChip Scouting',
lang: 'en',
display: 'standalone',
},
buildModules: ['@nuxtjs/pwa'],
pwa: {
manifest: {
name: 'Fire hydrant surveyor',
short_name: 'Hydrant Surveyor',
lang: 'en',
display: 'standalone',
},
workbox: {
enabled: true
}
workbox: {
enabled: true,
},
notifications: {
// Show toasts at the top right of the screen
position: 'top-0 right-0'
}
})
},
notifications: {
// Show toasts at the top right of the screen
position: 'top-0 right-0',
},
});
2 changes: 1 addition & 1 deletion components/24-crescendo/AmpVisualization.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ let rows = [
></LineChart>
<div class="flex-auto whitespace-normal">
<div
class="font-semibold underline underline-offset-2 mb-1 w-full text-center"
class="font-semibold underline underline-offset-2 mb-1 w-full text-center dark:!text-primary"
>
<h1>Amp</h1>
</div>
Expand Down
8 changes: 4 additions & 4 deletions components/24-crescendo/MatchVisualization.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ console.log(props.rowData.rawData);
<div
v-if="rowData.rawData[selectedMatch - 1].auto.position != undefined"
>
<p class="font-extrabold text-sm inline-block">
<p class="font-extrabold text-sm inline-block dark:text-gray-400">
Auto Position: &nbsp;
</p>
<p class="text-sm inline-block">
{{ rowData.rawData[selectedMatch - 1].auto.position }}
</p>
</div>
<p class="font-extrabold text-sm">Auto & Endgame:</p>
<p class="font-extrabold text-sm dark:text-gray-400">Auto & Endgame:</p>
<div class="pb-1">
<UBadge
color="sky"
Expand Down Expand Up @@ -178,7 +178,7 @@ console.log(props.rowData.rawData);
</div>
</div>
</div>
<span class="font-extrabold text-sm">Other notes: </span>
<span class="font-extrabold text-sm dark:text-gray-400">Other notes: </span>
<UBadge
:color="
sentimentScore > 1
Expand All @@ -192,7 +192,7 @@ console.log(props.rowData.rawData);
"
>{{ sentimentScore }}</UBadge
>
<p class="pb-2 text-xs">
<p class="pb-2 text-xs dark:text-gray-400">
{{
rowData.rawData[selectedMatch - 1].notes.notes == ''
? 'None'
Expand Down
2 changes: 1 addition & 1 deletion components/24-crescendo/SpeakerVisualization.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ let rows = [
></LineChart>
<div class="flex-auto whitespace-normal">
<div
class="font-semibold underline underline-offset-2 mb-1 w-full text-center"
class="font-semibold underline underline-offset-2 mb-1 w-full text-center dark:!text-primary"
>
<h1>Speaker</h1>
</div>
Expand Down
8 changes: 8 additions & 0 deletions components/charts/BarChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,15 @@ let options = {
scales: {
y: {
suggestedMax: props.suggestedMax || 10,
grid: {
color: 'rgba(193,193,193,0.5)',
}
},
x: {
grid: {
color: 'rgba(193,193,193,0.5)',
}
}
},
responsive: true,
}
Expand Down
8 changes: 8 additions & 0 deletions components/charts/LineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,15 @@ let options = {
y: {
suggestedMax: props.suggestedMax || 10,
suggestedMin: 0,
grid: {
color: 'rgba(193,193,193,0.5)',
}
},
x: {
grid: {
color: 'rgba(193,193,193,0.5)',
}
}
},
responsive: true,
};
Expand Down
2 changes: 1 addition & 1 deletion components/website-utils/AddButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let addButtonLinks = [
<UPopover>
<UButton
:ui="{ rounded: 'rounded-full' }"
class="m-0 shadow-md"
class="ml-20 shadow-md"
color="primary"
icon="i-heroicons-plus-20-solid"
size="xl"
Expand Down
6 changes: 4 additions & 2 deletions components/website-utils/OuterComponents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ if (
</script>

<template>
<div class="flex min-h-screen w-screen flex-col">
<div
class="min-h-screen w-screen flex-col dark:bg-gray-800 m overflow-auto max-h-dvh"
>
<Navbar
class="flex-grow basis-auto"
:disable-sidebar="width > 800"
Expand Down Expand Up @@ -116,7 +118,7 @@ if (
<template #header>
<div class="text-center">
<span
class="overflow-hidden flex-auto text-zinc-900 max-w-32"
class="overflow-hidden dark:text-white flex-auto max-w-32"
>
{{ usernameState }}
</span>
Expand Down
5 changes: 3 additions & 2 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// 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
Expand Down Expand Up @@ -202,7 +203,7 @@ export default defineNuxtConfig({
},

colorMode: {
preference: 'light' //eventually we will add color mode preference
preference: 'light', // default value of $colorMode.preference
},

tailwindcss:{
Expand Down
Loading
Loading