From 50485c8cbbed1c82bc91501ae834a412fb5023ae Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Wed, 14 Sep 2022 16:36:53 +0300 Subject: [PATCH 1/6] =?UTF-8?q?Update=20s=C3=B6ss=C3=B6=20mediacard=20url.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/CorporatePage/CorporatePageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 289effa..432786f 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -100,7 +100,7 @@ const CorporatePageView: React.FC = ({ jobAds }) => ( Mainos Sössöön? From eb819f73450a3b2bb24ed4cc6127cc0546b0c202 Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Wed, 14 Sep 2022 16:38:00 +0300 Subject: [PATCH 2/6] Revert 4849be84 --- src/pages/admin/signups/[id].tsx | 9 +++++---- tests/testcafe/utils.ts | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/admin/signups/[id].tsx b/src/pages/admin/signups/[id].tsx index 7135748..16cafb0 100644 --- a/src/pages/admin/signups/[id].tsx +++ b/src/pages/admin/signups/[id].tsx @@ -102,15 +102,16 @@ const SignupCreatePage: NextPage = () => { const router = useRouter(); - let id: number; + let id: string; if (router.query?.id && router.query.id !== "create") { - id = Number(router.query.id); + id = router.query.id as string; } useEffect(() => { - if (!Number.isNaN(id)) { - SignupApi.getForm(id, true) + const suId = id && Number(id); + if (suId !== undefined) { + SignupApi.getForm(suId, true) .then((res) => { setFormData({ ...res, diff --git a/tests/testcafe/utils.ts b/tests/testcafe/utils.ts index e734fd7..d2401f5 100644 --- a/tests/testcafe/utils.ts +++ b/tests/testcafe/utils.ts @@ -7,7 +7,7 @@ const API_URL = "https://api.dev.sahkoinsinoorikilta.fi/api"; export const getSiteRoot = (): string => process.env.NEXT_PUBLIC_SITE_URL || "http://localhost:3000"; export const getPageUrl = ClientFunction(() => window.location.pathname); -export const getPostRequestLogger = (url: string) => RequestLogger({ url: `${API_URL}/${url}`, method: "post" }, { +export const getPostRequestLogger = (url: string) => RequestLogger({ url: `${API_URL}/${url}`, method: "POST" }, { // logResponseHeaders: true, logResponseBody: true, stringifyResponseBody: true, From 16c59b75ab07aa110ea9ca24cbd4c8c3721004c9 Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Thu, 15 Sep 2022 20:23:37 +0300 Subject: [PATCH 3/6] Quick fix to Fix issues where frontend calls backend with NaN signup id --- src/pages/admin/signups/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/admin/signups/[id].tsx b/src/pages/admin/signups/[id].tsx index 16cafb0..62aa0d7 100644 --- a/src/pages/admin/signups/[id].tsx +++ b/src/pages/admin/signups/[id].tsx @@ -110,7 +110,7 @@ const SignupCreatePage: NextPage = () => { useEffect(() => { const suId = id && Number(id); - if (suId !== undefined) { + if (suId !== undefined && !Number.isNaN(suId)) { SignupApi.getForm(suId, true) .then((res) => { setFormData({ From 05f972a81a28ffe2931eb1ddd6145b0596669d00 Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Mon, 19 Sep 2022 11:26:10 +0300 Subject: [PATCH 4/6] Update guild tg link --- src/views/FreshmenPage/FreshmenPageHero.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/FreshmenPage/FreshmenPageHero.tsx b/src/views/FreshmenPage/FreshmenPageHero.tsx index 948c0ba..0c2d82f 100644 --- a/src/views/FreshmenPage/FreshmenPageHero.tsx +++ b/src/views/FreshmenPage/FreshmenPageHero.tsx @@ -19,7 +19,7 @@ const FreshmenPageHero: React.FC = () => ( Date: Mon, 19 Sep 2022 15:45:20 +0300 Subject: [PATCH 5/6] Fix signup list error when opening in new tab --- src/pages/admin/signups/[id]/list.tsx | 61 ++++++++++++++++----------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/src/pages/admin/signups/[id]/list.tsx b/src/pages/admin/signups/[id]/list.tsx index a3723dc..d3c005b 100644 --- a/src/pages/admin/signups/[id]/list.tsx +++ b/src/pages/admin/signups/[id]/list.tsx @@ -26,13 +26,19 @@ const SignupEmailPage: NextPage = () => { const { id } = router.query; useEffect(() => { - const formId = Number(id); - SignupApi.getForm(formId, true) - .then((res) => setSignupForm(res)); - - SignupApi.getSignups(formId).then((res) => setSignups(res)); + const formId = id && Number(id); + if (formId !== undefined && !Number.isNaN(formId)) { + SignupApi.getForm(formId, true).then((res) => { + setSignupForm(res); + }); + SignupApi.getSignups(formId).then((res) => { + setSignups(res); + }); + } }, [id]); + const title = signupForm ? signupForm.title_fi : "Loading..."; + const confirmDelete = async (signup: Signup, question: any) => { if (window.confirm(`Delete: ${signup.id}: ${signup.answer[question.id]}; Are you sure?`) === true) { try { @@ -45,27 +51,25 @@ const SignupEmailPage: NextPage = () => { } }; - const title = signupForm ? signupForm.title_fi : "Loading..."; + const renderData = () => { + if (!signupForm || !signups || signups.length === 0) { + return
No signups.
; + } - // TODO: ATM we filter 'info' questions from table here. Maybe remove them from answer JSON altogether? - const questions = signupForm ? signupForm.questions.filter((q) => q.type !== "info").map((q) => ({ - title: q.title_fi, - id: q.id, - })) : []; + // TODO: ATM we filter 'info' questions from table here. Maybe remove them from answer JSON altogether? + const questions = signupForm ? signupForm.questions.filter((q) => q.type !== "info").map((q) => ({ + title: q.title_fi, + id: q.id, + })) : []; - // Generate 2-dimensional array where rows are signups and columns are answers to questions. - const CSVData = signups.map((s) => questions.map((q) => s.answer[q.id])); - // Add reserve signup "header" - if (signupForm?.quota) { - CSVData.splice(signupForm.quota, 0, ["RESERVE-SIGNUPS"]); - } + // Generate 2-dimensional array where rows are signups and columns are answers to questions. + const CSVData = signups.map((s) => questions.map((q) => s.answer[q.id])); + // Add reserve signup "header" + if (signupForm?.quota) { + CSVData.splice(signupForm.quota, 0, ["RESERVE-SIGNUPS"]); + } - return ( - -

- {title} - : Sign-ups -

+ return ( @@ -81,7 +85,6 @@ const SignupEmailPage: NextPage = () => { - {signups.map((s) => ( @@ -99,6 +102,16 @@ const SignupEmailPage: NextPage = () => { ))}
+ ); + }; + + return ( + +

+ {title} + : Sign-ups +

+ {renderData()} ); }; From 60b1b08c1a8f3917056e07b730763bae1f39f7c4 Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Wed, 21 Sep 2022 04:22:56 +0300 Subject: [PATCH 6/6] Update corp logos --- src/views/FrontPage/FrontPageView.tsx | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index 3cd2fed..0a3f3c2 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -18,16 +18,12 @@ import FrontPageHero from "./FrontPageHero"; // Corporate logos import const ABB = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/abb.jpg"; const Caruna = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/caruna.jpg"; -const Eaton = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/eaton.jpg"; const Ensto = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ensto.jpg"; const eSett = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/esett.jpg"; const Fingrid = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/fingrid.jpg"; -const NRCGroup = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/nrcgroup.jpg"; const Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmetic.jpg"; -const Ramboll = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ramboll.png"; -const Helmet = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/helmet.png"; -const Siemens = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/siemens.png"; -const Afry = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/afry.png"; +const Nokia = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/nokia.jpg"; +const Granlund = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/granlund.jpg"; interface FrontPageViewProps { events: Event[]; @@ -97,11 +93,8 @@ const FrontPageView: React.FC = ({ events, feed }) => ( Caruna - - Siemens - - - Eaton + + Nokia Ensto @@ -115,14 +108,8 @@ const FrontPageView: React.FC = ({ events, feed }) => ( Okmetic - - Ramboll - - - Helmet - - - Afry + + Granlund Haluatko kuulla lisää yhteistyöstä kanssamme?