From 8046d87131a19234d3e139832ba992e0b7caa67a Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 8 Apr 2024 16:32:34 -0700 Subject: [PATCH 1/6] chore: nuxt config cleanup --- nuxt.config.ts | 33 +++++++++++++++++++++++---------- src/assets/lang.ts | 9 --------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index a195b47..1ed4df6 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -2,6 +2,16 @@ import { name, version, author } from './package.json'; // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ + schemaOrg: { + identity: { + type: 'WebApplication', + name: 'PeepoChat', + url: 'https://peepochat.com', + }, + }, + + site: { url: 'https://peepochat.com', name: 'PeepoChat', indexable: false }, + app: { head: { meta: [ @@ -40,16 +50,10 @@ export default defineNuxtConfig({ }, ], - site: { url: 'https://peepochat.com', name: 'PeepoChat', indexable: false }, - - sitemap: { autoI18n: false }, - - schemaOrg: { - identity: { - type: 'WebApplication', - name: 'PeepoChat', - url: 'https://peepochat.com', - }, + sitemap: { + autoI18n: false, + credits: false, + xslTips: false, }, ui: { @@ -58,6 +62,15 @@ export default defineNuxtConfig({ }, i18n: { + locales: [ + { + code: 'en', + iso: 'en-US', + isCatchallLocale: true, + }, + ], + defaultLocale: 'en', + strategy: 'prefix_except_default', vueI18n: './src/assets/lang.ts', }, diff --git a/src/assets/lang.ts b/src/assets/lang.ts index f8d4e9d..978d847 100644 --- a/src/assets/lang.ts +++ b/src/assets/lang.ts @@ -3,18 +3,9 @@ import en from '~/assets/lang/en.json'; export default defineI18nConfig(() => ({ legacy: false, baseUrl: 'https://peepochat.com', - strategy: 'prefix_except_default', locale: 'en', - defaultLocale: 'en', fallbackLocale: 'en', messages: { en, }, - locales: [ - { - code: 'en', - iso: 'en-US', - isCatchallLocale: true, - }, - ], })); From b948b03b07ab43580798c48e80df1bd16ece6a46 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 8 Apr 2024 18:48:31 -0700 Subject: [PATCH 2/6] style: lint tailwind config --- tailwind.config.ts | 142 ++++++++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/tailwind.config.ts b/tailwind.config.ts index 93a94c7..b5242e4 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,31 +1,31 @@ /** @type {import('tailwindcss').Config} */ export default { - content: ["./src/**/*.{vue,ts}"], + content: ['!./src/server/**/*.ts', './src/**/*.{vue,ts}'], - darkMode: "class", + darkMode: 'class', theme: { screens: { - xs: "0px", - md: "968px", - lg: "1024px", - xl: "1280px", - "2xl": "1536px", + xs: '0px', + md: '968px', + lg: '1024px', + xl: '1280px', + '2xl': '1536px', }, extend: { colors: { // brands - "twitch-background": "#9146FF", - "twitch-icon": "#ffffff", - "youtube-background": "#FF0000", - "youtube-icon": "#ffffff", - "kick-background": "#53FC18", - "kick-icon": "#000000", + 'twitch-background': '#9146FF', + 'twitch-icon': '#ffffff', + 'youtube-background': '#FF0000', + 'youtube-icon': '#ffffff', + 'kick-background': '#53FC18', + 'kick-icon': '#000000', // primary - 'shark': { + shark: { '50': '#f6f6f6', '100': '#e7e7e7', '200': '#d1d1d1', @@ -40,89 +40,89 @@ export default { }, // accent - "spring-green": { - 50: "#eefff5", - 100: "#d7ffea", - 200: "#b2ffd7", - 300: "#52ffa8", - 400: "#33f594", - 500: "#09de74", - 600: "#01b85d", - 700: "#05904c", - 800: "#0a713f", - 900: "#0a5d36", - 950: "#00341c", + 'spring-green': { + 50: '#eefff5', + 100: '#d7ffea', + 200: '#b2ffd7', + 300: '#52ffa8', + 400: '#33f594', + 500: '#09de74', + 600: '#01b85d', + 700: '#05904c', + 800: '#0a713f', + 900: '#0a5d36', + 950: '#00341c', }, }, spacing: { - 0: "0", - 1: "2px", - 2: "4px", - 3: "8px", - 4: "12px", - 5: "16px", - 6: "24px", - 7: "32px", - 8: "40px", - 9: "48px", - 10: "64px", - 11: "80px", - 12: "96px", - 13: "160px", + 0: '0', + 1: '2px', + 2: '4px', + 3: '8px', + 4: '12px', + 5: '16px', + 6: '24px', + 7: '32px', + 8: '40px', + 9: '48px', + 10: '64px', + 11: '80px', + 12: '96px', + 13: '160px', }, borderRadius: { - none: "0", - sm: "8px", - DEFAULT: "12px", - lg: "20px", - full: "9999px", + none: '0', + sm: '8px', + DEFAULT: '12px', + lg: '20px', + full: '9999px', }, opacity: { - 0: "0", - 20: "0.20", - 30: "0.30", - 40: "0.40", - 50: "0.54", - 60: "0.63", - 70: "0.70", - 80: "0.80", - 90: "0.90", - 100: "1", + 0: '0', + 20: '0.20', + 30: '0.30', + 40: '0.40', + 50: '0.54', + 60: '0.63', + 70: '0.70', + 80: '0.80', + 90: '0.90', + 100: '1', }, boxShadow: { - cxl: "0 2px 5px rgba(193, 202, 255, 0.5), 2px 0 5px rgba(193, 202, 255, 0.5), -2px 0 5px rgba(193, 202, 255, 0.5), 0 -2px 5px rgba(193, 202, 255, 0.5)", - "shadow-sm": "0px 1px 3px 0px rgba(5,5,5,0.10)", - shadow: "rgb(145 158 171 / 20%) 0px 1px 3px 0px , rgb(145 158 171 / 12%) 0px 1px 2px -4px", - "shadow-md": - "0px 3px 4px 0px rgba(3,3,3,0.1), 0px 2px 4px 0px rgba(3,3,3,0.1)", - "shadow-lg": - "0px 10px 20px 0px rgba(3,3,3,0.1), 0px 3px 6px 0px rgba(3,3,3,0.1)", - "shadow-xl": - "0px 15px 25px 0px rgba(3,3,3,0.1), 0px 5px 10px 0px rgba(3,3,3,0.1)", + cxl: '0 2px 5px rgba(193, 202, 255, 0.5), 2px 0 5px rgba(193, 202, 255, 0.5), -2px 0 5px rgba(193, 202, 255, 0.5), 0 -2px 5px rgba(193, 202, 255, 0.5)', + 'shadow-sm': '0px 1px 3px 0px rgba(5,5,5,0.10)', + shadow: 'rgb(145 158 171 / 20%) 0px 1px 3px 0px , rgb(145 158 171 / 12%) 0px 1px 2px -4px', + 'shadow-md': + '0px 3px 4px 0px rgba(3,3,3,0.1), 0px 2px 4px 0px rgba(3,3,3,0.1)', + 'shadow-lg': + '0px 10px 20px 0px rgba(3,3,3,0.1), 0px 3px 6px 0px rgba(3,3,3,0.1)', + 'shadow-xl': + '0px 15px 25px 0px rgba(3,3,3,0.1), 0px 5px 10px 0px rgba(3,3,3,0.1)', }, keyframes: { gradient: { - "0%": { - "background-position": "0% 0%", + '0%': { + 'background-position': '0% 0%', }, - "50%": { - "background-position": "0% 100%", + '50%': { + 'background-position': '0% 100%', }, - "100%": { - "background-position": "0% 0%", + '100%': { + 'background-position': '0% 0%', }, }, }, animation: { - gradient: "gradient 15s ease infinite" + gradient: 'gradient 15s ease infinite', }, }, }, From 4403f989cb816c7971334079218972e3eccd1e01 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 8 Apr 2024 18:48:07 -0700 Subject: [PATCH 3/6] refactor: stores -> store --- src/components/nav/Sidebar.vue | 2 +- src/layouts/default.vue | 2 +- src/{stores => store}/defaults.ts | 0 src/{stores => store}/index.ts | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/{stores => store}/defaults.ts (100%) rename src/{stores => store}/index.ts (100%) diff --git a/src/components/nav/Sidebar.vue b/src/components/nav/Sidebar.vue index 6c55d0b..79832f2 100644 --- a/src/components/nav/Sidebar.vue +++ b/src/components/nav/Sidebar.vue @@ -1,6 +1,6 @@ + + diff --git a/src/components/badges/LiveBadge.vue b/src/components/badges/LiveBadge.vue new file mode 100644 index 0000000..8add006 --- /dev/null +++ b/src/components/badges/LiveBadge.vue @@ -0,0 +1,12 @@ + + + diff --git a/src/components/buttons/AccountButton.vue b/src/components/buttons/AccountButton.vue index 64235a4..cdea5b2 100644 --- a/src/components/buttons/AccountButton.vue +++ b/src/components/buttons/AccountButton.vue @@ -31,14 +31,14 @@ const dropdownContentAuth = [ const dropdownContentAnon = [ [ { - label: localize('sidebar.account.dropdown.settings'), - icon: 'i-heroicons-cog-8-tooth', + label: localize('sidebar.account.dropdown.sign_in'), + icon: 'i-heroicons-arrow-left-on-rectangle', }, ], [ { - label: localize('sidebar.account.dropdown.sign_in'), - icon: 'i-heroicons-arrow-left-on-rectangle', + label: localize('sidebar.account.dropdown.settings'), + icon: 'i-heroicons-cog-8-tooth', }, ], ]; @@ -62,7 +62,7 @@ const dropdownContentAnon = [ :popper="{ placement: 'right' }" show > - +