Merge pull request #140 from flickmatch/site-changes

website logo, login & what-we-do page text added.

react-fm/index.html

@@ -10,13 +10,13 @@
     <link
       rel="icon"
       sizes="256x256"
-      href="https://firebasestorage.googleapis.com/v0/b/flickmatch-374a2.appspot.com/o/flickmatch-logo-256.png?alt=media&token=99e4f3bc-4ab0-4dec-b1a2-542d207e2905"
+      href="https://firebasestorage.googleapis.com/v0/b/flickmatch-374a2.appspot.com/o/fm_rainbow.png?alt=media&token=1b06ae27-bf10-4974-9100-6bb5f2308314"
       type="image/png"
     />
     <link rel="alternate icon" href="/logo.png" type="image/png" sizes="256x256" />
     <link
       rel="apple-touch-icon"
-      href="https://firebasestorage.googleapis.com/v0/b/flickmatch-374a2.appspot.com/o/fmappletouch-icon.png?alt=media&token=890542b4-7ee6-489e-af08-240afd99978c"
+      href="https://firebasestorage.googleapis.com/v0/b/flickmatch-374a2.appspot.com/o/fm_rainbow.png?alt=media&token=1b06ae27-bf10-4974-9100-6bb5f2308314"
       sizes="256x256"
     />
     <!-- <link rel="mask-icon" href="/logo.png" color="#FFFFFF" /> -->

react-fm/manifest.json

@@ -5,17 +5,17 @@
   "theme_color": "#ffffff",
   "icons": [
     {
-      "src": "logo.png",
+      "src": "fm_rainbow.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "logo.png",
+      "src": "fm_rainbow.png",
       "sizes": "512x512",
       "type": "image/png"
     },
     {
-      "src": "logo.png",
+      "src": "fm_rainbow.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any maskable"

react-fm/src/pages/googleLoginAuth/GoogleLogin.tsx

@@ -72,7 +72,8 @@ function GoogleLogin() {
               <Typography className={styles.loginSignupText}>Login/Signup</Typography>
               <Typography className={styles.getStarted}>Let&#39;s get Started</Typography>
               <Typography className={styles.signUpImmediately}>
-                Join our sports organizing community and start your journey right away!
+                Join our community and start your <br />
+                journey right away!
               </Typography>
             </Box>
             <Box className={styles.loginSignupButton}>

react-fm/src/pages/whatWeDo/WhatWeDo.module.scss

@@ -17,6 +17,10 @@
   align-items: center;
 }
 
+.intro {
+  width: 100%;
+}
+
 .videoCarousel {
   width: 100%;
   margin-top: 40px;

react-fm/src/pages/whatWeDo/WhatWeDo.tsx

@@ -18,8 +18,9 @@ import styles from './WhatWeDo.module.scss';
 import { assessmentUrl, comingSoonUrl, statsUrl } from './constants';
 
 function WhatWeDo() {
-  const [hideIndicators, setHideIndicator] = useState(true);
   const isPortrait = useOrientation();
+  const [hideIndicators, setHideIndicator] = useState(true);
+
   const [isLoggedIn, setIsLoggedIn] = useState(false);
 
   const opts: YouTubeProps['opts'] = {
@@ -79,7 +80,10 @@ function WhatWeDo() {
       <Box className={styles.box}>
         <Box className={isPortrait ? styles.smallDeviceContainer : styles.container}>
           <Typography variant="h3" className={styles.heading}>
-            Match Highlights
+            What We Do
+          </Typography>
+          <Typography className={styles.job}>
+            Flickmatch finds or organises football games near you.
           </Typography>
           <Carousel
             autoPlay={false}

react-fm/src/sections/Header/Header.module.scss

@@ -7,7 +7,7 @@
 }
 
 .logo {
-  height: 45px;
+  height: 52px;
   margin-top: 5px;
 }
 

react-fm/src/sections/Header/Header.tsx

@@ -21,7 +21,7 @@ import useSidebar from '@/store/sidebar';
 //import useTheme from '@/store/theme';
 import styles from './Header.module.scss';
 //import { HotKeysButton } from './styled';
-import mainlogo from '/logo.png';
+import { appLogo } from './constants';
 
 interface UserDetails {
   email: string;
@@ -106,7 +106,7 @@ const Header: FC<login> = ({ loggedIn }) => {
           <FlexBox sx={{ alignItems: 'center' }}>
             {navIcon()}
             <Typography component={Link} to="/home">
-              <img src={mainlogo} alt="logo" className={styles.logo} />
+              <img src={appLogo} alt="logo" className={styles.logo} />
             </Typography>
           </FlexBox>
           <FlexBox>

react-fm/src/sections/Header/constants.ts

@@ -0,0 +1,3 @@
+const appLogo = 'https://service.flickmatch.in:8443/platform-0.0.1-SNAPSHOT/graphql';
+
+export { appLogo };