From bd4d483920d1cbcbc01408c357ca076f1c820d11 Mon Sep 17 00:00:00 2001
From: ojakoo
Date: Sun, 30 May 2021 14:16:49 +0300
Subject: [PATCH 1/4] added sort to signup forms
---
src/views/EventPage/EventPageView.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/EventPage/EventPageView.tsx b/src/views/EventPage/EventPageView.tsx
index 79acbca..b0ba105 100644
--- a/src/views/EventPage/EventPageView.tsx
+++ b/src/views/EventPage/EventPageView.tsx
@@ -99,7 +99,7 @@ const EventPageView: React.FC = ({ event }) => {
{/* We may have multiple signup forms. Generate own Button for each one */}
- {event.signupForm.map((sf) => (
+ {event.signupForm.sort((a, b) => (a.title_fi.localeCompare(b.title_fi))).map((sf) => (
{isFi ? sf.title_fi : sf.title_en}
From 654a24212e947ba646b51f040a407f9e066e2fa5 Mon Sep 17 00:00:00 2001
From: Aarni Halinen
Date: Sat, 8 May 2021 02:41:20 +0300
Subject: [PATCH 2/4] try to fix testcafe
---
testcafe.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testcafe.json b/testcafe.json
index f086c7a..e951fa2 100644
--- a/testcafe.json
+++ b/testcafe.json
@@ -3,7 +3,7 @@
"browsers": "all",
"concurrency": 1,
"screenshots": {
- "path": "e2e-screenshots",
+ "path": "e2e-screenshots/",
"takeOnFails": true
},
"skipJsErrors": true,
From e1eb1c25bbff21fbb2a031796e165cac88a814fa Mon Sep 17 00:00:00 2001
From: ojakoo
Date: Mon, 31 May 2021 12:30:50 +0300
Subject: [PATCH 3/4] language conditional sort for signup form buttons
---
src/views/EventPage/EventPageView.tsx | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/EventPage/EventPageView.tsx b/src/views/EventPage/EventPageView.tsx
index b0ba105..cfd45a0 100644
--- a/src/views/EventPage/EventPageView.tsx
+++ b/src/views/EventPage/EventPageView.tsx
@@ -99,13 +99,15 @@ const EventPageView: React.FC = ({ event }) => {
{/* We may have multiple signup forms. Generate own Button for each one */}
- {event.signupForm.sort((a, b) => (a.title_fi.localeCompare(b.title_fi))).map((sf) => (
-
-
- {isFi ? sf.title_fi : sf.title_en}
-
-
- ))}
+ {event.signupForm
+ .sort((a, b) => (isFi ? a.title_fi.localeCompare(b.title_fi) : a.title_en.localeCompare(b.title_en)))
+ .map((sf) => (
+
+
+ {isFi ? sf.title_fi : sf.title_en}
+
+
+ ))}
From 2f4c17d53411003d17cd3272c72693aba3993ed3 Mon Sep 17 00:00:00 2001
From: dev
Date: Tue, 1 Jun 2021 12:38:28 +0300
Subject: [PATCH 4/4] fixed read more button styling on actual page
---
src/components/Sections/FullWidthSection.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Sections/FullWidthSection.tsx b/src/components/Sections/FullWidthSection.tsx
index 165a63e..c61e1ab 100644
--- a/src/components/Sections/FullWidthSection.tsx
+++ b/src/components/Sections/FullWidthSection.tsx
@@ -2,7 +2,7 @@ import React from "react";
import styled from "styled-components";
const StyledSection = styled.section`
- display: grid;
+ display: block;
padding: 1.5rem;
grid-template-columns: 1fr auto;