public-web: Adjust wordings and UX update

merged #67
WeAreBeep · Jan 16, 2022 · 5b71df0 · 5b71df0
2 parents 4d30c0e + 048c3a7
commit 5b71df0
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 28 deletions.
diff --git a/src/public-web/src/components/MainLinks/index.tsx b/src/public-web/src/components/MainLinks/index.tsx
@@ -5,8 +5,8 @@ import { RouteType } from '../../routes';
 import { useStyles } from './style';
 
 const links: { name: string; routeType: RouteType }[] = [
-  { routeType: RouteType.RequestPpe, name: 'REQUEST PPE' },
-  { routeType: RouteType.RegisterSupplies, name: 'GIVE PPE' },
+  { routeType: RouteType.RequestPpe, name: 'I NEED' },
+  { routeType: RouteType.RegisterSupplies, name: 'I HAVE' },
   { routeType: RouteType.About, name: 'ABOUT' },
   { routeType: RouteType.Partners, name: 'PARTNERS' },
 ];

diff --git a/src/public-web/src/containers/contactUs/index.tsx b/src/public-web/src/containers/contactUs/index.tsx
@@ -3,14 +3,15 @@ import { useStyles } from './style';
 
 export const ContactUs: React.FC = () => {
   const { classes } = useStyles();
-  return <div className={classes.content}>
-    <h1>Contact Us</h1>
+  return (
+    <div className={classes.content}>
+      <h1>Contact Us</h1>
 
-    <p>
-      Please contact us by sending email to <a href="mailto:admin@example.com">admin@example.com</a>.
-    </p>
-    <p>
-      Thank you!
-    </p>
-  </div>;
+      <p>
+        Please contact us by sending email to{' '}
+        <a href="mailto:frontline@wearebeep.com">frontline@wearebeep.com</a>.
+      </p>
+      <p>Thank you!</p>
+    </div>
+  );
 };
diff --git a/src/public-web/src/containers/contactUs/style.ts b/src/public-web/src/containers/contactUs/style.ts
@@ -13,4 +13,3 @@ export const useStyles = createStyles((theme) => ({
     },
   },
 }));
-
diff --git a/src/public-web/src/containers/landing/components/Map/index.tsx b/src/public-web/src/containers/landing/components/Map/index.tsx
@@ -246,10 +246,6 @@ export const Map: React.FC = () => {
   const [mapData, setMapData] = useState<Nullable<MapData>>(null);
   const [loaded, setLoaded] = useState(false);
 
-  const [lng] = useState(-0.118092);
-  const [lat] = useState(51.509865);
-  const [zoom] = useState(8);
-
   const [categoryVisibilityMap, setCategoryVisibilityMap] = useState(
     defaultCategoryVisibilityMap
   );
@@ -260,8 +256,16 @@ export const Map: React.FC = () => {
     mapRef.current = new MapboxMap({
       container: mapContainer.current,
       style: 'mapbox://styles/mapbox/streets-v11',
-      center: [lng, lat],
-      zoom: zoom,
+      // The bound of the UK
+      bounds: [
+        [-10.809872337116673, 49.300494132364435],
+        [9.028203002610155, 59.13892469548853],
+      ],
+      fitBoundsOptions: {
+        padding: 20,
+      },
+      minZoom: 1,
+      maxZoom: 18,
       pitchWithRotate: false,
     });
     mapRef.current.on('load', () => {

diff --git a/src/public-web/src/containers/landing/components/MapControl/index.tsx b/src/public-web/src/containers/landing/components/MapControl/index.tsx
@@ -203,13 +203,13 @@ export const MapControl: React.FC<Props> = ({
             spacing="xs"
           >
             <Radio value="post">
-              Post{' '}
+              All requests{' '}
               {countMap?.[CategoryEnum.Need].posts && (
                 <i>{countMap[CategoryEnum.Need].posts}</i>
               )}
             </Radio>
             <Radio value="breakdown">
-              Breakdowns{' '}
+              Filter items{' '}
               {countMap?.[CategoryEnum.Need].totalBreakdowns && (
                 <i>{countMap[CategoryEnum.Need].totalBreakdowns}</i>
               )}
@@ -236,13 +236,13 @@ export const MapControl: React.FC<Props> = ({
             spacing="xs"
           >
             <Radio value="post">
-              Post{' '}
+              All requests{' '}
               {countMap?.[CategoryEnum.NeedMet].posts && (
                 <i>{countMap[CategoryEnum.NeedMet].posts}</i>
               )}
             </Radio>
             <Radio value="breakdown">
-              Breakdowns{' '}
+              Filter items{' '}
               {countMap?.[CategoryEnum.NeedMet].totalBreakdowns && (
                 <i>{countMap[CategoryEnum.NeedMet].totalBreakdowns}</i>
               )}
@@ -269,13 +269,13 @@ export const MapControl: React.FC<Props> = ({
             spacing="xs"
           >
             <Radio value="post">
-              Post{' '}
+              All supplies{' '}
               {countMap?.[CategoryEnum.Supply].posts && (
                 <i>{countMap[CategoryEnum.Supply].posts}</i>
               )}
             </Radio>
             <Radio value="breakdown">
-              Breakdowns{' '}
+              Filter items{' '}
               {countMap?.[CategoryEnum.Supply].totalBreakdowns && (
                 <i>{countMap[CategoryEnum.Supply].totalBreakdowns}</i>
               )}

diff --git a/src/public-web/src/containers/registerSupplies/index.tsx b/src/public-web/src/containers/registerSupplies/index.tsx
@@ -42,8 +42,8 @@ export const RegisterSupplies: React.FC = () => {
         color: 'flGreen',
         title: 'Save Successful',
         message:
-          'Thanks you have been added to the database, we will be in contact in due course. You will be redirected to home page in 5 seconds.',
-        autoClose: 5000,
+          'Thanks you have been added to the database, we will be in contact in due course. You will be redirected to home page in 10 seconds.',
+        autoClose: 10000,
         onClose: () => {
           navigate('/');
         },

diff --git a/src/public-web/src/containers/requestPpe/index.tsx b/src/public-web/src/containers/requestPpe/index.tsx
@@ -59,8 +59,8 @@ export const RequestPpe: React.FC = () => {
         color: 'flGreen',
         title: 'Save Successful',
         message:
-          'Thanks you have been added to the database, we will be in contact in due course. You will be redirected to home page in 5 seconds.',
-        autoClose: 5000,
+          'Thanks you have been added to the database, we will be in contact in due course. You will be redirected to home page in 10 seconds.',
+        autoClose: 10000,
         onClose: () => {
           navigate('/');
         },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,3 @@ export const useStyles = createStyles((theme) => ({
		},
		},
		}));