Merge pull request #35 from CinCoders/develop

Version 1.0.0

.env.example

@@ -1,2 +1,3 @@
 REACT_APP_SHEET_ID=<your_googledrive_spreadsheet_id>
-REACT_APP_SHEET_NAME=<the_deadline_sheet_name_in_the_spreadsheet>
+REACT_APP_SHEET_NAME=<the_deadline_sheet_name_in_the_spreadsheet>
+REACT_APP_GOOGLE_ANALYTICS_ID=<your_google_analytics_id>

.github/workflows/build-deploy.yml

@@ -30,6 +30,7 @@ jobs:
         env:
           REACT_APP_SHEET_ID: ${{ vars.REACT_APP_SHEET_ID }}
           REACT_APP_SHEET_NAME: ${{ vars.REACT_APP_SHEET_NAME }}
+          REACT_APP_GOOGLE_ANALYTICS_ID: ${{ vars.REACT_APP_GOOGLE_ANALYTICS_ID }}
 
       - name: Upload Artifact
         uses: actions/upload-pages-artifact@v1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cs-deadlines",
-  "version": "0.3.0",
+  "version": "1.0.0",
   "description": "Deadlines from the Top Computer Science Conferences!",
   "license": "MIT",
   "private": true,
@@ -15,12 +15,12 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "GENERATE_SOURCEMAP=false react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
   "dependencies": {
-    "@cincoders/cinnamon": "^1.2.0",
+    "@cincoders/cinnamon": "^1.3.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.14.1",
@@ -30,8 +30,10 @@
     "date-fns-tz": "^2.0.0",
     "papaparse": "^5.4.1",
     "react": "^18.1.0",
+    "react-cookie-consent": "^9.0.0",
     "react-countdown": "^2.3.5",
     "react-dom": "^18.1.0",
+    "react-ga4": "^2.1.0",
     "react-router-dom": "^6.14.2",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"

src/App.tsx

@@ -1,7 +1,18 @@
 import { CssBaseline } from '@mui/material';
+import ReactGA from 'react-ga4';
 import RoutesApp from './routes';
 
 function App() {
+  ReactGA.gtag('consent', 'default', {
+    ad_storage: 'denied',
+    ad_user_data: 'denied',
+    ad_personalization: 'denied',
+    analytics_storage: 'denied',
+  });
+  if (process.env.REACT_APP_GOOGLE_ANALYTICS_ID) {
+    ReactGA.initialize(process.env.REACT_APP_GOOGLE_ANALYTICS_ID);
+  }
+
   return (
     <>
       <CssBaseline />

src/components/ConferencePage/index.tsx

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import { Page } from '@cincoders/cinnamon';
 import logoCin from '../../assets/cin-logo.svg';
 import logoCinSmall from '../../assets/cin-logo-small.svg';
+import { CookieConsent } from '../CookieConsent';
 
 interface PageProps {
   children: JSX.Element | JSX.Element[];
@@ -38,7 +39,8 @@ export default function ConferencePage({ children }: PageProps) {
       haveToast={false}
       createNavbarContext={false}
     >
-      {children}
+      <div>{children}</div>
+      <CookieConsent />
     </Page>
   );
 }