Fjern coronagreier

Kristianrosland · Nov 2, 2020 · 243352d · 243352d
1 parent 4ca2653
commit 243352d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/src/Frontend/App.jsx b/src/Frontend/App.jsx
@@ -37,21 +37,11 @@ function App(props) {
     subEvents: subEvents.filter((s) => s.parent_event_id === e.id),
   }));
 
-  const coronaClosed = false;
-
   return (
     <AppContext.Provider value={[state, setState]}>
       <div className="app">
         {<SelectLanguage state={state} changeLanguage={changeLanguage} />}
-        {(coronaClosed || !group) && (
-          <WelcomeScreen
-            groupNames={groupNames}
-            setGroup={setGroup}
-            setCookie={setCookie}
-            coronaClosed={coronaClosed}
-          />
-        )}
-        {!coronaClosed && group && (
+        {group ? (
           <MainScreen
             events={eventsWithSubevents}
             group={group}
@@ -60,6 +50,12 @@ function App(props) {
               setGroup(undefined);
             }}
           />
+        ) : (
+          <WelcomeScreen
+            groupNames={groupNames}
+            setGroup={setGroup}
+            setCookie={setCookie}
+          />
         )}
       </div>
     </AppContext.Provider>

diff --git a/src/Frontend/App.scss b/src/Frontend/App.scss
@@ -33,10 +33,6 @@ html {
   }
 }
 
-.corona-title {
-  color: red !important;
-}
-
 .dropdown-wrapper {
   display: flex;
   flex-direction: column;
@@ -89,10 +85,6 @@ html {
   }
 }
 
-.ready-button-corona {
-  opacity: 0.5;
-}
-
 .language-pos-absolute {
   position: absolute;
   right: 8px;

diff --git a/src/Frontend/WelcomeScreen.jsx b/src/Frontend/WelcomeScreen.jsx
@@ -9,8 +9,7 @@ const WelcomeScreen = ({
   group,
   setGroup,
   setCookie,
-  groupNames,
-  coronaClosed,
+  groupNames
 }) => {
   const [state] = useContext(AppContext);
   const [selected, setSelected] = useState(group);
@@ -63,7 +62,7 @@ const WelcomeScreen = ({
   return (
     <div className="welcome-screen">
       <div>
-        <h1 className="welcome-screen-main-title corona-title"> {header} </h1>
+        <h1 className="welcome-screen-main-title"> {header} </h1>
         <h3 className="welcome-screen-sub-title"> {subtitle} </h3>
       </div>
       <img
@@ -80,11 +79,10 @@ const WelcomeScreen = ({
           onChange={(v) => setSelected(v)}
           options={groups}
           isSearchable={false}
-          isDisabled={groups.length === 0 || coronaClosed}
+          isDisabled={groups.length === 0}
         />
-        <div className="ready-button ready-button-corona" onClick={submit}>
+        <div className="ready-button" onClick={submit}>
           <p className="ready-button-text">
-            {" "}
             {buttonLabel} <FontAwesomeIcon icon={faChevronRight} />{" "}
           </p>
         </div>

diff --git a/src/Frontend/textResources.jsx b/src/Frontend/textResources.jsx
@@ -1,11 +1,11 @@
 const textResources = {
   /** Welcome screen **/
-  WELCOME_NO: "AVLYST!", //'Velkommen!',
-  WELCOME_EN: "CANCELLED!", // 'Welcome!',
+  WELCOME_NO: 'Velkommen!',
+  WELCOME_EN: 'Welcome!',
   WELCOME_SUBTITLE_NO:
-    "Vi beklager å måtte meddele at fadderuken på UiB dessverre er avlyst. På grunn av oppblomstring av COVID-smitte den siste tiden har administrasjonen på UiB tatt en avgjørelse om å avlyse alle arrangementer.", //'For å kunne gi deg relevant informasjon, trenger vi å vite hvilken gruppe du tilhører. Du kan gå tilbake og endre dette senere ved å klikke på gruppenavnet ditt!',
+    'For å kunne gi deg relevant informasjon, trenger vi å vite hvilken gruppe du tilhører. Du kan gå tilbake og endre dette senere ved å klikke på gruppenavnet ditt!',
   WELCOME_SUBTITLE_EN:
-    "We are sorry to inform you that the mentor week is cancelled. Because of the recent rise in COVID cases, a decision was made by the administration of UiB to cancel all events. ", //'To provide you with relevant information, we need to know which group you belong to. You can go back and change this later by clicking on your group name!',
+    'To provide you with relevant information, we need to know which group you belong to. You can go back and change this later by clicking on your group name!',
   GROUP_PLACEHOLDER_NO: "Velg gruppe...",
   GROUP_PLACEHOLDER_EN: "Select group...",
   WELCOME_SCREEN_BUTTON_LABEL_NO: "Jeg er klar",