+ {children}
+
+ )
+ }
+ }}
+ >
{markdown}
@@ -184,7 +193,7 @@ const ProjectView = ({
width: '90%',
margin: 'auto',
my: 3,
- maxWidth: '800px',
+ maxWidth: '800px'
}}
>
)
}
From d9e304591c95b70f8990a5e7871294e5c1a8e161 Mon Sep 17 00:00:00 2001
From: Kieran Klukas <92754843+kcoderhtml@users.noreply.github.com>
Date: Wed, 21 Aug 2024 22:04:34 -0400
Subject: [PATCH 11/21] bug: stop empty token bypass
---
pages/api/arcade/showcase/login/[token].js | 30 ++++++++++++----------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/pages/api/arcade/showcase/login/[token].js b/pages/api/arcade/showcase/login/[token].js
index 29ae9c65..c2ffe4b1 100644
--- a/pages/api/arcade/showcase/login/[token].js
+++ b/pages/api/arcade/showcase/login/[token].js
@@ -1,21 +1,17 @@
-import AirtablePlus from "airtable-plus"
+import AirtablePlus from 'airtable-plus'
const airtable = new AirtablePlus({
apiKey: process.env.AIRTABLE_API_KEY,
baseID: 'app4kCWulfB02bV8Q',
- tableName: "Users"
+ tableName: 'Users'
})
async function getUserFromLogin(loginToken) {
-
- // only alphanumeric & '-' characters are allowed in the token
- const safeLoginToken = loginToken.replace(/[^a-zA-Z0-9-]/g, '')
-
const results = await airtable.read({
filterByFormula: `{Login Token} = '${safeLoginToken}'`,
maxRecords: 1
})
-
+
return results[0]
}
@@ -28,26 +24,34 @@ async function scrubLoginToken(userID) {
export default async function handler(req, res) {
if (req.method !== 'POST') {
- return res.status(405).json({ error: "Method not allowed" })
+ return res.status(405).json({ error: 'Method not allowed' })
}
const { token } = req.query
if (!token) {
- return res.status(400).json({ error: "Token is required" })
+ return res.status(400).json({ error: 'Token is required' })
}
- const user = await getUserFromLogin(token)
+ // only alphanumeric & '-' characters are allowed in the token
+ const safeLoginToken = token.replace(/[^a-zA-Z0-9-]/g, '')
+ if (safeLoginToken === '') {
+ return res
+ .status(400)
+ .json({ error: 'hey! no injection attacks thats mean' })
+ }
+
+ const user = await getUserFromLogin(safeLoginToken)
if (!user) {
- return res.status(404).json({ error: "User not found" })
+ return res.status(404).json({ error: 'User not found' })
}
const authToken = user.fields['Auth Token']
if (!authToken) {
- return res.status(500).json({ error: "Auth Token not found" })
+ return res.status(500).json({ error: 'Auth Token not found' })
}
await scrubLoginToken(user.id)
// return back the user's AuthToken
res.status(200).json({ authToken })
-}
\ No newline at end of file
+}
From 86b6cbb537afaae0d87f8aec01e8d34e02f771ee Mon Sep 17 00:00:00 2001
From: Kieran Klukas <92754843+kcoderhtml@users.noreply.github.com>
Date: Wed, 21 Aug 2024 22:23:20 -0400
Subject: [PATCH 12/21] chore: Update project-view.js to export CSS properties
for color and dark color
---
components/arcade/showcase/project-view.js | 28 +++++++++++++------
.../showcase/readme-renderer.module.css | 2 ++
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/components/arcade/showcase/project-view.js b/components/arcade/showcase/project-view.js
index 6156a4f8..356bf3d2 100644
--- a/components/arcade/showcase/project-view.js
+++ b/components/arcade/showcase/project-view.js
@@ -98,11 +98,26 @@ const ProjectView = ({
}, [readMeLink])
return (
+ // export a css property for each of the color and dark color
- { image != '' && (
+ {image != '' && (
-
- 
+
)}
+
)
}
diff --git a/components/arcade/showcase/readme-renderer.module.css b/components/arcade/showcase/readme-renderer.module.css
index 73bf5860..14a3e818 100644
--- a/components/arcade/showcase/readme-renderer.module.css
+++ b/components/arcade/showcase/readme-renderer.module.css
@@ -364,6 +364,8 @@ SOFTWARE.
.reactMarkDown pre div {
margin: 0 !important;
+ background-color: var(--color) !important;
+ filter: brightness(105%);
}
.reactMarkDown code, .reactMarkDown pre tt {
From 41e111fe58e53e8991710e5c39ef05b4a06dda75 Mon Sep 17 00:00:00 2001
From: Arnav Kumar <72879799+arnav-kr@users.noreply.github.com>
Date: Thu, 22 Aug 2024 09:57:40 +0530
Subject: [PATCH 13/21] Update index.js
---
pages/arcade/showcase/project/[projectID]/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/arcade/showcase/project/[projectID]/index.js b/pages/arcade/showcase/project/[projectID]/index.js
index 565561d6..658684f7 100644
--- a/pages/arcade/showcase/project/[projectID]/index.js
+++ b/pages/arcade/showcase/project/[projectID]/index.js
@@ -85,7 +85,7 @@ const ProjectShowPage = ({ projectID }) => {
key={project.id}
id={project.id}
title={project.title}
- desc={project.description}
+ description={project.description}
slack={project.slackLink}
codeLink={project.codeLink}
playLink={project.playLink}
From 49e7b94cfdc1cd4416ef5ef5e7b613560e10bd4c Mon Sep 17 00:00:00 2001
From: Max Wofford
Date: Thu, 22 Aug 2024 03:00:37 -0400
Subject: [PATCH 14/21] Fix incorrectly named variable
---
pages/api/arcade/showcase/login/[token].js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/api/arcade/showcase/login/[token].js b/pages/api/arcade/showcase/login/[token].js
index c2ffe4b1..2e163f48 100644
--- a/pages/api/arcade/showcase/login/[token].js
+++ b/pages/api/arcade/showcase/login/[token].js
@@ -8,7 +8,7 @@ const airtable = new AirtablePlus({
async function getUserFromLogin(loginToken) {
const results = await airtable.read({
- filterByFormula: `{Login Token} = '${safeLoginToken}'`,
+ filterByFormula: `{Login Token} = '${loginToken}'`,
maxRecords: 1
})
From f42d441672b94e97fa617d4ddef920a79e9e66c9 Mon Sep 17 00:00:00 2001
From: Arnav Kumar <72879799+arnav-kr@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:48:24 +0530
Subject: [PATCH 15/21] chore: imporve arcade showcase mobile UI
---
components/arcade/showcase/cohort-card.js | 4 ++--
components/arcade/showcase/cohort-card.module.css | 2 +-
components/arcade/showcase/my.module.css | 6 ++++++
components/arcade/showcase/project-view.js | 5 ++++-
components/arcade/showcase/project-view.module.css | 2 +-
components/arcade/showcase/readme-renderer.module.css | 6 ++++++
6 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/components/arcade/showcase/cohort-card.js b/components/arcade/showcase/cohort-card.js
index 2ab5295f..14ffb6ad 100644
--- a/components/arcade/showcase/cohort-card.js
+++ b/components/arcade/showcase/cohort-card.js
@@ -71,8 +71,8 @@ const CohortCard = ({
- { image != '' && (
+ {image != '' && (
-
-
+
)}
{title}
-{description}
+{description}
By {user}
Date: Thu, 22 Aug 2024 18:14:54 +0200
Subject: [PATCH 16/21] Change Play now button label to Try now
---
components/arcade/showcase/project-edit.js | 5 ++++-
components/arcade/showcase/project-view.js | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/components/arcade/showcase/project-edit.js b/components/arcade/showcase/project-edit.js
index fc697f50..d72b126d 100644
--- a/components/arcade/showcase/project-edit.js
+++ b/components/arcade/showcase/project-edit.js
@@ -118,7 +118,10 @@ const ProjectEditForm = ({ project }) => {
/>
From 60d3c254b595fdafe1bd84c07ff61fdcf836200b Mon Sep 17 00:00:00 2001
From: Kieran Klukas <92754843+kcoderhtml@users.noreply.github.com>
Date: Thu, 22 Aug 2024 20:45:47 -0400
Subject: [PATCH 20/21] feat: round showcase container card images
---
components/arcade/showcase/cohort-card.js | 12 +++++++-----
components/arcade/showcase/cohort-card.module.css | 10 ++++++++--
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/components/arcade/showcase/cohort-card.js b/components/arcade/showcase/cohort-card.js
index 2ab5295f..835ad258 100644
--- a/components/arcade/showcase/cohort-card.js
+++ b/components/arcade/showcase/cohort-card.js
@@ -120,11 +120,13 @@ const CohortCard = ({
target="_blank"
rel="noopener noreferrer"
>
- 
+
+
+