Merge branch 'master' into production

src/components/animated-mbd-logo/animated-mbd-logo.tsx

@@ -98,11 +98,11 @@ const AnimatedMBDLogo: FC = () => {
                         <MBDDateContext.Consumer>
                             {(mbdDate) => (
                                 <div>
-                                    {16}{' '}
+                                    {20}{' '}
                                     {TranslationModel.translate(
-                                        phrases.months.february
+                                        phrases.months.march
                                     )}{' '}
-                                    {2023}
+                                    {2025}
                                 </div>
                             )}
                         </MBDDateContext.Consumer>

src/components/card/card.css

@@ -7,7 +7,7 @@
 }
 .card--light {
     box-shadow: 0 0px 8px rgba(0,0,0,0.1), 0 3px 6px rgba(0,0,0,0.1);
-}z
+}
 .card--unselected {
     box-shadow: none;
 }
@@ -24,4 +24,14 @@
 }
 .card--clickable.card--light:hover {
     box-shadow: 0 3px 6px rgba(0,0,0,0.1), 0 5px 10px rgba(0,0,0,0.2);
+}
+.card--gold {
+    background: linear-gradient(338deg, rgba(255,215,0,1) 0%, rgb(241, 210, 29) 63%, rgba(255,255,255,1) 120%);
+}
+
+.card--silver {
+    background: linear-gradient(338deg, #bdbded 0%, #ededed 63%, rgba(255,255,255,1) 120%);
+}
+.card--bronze {
+    background: linear-gradient(338deg, #ee7411 0%, #ffa069 63%, rgb(255, 245, 234) 120%);
 }

src/components/card/card.tsx

@@ -6,6 +6,9 @@ interface CardProps {
     className?: string,
     light?: boolean,
     unselected?: boolean,
+    gold?: boolean,
+    silver?: boolean,
+    bronze?: boolean
 }
 
 const Card: FC<CardProps> = (props) => {
@@ -16,6 +19,15 @@ const Card: FC<CardProps> = (props) => {
     if (props.light) {
         className += 'card--light ';
     }
+    if (props.gold) {
+        className += 'card--gold ';
+    }
+    if (props.silver) {
+        className += 'card--silver ';
+    }
+    if (props.bronze) {
+        className += 'card--bronze ';
+    }
     if (props.unselected) {
         className += 'card--unselected ';
     }

src/components/content-padding-thin.tsx

@@ -0,0 +1,12 @@
+import React, { FC } from 'react';
+
+export const ContentPaddingThin: FC = (props) => {
+    return (
+        <div style={{
+            padding: '5px'
+        }}>
+            {props.children}
+        </div>
+    );
+}
+

src/pages/company-page/company-page.css

@@ -9,6 +9,11 @@
     color: var(--theme-text-dark);
 }
 
+ul {
+    margin-top: 0.1em;
+    border-top: 1px #eee solid;
+    padding: 0px 30px;
+}
 
 .companypage-offer p, .companypage-offer h3, .companypage-offer h4, .companypage-offer h5 {
     text-align: center;

src/pages/contact-page/contact-page.css

@@ -45,6 +45,21 @@
     }
 }
 
+.intro-screen-title {
+    padding: 35px 35px 0px 35px;
+    padding-bottom: 50px;
+    box-sizing: border-box;
+    width: 100%;
+
+    text-transform: uppercase;
+    font-weight: 900;
+    font-size: 40px;
+    text-align: center;
+    color: #ffd521;
+
+    background-image: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.0));
+}
+
 /* Animation */
 @keyframes paning-background-animation {
     0% {

src/pages/contact-page/contact-page.tsx

@@ -27,14 +27,18 @@ const Contactpage: FC = () => {
 
     return (
         <div className='contactpage'>
+            <div className="intro-screen-title">{TranslationModel.translate(phrases.the_project_group)}</div>
+
+            {/*
             <IntroScreen
                 title={TranslationModel.translate(phrases.the_project_group)}
             >
+                
                 <div
                     style={{ backgroundImage: `url(${Background})` }}
                     className='contactpage-background'
-                ></div>
-            </IntroScreen>
+                ></div> 
+            </IntroScreen>*/}
 
             {/* List of every memeber in PG */}
             <ContentSection>
@@ -54,7 +58,8 @@ const Contactpage: FC = () => {
                         )
                     })}
                 </div>
-
+
+                {/*
                 <div className='photographer-thanks'>
                     {TranslationModel.translate(phrases.photo_thanks_start)}{' '}
                     <a
@@ -66,6 +71,8 @@ const Contactpage: FC = () => {
                     </a>{' '}
                     {TranslationModel.translate(phrases.photo_thanks_end)}!
                 </div>
+                */}
+
             </ContentSection>
             {/* Contact form*/}
             <ContentSection background={ContentSectionBackground.dark}>

src/pages/home-page/home-page.tsx

@@ -78,11 +78,11 @@ const Homepage: FC = () => {
                                             <span>
                                                 Vad kul att just du hittat hit!
                                                 Medias Branschdag kommer att äga
-                                                rum {16}{' '}
+                                                rum {20}{' '}
                                                 {TranslationModel.translate(
-                                                    phrases.months.february
+                                                    phrases.months.march
                                                 )}{' '}
-                                                {2023} i kårhuset Nymble på KTH
+                                                {2025} i kårhuset Nymble på KTH
                                                 campus Valhallavägen.
                                                 <br />
                                                 <br />
@@ -111,11 +111,11 @@ const Homepage: FC = () => {
                                         en: (
                                             <span>
                                                 Fancy seeing you here! The fair
-                                                will take place on the 16th of{' '}
+                                                will take place on the 20th of{' '}
                                                 {TranslationModel.translate(
-                                                    phrases.months.february
+                                                    phrases.months.march
                                                 )}{' '}
-                                                {2023} in the student union
+                                                {2025} in the student union
                                                 house Nymble at KTH campus
                                                 Valhallavägen.
                                                 <br />
@@ -162,11 +162,11 @@ const Homepage: FC = () => {
                             <div className='photographer-info'>
                                 <img src={CameraIcon} alt='' />
                                 <a
-                                    href='https://www.instagram.com/fotogruppen_medieteknik/'
+                                    href='http://linkedin.com/in/favourezennaya'
                                     target='_blank'
                                     rel='noopener noreferrer'
                                 >
-                                    Johan Wangärd
+                                    Favour Ezennaya
                                 </a>
                             </div>
                         </>
@@ -200,7 +200,7 @@ const Homepage: FC = () => {
                                                     Läs mer om hur ni kan delta
                                                     i Medias Branschdag{' '}
                                                     {
-                                                        /*mbdDate.getStartYear()*/ 2023 // Need to hardcode as server connection is not working
+                                                        /*mbdDate.getStartYear()*/ 2025 // Need to hardcode as server connection is not working
                                                     }
                                                     .
                                                 </span>

src/pages/student-page/student-page.tsx

@@ -314,7 +314,7 @@ const Studentpage = () => {
                 <>
                 <h1 style={{textAlign:"center", padding:"3rem"}}>More information coming soon...</h1>
                 </>)
-                })/*
+                })}</div>/*
         <div className='studentpage'>
             <div id='studentpage-exhibitors'>
                 <ContentSection>
@@ -339,8 +339,8 @@ const Studentpage = () => {
                 </ContentSection>
             </div>
             <Footer />
-        </div>
-        */}</div>
+        </div>*/
+
     )
 }