Skip to content

Commit 6e89a51

Browse files
codercatdevmgehrlsalex-fusionauth
authored
Release: 2023-10-01 (CodingCatDev#485)
* Update packages (CodingCatDev#483) * fix start date (CodingCatDev#453) (CodingCatDev#454) * Release RSS Fix (CodingCatDev#456) * fix start date (CodingCatDev#453) * add author and html to rss (CodingCatDev#455) * Release to Prod (CodingCatDev#467) * fix start date (CodingCatDev#453) * add author and html to rss (CodingCatDev#455) * Fix/course data (CodingCatDev#457) * Fixed Author lookup * update sponsor listings * add key to force refresh of data (CodingCatDev#460) * CodingCatDev#418 feature:/account details (CodingCatDev#445) * add feature/account details CodingCatDev#418 * fixed wrong href * Fix/picks (CodingCatDev#466) * large links wrap text * season 2 picks * fix data refresh issue * fix guest pick wrap * season 1 * move cwcc to posts * season 0 --------- Co-authored-by: Matt Gehrls <mattgehrls@gmail.com> * Release (CodingCatDev#471) * fix start date (CodingCatDev#453) * add author and html to rss (CodingCatDev#455) * Fix/course data (CodingCatDev#457) * Fixed Author lookup * update sponsor listings * add key to force refresh of data (CodingCatDev#460) * CodingCatDev#418 feature:/account details (CodingCatDev#445) * add feature/account details CodingCatDev#418 * fixed wrong href * Fix/picks (CodingCatDev#466) * large links wrap text * season 2 picks * fix data refresh issue * fix guest pick wrap * season 1 * move cwcc to posts * season 0 * fix video (CodingCatDev#469) * add holopin badge (CodingCatDev#470) * Fix/hashnode (CodingCatDev#472) * fix cloud functions on pnpm * add missing field for graph --------- Co-authored-by: Matt Gehrls <mattgehrls@gmail.com> * add podcasts (CodingCatDev#473) * update turbo * update svelte * minor updates * a11y issues --------- Co-authored-by: Matt Gehrls <mattgehrls@gmail.com> Co-authored-by: Alex FusionAuth <alex.patterson@fusionauth.io> * Update major version of packages (CodingCatDev#484) merge major package updates --------- Co-authored-by: Matt Gehrls <mattgehrls@gmail.com> Co-authored-by: Alex FusionAuth <alex.patterson@fusionauth.io>
1 parent 343546d commit 6e89a51

File tree

10 files changed

+2233
-1557
lines changed

10 files changed

+2233
-1557
lines changed

‎.vscode/launch.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "CodingCat server",
6+
"cwd": "${workspaceFolder}/apps/codingcatdev",
7+
"request": "launch",
8+
"runtimeArgs": ["run-script", "dev"],
9+
"runtimeExecutable": "pnpm",
10+
"skipFiles": ["<node_internals>/**"],
11+
"type": "node",
12+
"console": "integratedTerminal"
13+
},
14+
{
15+
"name": "CodingCat client",
16+
"request": "launch",
17+
"type": "chrome",
18+
"url": "http://localhost:5173",
19+
"webRoot": "${workspaceFolder}/apps/codingcatdev"
20+
}
21+
],
22+
"compounds": [
23+
{
24+
"name": "CodingCat Full",
25+
"configurations": ["CodingCat server", "CodingCat client"]
26+
}
27+
]
28+
}

‎apps/codingcatdev/package.json

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,54 +14,51 @@
1414
"format": "prettier --plugin-search-dir . --write ."
1515
},
1616
"devDependencies": {
17-
"@auth/core": "^0.5.1",
18-
"@auth/sveltekit": "^0.3.0",
19-
"@codingcatdev/blackcatui": "^0.0.5",
17+
"@auth/sveltekit": "^0.3.7",
18+
"@codingcatdev/blackcatui": "^0.1.0",
2019
"@firebase/app-types": "~0.9.0",
21-
"@playwright/test": "^1.31.1",
22-
"@steeze-ui/heroicons": "^2.2.2",
23-
"@steeze-ui/simple-icons": "^1.4.0",
24-
"@steeze-ui/svelte-icon": "^1.3.2",
25-
"@sveltejs/adapter-auto": "^2.0.0",
26-
"@sveltejs/adapter-vercel": "^2.4.1",
27-
"@sveltejs/kit": "^1.16.2",
28-
"@tailwindcss/forms": "^0.5.3",
29-
"@types/marked": "^4.0.8",
30-
"@types/prismjs": "^1.26.0",
31-
"@types/video.js": "^7.3.51",
32-
"autoprefixer": "^10.4.13",
33-
"eslint": "^8.35.0",
34-
"eslint-config-prettier": "^8.6.0",
20+
"@playwright/test": "^1.38.1",
21+
"@steeze-ui/heroicons": "^2.2.3",
22+
"@steeze-ui/simple-icons": "^1.5.1",
23+
"@steeze-ui/svelte-icon": "^1.5.0",
24+
"@sveltejs/adapter-auto": "^2.1.0",
25+
"@sveltejs/adapter-vercel": "^3.0.3",
26+
"@sveltejs/kit": "^1.25.1",
27+
"@tailwindcss/forms": "^0.5.6",
28+
"@types/marked": "^5.0.2",
29+
"@types/prismjs": "^1.26.1",
30+
"@types/video.js": "^7.3.53",
31+
"autoprefixer": "^10.4.16",
32+
"eslint": "^8.50.0",
33+
"eslint-config-prettier": "^9.0.0",
3534
"eslint-plugin-svelte3": "^4.0.0",
3635
"feed": "^4.2.2",
37-
"firebase-admin": "^11.5.0",
36+
"firebase-admin": "^11.11.0",
3837
"flexsearch": "^0.7.31",
39-
"marked": "^4.2.12",
40-
"postcss": "^8.4.21",
38+
"marked": "^9.0.3",
39+
"mdsvex": "^0.11.0",
40+
"postcss": "^8.4.31",
4141
"postcss-load-config": "^4.0.1",
42-
"prettier": "^2.8.4",
43-
"prettier-plugin-svelte": "^2.9.0",
42+
"prettier": "^3.0.3",
43+
"prettier-plugin-svelte": "^3.0.3",
4444
"prismjs": "^1.29.0",
45-
"svelte": "^3.58.0",
46-
"svelte-check": "^3.2.0",
47-
"svelte-preprocess": "^5.0.3",
48-
"tailwindcss": "^3.3.2",
49-
"typescript": "^4.9.5",
50-
"vite": "^4.1.4",
51-
"vitest": "^0.29.1"
45+
"svelte": "^4.2.1",
46+
"svelte-check": "^3.5.2",
47+
"svelte-preprocess": "^5.0.4",
48+
"tailwindcss": "^3.3.3",
49+
"typescript": "^5.2.2",
50+
"vite": "^4.4.9",
51+
"vitest": "^0.34.6"
5252
},
5353
"type": "module",
5454
"dependencies": {
55-
"@cloudinary/html": "^1.11.0",
56-
"@cloudinary/url-gen": "^1.9.1",
57-
"@floating-ui/dom": "^1.2.6",
55+
"@cloudinary/html": "^1.11.2",
56+
"@cloudinary/url-gen": "^1.11.2",
57+
"@floating-ui/dom": "^1.5.3",
5858
"esm-env": "^1.0.0",
59-
"firebase": "^9.19.1",
60-
"gsap": "^3.11.5",
61-
"mdsvex": "^0.10.6",
59+
"firebase": "^10.4.0",
60+
"gsap": "^3.12.2",
6261
"prism-svelte": "^0.5.0",
63-
"prism-themes": "^1.9.0",
64-
"theme-change": "^2.3.0",
65-
"videojs-youtube": "^2.6.1"
62+
"prism-themes": "^1.9.0"
6663
}
67-
}
64+
}

‎apps/codingcatdev/src/lib/client/firebase.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { getAnalytics, type Analytics, logEvent, type AnalyticsCallOptions } fro
99

1010
import { env } from '$env/dynamic/public';
1111

12-
const firebaseConfig = {
12+
export const firebaseConfig = {
1313
apiKey: env.PUBLIC_FB_API_KEY,
1414
authDomain: env.PUBLIC_FB_AUTH_DOMAIN,
1515
projectId: env.PUBLIC_FB_PROJECT_ID,
@@ -43,6 +43,8 @@ if (!app &&
4343
db = getFirestore(app);
4444
functions = getFunctions(app);
4545
analytics = getAnalytics(app);
46+
} else {
47+
console.debug('Skipping Firebase Initialization, check firebaseconfig.')
4648
}
4749

4850
/* AUTH */
@@ -84,6 +86,8 @@ export const ccdSignInWithPopUp = async (provider: AuthProvider) => {
8486
background: 'variant-filled-error'
8587
})
8688
}
89+
} else {
90+
console.error(err);
8791
}
8892
}
8993
}
@@ -130,5 +134,10 @@ export const analyticsLogPageView = async (eventParams?: {
130134
// eslint-disable-next-line @typescript-eslint/no-explicit-any
131135
[key: string]: any;
132136
}, options?: AnalyticsCallOptions) => {
133-
logEvent(analytics, "page_view", eventParams, options)
137+
138+
if (firebaseConfig.apiKey) {
139+
logEvent(analytics, "page_view", eventParams, options)
140+
} else {
141+
console.debug('Skipping Firebase Analytics, no key specified.')
142+
}
134143
}

‎apps/codingcatdev/src/lib/server/content.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { Content, Course } from '$lib/types';
33
import { env } from '$env/dynamic/private';
44
import { fileURLToPath } from 'url';
55
import { opendirSync } from "fs";
6-
import type { SvelteComponentTyped, ComponentType } from 'svelte';
76

87
const LIMIT = 20;
98

@@ -47,7 +46,7 @@ export const getContentTypePath = async <T>(contentType: ContentType, path: stri
4746
}
4847

4948
export const parseContentType = (async <T>(path: string, render = false) => {
50-
const { metadata, default: page } = await import(path);
49+
const { metadata, default: page } = await import(/* @vite-ignore */ path);
5150
const frontmatter = metadata;
5251

5352
// TODO: Add more checks?

‎apps/codingcatdev/src/routes/(content-single)/(non-course)/post/content-modeling-in-a-headless-cms-vs-a-traditional-webcms/Traditional.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
/>
203203
<!-- Arrow -->
204204
<path
205-
in:draw={{ duration: 2000, easing: quintOut }}
205+
in:draw|global={{ duration: 2000, easing: quintOut }}
206206
d="M1714.02 723.87L1714.02 717.37L1714.02 717.37L1714.02 723.87ZM1734.01 703.879L1727.51 703.876L1727.51 703.876L1734.01 703.879ZM1738.72 460.297C1736.18 457.758 1732.07 457.756 1729.53 460.293L1688.14 501.64C1685.6 504.177 1685.6 508.293 1688.14 510.833C1690.67 513.372 1694.79 513.374 1697.33 510.837L1734.12 474.084L1770.87 510.87C1773.41 513.41 1777.52 513.412 1780.06 510.875C1782.6 508.337 1782.6 504.222 1780.07 501.682L1738.72 460.297ZM1474 730.498L1714.03 730.37L1714.02 717.37L1474 717.498L1474 730.498ZM1740.51 703.882L1740.62 464.895L1727.62 464.889L1727.51 703.876L1740.51 703.882ZM1714.03 730.37C1728.65 730.362 1740.5 718.507 1740.51 703.882L1727.51 703.876C1727.51 711.326 1721.47 717.366 1714.02 717.37L1714.03 730.37Z"
207207
class="fill-surface-800 dark:fill-surface-600"
208208
/>

‎apps/codingcatdev/src/routes/(layout-partials)/CcdSideNav.svelte

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@
2222
<section class={classesBase}>
2323
<nav class="nav-list-nav">
2424
<ul>
25-
<li on:click={onListItemClick} on:keypress>
26-
<a href={`/`} class={classesActive('')} data-sveltekit-preload-data="hover">
25+
<li>
26+
<a
27+
on:click={onListItemClick}
28+
on:keypress
29+
href={`/`}
30+
class={classesActive('')}
31+
data-sveltekit-preload-data="hover"
32+
>
2733
<span class="flex-auto text-3xl font-bold capitalize">Home</span>
2834
</a>
2935
</li>
@@ -32,18 +38,36 @@
3238
<hr />
3339
<nav class="nav-list-nav">
3440
<ul>
35-
<li on:click={onListItemClick} on:keypress>
36-
<a href={`/courses`} class={classesActive('courses')} data-sveltekit-preload-data="hover">
41+
<li>
42+
<a
43+
on:click={onListItemClick}
44+
on:keypress
45+
href={`/courses`}
46+
class={classesActive('courses')}
47+
data-sveltekit-preload-data="hover"
48+
>
3749
<span class="flex-auto text-3xl font-bold capitalize">courses</span>
3850
</a>
3951
</li>
40-
<li on:click={onListItemClick} on:keypress>
41-
<a href={`/podcasts`} class={classesActive('podcasts')} data-sveltekit-preload-data="hover">
52+
<li>
53+
<a
54+
on:click={onListItemClick}
55+
on:keypress
56+
href={`/podcasts`}
57+
class={classesActive('podcasts')}
58+
data-sveltekit-preload-data="hover"
59+
>
4260
<span class="flex-auto text-3xl font-bold capitalize">podcasts</span>
4361
</a>
4462
</li>
45-
<li on:click={onListItemClick} on:keypress>
46-
<a href={`/blog`} class={classesActive('blog')} data-sveltekit-preload-data="hover">
63+
<li>
64+
<a
65+
on:click={onListItemClick}
66+
on:keypress
67+
href={`/blog`}
68+
class={classesActive('blog')}
69+
data-sveltekit-preload-data="hover"
70+
>
4771
<span class="flex-auto text-3xl font-bold capitalize">blog</span>
4872
</a>
4973
</li>
@@ -52,13 +76,21 @@
5276
<hr />
5377
<nav class="nav-list-nav">
5478
<ul>
55-
<li on:click={onListItemClick} on:keypress>
56-
<a href={`/sponsors`} class={classesActive('sponsors')} data-sveltekit-preload-data="hover">
79+
<li>
80+
<a
81+
on:click={onListItemClick}
82+
on:keypress
83+
href={`/sponsors`}
84+
class={classesActive('sponsors')}
85+
data-sveltekit-preload-data="hover"
86+
>
5787
<span class="flex-auto text-3xl font-bold capitalize">Sponsors</span>
5888
</a>
5989
</li>
60-
<li on:click={onListItemClick} on:keypress>
90+
<li>
6191
<a
92+
on:click={onListItemClick}
93+
on:keypress
6294
href={`/sponsorships`}
6395
class={classesActive('sponsorships')}
6496
data-sveltekit-preload-data="hover"
@@ -71,13 +103,23 @@
71103
<hr />
72104
<nav class="nav-list-nav">
73105
<ul>
74-
<li on:click={onListItemClick} on:keypress>
75-
<a href={`/guests`} class={classesActive('guests')} data-sveltekit-preload-data="hover">
106+
<li>
107+
<a
108+
on:click={onListItemClick}
109+
href={`/guests`}
110+
class={classesActive('guests')}
111+
data-sveltekit-preload-data="hover"
112+
>
76113
<span class="flex-auto text-3xl font-bold capitalize">Guests</span>
77114
</a>
78115
</li>
79-
<li on:click={onListItemClick} on:keypress>
80-
<a href={`/authors`} class={classesActive('authors')} data-sveltekit-preload-data="hover">
116+
<li>
117+
<a
118+
on:keypress
119+
href={`/authors`}
120+
class={classesActive('authors')}
121+
data-sveltekit-preload-data="hover"
122+
>
81123
<span class="flex-auto text-3xl font-bold capitalize">Authors</span>
82124
</a>
83125
</li>

‎apps/codingcatdev/src/routes/login/GoogleAuth.svelte

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
class="flex justify-center w-full"
1717
method="POST"
1818
{action}
19-
use:enhance={async ({ action, cancel, controller, data, form }) => {
19+
use:enhance={async () => {
2020
await ccdSignInWithPopUp(provider);
2121

22-
return async ({ result, update }) => {
23-
// `result` is an `ActionResult` object
22+
return async ({ update }) => {
2423
// `update` is a function which triggers the logic that would be triggered if this callback wasn't set
25-
2624
update();
2725
};
2826
}}

‎apps/codingcatdev/vite.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ const config = {
55
plugins: [sveltekit()],
66
test: {
77
include: ['src/**/*.{test,spec}.{js,ts}']
8+
},
9+
ssr: {
10+
noExternal: ['gsap', '@gsap/shockingly', '@cloudinary/html']
811
}
912
};
1013

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Repo for all things codingcat.dev",
55
"author": "Alex Patterson",
66
"devDependencies": {
7-
"turbo": "^1.6.3"
7+
"turbo": "^1.10.14"
88
},
99
"scripts": {
1010
"dev": "turbo run dev",

0 commit comments

Comments
 (0)