Merge branch 'master' into 'production'

master to prod

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

next.config.js

@@ -11,7 +11,7 @@ module.exports = withBundleAnalyzer({
       "api.sahkoinsinoorikilta.fi",
       "static.sahkoinsinoorikilta.fi",
       "api.dev.sahkoinsinoorikilta.fi",
-      "placehold.it"
+      "placehold.it",
     ],
   },
 });

package.json

@@ -65,7 +65,7 @@
     "stylelint-config-styled-components": "0.1.1",
     "stylelint-processor-styled-components": "1.10.0",
     "testcafe": "1.10.1",
-    "typescript": "3.9.5",
+    "typescript": "4.1.5",
     "typescript-plugin-styled-components": "1.4.4"
   },
   "dependencies": {
@@ -74,7 +74,7 @@
     "date-fns": "2.0.0-alpha.27",
     "js-cookie": "2.2.0",
     "lodash": "4.17.20",
-    "next": "10.0.5",
+    "next": "10.0.7",
     "normalize.css": "8.0.1",
     "query-string": "6.5.0",
     "react": "17.0.1",
@@ -85,7 +85,7 @@
     "react-markdown": "5.0.3",
     "react-mde": "11.0.0",
     "shortid": "2.2.14",
-    "styled-components": "5.1.1",
+    "styled-components": "5.2.1",
     "swr": "0.3.11"
   }
 }

src/components/Footer/FooterContent.tsx

@@ -83,7 +83,7 @@ const FooterContent: React.FC = () => (
             </div>
           </div>
           <div>
-            <Link to="/jaseneksi">Jäseneksi</Link>
+            <Link to="https://api.sahkoinsinoorikilta.fi/members/application/">Jäseneksi</Link>
             <Link to="/palaute">Palaute</Link>
             <Link to="https://static.sahkoinsinoorikilta.fi">Arkisto</Link>
             <Link to="https://static.sahkoinsinoorikilta.fi">Materiaalipankki</Link>

src/views/ActualPage/ActualPageView.tsx

@@ -42,7 +42,7 @@ const ActualPageView: React.FC<ActualPageViewProps> = ({ events, feed }) => (
 
     <CTASection
       bgColor="lightTurquoise"
-      link="sik.kuvat.fi"
+      link="https://sik.kuvat.fi/"
       linkText="Kuvagalleria&nbsp;›"
     >
       Kuvia tapahtumista.

src/views/FreshmenPage/FreshmenPageView.tsx

@@ -6,11 +6,11 @@ import {
 } from "@components/index";
 import FreshmenPageHero from "./FreshmenPageHero";
 
-const FOPAS_LINK = "";
+const FOPAS_LINK = "https://static.sahkoinsinoorikilta.fi/FTMK/fopas_compressed.pdf";
-const FUKSI_POINTS_LINK = "";
+const FUKSI_POINTS_LINK = "https://static.sahkoinsinoorikilta.fi/FTMK/Fuksipisteohje.pdf";
 const TG_GROUP_CHAT_LINK = "https://t.me/joinchat/GsmJjhst3-BYIHQSefVhHg";
-const TG_NOTIFICATIONS_LINK = "";
+const TG_NOTIFICATIONS_LINK = "https://t.me/joinchat/GsmJjk5ZNHjgYsHN_ny2Iw";
-const EMAIL_LINK = "sik-ftmk@list.ayy.fi";
+const EMAIL_LINK = "ftmk@sahkoinsinoorikilta.fi";
 const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
 
 const ImageContainer = styled.div`
@@ -47,7 +47,7 @@ const FreshmenPageView: React.FC = () => (
           <PageLink to={EMAIL_LINK_MAILTO} desc={EMAIL_LINK}>
             Fuksikipparit tavoitat
           </PageLink>
-          <PageLink to="/jaseneksi/" desc="ja tule mukaan toimintaamme&nbsp;›">
+          <PageLink to="https://api.sahkoinsinoorikilta.fi/members/application" desc="ja tule mukaan toimintaamme&nbsp;›">
             Liity jäseneksi
           </PageLink>
           <PageLink to={FUKSI_POINTS_LINK} desc="Katso fuksipisteitä&nbsp;›">

src/views/FrontPage/FrontPageView.tsx

@@ -19,7 +19,6 @@ import FrontPageHero from "./FrontPageHero";
 
 // Corporate logos import
 const ABB = "/img/corporate_logos/abb.png";
-const Capgemini = "/img/corporate_logos/capgemini.png";
 const Caruna = "/img/corporate_logos/caruna.jpg";
 const Eaton = "/img/corporate_logos/eaton.png";
 const Ensto = "/img/corporate_logos/ensto.jpg";
@@ -28,7 +27,6 @@ const Fennovoima = "/img/corporate_logos/fennovoima.png";
 const Fingrid = "/img/corporate_logos/fingrid.jpg";
 const NRCGroup = "/img/corporate_logos/nrcgroup.png";
 const Okmetic = "/img/corporate_logos/okmetic.png";
-const Sogeti = "/img/corporate_logos/sogeti.jpg";
 
 interface FrontPageViewProps {
   events: Event[];
@@ -122,9 +120,6 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
             <Link to="https://new.abb.com/fi/uralle">
               <Image src={ABB} alt="ABB" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
-            <Link to="https://www.capgemini.com/">
-              <Image src={Capgemini} alt="Capgemini" layout="responsive" width={200} height={100} objectFit="contain" />
-            </Link>
             <Link to="https://www.caruna.fi/tietoa-meista/tyonhakijalle/tyonantajalupaus">
               <Image src={Caruna} alt="Caruna" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
@@ -149,9 +144,6 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
             <Link to="https://www.okmetic.com/fi/">
               <Image src={Okmetic} alt="Okmetic" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
-            <Link to="https://www.sogeti.com/">
-              <Image src={Sogeti} alt="Sogeti" layout="responsive" width={200} height={100} objectFit="contain" />
-            </Link>
           </div>
           <Link to="/yritysyhteistyo">Haluatko kuulla lisää yhteistyöstä kanssamme?</Link>
         </SponsorReel>