Merge branch 'main' into storybook

# Conflicts: # pnpm-lock.yaml
iva2k · Jan 16, 2024 · 2152259 · 2152259
2 parents bb949cb + 300b409
commit 2152259
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -31,3 +31,4 @@ test-results.json
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+/patches
diff --git a/.prettierignore b/.prettierignore
@@ -31,6 +31,7 @@ test-results.json
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+/patches
 
 # Ignore package.json, so our scripts will stay aligned.
 package.json
diff --git a/package.json b/package.json
@@ -71,7 +71,6 @@
   },
   "devDependencies": {
     "@capacitor/cli": "^5.6.0",
-    "@double-great/stylelint-a11y": "^3.0.0",
     "@fontsource/fira-mono": "^4.5.10",
     "@neoconfetti/svelte": "^1.0.0",
     "@playwright/test": "^1.28.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/components/header/PureHeader.svelte b/src/lib/components/header/PureHeader.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
   import logo from '$lib/images/logo.svg';
+  import website from '$lib/config/website';
+  const { websiteUrlBase } = website;
 
   export let pathname = '/';
   $: path1st = '/' + (pathname ?? '').split('/')[1];
@@ -14,7 +16,7 @@
 
 <header>
   <div class="corner corner-left">
-    <a href="https://total-app.vercel.app">
+    <a href={websiteUrlBase}>
       <img src={logo} alt="Total App" />
     </a>
   </div>

diff --git a/src/lib/components/reloadprompt/ReloadPrompt.svelte b/src/lib/components/reloadprompt/ReloadPrompt.svelte
@@ -76,7 +76,8 @@
     z-index: 2;
     text-align: left;
     box-shadow: 3px 4px 5px 0 #8885;
-    background-color: white;
+    background-color: var(--color-bg-2);
+    color: var(--color-text);
   }
   .pwa-toast .message {
     margin-bottom: 8px;

diff --git a/src/lib/config/website.js b/src/lib/config/website.js
@@ -1,4 +1,4 @@
-import websiteFnc from '$lib/config/websiteFnc.js';
+import websiteFnc from './websiteFnc.js';
 // TODO: (when needed) Figure out a fix for ESLint 'import/no-unresolved' error on '$env/static/public'
 // eslint-disable-next-line import/no-unresolved
 import * as env from '$env/static/public';

diff --git a/src/lib/config/websiteFnc.js b/src/lib/config/websiteFnc.js
@@ -34,6 +34,14 @@ const websiteFnc = (
   const twitterUserId = '1234567890';
   const wireUsername = '@iva2k';
   const githubRepo = 'https://github.com/iva2k/total-app';
+  const websiteUrlBase = 'https://total-app.iva2k.com';
+  const websiteUrlNetlify = 'https://total-app.netlify.app';
+  const websiteUrlVercel = 'https://total-app.vercel.app';
+  const websiteUrl = env.NETLIFY
+    ? websiteUrlNetlify
+    : env.VERCEL
+      ? websiteUrlVercel
+      : websiteUrlBase;
 
   const googleSiteVerificationNetlify = '';
   const googleSiteVerificationVercel = 'BXO06YUfaqiMbQ-FgBPqQAgWB7giDX-pLEDSz89vUng';
@@ -64,7 +72,9 @@ const websiteFnc = (
     wireUsername,
     googleSiteVerificationNetlify,
     googleSiteVerificationVercel,
-    githubRepo
+    githubRepo,
+    websiteUrlBase,
+    websiteUrl
   };
   console.log('DEBUG websiteFnc.js website=%o, env=%o', website, env);
   return website;

diff --git a/src/routes/styles.css b/src/routes/styles.css
@@ -4,11 +4,11 @@
   --font-body: Arial, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
     Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
   --font-mono: 'Fira Mono', monospace;
-  --color-bg-0: rgb(202, 216, 228);
-  --color-bg-1: hsl(209, 36%, 86%);
-  --color-bg-2: hsl(224, 44%, 95%);
+  --color-bg-0: #cad8e4; /* rgb(202, 216, 228); */
+  --color-bg-1: #cedce8; /* hsl(209, 36%, 86%); */
+  --color-bg-2: #edf0f8; /* hsl(224, 44%, 95%); */
   --color-theme-1: #ff3e00;
-  --color-theme-2: #4075a6;
+  --color-theme-2: #40b3ff;
   --color-text: rgba(0, 0, 0, 0.7);
   --column-width: 42rem;
   --column-margin-top: 4rem;

diff --git a/svelte.config.js b/svelte.config.js
@@ -11,6 +11,9 @@ const mode = process.env.NODE_ENV || 'development';
 const env = loadEnv(mode, process.cwd());
 const { pwaConfiguration } = await pwaConfigurationFnc(env);
 
+import websiteFnc from './src/lib/config/websiteFnc.js';
+const { websiteUrl } = websiteFnc(process.env);
+
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
   // Consult https://github.com/sveltejs/svelte-preprocess
@@ -26,11 +29,7 @@ const config = {
   prerender: {
     default: true,
     onError: 'continue',
-    origin: process.env.VERCEL
-      ? 'https://total-app.vercel.app'
-      : process.env.NETLIFY
-        ? 'https://total-app.netlify.app'
-        : 'https://total-app.iva2k.com'
+    origin: websiteUrl
   },
 
   kit: {