@openeventkit/event-site 2.0.128-beta.5 → 2.0.129

package/env.template

@@ -34,3 +34,4 @@ GATSBY_CMS_BACKEND_REPO=
 GATSBY_CMS_BACKEND_BRANCH=
 GATSBY_SITE_URL=
 GATSBY_GOOGLE_TAGMANAGER_ID=
+GATSBY_HASH_SANITIZE_TOKENS=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.128-beta.5",
+  "version": "2.0.129",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",

package/src/actions/clock-actions.js

@@ -1,24 +1,25 @@
-import { createAction } from 'openstack-uicore-foundation/lib/utils/actions';
+import { createAction } from "openstack-uicore-foundation/lib/utils/actions";
+import { PHASES, getSummitPhase, getEventPhase } from "@utils/phasesUtils";
+import { updateVotingPeriodsPhase } from "../actions/presentation-actions";
+import { sanitizeHash } from "../actions/security-actions";
 
-import { PHASES, getSummitPhase, getEventPhase } from '../utils/phasesUtils';
-
-import { updateVotingPeriodsPhase } from '../actions/presentation-actions';
-
-export const SUMMIT_PHASE_AFTER = 'SUMMIT_PHASE_AFTER';
-export const SUMMIT_PHASE_DURING = 'SUMMIT_PHASE_DURING';
-export const SUMMIT_PHASE_BEFORE = 'SUMMIT_PHASE_BEFORE';
-export const EVENT_PHASE_BEFORE = 'EVENT_PHASE_BEFORE';
-export const EVENT_PHASE_DURING = 'EVENT_PHASE_DURING';
-export const EVENT_PHASE_AFTER = 'EVENT_PHASE_AFTER';
-export const EVENT_PHASE_ADD = 'EVENT_PHASE_ADD';
-export const UPDATE_CLOCK = 'UPDATE_CLOCK';
+export const SUMMIT_PHASE_AFTER = "SUMMIT_PHASE_AFTER";
+export const SUMMIT_PHASE_DURING = "SUMMIT_PHASE_DURING";
+export const SUMMIT_PHASE_BEFORE = "SUMMIT_PHASE_BEFORE";
+export const EVENT_PHASE_BEFORE = "EVENT_PHASE_BEFORE";
+export const EVENT_PHASE_DURING = "EVENT_PHASE_DURING";
+export const EVENT_PHASE_AFTER = "EVENT_PHASE_AFTER";
+export const EVENT_PHASE_ADD = "EVENT_PHASE_ADD";
+export const UPDATE_CLOCK = "UPDATE_CLOCK";
 
 export const updateClock = (timestamp) => (dispatch) => {
-
   dispatch(createAction(UPDATE_CLOCK)({ timestamp }));
+
   dispatch(updateSummitPhase());
   dispatch(updateEventsPhase());
   dispatch(updateVotingPeriodsPhase());
+
+  dispatch(sanitizeHash());
 };
 
 export const updateSummitPhase = () => (dispatch, getState) => {
@@ -89,5 +90,5 @@ export const updateEventsPhase = () => (dispatch, getState) => {
           break;
       }
     }
-  })
-};
+  });
+};

package/src/actions/security-actions.js

@@ -0,0 +1,32 @@
+import { getEnvVariable, HASH_SANITIZE_TOKENS } from "@utils/envVariables";
+
+export const sanitizeHash = () => (dispatch, getState) => {
+  const { userState: { isAuthorized } } = getState();
+
+  if (!isAuthorized) {
+    const tokens = getEnvVariable(HASH_SANITIZE_TOKENS)?.split(",") ?? [];
+
+    if (tokens.length > 0) {
+      const url = new URL(window.location.href);
+      let fragment = url.hash;
+      let shouldUpdate = false;
+
+      tokens.forEach(token => {
+        if (fragment.includes(`${token}=`)) {
+          shouldUpdate = true;
+          fragment = fragment
+            .split("&")
+            .filter(fragmentToken => !fragmentToken.includes(`${token}=`))
+            .join("&")
+            .replace("#&", "#")
+            .replace("#?", "#")
+            .replace("#", "");
+        }
+      });
+
+      if (shouldUpdate) {
+        window.history.replaceState({}, "", `${url.pathname}${fragment ? `#${fragment}` : ""}`);
+      }
+    }
+  }
+};

package/src/styles/colors.scss

@@ -1,4 +1,10 @@
-$color_accent: #00A2FF;
+/**
+* Warning:
+* Dont edit this file by hand, has been generated by colors scss util
+* Uses default colors as base and then overriden by colors set via marketing
+**/
+
+$color_accent: #ff5e32;
 $color_alerts: #ff0000;
 $color_background_light: #ffffff;
 $color_background_dark: #000000;
@@ -19,16 +25,16 @@ $color_input_text_color_light: #363636;
 $color_input_text_color_dark: #ffffff;
 $color_input_text_color_disabled_light: #ffffff;
 $color_input_text_color_disabled_dark: #ffffff;
-$color_primary: #000000;
-$color_primary_contrast: #FFFFFF;
-$color_secondary: #00A2FF;
-$color_secondary_contrast: #181818;
+$color_primary: #6d6e71;
+$color_primary_contrast: #f1f2f2;
+$color_secondary: #00CEC4;
+$color_secondary_contrast: #ff5e32;
 $color_text_light: #ffffff;
 $color_text_med: #828282;
-$color_text_dark: #000000;
+$color_text_dark: #333333;
 $color_text_input_hints_light: #7b7b7b;
 $color_text_input_hints_dark: #7b7b7b;
-$color_text_input_hints: #131313;
+$color_text_input_hints: #c4c4c4;
 
 :root {
   --color_primary: #{$color_primary};

package/src/styles/fonts.scss

@@ -1,31 +1,26 @@
-$font-family: "BuilderExtended";
+/**
+* Warning:
+* Dont edit this file by hand, has been generated by fonts scss util
+* Generated with font values set via CMS
+**/
+
+$font-family: 'Nunito Sans', sans-serif;
 
 :root {
-  --font_family: "BuilderExtended" !important;
+  --font_family: #{$font-family};
 }
 
-@font-face {
-  font-family: "BuilderExtended";
-  src: url("/fonts/buildersans-regular.woff") format("woff");
-  font-weight: normal;
-}
-@font-face {
-  font-family: "BuilderExtended";
-  src: url("/fonts/builderextended-semibold.woff") format("woff");
-  font-weight: bold;
-}
-  
 %font-regular {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 400;
 }
 
 %font-semi {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 600;
 }
 
 %font-bold {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 700;
 }

package/src/utils/envVariables.js

@@ -26,6 +26,7 @@ export const REAL_TIME_UPDATES_STRATEGY = "REAL_TIME_UPDATES_STRATEGY";
 export const TIMEINTERVALSINCE1970_API_URL = "TIMEINTERVALSINCE1970_API_URL";
 export const ABLY_API_KEY = "ABLY_API_KEY";
 export const GOOGLE_TAGMANAGER_ID = "GOOGLE_TAGMANAGER_ID";
+export const HASH_SANITIZE_TOKENS = "HASH_SANITIZE_TOKENS";
 
 const processEnv = {
   /**
@@ -63,6 +64,7 @@ const processEnv = {
   TIMEINTERVALSINCE1970_API_URL: process.env.GATSBY_TIMEINTERVALSINCE1970_API_URL,
   ABLY_API_KEY: process.env.GATSBY_ABLY_API_KEY,
   GOOGLE_TAGMANAGER_ID: process.env.GATSBY_GOOGLE_TAGMANAGER_ID,
+  HASH_SANITIZE_TOKENS: process.env.GATSBY_HASH_SANITIZE_TOKENS
 }
 
 export const getEnvVariable = (name) => {