Merge pull request #1131 from data-for-change/dev

merge dev into master
data-for-change · Oct 22, 2024 · 7e1c8ab · 7e1c8ab
2 parents 00385a5 + 83b3723
commit 7e1c8ab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/assets/card-bg-road-oryarok.png b/src/assets/card-bg-road-oryarok.png
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
@@ -159,7 +159,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: