Skip to content

Commit b979be1

Browse files
committed
Merge branch 'dev' into a11y/social-icons
2 parents 1b818b8 + 4514c88 commit b979be1

87 files changed

Lines changed: 14808 additions & 919 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
.DS_Store
33
node_modules
44
lerna-debug.log
5-
*aws-exports.js
5+
*aws-exports.js
6+
# Local Netlify folder
7+
.netlify

‎backend/firebase/firestore.rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ service cloud.firestore {
114114
allow read: if true;
115115
}
116116
}
117+
//For Overlay Level
118+
match /overlays/{userId} {
119+
allow read: if true;
120+
}
117121
}
118122

119123
function isAlex(){

‎frontend/main/package-lock.json‎

Lines changed: 782 additions & 698 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/main/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,50 @@
1515
"lint": "next lint"
1616
},
1717
"dependencies": {
18-
"@9gustin/react-notion-render": "^3.9.0-beta.2",
18+
"@9gustin/react-notion-render": "^3.9.0",
1919
"@notionhq/client": "^1.0.4",
2020
"@tailwindcss/forms": "^0.5.2",
21-
"@tanem/react-nprogress": "^5.0.2",
21+
"@tanem/react-nprogress": "^5.0.7",
2222
"algoliasearch": "^4.8.3",
23-
"cloudinary-react": "^1.6.8",
23+
"cloudinary-react": "^1.8.0",
2424
"copy-to-clipboard": "^3.3.1",
2525
"cross-env": "^7.0.3",
2626
"feed": "^4.2.2",
27-
"firebase": "^9.4.1",
28-
"next": "^12.1.6",
27+
"firebase": "^9.9.0",
28+
"next": "^12.2.2",
2929
"next-pwa": "^5.4.0",
3030
"next-seo": "^4.28.1",
3131
"next-themes": "^0.2.0",
32-
"prism-react-renderer": "^1.3.3",
32+
"prism-react-renderer": "^1.3.5",
3333
"react": "^17.0.2",
3434
"react-dom": "^17.0.2",
3535
"react-firebaseui": "^6.0.0",
3636
"react-icons": "^4.2.0",
37-
"react-instantsearch-dom": "^6.8.2",
37+
"react-instantsearch-dom": "^6.30.0",
3838
"react-player": "^2.7.2",
3939
"reactfire": "^4.2.0",
4040
"use-sound": "^4.0.1",
4141
"video.js": "^7.11.4"
4242
},
4343
"devDependencies": {
44-
"@next/bundle-analyzer": "^12.0.3",
45-
"@next/eslint-plugin-next": "^12.0.3",
44+
"@next/bundle-analyzer": "^12.2.2",
45+
"@next/eslint-plugin-next": "^12.2.2",
4646
"@types/node": "^16.11.40",
4747
"@types/react-beautiful-dnd": "^13.0.0",
4848
"@types/react-dom": "^17.0.11",
4949
"@types/react-gtm-module": "^2.0.0",
5050
"@types/react-instantsearch-dom": "^6.8.0",
5151
"@types/react-timeago": "^4.1.2",
52-
"@types/react-transition-group": "^4.4.0",
52+
"@types/react-transition-group": "^4.4.5",
5353
"@types/uuid": "^8.3.0",
54-
"@types/video.js": "^7.3.14",
54+
"@types/video.js": "^7.3.42",
5555
"autoprefixer": "^10.4.7",
56-
"eslint-config-next": "^12.0.3",
56+
"eslint-config-next": "^12.2.2",
5757
"eslint-config-prettier": "^8.3.0",
5858
"next-sitemap": "^1.6.203",
5959
"postcss": "^8.4.14",
60-
"prettier": "^2.7.0",
61-
"tailwindcss": "^3.1.3",
62-
"typescript": "^4.7.3"
60+
"prettier": "^2.7.1",
61+
"tailwindcss": "^3.1.5",
62+
"typescript": "^4.7.4"
6363
}
6464
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
import Link from 'next/link';
2+
import Image from 'next/image';
3+
import { Post } from '@/models/post.model';
4+
import AJPrimary from '@/components/global/icons/AJPrimary';
5+
6+
export default function ScheduleCards({
7+
posts,
8+
}: {
9+
posts: Post[];
10+
}): JSX.Element {
11+
console.log(posts);
12+
let re = /(\w+).null - /;
13+
14+
return (
15+
<>
16+
{posts && posts.length > 0 ? (
17+
<section className="relative grid grid-cols-1 gap-4 lg:grid-cols-2 sm:gap-10">
18+
{posts.map((post) => {
19+
return (
20+
<div
21+
className="grid transition-all rounded-md shadow-lg dark:text-primary-50 dark:bg-basics-600 grid-rows-auto-2 hover:shadow-2xl hover:scale-105 bg-basics-50"
22+
key={post._id}
23+
>
24+
<Link href={`/${post._type}/${post.slug}`}>
25+
<div className="grid grid-cols-[200px_1fr] p-2">
26+
<div className="flex flex-wrap gap-1">
27+
{post?.guests?.map((guest) => {
28+
return (
29+
<div className="w-20 h-20" key={guest.id}>
30+
<Image
31+
src={`/main-codingcatdev-photo/podcast-guest/${guest.twitter?.replace(
32+
'https://twitter.com/',
33+
''
34+
)}`}
35+
alt={guest.name}
36+
width="50"
37+
height="50"
38+
layout="responsive"
39+
className="w-20 h-20 rounded-full cursor-pointer"
40+
/>
41+
</div>
42+
);
43+
})}
44+
</div>
45+
<div className="flex flex-col gap-1">
46+
<p className="text-xl border-b-2 card-title border-b-primary-500">
47+
{post?.recordingDate
48+
? new Date(post.recordingDate).toLocaleString()
49+
: ''}
50+
</p>
51+
<p className="text-2xl">{post?.title?.replace(re, '')}</p>
52+
<p className="text-lg">{post?.excerpt}</p>
53+
</div>
54+
</div>
55+
</Link>
56+
</div>
57+
);
58+
})}
59+
</section>
60+
) : (
61+
<>
62+
<div className="p-4 pt-8">
63+
<h1>Oh no! Nothing to show yet...</h1>
64+
</div>
65+
</>
66+
)}
67+
</>
68+
);
69+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import Link from 'next/link';
2+
import AJHeadphones from '@/components/global/icons/AJHeadphones';
3+
import Schedule from './global/icons/nav/Schedule';
4+
import Twitch from './global/icons/socials/Twitch';
5+
6+
export default function PurrfectDevUpper(): JSX.Element {
7+
return (
8+
<div className="flex justify-center w-full">
9+
<section className="grid items-center content-center max-w-md grid-cols-1 gap-4 mx-auto text-center lg:max-w-3xl 2xl:mx-0 2xl:justify-self-end">
10+
<h1 className="pt-4 -mb-4 text-5xl leading-snug tracking-tight vertical-text-clip xl:tracking-wide xl:text-6xl xl:leading-snug 2xl:text-7xl 2xl:leading-snug">
11+
Schedule
12+
</h1>
13+
<p className="font-sans 2xl:text-2xl">
14+
Schedule of streams presented by CodingCat.dev .
15+
</p>
16+
<p className="font-sans 2xl:text-2xl">
17+
Make sure to never miss an episode by adding the Google Calendar and
18+
subscribing on Twitch!
19+
</p>
20+
<div className="flex flex-wrap gap-4 m-auto">
21+
<a
22+
href="https://calendar.google.com/calendar?cid=Y18za2ttczRxMzZidG9yazRyY2o2YmhibmR0Y0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t"
23+
target="_blank"
24+
rel="noreferrer"
25+
>
26+
<button className="flex items-center gap-2 btn-primary fill-primary-50 hover:fill-primary-500">
27+
<Schedule className="block w-6 h-6" />
28+
Google Calendar
29+
</button>
30+
</a>
31+
<a
32+
href="https://twitch.tv/codingcatdev"
33+
target="_blank"
34+
rel="noreferrer"
35+
>
36+
<button className="flex items-center gap-2 btn-secondary-reverse fill-primary-50 hover:fill-primary-500">
37+
<Twitch className="block w-6 h-6" />
38+
Twitch
39+
</button>
40+
</a>
41+
</div>
42+
</section>
43+
</div>
44+
);
45+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
export default function Schedule({
2+
className = 'block w-8 h-8 p-1',
3+
fill,
4+
}: {
5+
className?: string;
6+
fill?: string;
7+
}): JSX.Element {
8+
return (
9+
<svg
10+
xmlns="http://www.w3.org/2000/svg"
11+
fill={fill}
12+
className={className}
13+
viewBox="0 0 16 16"
14+
xmlnsXlink="http://www.w3.org/1999/xlink"
15+
xmlSpace="preserve"
16+
>
17+
<path
18+
xmlns="http://www.w3.org/2000/svg"
19+
fillRule="evenodd"
20+
d="M4 .5a.5.5 0 0 0-1 0V1H2a2 2 0 0 0-2 2v1h16V3a2 2 0 0 0-2-2h-1V.5a.5.5 0 0 0-1 0V1H4V.5zM0 5h16v9a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V5zm9.5 2a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1zm3 0a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1zM2 10.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1zm3.5-.5a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1z"
21+
/>
22+
</svg>
23+
);
24+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
export default function Discord({
2+
className = 'block w-8 h-8',
3+
fill,
4+
}: {
5+
className?: string;
6+
fill: string;
7+
}): JSX.Element {
8+
return (
9+
<svg
10+
className={className}
11+
width={71}
12+
height={55}
13+
viewBox="0 0 71 55"
14+
fill={fill}
15+
xmlns="http://www.w3.org/2000/svg"
16+
>
17+
<g clipPath="url(#clip0_2047_16741)">
18+
<path
19+
d="M59.82 5.31733C67.7318 16.9774 71.6421 30.1098 70.2081 45.2262C64.2853 49.5587 58.548 52.2124 52.8871 53.9827C51.6639 52.2663 50.5468 50.4648 49.5574 48.5802C51.4114 47.8635 53.1804 47.0141 54.8854 46.0174C55.3424 45.7506 55.3606 45.1116 54.9515 44.807L54.9513 44.8069C54.5836 44.5334 54.2179 44.2456 53.8682 43.9573L53.8682 43.9573L53.8619 43.9522C53.6526 43.7853 53.3605 43.7414 53.1052 43.8625C41.7573 49.1044 29.3313 49.1049 17.8439 43.8601L17.8403 43.8585C17.5948 43.7488 17.3024 43.7835 17.0886 43.9602C16.7405 44.2472 16.3746 44.5325 16.0076 44.8075C15.5897 45.1192 15.6304 45.7566 16.077 46.0175L16.0805 46.0194C17.7824 46.9953 19.5513 47.862 21.4063 48.5838C20.4366 50.4688 19.3201 52.2687 18.0761 53.9835C12.4414 52.2133 6.70357 49.5595 0.78032 45.2267C-0.418934 32.1445 2.08142 18.9066 11.1562 5.31998C15.5684 3.30106 20.2903 1.80811 25.2219 0.941504C25.8175 2.01079 26.477 3.33086 26.9276 4.41358L27.0779 4.77486L27.4647 4.71574C32.7595 3.90647 38.1382 3.90624 43.5469 4.71597L43.9296 4.77326L44.081 4.41717C44.535 3.34987 45.1731 2.00769 45.7608 0.941698C50.6927 1.81062 55.4124 3.30258 59.82 5.31733ZM0.791565 45.3483L0.791242 45.3448L0.791565 45.3483ZM16.8451 30.1692C16.8451 34.3352 19.9 37.8252 23.7259 37.8252C27.6092 37.8252 30.6049 34.3342 30.6066 30.1727C30.6641 26.0298 27.6338 22.5132 23.7259 22.5132C19.8414 22.5132 16.8451 26.0062 16.8451 30.1692ZM40.4371 30.1692C40.4371 34.3352 43.492 37.8252 47.3178 37.8252C51.2305 37.8252 54.1969 34.3327 54.1986 30.1728C54.256 26.0299 51.2259 22.5132 47.3178 22.5132C43.4333 22.5132 40.4371 26.0062 40.4371 30.1692Z"
20+
fill="#BC2261"
21+
stroke="black"
22+
/>
23+
</g>
24+
<defs>
25+
<clipPath id="clip0_2047_16741">
26+
<rect width={71} height={55} fill={fill} />
27+
</clipPath>
28+
</defs>
29+
</svg>
30+
);
31+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
export default function Twitch({
2+
className = 'block w-8 h-8',
3+
fill,
4+
stroke,
5+
strokeWidth,
6+
}: {
7+
className?: string;
8+
fill?: string;
9+
stroke?: string;
10+
strokeWidth?: string;
11+
}): JSX.Element {
12+
return (
13+
<svg
14+
version="1.1"
15+
id="Layer_1"
16+
xmlns="http://www.w3.org/2000/svg"
17+
viewBox="0 0 2400 2800"
18+
xmlSpace="preserve"
19+
className={className}
20+
fill={fill}
21+
>
22+
<g id="Layer_1-2">
23+
<path
24+
className="st0"
25+
stroke={stroke}
26+
strokeWidth={strokeWidth}
27+
d="M500 0 0 500v1800h600v500l500-500h400l900-900V0H500zm1700 1300-400 400h-400l-350 350v-350H600V200h1600v1100z"
28+
/>
29+
<path
30+
className="st1"
31+
d="M1700 550h200v600h-200zM1150 550h200v600h-200z"
32+
/>
33+
</g>
34+
</svg>
35+
);
36+
}

‎frontend/main/src/layout/Footer.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import Twitter from '@/components/global/icons/socials/Twitter';
88
import YouTube from '@/components/global/icons/socials/YouTube';
99
import { Site, SocialLink, SocialType } from '@/models/site.model';
1010
import Link from 'next/link';
11+
import Discord from '@/components/global/icons/socials/Discord';
12+
import Twitch from '@/components/global/icons/socials/Twitch';
1113

1214
const socialLinks = ``;
1315

@@ -34,6 +36,10 @@ export default function Footer({
3436
return <Twitter fill="#BC2261" />;
3537
case SocialType.youtube:
3638
return <YouTube fill="#BC2261" />;
39+
case SocialType.discord:
40+
return <Discord fill="#BC2261" />;
41+
case SocialType.twitch:
42+
return <Twitch fill="#BC2261" stroke="black" strokeWidth="60" />;
3743
}
3844
}
3945

0 commit comments

Comments
 (0)