diff --git a/src/lib/components/basics.test.ts b/src/lib/components/basics.test.ts
index 98abfe2a..72712786 100644
--- a/src/lib/components/basics.test.ts
+++ b/src/lib/components/basics.test.ts
@@ -1,6 +1,6 @@
-import { cleanup, render } from '@testing-library/svelte/svelte5'
-import { afterEach, describe, expect, it } from 'vitest'
-import Basics from './basics.svelte'
+import { cleanup, render } from '@testing-library/svelte/svelte5';
+import { afterEach, describe, expect, it } from 'vitest';
+import Basics from './basics.svelte';
describe('Basics', () => {
// Define default props
@@ -11,31 +11,31 @@ describe('Basics', () => {
phone: 'default-phone-number',
website: 'default-website.com',
imgSrc: 'default-path/to/image.jpg',
- }
+ };
afterEach(() => {
- cleanup()
- })
+ cleanup();
+ });
it('should render the name and label', () => {
- const { getByText } = render(Basics, { ...defaultProps })
+ const { getByText } = render(Basics, { ...defaultProps });
- const name = getByText('John Doe')
- expect(name).not.toBeNull()
+ const name = getByText('John Doe');
+ expect(name).not.toBeNull();
- const label = getByText('Software Developer')
- expect(label).not.toBeNull()
- })
+ const label = getByText('Software Developer');
+ expect(label).not.toBeNull();
+ });
it('should render the avatar if imgSrc is provided', () => {
const { getByAltText } = render(Basics, {
...defaultProps,
imgSrc: 'path/to/image.jpg',
- })
+ });
- const avatar = getByAltText('John Doe')
- expect(avatar).not.toBeNull()
- })
+ const avatar = getByAltText('John Doe');
+ expect(avatar).not.toBeNull();
+ });
it('should render email, phone, and website details', () => {
const { getByText } = render(Basics, {
@@ -43,18 +43,18 @@ describe('Basics', () => {
email: 'john@example.com',
phone: '+1234567890',
website: 'example.com',
- })
+ });
// Check email
- const email = getByText('john@example.com')
- expect(email).not.toBeNull()
+ const email = getByText('john@example.com');
+ expect(email).not.toBeNull();
// Check phone
- const phone = getByText('+1234567890')
- expect(phone).not.toBeNull()
+ const phone = getByText('+1234567890');
+ expect(phone).not.toBeNull();
// Check website
- const website = getByText('example.com')
- expect(website).not.toBeNull()
- })
-})
+ const website = getByText('example.com');
+ expect(website).not.toBeNull();
+ });
+});
diff --git a/src/lib/components/date-distance.svelte b/src/lib/components/date-distance.svelte
index c635968c..6142dd28 100644
--- a/src/lib/components/date-distance.svelte
+++ b/src/lib/components/date-distance.svelte
@@ -1,12 +1,12 @@
{distance}
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index 421f8d6e..6d638c9c 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -1,5 +1,5 @@
-export { default as Basics } from './basics.svelte'
-export { default as Collapse } from './collapse.svelte'
-export { default as DD } from './date-distance.svelte'
-export { default as RoleDetails } from './role-details.svelte'
-export { default as ThemeSwitch } from './theme-switch.svelte'
+export { default as Basics } from './basics.svelte';
+export { default as Collapse } from './collapse.svelte';
+export { default as DD } from './date-distance.svelte';
+export { default as RoleDetails } from './role-details.svelte';
+export { default as ThemeSwitch } from './theme-switch.svelte';
diff --git a/src/lib/components/role-details.svelte b/src/lib/components/role-details.svelte
index 9a1887d7..02f03207 100644
--- a/src/lib/components/role-details.svelte
+++ b/src/lib/components/role-details.svelte
@@ -1,52 +1,52 @@
{
const defaultProps = {
@@ -9,74 +9,74 @@ describe('RoleDetails', () => {
company: 'Tech Corp',
startDate: new Date('2020-01-01'),
endDate: new Date('2022-12-31'),
- }
+ };
afterEach(() => {
- cleanup()
- })
+ cleanup();
+ });
it('renders the position and company', () => {
- const { getByText } = render(RoleDetails, { ...defaultProps })
+ const { getByText } = render(RoleDetails, { ...defaultProps });
- expect(getByText('Software Developer')).not.toBeNull()
- expect(getByText('Tech Corp')).not.toBeNull()
- })
+ expect(getByText('Software Developer')).not.toBeNull();
+ expect(getByText('Tech Corp')).not.toBeNull();
+ });
it('formats dates correctly when both start and end dates are valid', () => {
- const { getByText } = render(RoleDetails, { ...defaultProps })
+ const { getByText } = render(RoleDetails, { ...defaultProps });
expect(
getByText('Jan 2020 - Dec 2022 (2yrs 11mos)'),
- ).not.toBeNull()
- })
+ ).not.toBeNull();
+ });
it('shows "Present" for an invalid end date', () => {
const { getByText } = render(RoleDetails, {
...defaultProps,
endDate: null,
- })
+ });
- const currentDate = new Date()
+ const currentDate = new Date();
const totalMonths = differenceInMonths(
currentDate,
defaultProps.startDate,
- )
- const years = Math.floor(totalMonths / 12)
- const months = totalMonths % 12
+ );
+ const years = Math.floor(totalMonths / 12);
+ const months = totalMonths % 12;
const durationText =
- months === 0 ? `${years}yrs` : `${years}yrs ${months}mos`
+ months === 0 ? `${years}yrs` : `${years}yrs ${months}mos`;
expect(
getByText(`Jan 2020 - Present (${durationText})`),
- ).not.toBeNull()
- })
+ ).not.toBeNull();
+ });
it('shows duration correctly for 1 year', () => {
const { getByText } = render(RoleDetails, {
...defaultProps,
endDate: new Date('2021-01-01'),
- })
+ });
- expect(getByText('Jan 2020 - Jan 2021 (1yr)')).not.toBeNull()
- })
+ expect(getByText('Jan 2020 - Jan 2021 (1yr)')).not.toBeNull();
+ });
it('shows duration correctly for 1 month', () => {
const { getByText } = render(RoleDetails, {
...defaultProps,
startDate: new Date('2022-01-01'),
endDate: new Date('2022-02-01'),
- })
+ });
- expect(getByText('Jan 2022 - Feb 2022 (1mo)')).not.toBeNull()
- })
+ expect(getByText('Jan 2022 - Feb 2022 (1mo)')).not.toBeNull();
+ });
it('shows duration correctly for a combination of years and months', () => {
const { getByText } = render(RoleDetails, {
...defaultProps,
startDate: new Date('2020-01-01'),
endDate: new Date('2021-02-01'),
- })
+ });
- expect(getByText('Jan 2020 - Feb 2021 (1yr 1mo)')).not.toBeNull()
- })
-})
+ expect(getByText('Jan 2020 - Feb 2021 (1yr 1mo)')).not.toBeNull();
+ });
+});
diff --git a/src/lib/config.ts b/src/lib/config.ts
index bf207546..279515a7 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -1,5 +1,5 @@
-export const authorName = `Scott Spence`
+export const authorName = `Scott Spence`;
-export const siteName = `CV for Scott Spence`
+export const siteName = `CV for Scott Spence`;
-export const siteUrl = `https://mecv.xyz`
+export const siteUrl = `https://mecv.xyz`;
diff --git a/src/lib/copy/index.ts b/src/lib/copy/index.ts
index 05da28f4..cbee8f4f 100644
--- a/src/lib/copy/index.ts
+++ b/src/lib/copy/index.ts
@@ -1,8 +1,8 @@
// @ts-nocheck
-export { default as Basics } from './basics.md'
-export { default as Education } from './education.md'
-export { default as Interests } from './interests.md'
-export { default as NonWebDevExp } from './non-webdev-exp.md'
-export { default as References } from './references.md'
-export { default as Skills } from './skills.md'
-export { default as Work } from './work.md'
+export { default as Basics } from './basics.md';
+export { default as Education } from './education.md';
+export { default as Interests } from './interests.md';
+export { default as NonWebDevExp } from './non-webdev-exp.md';
+export { default as References } from './references.md';
+export { default as Skills } from './skills.md';
+export { default as Work } from './work.md';
diff --git a/src/lib/copy/non-webdev-exp.md b/src/lib/copy/non-webdev-exp.md
index 633560da..30452a28 100644
--- a/src/lib/copy/non-webdev-exp.md
+++ b/src/lib/copy/non-webdev-exp.md
@@ -244,9 +244,10 @@ processes, standards tools and resources.
### Highlights
-Most recent project [Financial Crime Unit Sanctions Workflow Database
-(Workflow Tool)] winning a Gold ROSCA [Barclays internal award for
-excellence formerly known as a RAFTA] award for process enhancement.
+Most recent project [Financial Crime Unit Sanctions Workflow
+Database (Workflow Tool)] winning a Gold ROSCA [Barclays internal
+award for excellence formerly known as a RAFTA] award for process
+enhancement.
Redeveloping two key systems within the team, both of which had
reached the end of their current lifecycle. Both projects were MS
@@ -303,10 +304,9 @@ plan for Larger Business sector found on the Business Banking Risk
Learning intranet.
Construction of the Sanctioners Toolkit also won a Silver RAFTA, this
-also was delivered within a tight timescale [two weeks!] which has
-also been adopted by all the GLT staff as an essential piece of kit
-enabling smarter working within the teams. Feedback on this was
-phenomenal
+also was delivered within a tight timescale [two weeks!] which has also
+been adopted by all the GLT staff as an essential piece of kit enabling
+smarter working within the teams. Feedback on this was phenomenal
diff --git a/src/lib/copy/work.md b/src/lib/copy/work.md
index 1d99ee4f..3a56e572 100644
--- a/src/lib/copy/work.md
+++ b/src/lib/copy/work.md
@@ -123,11 +123,11 @@ product development to improve product designs.
Jamstack Conf 2021 Workshop, **"Build with SvelteKit and GraphQL"**
_build a fast secure project that uses SvelteKit's features_.
-Jamstack Explorers Mission: "**[Building with SvelteKit and
-GraphCMS]**".
+Jamstack Explorers Mission: "**[Building with SvelteKit
+and GraphCMS]**".
-Recorded 26 [getting started videos] for the GraphCMS [examples repo]
-on GitHub.
+Recorded 26 [getting started videos] for the GraphCMS [examples repo] on
+GitHub.
Deep dives on getting started with SvelteKit and Data Binding with
Svelte.
diff --git a/src/lib/icons/index.ts b/src/lib/icons/index.ts
index f84a403d..bc9e2c80 100644
--- a/src/lib/icons/index.ts
+++ b/src/lib/icons/index.ts
@@ -1,3 +1,3 @@
-export { default as Email } from './email.svelte'
-export { default as Globe } from './globe.svelte'
-export { default as Mobile } from './mobile.svelte'
+export { default as Email } from './email.svelte';
+export { default as Globe } from './globe.svelte';
+export { default as Mobile } from './mobile.svelte';
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index c7b60e06..926b9dba 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,5 +1,5 @@
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 1bf236ae..06e50359 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,28 +1,36 @@
@@ -48,5 +56,5 @@
website="scottspence.com"
imgSrc="profile-pic.png"
/>
-
+ {@render children?.()}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 31f63551..41a4f45a 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,13 +1,13 @@
diff --git a/src/routes/non-webdev-exp/+page.svelte b/src/routes/non-webdev-exp/+page.svelte
index 4eb089ee..603749ef 100644
--- a/src/routes/non-webdev-exp/+page.svelte
+++ b/src/routes/non-webdev-exp/+page.svelte
@@ -1,13 +1,13 @@
diff --git a/static/sw.js b/static/sw.js
index 96062228..6981bd6a 100644
--- a/static/sw.js
+++ b/static/sw.js
@@ -1,14 +1,14 @@
self.addEventListener('install', function (e) {
- self.skipWaiting()
-})
+ self.skipWaiting();
+});
self.addEventListener('activate', function (e) {
self.registration
.unregister()
.then(function () {
- return self.clients.matchAll()
+ return self.clients.matchAll();
})
.then(function (clients) {
- clients.forEach(client => client.navigate(client.url))
- })
-})
+ clients.forEach(client => client.navigate(client.url));
+ });
+});
diff --git a/svelte.config.js b/svelte.config.js
index 84589ad6..8946a6be 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,22 +1,23 @@
-import adapter from '@sveltejs/adapter-auto'
-import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
-import { mdsvex } from 'mdsvex'
-import mdsvexConfig from './mdsvex.config.js'
+import adapter from '@sveltejs/adapter-auto';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
+import { mdsvex } from 'mdsvex';
+import mdsvexConfig from './mdsvex.config.js';
/** @type {import('@sveltejs/kit').Config} */
const config = {
extensions: ['.svelte', ...mdsvexConfig.extensions],
-
// Consult https://kit.svelte.dev/docs/integrations#preprocessors
// for more information about preprocessors
- preprocess: [vitePreprocess({}), mdsvex(mdsvexConfig)],
+ preprocess: [vitePreprocess(), mdsvex(mdsvexConfig)],
kit: {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
- // If your environment is not supported or you settled on a specific environment, switch out the adapter.
+ // If your environment is not supported, or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter(),
},
-}
-export default config
+ extensions: ['.svelte', '.svx', '.md'],
+};
+
+export default config;
diff --git a/tailwind.config.cjs b/tailwind.config.ts
similarity index 81%
rename from tailwind.config.cjs
rename to tailwind.config.ts
index b27cfa8f..45bbb906 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.ts
@@ -1,5 +1,5 @@
-const daisyui = require('daisyui')
-const typography = require('@tailwindcss/typography')
+const daisyui = require('daisyui');
+const typography = require('@tailwindcss/typography');
/** @type {import('tailwindcss').Config}*/
const config = {
@@ -38,6 +38,6 @@ const config = {
'wireframe',
],
},
-}
+};
-module.exports = config
+module.exports = config;
diff --git a/tests/index-page.test.ts b/tests/index-page.test.ts
index cf371fa8..35e159d9 100644
--- a/tests/index-page.test.ts
+++ b/tests/index-page.test.ts
@@ -1,10 +1,10 @@
-import { expect, test } from '@playwright/test'
+import { expect, test } from '@playwright/test';
test('index page has expected h1', async ({ page }) => {
- await page.goto('/')
- const h1TextContent = await page.textContent('h1')
+ await page.goto('/');
+ const h1TextContent = await page.textContent('h1');
const cleanedH1TextContent = h1TextContent
?.replace(/\s+/g, ' ')
- .trim()
- expect(cleanedH1TextContent).toBe('Scott Spence')
-})
+ .trim();
+ expect(cleanedH1TextContent).toBe('Scott Spence');
+});
diff --git a/tsconfig.json b/tsconfig.json
index c1493e89..fc93cbd9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,9 +9,10 @@
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
- "moduleResolution": "bundler",
- },
+ "moduleResolution": "bundler"
+ }
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
+ // except $lib which is handled by https://kit.svelte.dev/docs/configuration#files
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
diff --git a/vite.config.ts b/vite.config.ts
index 4882cd97..d670bc72 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,5 @@
-import { sveltekit } from '@sveltejs/kit/vite'
-import { defineConfig } from 'vitest/config'
+import { sveltekit } from '@sveltejs/kit/vite';
+import { defineConfig } from 'vitest/config';
export default defineConfig({
plugins: [sveltekit()],
@@ -7,4 +7,4 @@ export default defineConfig({
environment: 'jsdom',
include: ['src/**/*.{test,spec}.{js,ts}'],
},
-})
+});