diff --git a/.vscode/svelte.code-snippets b/.vscode/svelte.code-snippets index 082ad1b..f080166 100644 --- a/.vscode/svelte.code-snippets +++ b/.vscode/svelte.code-snippets @@ -3,10 +3,11 @@ "prefix": "s-page-template", "body": [ "", "", - "", + "", ], "description": "Basic page layout for all +page routes with SEO built in", "scope": "svelte" @@ -15,6 +16,7 @@ "prefix": "s-ts", "body": [ "", "", @@ -30,12 +32,34 @@ ], "scope": "svelte" }, + + // Elemental Snippets + "Button": { + "prefix": "E.Btn", + "body": [ + "$1" + ], + "scope": "svelte" + }, "Debug": { - "prefix": "s-debug", - "description": "Quickly see current data in the dom in JSON format.", + "prefix": "E.Debug", + "body": [ + "" + ], + "scope": "svelte" + }, + "Icon": { + "prefix": "E.Icon", "body": [ - "
{JSON.stringify($1, null, 2)}
" + "" ], "scope": "svelte" - } + }, + "SEO": { + "prefix": "E.SEO", + "body": [ + "" + ], + "scope": "svelte" + }, } \ No newline at end of file diff --git a/package.json b/package.json index 9e49b9d..d1e6b63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nathanblaylock.com", - "version": "2.0.5", + "version": "2.0.6", "private": true, "scripts": { "blunt": "node ./node_modules/@ngblaylock/blunt-images ./blunt.config.cjs", diff --git a/src/components/Elemental/Btn.svelte b/src/components/Elemental/Btn.svelte new file mode 100644 index 0000000..cc7728a --- /dev/null +++ b/src/components/Elemental/Btn.svelte @@ -0,0 +1,10 @@ + + +{#if href} + +{:else} + +{/if} \ No newline at end of file diff --git a/src/components/Debug.svelte b/src/components/Elemental/Debug.svelte similarity index 100% rename from src/components/Debug.svelte rename to src/components/Elemental/Debug.svelte diff --git a/src/components/Icon.svelte b/src/components/Elemental/Icon.svelte similarity index 100% rename from src/components/Icon.svelte rename to src/components/Elemental/Icon.svelte diff --git a/src/components/SEO.svelte b/src/components/Elemental/SEO.svelte similarity index 93% rename from src/components/SEO.svelte rename to src/components/Elemental/SEO.svelte index 44d1c79..d48c77e 100644 --- a/src/components/SEO.svelte +++ b/src/components/Elemental/SEO.svelte @@ -21,7 +21,6 @@ - {#if !robots} diff --git a/src/components/Elemental/index.ts b/src/components/Elemental/index.ts new file mode 100644 index 0000000..f9562e9 --- /dev/null +++ b/src/components/Elemental/index.ts @@ -0,0 +1,5 @@ +export { default as Btn } from './Btn.svelte'; +export { default as Debug } from './Debug.svelte'; +export { default as SEO } from './SEO.svelte'; +export { default as Icon } from './Icon.svelte'; + diff --git a/src/components/Favicons.svelte b/src/components/Favicons.svelte deleted file mode 100644 index 33c4742..0000000 --- a/src/components/Favicons.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {#if dev} - - {:else} - - - - - - - {/if} - diff --git a/src/components/Meta.svelte b/src/components/Meta.svelte new file mode 100644 index 0000000..9008dc1 --- /dev/null +++ b/src/components/Meta.svelte @@ -0,0 +1,18 @@ + + + + + {#if dev} + + {:else} + + + + + + + + {/if} + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index f0d44b3..9a17558 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,7 +3,7 @@ import { onMount } from 'svelte'; import Footer from '$components/Footer.svelte'; import Navbar from '$components/Navbar.svelte'; - import Favicons from '$components/Favicons.svelte'; + import Meta from '$components/Meta.svelte'; import BgAngle from '$components/BgAngle.svelte'; import MqHelper from '$components/MqHelper.svelte'; import Analytics from '$components/Analytics.svelte'; @@ -34,7 +34,7 @@ - + diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fd47625..5047b97 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,9 +1,9 @@ - +
{#each projects as project} diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index 2127e1a..e1c55d8 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -1,8 +1,8 @@ - +
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte index 459021b..2e03d6c 100644 --- a/src/routes/contact/+page.svelte +++ b/src/routes/contact/+page.svelte @@ -1,5 +1,5 @@ - +
diff --git a/src/routes/privacy/+page.svelte b/src/routes/privacy/+page.svelte index 07a1222..15f1e9b 100644 --- a/src/routes/privacy/+page.svelte +++ b/src/routes/privacy/+page.svelte @@ -1,9 +1,9 @@
- +

Our main priorities is the privacy of our visitors. This Privacy Policy document contains types diff --git a/src/routes/projects/+layout.svelte b/src/routes/projects/+layout.svelte index de300fa..897dabe 100644 --- a/src/routes/projects/+layout.svelte +++ b/src/routes/projects/+layout.svelte @@ -2,8 +2,7 @@ import { onMount } from 'svelte'; import { page } from '$app/stores'; import { projects } from '$lib/projectList'; - import Debug from '$components/Debug.svelte'; - import Icon from '$components/Icon.svelte'; + import * as E from '$components/Elemental'; onMount(() => { // Set all external anchor links to go to a new tab. Markdown doesn't support it. @@ -63,12 +62,12 @@ href="/projects/{getPrevProject().route}" class="btn btn-outline-dark btn-inner-icon text-end" > - + {getPrevProject().alt} {getNextProject().alt} -

{/if} diff --git a/src/routes/projects/bingo-caller/+page.md b/src/routes/projects/bingo-caller/+page.md index f27c9fc..fb767d8 100644 --- a/src/routes/projects/bingo-caller/+page.md +++ b/src/routes/projects/bingo-caller/+page.md @@ -1,5 +1,5 @@ - + # Bingo Caller diff --git a/src/routes/projects/busy-bee-odd-jobs/+page.md b/src/routes/projects/busy-bee-odd-jobs/+page.md index 03e1b81..cc2bdb5 100644 --- a/src/routes/projects/busy-bee-odd-jobs/+page.md +++ b/src/routes/projects/busy-bee-odd-jobs/+page.md @@ -1,5 +1,5 @@ - + # Busy Bee Odd Jobs diff --git a/src/routes/projects/cookbook/+page.md b/src/routes/projects/cookbook/+page.md index e287e67..2235bc7 100644 --- a/src/routes/projects/cookbook/+page.md +++ b/src/routes/projects/cookbook/+page.md @@ -1,5 +1,5 @@ - + # Cookbook diff --git a/src/routes/projects/enoch-initiative/+page.md b/src/routes/projects/enoch-initiative/+page.md index 60f7f6b..4177f9d 100644 --- a/src/routes/projects/enoch-initiative/+page.md +++ b/src/routes/projects/enoch-initiative/+page.md @@ -1,5 +1,5 @@ - + # Enoch Initiative diff --git a/src/routes/projects/extract-gsheet/+page.md b/src/routes/projects/extract-gsheet/+page.md index 1944542..46ad86e 100644 --- a/src/routes/projects/extract-gsheet/+page.md +++ b/src/routes/projects/extract-gsheet/+page.md @@ -1,5 +1,5 @@ - + # Extract GSheet diff --git a/src/routes/projects/group-sale-tracker/+page.md b/src/routes/projects/group-sale-tracker/+page.md index 2dccd8a..146b171 100644 --- a/src/routes/projects/group-sale-tracker/+page.md +++ b/src/routes/projects/group-sale-tracker/+page.md @@ -1,5 +1,5 @@ - + # Group Sale Tracker diff --git a/src/routes/projects/gtd/+page.md b/src/routes/projects/gtd/+page.md index e45eabb..9ab5c7e 100644 --- a/src/routes/projects/gtd/+page.md +++ b/src/routes/projects/gtd/+page.md @@ -1,5 +1,5 @@ - + # Grammy Tammy's Delights diff --git a/src/routes/projects/jrwcpatax/+page.md b/src/routes/projects/jrwcpatax/+page.md index a7894b7..bd4bf48 100644 --- a/src/routes/projects/jrwcpatax/+page.md +++ b/src/routes/projects/jrwcpatax/+page.md @@ -1,5 +1,5 @@ - + # Jeffrey R. Wangsgard & Associates diff --git a/src/routes/projects/placeholdate/+page.md b/src/routes/projects/placeholdate/+page.md index ac2c8ea..9a45dbf 100644 --- a/src/routes/projects/placeholdate/+page.md +++ b/src/routes/projects/placeholdate/+page.md @@ -1,5 +1,5 @@ - + # Placeholdate Figma Plugin diff --git a/src/routes/projects/psychology/+page.md b/src/routes/projects/psychology/+page.md index fccb08b..c80f8f2 100644 --- a/src/routes/projects/psychology/+page.md +++ b/src/routes/projects/psychology/+page.md @@ -1,5 +1,5 @@ - + # Department of Psychology Website diff --git a/src/routes/projects/scce/+page.md b/src/routes/projects/scce/+page.md index 31fd527..e23e2d7 100644 --- a/src/routes/projects/scce/+page.md +++ b/src/routes/projects/scce/+page.md @@ -1,5 +1,5 @@ - + # Sorenson Center Website diff --git a/src/routes/projects/scoresheet/+page.md b/src/routes/projects/scoresheet/+page.md index 64c656d..d11a217 100644 --- a/src/routes/projects/scoresheet/+page.md +++ b/src/routes/projects/scoresheet/+page.md @@ -1,5 +1,5 @@ - + # Scoresheet App diff --git a/src/routes/projects/sdl/+page.md b/src/routes/projects/sdl/+page.md index 516e846..ed24d2b 100644 --- a/src/routes/projects/sdl/+page.md +++ b/src/routes/projects/sdl/+page.md @@ -1,5 +1,5 @@ - + # Space Dynamics Laboratory diff --git a/src/routes/projects/smallsat/+page.md b/src/routes/projects/smallsat/+page.md index 180bde7..a079373 100644 --- a/src/routes/projects/smallsat/+page.md +++ b/src/routes/projects/smallsat/+page.md @@ -1,5 +1,5 @@ - + # Small Satellite Conference diff --git a/src/routes/projects/smithfield-chamber-of-commerce/+page.md b/src/routes/projects/smithfield-chamber-of-commerce/+page.md index 1d1558a..1c34f20 100644 --- a/src/routes/projects/smithfield-chamber-of-commerce/+page.md +++ b/src/routes/projects/smithfield-chamber-of-commerce/+page.md @@ -1,5 +1,5 @@ - + # Smithfield Chamber of Commerce diff --git a/src/routes/uikit/+layout.svelte b/src/routes/uikit/+layout.svelte index d5644a3..ee149ee 100644 --- a/src/routes/uikit/+layout.svelte +++ b/src/routes/uikit/+layout.svelte @@ -7,7 +7,10 @@