Merge branch 'dev' into 1136-bug-axis-partial

data-for-change · Oct 31, 2024 · 0bafe8d · 0bafe8d
2 parents 64db6a3 + 928b0a7
commit 0bafe8d
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 9 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Build
         run: npm run build:staging
       - name: Deploy
-        uses: w9jds/firebase-action@master
+        uses: w9jds/firebase-action@v13.22.1
         with:
           args: deploy --only hosting:dev
         env:

diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Build
         run: npm run build
       - name: Deploy
-        uses: w9jds/firebase-action@master
+        uses: w9jds/firebase-action@v13.22.1
         with:
           args: deploy --only hosting:master
         env:

diff --git a/docs/Vision.md b/docs/Vision.md
@@ -2,7 +2,10 @@
 
 ## About ANYWAY
 
-ANYWAY give interactive map, Database engine, and information on Traffic accidents in israel. the data originating from the Central Bureau of Statistics and United Hazalah’s, as well as traffic violations as reported by road vigilantes.
+ANYWAY is Data For Change’s first community based project aiming to reduce road fatalities via data driven decisions, public awareness and government’s data transparency.
+Our community of devoted volunteers build technological tools for analysis and accessibility of reliable information of road accidents, and their prevention, in line with the "Vision Zero" approach.
+The first tool we developed, is an interactive map showing car accidents [found here](www.anyway.co.il)
+ANYWAY MAP is an interactive map, Database engine, and information on Traffic accidents in israel. the data originating from the Central Bureau of Statistics, as well as traffic violations as reported by road vigilantes.
 
 The goal of the project is to primarily raise public awareness for Road Hazard and about available
 solution's to improve road safety. This is used to create pressure on decision makers to perform necessary infrastructural repairs as well as create discourse regarding solutions.

diff --git a/src/assets/card-bg-road-oryarok.png b/src/assets/card-bg-road-oryarok.png
diff --git a/src/assets/greenlight.png b/src/assets/greenlight.png
diff --git a/src/components/molecules/LogInLinkGoogle.tsx b/src/components/molecules/LogInLinkGoogle.tsx
@@ -9,6 +9,7 @@ const useStyles = makeStyles((theme) => ({
     padding: theme.spacing(1),
     color: `${oceanBlueColor}`,
     textDecoration: 'none',
+    fontFamily: 'Rubik',
     '&:hover': {
       color: `${skyBlueColor}`,
     },

diff --git a/src/components/molecules/UserProfileHeader.tsx b/src/components/molecules/UserProfileHeader.tsx
@@ -20,6 +20,7 @@ const useStyles = makeStyles((theme) => ({
     color: `${oceanBlueColor}`,
     padding: theme.spacing(1),
     textDecoration: 'none',
+    fontFamily: 'Rubik',
     '&:hover': {
       color: `${skyBlueColor}`,
     },

diff --git a/src/components/molecules/card/AnyWayCard.tsx b/src/components/molecules/card/AnyWayCard.tsx
@@ -72,7 +72,7 @@ const useStyles = makeStyles((theme) => ({
     cursor: 'pointer',
   },
   tooltip: {
-    fontSize: '13px',
+    fontSize: '20px',
   },
 }));
 
@@ -163,7 +163,7 @@ const AnyWayCard: FC<IProps> = ({
       <Card ref={refFn} className={classes.root} variant="outlined">
         <Box height={sizes.height} width={sizes.width} position="relative" padding={3}>
           {/* HEADER */}
-          {organizationData?.key !== 'n12'?<CardBackgroundImage variant={variant.header} />:<></>}
+          {organizationData?.key !== 'n12' ? (<CardBackgroundImage variant={variant.header} {...(organizationData?.key && { org: organizationData.key })} />) : null}
           {variant.header !== HeaderVariant.None && (
             <Box height={sizes.headerHeight} width="100%">
               <CardHeader

diff --git a/src/components/molecules/card/CardBackgroundImage.tsx b/src/components/molecules/card/CardBackgroundImage.tsx
@@ -2,13 +2,16 @@ import { makeStyles, Theme } from '@material-ui/core';
 import React, { FC } from 'react';
 import { HeaderVariant } from 'services/widgets.style.service';
 import CardBackgrounRoadImage from 'assets/card-bg-road.png';
+import CardBackgrounRoadImageOrYarok from 'assets/card-bg-road-oryarok.png';
 import CardBackgrounMapImage from 'assets/card-bg-map.png';
 
 const ROAD_IMAGE_HEIGHT = 130;
 const MAP_IMAGE_HEIGHT = '100%';
+let backgroundImage = CardBackgrounRoadImage;
 
 interface IProps {
   variant: HeaderVariant;
+  org?: string;
 }
 
 const useStyles = makeStyles<Theme, IProps>((theme) => ({
@@ -21,16 +24,25 @@ const useStyles = makeStyles<Theme, IProps>((theme) => ({
   },
 }));
 
-const CardBackgroundImage: FC<IProps> = ({ variant }) => {
+const CardBackgroundImage: FC<IProps> = ({ variant,  org = 'no_organization'}) => {
   const classes = useStyles({ variant });
   let src;
   let height;
 
+  switch (org) {
+    case 'or_yarok':
+      backgroundImage = CardBackgrounRoadImageOrYarok;
+      break;
+    case 'no_organization':
+      backgroundImage = CardBackgrounRoadImage;
+      break;
+  }
+
   switch (variant) {
     case HeaderVariant.Centered:
     case HeaderVariant.CenteredNoTitle:
     case HeaderVariant.Logo:
-      src = CardBackgrounRoadImage;
+      src = backgroundImage;
       height = ROAD_IMAGE_HEIGHT;
       break;
     case HeaderVariant.Label:

diff --git a/src/style/_colors.ts b/src/style/_colors.ts
@@ -49,8 +49,8 @@ export const defaultThemeColors : ColorScheme = {
   main: blueVioletColor,
   fontColor: blackColor,
   backgroundColor: whiteColor,
-  containerColor: whiteColor,
-  titleContainerColor: whiteColor,
+  containerColor: transparentColor,
+  titleContainerColor: transparentColor,
   pieChartColors: pieChartColors,
   barChartColors: barColors,
   roadNumberBackground: silverGrayColor,