Merge branch 'master' into 'production'

fix actual page read more button style

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!68

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;

src/views/EventPage/EventPageView.tsx

@@ -99,13 +99,15 @@ const EventPageView: React.FC<EventPageViewProps> = ({ event }) => {
           </p>
           {/* We may have multiple signup forms. Generate own Button for each one */}
           <SignupButtons>
-            {event.signupForm.map((sf) => (
-              <Link key={sf.id} to={`/signup/${sf.id}`}>
-                <Button data-e2e="signup-button" buttonStyle="filled" onClick={noop}>
-                  {isFi ? sf.title_fi : sf.title_en}
-                </Button>
-              </Link>
-            ))}
+            {event.signupForm
+              .sort((a, b) => (isFi ? a.title_fi.localeCompare(b.title_fi) : a.title_en.localeCompare(b.title_en)))
+              .map((sf) => (
+                <Link key={sf.id} to={`/signup/${sf.id}`}>
+                  <Button data-e2e="signup-button" buttonStyle="filled" onClick={noop}>
+                    {isFi ? sf.title_fi : sf.title_en}
+                  </Button>
+                </Link>
+              ))}
           </SignupButtons>
         </div>
       </StyledTextSection>

testcafe.json

@@ -3,7 +3,7 @@
   "browsers": "all",
   "concurrency": 1,
   "screenshots": {
-    "path": "e2e-screenshots",
+    "path": "e2e-screenshots/",
     "takeOnFails": true
   },
   "skipJsErrors": true,