structure organization and

src/App.tsx

@@ -3,12 +3,12 @@ import {Grid, useTheme} from '@mui/material';
 import {BrowserRouter, Navigate, Route, Routes} from 'react-router-dom'
 import React from 'react'
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
-import FourOhFour from "./components/transform-hw/pages/error-page/FourOhFour";
+import FourOhFour from "./components/templates/transform-hw/pages/error-page/FourOhFour";
 import PageProvider from "./components/page-context/PageProvider";
 import AmenityProvider from "./components/amenity-context/AmenityProvider";
 import ModalProvider from "./components/snackbar-context/ModalProvider";
 import SnackbarProvider from "./components/modal-context/SnackbarProvider";
-import PageMux from "./components/mackenzies-mind/pages/PageMux";
+import PageMux from "./components/templates/mackenzies-mind/pages/PageMux";
 import CustomizedThemeProvider from "./components/customized-theme-provider/CustomizedThemeProvider";
 
 export enum RoutesEnum {

src/components/BlockContentLayoutContainer.tsx

@@ -29,32 +29,32 @@ import {
     WebDevTestimonialsSectionType,
 } from "./BlockContentTypes";
 import useThwCommonStyles from "../common/sanityIo/ThwCommonStyles";
-import ThwPositivePsychology from "./transform-hw/ThwPositivePsychology";
-import ThwMottoSection from "./transform-hw/ThwMottoSection";
-import AboutTheProprietorSection from "./transform-hw/AboutTheProprietorSection";
-import ThwServicesSection from "./transform-hw/ThwServicesSection";
-import ThwWhyChooseUsSection from "./transform-hw/ThwWhyChooseUsSection";
-import ThwContactUsSection from "./transform-hw/ThwContactUsSection";
+import ThwPositivePsychology from "./templates/transform-hw/ThwPositivePsychology";
+import ThwMottoSection from "./templates/transform-hw/ThwMottoSection";
+import AboutTheProprietorSection from "./templates/transform-hw/AboutTheProprietorSection";
+import ThwServicesSection from "./templates/transform-hw/ThwServicesSection";
+import ThwWhyChooseUsSection from "./templates/transform-hw/ThwWhyChooseUsSection";
+import ThwContactUsSection from "./templates/transform-hw/ThwContactUsSection";
 import {SanityHomePage} from "./block-content-ui/static-pages/cmsStaticPagesClient";
-import ThwServicesEducationPage from "./transform-hw/service-education-page/ThwServiceEducationPage";
-import ResumeBioSection from "./my-digital-resume/resume-bio-section/ResumeBioSection";
-import MMHeroContentSection from "./mackenzies-mind/MMHeroContentSection";
-import ResumeSkillsSection from "./my-digital-resume/resume-skills-section/ResumeSkillsSection";
-import ResumeExperienceSection from "./my-digital-resume/resume-experience-section/ResumeExperienceSection";
-import ResumeEducationSection from "./my-digital-resume/resume-education-section/ResumeEducationSection";
-import ResumeFeedbackSection from "./my-digital-resume/resume-feedback-section/ResumeFeedbackSection";
-import ResumeContactUsSection from "./my-digital-resume/ResumeContactUsSection";
-import ResumePortfolioSection from "./my-digital-resume/resume-portfolio-section/ResumePortfolioSection";
-import WebDevHeroContentSection from "./web-dev-site/WebDevHeroContentSection";
-import WebDevStatsCounterSection from "./web-dev-site/WebDevStatsCounterSection";
-import WebDevAboutUsSection from "./web-dev-site/WebDevAboutUsSection";
-import WebDevServicesSection from "./web-dev-site/WebDevServicesSection";
-import WebDevPortfolioSection from "./web-dev-site/WebDevPortfolioSection";
-import WebDevTestimonialsSection from "./web-dev-site/WebDevTestimonialsSection";
-import WebDevHowItWorksSection from "./web-dev-site/WebDevHowItWorksSection";
+import ThwServicesEducationPage from "./templates/transform-hw/service-education-page/ThwServiceEducationPage";
+import ResumeBioSection from "./templates/my-digital-resume/resume-bio-section/ResumeBioSection";
+import MMHeroContentSection from "./templates/mackenzies-mind/MMHeroContentSection";
+import ResumeSkillsSection from "./templates/my-digital-resume/resume-skills-section/ResumeSkillsSection";
+import ResumeExperienceSection from "./templates/my-digital-resume/resume-experience-section/ResumeExperienceSection";
+import ResumeEducationSection from "./templates/my-digital-resume/resume-education-section/ResumeEducationSection";
+import ResumeFeedbackSection from "./templates/my-digital-resume/resume-feedback-section/ResumeFeedbackSection";
+import ResumeContactUsSection from "./templates/my-digital-resume/ResumeContactUsSection";
+import ResumePortfolioSection from "./templates/my-digital-resume/resume-portfolio-section/ResumePortfolioSection";
+import WebDevHeroContentSection from "./templates/web-dev-site/WebDevHeroContentSection";
+import WebDevStatsCounterSection from "./templates/web-dev-site/WebDevStatsCounterSection";
+import WebDevAboutUsSection from "./templates/web-dev-site/WebDevAboutUsSection";
+import WebDevServicesSection from "./templates/web-dev-site/WebDevServicesSection";
+import WebDevPortfolioSection from "./templates/web-dev-site/WebDevPortfolioSection";
+import WebDevTestimonialsSection from "./templates/web-dev-site/WebDevTestimonialsSection";
+import WebDevHowItWorksSection from "./templates/web-dev-site/WebDevHowItWorksSection";
 import TheWebsiteTheme from "../theme/Theme";
-import HeroAnimatedContentSection from "./HeroAnimatedContentSection";
-import AnimatedServicesSection from "./AnimatedServicesSection";
+import HeroAnimatedContentSection from "./animated/HeroAnimatedContentSection";
+import AnimatedAboutUsSection from "./animated/AnimatedAboutUsSection";
 
 export type BlockContentLayoutContainerProps = {
     content?: any,
@@ -417,10 +417,10 @@ const BlockContentLayoutContainer: FunctionComponent<BlockContentLayoutContainer
                     case 'AnimatedServicesSection':
                         const animatedServicesSection: AnimatedServicesSectionType = columnLayoutContainer
                         return (
-                            <Grid key={'animated-services'} container item xs={12}>
-                                <Link id={"ANIMATED_SERVICES"} underline="hover"><></>
+                            <Grid key={'animated-about-us'} container item xs={12}>
+                                <Link id={"ANIMATED_ABOUT_US"} underline="hover"><></>
                                 </Link>
-                                <AnimatedServicesSection
+                                <AnimatedAboutUsSection
                                     sectionData={animatedServicesSection}
                                 />
                             </Grid>

src/components/BusinessCard.tsx

@@ -4,15 +4,15 @@ import makeStyles from '@mui/styles/makeStyles';
 import {Avatar, Button, Divider, Drawer, Grid, List, ListItem, Typography, useTheme,} from '@mui/material';
 import createStyles from '@mui/styles/createStyles';
 import {Close, FileCopy} from "@mui/icons-material";
-import SocialMediaBlock from "./my-digital-resume/social-media-block/SocialMediaBlock";
+import SocialMediaBlock from "./templates/my-digital-resume/social-media-block/SocialMediaBlock";
 import {urlFor} from "./block-content-ui/static-pages/cmsStaticPagesClient";
 import {MainMenuAnchorType, SanityTransformHwHomePage} from "../common/sanityIo/Types";
 import {ResumeBioSectionType} from "./BlockContentTypes";
 import MailTo from "./mail-to/MailTo";
 import QrCodeContext from "./qr-code-context/QrCodeContext";
 import SnackbarContext from "./modal-context/SnackbarContext";
-import BusinessCardSubmitEmail from "./transform-hw/pages/BusinessCardSubmitEmail";
-import firebaseAnalyticsClient from "../utils/firebase/FirebaseAnalyticsClient";
+import BusinessCardSubmitEmail from "./templates/transform-hw/pages/BusinessCardSubmitEmail";
+import firebaseAnalyticsClient from "../common/firebase/FirebaseAnalyticsClient";
 import {useLocation} from "react-router";
 import {COLORS} from "../theme/common/ColorPalette";
 import TheWebsiteTheme from "../theme/Theme";

src/components/FooterBlockContentLayoutContainer.tsx

@@ -7,8 +7,8 @@ import {DevelopmentFooterSectionType, FooterSectionType,} from "./BlockContentTy
 import TheWebsiteTheme from "../theme/Theme";
 import useThwCommonStyles from "../common/sanityIo/ThwCommonStyles";
 import WebDevSiteTheme from "../theme/WebDevSiteTheme";
-import Footer from "./mackenzies-mind/footer/Footer";
-import WebDevFooter from "./web-dev-site/dev-footer/WebDevFooter";
+import Footer from "./templates/mackenzies-mind/footer/Footer";
+import WebDevFooter from "./templates/web-dev-site/dev-footer/WebDevFooter";
 
 export type FooterBlockContentLayoutContainerProps = {
     content?: any,

src/components/HeaderBlockContentLayoutContainer.tsx

@@ -6,8 +6,8 @@ import {blockSerializers} from '../common/sanityIo/BlockContentRenderer'
 import {DevelopmentHeaderSectionType, HeaderSectionType,} from "./BlockContentTypes";
 import TheWebsiteTheme from "../theme/Theme";
 import useThwCommonStyles from "../common/sanityIo/ThwCommonStyles";
-import DevelopmentHeader from "./mackenzies-mind/header/DevelopmentHeader";
-import Header from "./mackenzies-mind/header/Header";
+import DevelopmentHeader from "./templates/mackenzies-mind/header/DevelopmentHeader";
+import Header from "./templates/mackenzies-mind/header/Header";
 import WebDevSiteTheme from "../theme/WebDevSiteTheme";
 import TransformHWTheme from "../theme/TransformHWTheme";
 

src/components/amenity-context/AmenityProvider.tsx

@@ -3,12 +3,12 @@ import {ServiceAmenityType} from "../BlockContentTypes";
 import AmenityContext from './AmenityContext';
 import {Grid, ListItem, ListItemIcon, ListItemText, Typography} from "@mui/material";
 import {v4 as uuidv4} from "uuid";
-import ToolTipWrap from "../transform-hw/ToolTipWrap";
+import ToolTipWrap from "../templates/transform-hw/ToolTipWrap";
 import {urlFor} from "../block-content-ui/static-pages/cmsStaticPagesClient";
 import PageContext from "../page-context/PageContext";
 import ColoredPng from "../colored-png/ColoredPng";
 import SnackbarContext from "../modal-context/SnackbarContext";
-import firebaseAnalyticsClient from "../../utils/firebase/FirebaseAnalyticsClient";
+import firebaseAnalyticsClient from "../../common/firebase/FirebaseAnalyticsClient";
 
 type IProps = {};
 

src/components/AnimatedServiceItem.tsx → src/components/animated/AnimatedAboutUsItem.tsx

@@ -1,10 +1,10 @@
 import React, {FunctionComponent, useContext} from 'react'
 import {Card, Grid, ThemeProvider, Typography} from '@mui/material'
 import {v4 as uuidv4} from 'uuid'
-import {AnimatedServiceItemNoRefType} from "./BlockContentTypes";
-import ImageWIthButtonOverlay from "./image-with-button-overlay/ImageWithButtonOverlay";
-import CustomizedThemeContext from "./customized-theme-provider/CustomizedThemeContext";
-import {urlFor} from "./block-content-ui/static-pages/cmsStaticPagesClient";
+import {AnimatedServiceItemNoRefType} from "../BlockContentTypes";
+import ImageWIthButtonOverlay from "../image-with-button-overlay/ImageWithButtonOverlay";
+import CustomizedThemeContext from "../customized-theme-provider/CustomizedThemeContext";
+import {urlFor} from "../block-content-ui/static-pages/cmsStaticPagesClient";
 
 
 interface IProps {
@@ -15,7 +15,7 @@ interface IProps {
     showAmenities?: boolean
 }
 
-const AnimatedServiceItem: FunctionComponent<IProps> = (props: IProps) => {
+const AnimatedAboutUsItem: FunctionComponent<IProps> = (props: IProps) => {
     const customizedTheme = useContext(CustomizedThemeContext)
     return (
         <ThemeProvider theme={customizedTheme.customizedTheme} key={uuidv4()}>
@@ -73,4 +73,4 @@ const AnimatedServiceItem: FunctionComponent<IProps> = (props: IProps) => {
     )
 }
 
-export default AnimatedServiceItem
+export default AnimatedAboutUsItem

src/components/AnimatedServicesSection.tsx → src/components/animated/AnimatedAboutUsSection.tsx

@@ -2,13 +2,13 @@ import React, {FunctionComponent, useContext} from 'react'
 import {Theme, ThemeProvider} from '@mui/material/styles';
 import makeStyles from '@mui/styles/makeStyles';
 import {Card, Grid, Typography} from '@mui/material'
-import AnimatedServiceItem from "./AnimatedServiceItem";
-import CustomizedThemeContext from "./customized-theme-provider/CustomizedThemeContext";
-import {AnimatedServiceItemNoRefType, AnimatedServicesSectionType, ServiceAmenityType} from "./BlockContentTypes";
-import {urlFor} from "./block-content-ui/static-pages/cmsStaticPagesClient";
+import AnimatedAboutUsItem from "./AnimatedAboutUsItem";
+import CustomizedThemeContext from "../customized-theme-provider/CustomizedThemeContext";
+import {AnimatedServiceItemNoRefType, AnimatedServicesSectionType, ServiceAmenityType} from "../BlockContentTypes";
+import {urlFor} from "../block-content-ui/static-pages/cmsStaticPagesClient";
 import {Circle} from "@mui/icons-material";
 import {motion} from "framer-motion"
-import widthUtils from "../utils/widthUtils";
+import widthUtils from "../../utils/widthUtils";
 
 export const useStyles = makeStyles((theme: Theme) => ({
     root: {
@@ -22,7 +22,7 @@ interface IProps {
     sectionData: AnimatedServicesSectionType
 }
 
-const AnimatedServicesSection: FunctionComponent<IProps> = (props) => {
+const AnimatedAboutUsSection: FunctionComponent<IProps> = (props) => {
     const classes = useStyles()
     const mdDown = widthUtils.useIsWidthDown('md')
     const customizedThemeContext = useContext(CustomizedThemeContext)
@@ -37,7 +37,7 @@ const AnimatedServicesSection: FunctionComponent<IProps> = (props) => {
             <Grid container item className={classes.root} xs={12} alignItems='center'>
                 <Grid item container justifyContent='center' spacing={2}>
                     {props.sectionData.servicesList?.map((service: AnimatedServiceItemNoRefType, index: number) => {
-                        return <Grid item xs={12} sm={3}><AnimatedServiceItem service={service}/></Grid>
+                        return <Grid item xs={12} sm={3}><AnimatedAboutUsItem service={service}/></Grid>
                     })}
                 </Grid>
                 <Grid item container style={{padding: customizedThemeContext.customizedTheme.spacing(8, 6)}}
@@ -208,4 +208,4 @@ const AnimatedServicesSection: FunctionComponent<IProps> = (props) => {
     )
 }
 
-export default AnimatedServicesSection
+export default AnimatedAboutUsSection

src/components/HeroAnimatedContentSection.tsx → src/components/animated/HeroAnimatedContentSection.tsx

@@ -2,13 +2,13 @@ import React, {FunctionComponent, useContext} from 'react'
 import {Theme, ThemeProvider} from "@mui/material/styles";
 import {Button, Grid, Typography} from "@mui/material";
 import makeStyles from "@mui/styles/makeStyles";
-import {HeroAnimatedContentSectionType, SanityHeroContentSlide} from "./BlockContentTypes";
-import {urlFor} from "./block-content-ui/static-pages/cmsStaticPagesClient";
-import PageContext, {PageContextType} from "./page-context/PageContext";
-import useCustomStyles from "./mackenzies-mind/pages/Styles";
+import {HeroAnimatedContentSectionType, SanityHeroContentSlide} from "../BlockContentTypes";
+import {urlFor} from "../block-content-ui/static-pages/cmsStaticPagesClient";
+import PageContext, {PageContextType} from "../page-context/PageContext";
+import useCustomStyles from "../templates/mackenzies-mind/pages/Styles";
 import clsx from "clsx";
-import firebaseAnalyticsClient from "../utils/firebase/FirebaseAnalyticsClient";
-import CustomizedThemeContext from "./customized-theme-provider/CustomizedThemeContext";
+import firebaseAnalyticsClient from "../../common/firebase/FirebaseAnalyticsClient";
+import CustomizedThemeContext from "../customized-theme-provider/CustomizedThemeContext";
 import {ArrowBack, ArrowForward} from "@mui/icons-material";
 import {motion} from "framer-motion"
 
@@ -129,13 +129,14 @@ const HeroAnimatedContentSection: FunctionComponent<IProps> = (props) => {
 
                                                 >
                                                     <Grid container item justifyContent='center'>
-                                                        <Grid item container justifyContent='center' spacing={1}>
+                                                        <Grid item container justifyContent='center' spacing={1} wrap='nowrap'>
                                                             <Grid item>
                                                                 {contentSlide?.heroBullet && <img width={12}
                                                                                                   src={urlFor(contentSlide?.heroBullet).url() ?? ""}/>}
                                                             </Grid>
                                                             <Grid item>
                                                                 <Typography variant='body1' alignContent='center'
+                                                                            noWrap
                                                                             style={{
                                                                                 textTransform: "uppercase",
                                                                                 color: themeContext.customizedTheme.palette.text.secondary,

src/components/block-content-ui/cmsClient.ts

@@ -8,8 +8,8 @@ import {
 } from '../../common/sanityIo/Types'
 
 import {ThwServiceItemType, WhySwitchSectionType} from "../BlockContentTypes";
-import GroqQueries from "../../utils/groqQueries";
-import groqQueries from "../../utils/groqQueries";
+import GroqQueries from "../../common/sanityIo/groqQueries";
+import groqQueries from "../../common/sanityIo/groqQueries";
 import {SanityHomePage} from "./static-pages/cmsStaticPagesClient";
 import {QueryKey, useQuery} from "@tanstack/react-query";
 

src/components/css-fade-to-color/CssFadeToColor.tsx

@@ -2,7 +2,7 @@ import React, {FunctionComponent, useContext} from 'react'
 import { Theme } from '@mui/material/styles';
 import makeStyles from '@mui/styles/makeStyles';
 import {Grid} from '@mui/material'
-import useCustomStyles from "../mackenzies-mind/pages/Styles";
+import useCustomStyles from "../templates/mackenzies-mind/pages/Styles";
 import {CssFadeToColorDirectionEnum} from "./CssFadeToColorDirectionEnum";
 import widthUtils from "../../utils/widthUtils";
 

src/components/filtered-menu-items/FilteredMenuItems.tsx

@@ -3,7 +3,7 @@ import {v4 as uuidv4} from 'uuid'
 import {Theme} from "@mui/material/styles";
 import makeStyles from '@mui/styles/makeStyles';
 import {Grid} from '@mui/material'
-import HeaderMenuItemButton from "../transform-hw/HeaderMenuItemButton";
+import HeaderMenuItemButton from "../templates/transform-hw/HeaderMenuItemButton";
 import PopupStateWrapper from "./PopupStateWrapper";
 import {SanityMenuContainer} from "../../common/sanityIo/Types";
 import widthUtils from "../../utils/widthUtils";

src/components/filtered-menu-items/FilteredMenuItemsPopup.tsx

@@ -4,7 +4,7 @@ import {Grid, Popover, PropTypes} from '@mui/material'
 import {v4 as uuidv4} from 'uuid'
 import {bindPopover} from "material-ui-popup-state";
 import {SanityMenuGroup} from "../../common/sanityIo/Types";
-import SubMenu from "../mackenzies-mind/header/SubMenu";
+import SubMenu from "../templates/mackenzies-mind/header/SubMenu";
 
 interface FilteredMenuItemsPopupProps {
     // uuid:any

src/components/filtered-menu-items/PopupStateWrapper.tsx

@@ -7,7 +7,7 @@ import {ArrowDropDown} from "@mui/icons-material";
 import {SanityMenuGroup} from "../../common/sanityIo/Types";
 import { Theme } from "@mui/material/styles";
 import makeStyles from '@mui/styles/makeStyles';
-import SubMenu from "../mackenzies-mind/header/SubMenu";
+import SubMenu from "../templates/mackenzies-mind/header/SubMenu";
 
 
 const useStyles = makeStyles((theme: Theme) => ({

src/components/image-with-button-overlay/ImageWithButtonOverlay.tsx

@@ -7,7 +7,7 @@ import {urlFor} from "../block-content-ui/static-pages/cmsStaticPagesClient";
 import {SanityImageSource} from "@sanity/asset-utils";
 import {CssFadeToColorDirectionEnum} from "../css-fade-to-color/CssFadeToColorDirectionEnum";
 import {ImageWithButtonOverlayAligmentEnum} from "./ImageWithButtonOverlayAligmentEnum";
-import firebaseAnalyticsClient from "../../utils/firebase/FirebaseAnalyticsClient";
+import firebaseAnalyticsClient from "../../common/firebase/FirebaseAnalyticsClient";
 import PageContext from "../page-context/PageContext";
 import {OverridableStringUnion} from "@mui/types";
 import {ButtonPropsColorOverrides} from "@mui/material/Button/Button";