From 6db5e1d3b2bfc736b241c2ad9e574ff6088f0841 Mon Sep 17 00:00:00 2001
From: "Mr. Singleton" <terrell.singleton@gmail.com>
Date: Wed, 13 Dec 2023 11:12:10 -0500
Subject: [PATCH] control over which documents can be searched by a page.

---
 functions/src/groqQueries.ts                  |  1 +
 .../resume/resume-bio/ResumeBioSection.js     |  6 ++
 .../ResumeContactUsSection.js                 |  7 +++
 .../resume-education/ResumeEducation.js       |  7 +++
 .../ResumeEducationSection.js                 |  7 +++
 .../resume-experience/ResumeExperience.js     |  7 +++
 .../ResumeExperienceSection.js                |  7 +++
 .../resume/resume-feedback/ResumeFeedback.js  |  7 +++
 .../resume-feedback/ResumeFeedbackSection.js  |  7 +++
 .../resume-portfolio/ResumePortfolioItem.js   |  7 +++
 .../ResumePortfolioSection.js                 |  7 +++
 .../resume/resume-skills/ResumeSkill.js       |  9 ++-
 .../resume/resume-skills/ResumeSkillSet.js    |  7 +++
 .../resume-skills/ResumeSkillsSection.js      |  6 ++
 src/common/sanityIo/Types.ts                  |  2 +-
 src/common/sanityIo/groqQueries.ts            |  3 +-
 src/components/block-content-ui/cmsClient.ts  | 27 ++++++---
 .../mackenzies-mind/header/FullTextSearch.tsx | 28 ++++++---
 .../resume-bio-section/ResumeBioSection.tsx   | 23 ++++---
 .../ResumePortfolioEntry.tsx                  |  2 +-
 .../ResumePortfolioSection.tsx                |  2 +-
 .../ResumeSkillReferences.tsx                 | 60 ++++++++++++++-----
 22 files changed, 192 insertions(+), 47 deletions(-)

diff --git a/functions/src/groqQueries.ts b/functions/src/groqQueries.ts
index 8dd4df1c..00b71a6b 100644
--- a/functions/src/groqQueries.ts
+++ b/functions/src/groqQueries.ts
@@ -58,6 +58,7 @@ const SERVICE =
 
 
 const HOMEPAGE = `_type,
+          _id,
           title,
           isUnderConstruction,
           releaseDate,
diff --git a/sanityIo/schemas/sections/resume/resume-bio/ResumeBioSection.js b/sanityIo/schemas/sections/resume/resume-bio/ResumeBioSection.js
index c553f7b4..1415da17 100644
--- a/sanityIo/schemas/sections/resume/resume-bio/ResumeBioSection.js
+++ b/sanityIo/schemas/sections/resume/resume-bio/ResumeBioSection.js
@@ -13,6 +13,12 @@ export default {
             title: 'Title of Section',
             type: 'string',
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
         {
             name: 'introduction',
             title: 'Introduction',
diff --git a/sanityIo/schemas/sections/resume/resume-contact-us/ResumeContactUsSection.js b/sanityIo/schemas/sections/resume/resume-contact-us/ResumeContactUsSection.js
index b57ec248..e6fb2b82 100644
--- a/sanityIo/schemas/sections/resume/resume-contact-us/ResumeContactUsSection.js
+++ b/sanityIo/schemas/sections/resume/resume-contact-us/ResumeContactUsSection.js
@@ -30,6 +30,13 @@ export default {
       title: 'Form Submit Button Text',
       type: 'string'
     },
+    {
+      name: 'searchableOnPages',
+      title: 'Make Searchable on pages',
+      type: 'array',
+      of:[{type: "reference", to: {type:"homePage"}}]
+    },
+
   ],
   preview: {
     select: {
diff --git a/sanityIo/schemas/sections/resume/resume-education/ResumeEducation.js b/sanityIo/schemas/sections/resume/resume-education/ResumeEducation.js
index 222c76b6..6e3a81af 100644
--- a/sanityIo/schemas/sections/resume/resume-education/ResumeEducation.js
+++ b/sanityIo/schemas/sections/resume/resume-education/ResumeEducation.js
@@ -43,6 +43,13 @@ export default {
             title: 'Job Description or Requirements',
             type: 'text',
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ],
     preview: {
         select: {
diff --git a/sanityIo/schemas/sections/resume/resume-education/ResumeEducationSection.js b/sanityIo/schemas/sections/resume/resume-education/ResumeEducationSection.js
index 35029ce5..a9de6e38 100644
--- a/sanityIo/schemas/sections/resume/resume-education/ResumeEducationSection.js
+++ b/sanityIo/schemas/sections/resume/resume-education/ResumeEducationSection.js
@@ -35,5 +35,12 @@ export default {
                 }
             ]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-experience/ResumeExperience.js b/sanityIo/schemas/sections/resume/resume-experience/ResumeExperience.js
index d9e40470..e8502752 100644
--- a/sanityIo/schemas/sections/resume/resume-experience/ResumeExperience.js
+++ b/sanityIo/schemas/sections/resume/resume-experience/ResumeExperience.js
@@ -57,6 +57,13 @@ export default {
                 to: [{type: "ResumeSkill"}]
             }]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ],
     preview: {
         select: {
diff --git a/sanityIo/schemas/sections/resume/resume-experience/ResumeExperienceSection.js b/sanityIo/schemas/sections/resume/resume-experience/ResumeExperienceSection.js
index 31584456..ff7cd340 100644
--- a/sanityIo/schemas/sections/resume/resume-experience/ResumeExperienceSection.js
+++ b/sanityIo/schemas/sections/resume/resume-experience/ResumeExperienceSection.js
@@ -35,5 +35,12 @@ export default {
             type: 'reference',
             to:[{type: 'MuiTheme'}]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedback.js b/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedback.js
index 5aebec2f..ea6761ed 100644
--- a/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedback.js
+++ b/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedback.js
@@ -36,6 +36,13 @@ export default {
                 hotspot: true,
             },
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ],
     preview: {
         select: {
diff --git a/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedbackSection.js b/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedbackSection.js
index a5d9e2ab..4f66d184 100644
--- a/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedbackSection.js
+++ b/sanityIo/schemas/sections/resume/resume-feedback/ResumeFeedbackSection.js
@@ -35,5 +35,12 @@ export default {
                 }
             ]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioItem.js b/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioItem.js
index c23d6b35..cf8067ed 100644
--- a/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioItem.js
+++ b/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioItem.js
@@ -69,5 +69,12 @@ export default {
             type: 'array',
             of:[{type: 'image'}]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioSection.js b/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioSection.js
index 767f1f72..22703336 100644
--- a/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioSection.js
+++ b/sanityIo/schemas/sections/resume/resume-portfolio/ResumePortfolioSection.js
@@ -35,5 +35,12 @@ export default {
                 }
             ]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkill.js b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkill.js
index 8b76921c..dbe488f6 100644
--- a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkill.js
+++ b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkill.js
@@ -12,6 +12,13 @@ export default {
             name: 'title',
             title: 'Title of Skillset',
             type: 'string',
-        }
+        },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js
index 965678df..05cf0f90 100644
--- a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js
+++ b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js
@@ -22,5 +22,12 @@ export default {
                 to: [{type: "ResumeSkill"}]
             }]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js
index 0fe8c874..19402337 100644
--- a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js
+++ b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js
@@ -31,5 +31,11 @@ export default {
             of: [{type: "reference", to:{type:"ResumeSkillset"}},
             ]
         },
+        {
+            name: 'searchableOnPages',
+            title: 'Make Searchable on pages',
+            type: 'array',
+            of:[{type: "reference", to: {type:"homePage"}}]
+        },
     ]
 }
\ No newline at end of file
diff --git a/src/common/sanityIo/Types.ts b/src/common/sanityIo/Types.ts
index 6eca7261..f68d8eae 100644
--- a/src/common/sanityIo/Types.ts
+++ b/src/common/sanityIo/Types.ts
@@ -1,7 +1,6 @@
 import {SanityImageSource} from "@sanity/asset-utils";
 import {SanityImageAsset, ThwServiceItemNoRefType} from "../../components/BlockContentTypes";
 import {Slug} from "@sanity/types";
-import BusinessContact from "../../../sanityIo/schemas/businessContact";
 
 export type SanitySlug = Slug
 
@@ -53,6 +52,7 @@ export type SanityBusinessContact = {
 export type SanityTransformHwHomePage = {
     _type?: string
     title?: string
+    _id?:string
     description?: string
     bookAppointmentLink?: string
     bookAppointmentQrCode?: SanityImageSource
diff --git a/src/common/sanityIo/groqQueries.ts b/src/common/sanityIo/groqQueries.ts
index 4ccd4920..86f59597 100644
--- a/src/common/sanityIo/groqQueries.ts
+++ b/src/common/sanityIo/groqQueries.ts
@@ -42,7 +42,8 @@ const SERVICE =
       `
 
 
-const HOMEPAGE = `_type,
+const HOMEPAGE = `_type, 
+          _id,
           title,
           isUnderConstruction,
           releaseDate,
diff --git a/src/components/block-content-ui/cmsClient.ts b/src/components/block-content-ui/cmsClient.ts
index dd4e20a8..97e32b79 100644
--- a/src/components/block-content-ui/cmsClient.ts
+++ b/src/components/block-content-ui/cmsClient.ts
@@ -466,8 +466,9 @@ const useFetchServicesQuery = (pageSlug?: string) => {
         });
 }
 
-const fullTextSearch = (textToSearch: string): Promise<any> => {
+const fullTextSearch = (textToSearch: string, pageId: string): Promise<any> => {
 
+    console.log("the page id", pageId)
     return sanityClient
         .fetch(
             `*[
@@ -476,6 +477,7 @@ const fullTextSearch = (textToSearch: string): Promise<any> => {
                 careerTitle,
                 introduction,
                 name, 
+                email,
                 contentText, 
                 contentTexts, 
                 contentTitle, 
@@ -486,18 +488,17 @@ const fullTextSearch = (textToSearch: string): Promise<any> => {
                 contentSummaryTitle,
                 contentSummaryTexts,
                 videoUrl,
-            ] match '*${textToSearch}*']{
+            ] match '*${textToSearch}*' && references('${pageId}')]{
                 ..., 
                 "skillsUsed" : skillsUsed[]->,
                 "skills" : skills[]->,
             }`,
             // {searchText: textToSearch}
         ).then((data: any) => {
-            console.log("data from fulltext search", data)
             return data
         })
 }
-const skillReferenceSearch = (skill: ResumeSkill): Promise<any> => {
+const skillReferenceSearch = (skill: ResumeSkill, pageId: string): Promise<any> => {
     return sanityClient
         .fetch(
             `*[references($searchText)]{
@@ -506,9 +507,21 @@ const skillReferenceSearch = (skill: ResumeSkill): Promise<any> => {
                 "skillsUsed" : skillsUsed[]->,
                 "skills":skills[]->,
             }`,
-            {searchText: skill._id}
-        ).then((data: any) => {
-            console.log("data from skillReference search", data)
+            {searchText: skill._id, pageId: pageId}
+        ).then((data: any[]) => {
+
+
+            data.sort((left, right)=>{
+                if (left._type === right._type) {
+                    return 0
+                }
+
+                if(left._type > right._type)
+                    return 1
+
+                return -1
+            })
+
             return data
         })
 }
diff --git a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx
index 2db23102..75d0a6e6 100644
--- a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx
+++ b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx
@@ -9,7 +9,7 @@ import makeStyles from "@mui/styles/makeStyles";
 import {Theme} from "@mui/material/styles";
 import {
     AnimatedAboutUsSectionType,
-    HeroAnimatedContentSectionType,
+    HeroAnimatedContentSectionType, ResumeBioSectionType,
     ResumeExperience,
     ResumeSkill,
     SanityHeroContentSlide,
@@ -18,6 +18,8 @@ import {
 import ResumeExperienceItem from "../../my-digital-resume/resume-experience-section/ResumeExperienceItem";
 import {COLORS} from "../../../../theme/common/ColorPalette";
 import ResumeSkillReferences from "../../my-digital-resume/resume-skills-section/ResumeSkillReferences";
+import PageContext from "../../../page-context/PageContext";
+import ResumeBioSection from "../../my-digital-resume/resume-bio-section/ResumeBioSection";
 
 export const useStyles = makeStyles((theme: Theme) => ({
     endAdornedInput: {
@@ -55,10 +57,11 @@ const FullTextSearch: FunctionComponent<IProps> = (props: IProps) => {
     const [searchText, setSearchText] = React.useState<string>()
     const myClasses = useStyles(customizedTheme)
     const [results, setResults] = React.useState<any[]>()
+    const pageContext = useContext(PageContext)
     const searchCMS = async () => {
         console.log("about to search full text")
         if (searchText) {
-            const cmsResponse = await cmsClient.fullTextSearch(searchText)
+            const cmsResponse = await cmsClient.fullTextSearch(searchText, pageContext.page?._id??"")
             console.log("results", cmsResponse)
             setResults(cmsResponse)
         }
@@ -149,7 +152,6 @@ const FullTextSearch: FunctionComponent<IProps> = (props: IProps) => {
                         case "AnimatedServicesSection":
                             const convertedAnimatedServicesSection: AnimatedAboutUsSectionType = theResult;
 
-                            console.log(convertedAnimatedServicesSection)
                             return <Grid container sx={{marginBottom: "16px"}}>
                                 <Grid container item><Typography color='textSecondary'>Services:</Typography></Grid>
                                 <Grid item sx={{paddingLeft: "16px"}} container>
@@ -181,25 +183,37 @@ const FullTextSearch: FunctionComponent<IProps> = (props: IProps) => {
                                 padding: "16px"
                             }}>
                                 <Grid container>
-                                    <Typography variant='h6' gutterBottom color='primary'>My Experience</Typography>
+                                    <Typography variant='h6' gutterBottom color='primary'>{convertedResumeExperience.title} Experience</Typography>
                                 </Grid>
                                 <ResumeExperienceItem experience={convertedResumeExperience}/>
                             </Grid>
                         case "ResumeSkill":
                             const convertedResumeSkill: ResumeSkill = theResult;
 
-                            console.log(convertedResumeSkill)
                             return <Grid container sx={{
                                 marginBottom: "16px",
                                 backgroundColor: COLORS.LIGHTGRAY,
                                 padding: "16px"
                             }}>
                                 <Grid container>
-                                    <Typography variant='h6' gutterBottom color='primary'>My Skill
-                                        - {convertedResumeSkill.title}</Typography>
+                                    <Typography variant='h6' gutterBottom color='primary'>Experience with {convertedResumeSkill.title}</Typography>
                                 </Grid>
                                 <ResumeSkillReferences skill={convertedResumeSkill}/>
                             </Grid>
+                        case "ResumeBioSection":
+                            const resumeBioSectionObj: ResumeBioSectionType = theResult;
+
+                            return <Grid container sx={{
+                                marginBottom: "16px",
+                                backgroundColor: COLORS.LIGHTGRAY,
+                                padding: "16px"
+                            }}>
+                                <Grid container>
+                                    <Typography variant='h6' gutterBottom color='primary'>My Bio
+                                        - {resumeBioSectionObj.title}</Typography>
+                                </Grid>
+                                <ResumeBioSection sectionData={resumeBioSectionObj} homePage={pageContext.page}/>
+                            </Grid>
                         default:
                             return <Grid container sx={{marginBottom: "16px"}}><Typography
                                 color='textSecondary'>{theResult?._type}</Typography></Grid>
diff --git a/src/components/templates/my-digital-resume/resume-bio-section/ResumeBioSection.tsx b/src/components/templates/my-digital-resume/resume-bio-section/ResumeBioSection.tsx
index 96aa1a53..05564b51 100644
--- a/src/components/templates/my-digital-resume/resume-bio-section/ResumeBioSection.tsx
+++ b/src/components/templates/my-digital-resume/resume-bio-section/ResumeBioSection.tsx
@@ -1,4 +1,4 @@
-import React, {FunctionComponent, useContext} from 'react'
+import React, {FunctionComponent} from 'react'
 import {Button, ButtonGroup, Grid, Typography, useMediaQuery, useTheme,} from '@mui/material';
 import {ResumeBioSectionType} from "../../../BlockContentTypes";
 import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient";
@@ -6,13 +6,11 @@ import {SanityTransformHwHomePage} from "../../../../common/sanityIo/Types";
 import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles";
 import SocialMediaBlock from "../social-media-block/SocialMediaBlock";
 import BusinessCardSubmitEmail from "../../transform-hw/pages/BusinessCardSubmitEmail";
-import CustomizedThemeProvider from "../../../customized-theme-provider/CustomizedThemeProvider";
-import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext";
 
 
 interface IProps {
     sectionData: ResumeBioSectionType
-    homePage: SanityTransformHwHomePage
+    homePage?: SanityTransformHwHomePage
 }
 
 const ResumeBioSection: FunctionComponent<IProps> = (props: IProps) => {
@@ -22,7 +20,6 @@ const ResumeBioSection: FunctionComponent<IProps> = (props: IProps) => {
 
     const smDown = useMediaQuery(theme.breakpoints.down('sm'))
 
-    const customizedthemeContext = useContext(CustomizedThemeContext)
     return (
         <Grid container item style={{padding: theme.spacing(4,smDown?1:4)}} justifyContent='center'
               className={classes.resumeSection} spacing={3}>
@@ -49,13 +46,13 @@ const ResumeBioSection: FunctionComponent<IProps> = (props: IProps) => {
                         <Typography gutterBottom variant='body1' style={{textTransform: "uppercase"}}>Phone</Typography>
                     </Grid>
                     <Grid item xs={9}><Typography gutterBottom
-                                                  variant='body1'>{props.homePage.businessContact?.phone}</Typography></Grid>
+                                                  variant='body1'>{props.homePage?.businessContact?.phone}</Typography></Grid>
                 </Grid>
                 <Grid container item xs={11} sm={12}>
                     <Grid item xs={3}><Typography gutterBottom variant='body1'
                                                   style={{textTransform: "uppercase"}}>Email</Typography></Grid>
                     <Grid item xs={9}><Typography gutterBottom
-                                                  variant='body1'>{props.homePage.businessContact?.email}</Typography></Grid>
+                                                  variant='body1'>{props.homePage?.businessContact?.email}</Typography></Grid>
                 </Grid>
                 {/*<Grid container item xs={11} sm={12}>*/}
                 {/*    <Grid item xs={3}><Typography gutterBottom variant='body1'*/}
@@ -66,11 +63,11 @@ const ResumeBioSection: FunctionComponent<IProps> = (props: IProps) => {
                 <Grid container item xs={11} sm={12} justifyContent={'center'}>
                     <SocialMediaBlock
                         isCentered={true}
-                        facebook={props.homePage.businessContact?.facebook}
-                        twitter={props.homePage.businessContact?.twitter}
-                        instagram={props.homePage.businessContact?.instagram}
-                        linkedIn={props.homePage.businessContact?.linkedIn}
-                        github={props.homePage.businessContact?.github}
+                        facebook={props.homePage?.businessContact?.facebook}
+                        twitter={props.homePage?.businessContact?.twitter}
+                        instagram={props.homePage?.businessContact?.instagram}
+                        linkedIn={props.homePage?.businessContact?.linkedIn}
+                        github={props.homePage?.businessContact?.github}
                     />
                 </Grid>
             </Grid>
@@ -88,7 +85,7 @@ const ResumeBioSection: FunctionComponent<IProps> = (props: IProps) => {
                 <Grid item container>
                     <ButtonGroup fullWidth orientation={smDown ? 'vertical' : "horizontal"}>
                         <Button name={'appointment'} variant='contained' fullWidth color='primary'
-                                href={props.homePage.bookAppointmentLink}><Typography variant="button" align='center'>Meet
+                                href={props.homePage?.bookAppointmentLink}><Typography variant="button" align='center'>Meet
                             with Me</Typography></Button>
                         <Button name={'contact-me'} variant='contained' fullWidth color='primary'
                                 href={'#CONTACT_ME'}><Typography variant="button" align='center'>Contact
diff --git a/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioEntry.tsx b/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioEntry.tsx
index 34a02770..24b4d30e 100644
--- a/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioEntry.tsx
+++ b/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioEntry.tsx
@@ -29,7 +29,7 @@ const ResumePortfolioEntry: FunctionComponent<IProps> = (props:IProps) => {
     return (<Grid
                   role='portfoliobutton'
                   // style={{backgroundColor: index2 % 2 === 1 ? "whitesmoke" : "white"}}
-                  container item xs={12} sm={6} lg={4} xl={4} alignContent='flex-start'
+                  container item alignContent='flex-start'
                   justifyContent='center'>
         <Card elevation={0} sx={{width:"100%",border: `1px solid ${COLORS.GRAY}`}}>
             <Button fullWidth sx={{padding:0}} onClick={(e) => {
diff --git a/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioSection.tsx b/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioSection.tsx
index 9e95255e..24cc8d24 100644
--- a/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioSection.tsx
+++ b/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioSection.tsx
@@ -51,7 +51,7 @@ const ResumePortfolioSection: FunctionComponent<IProps> = (props: IProps) => {
                 <Grid item container justifyContent={'center'} xs={11} justifySelf={'center'} spacing={1}>
                     {
                         props.sectionData.portfolioEntries?.map((portfolioItem: ResumePortfolioItem, index2: number) => {
-                            return <ResumePortfolioEntry portfolioItem={portfolioItem} key={index2}/>
+                            return <Grid item xs={12} sm={6} lg={4} xl={4}><ResumePortfolioEntry portfolioItem={portfolioItem} key={index2}/></Grid>
                         })
                     }
                 </Grid>
diff --git a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx
index 5c087df1..a816c5aa 100644
--- a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx
+++ b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx
@@ -1,13 +1,11 @@
-import React, {FunctionComponent} from 'react'
-
-import makeStyles from "@mui/styles/makeStyles";
-import {Theme} from "@mui/material/styles";
+import React, {FunctionComponent, useContext} from 'react'
 import {Grid, Typography} from "@mui/material";
 import {ResumePortfolioItem, ResumeSkill} from "../../../BlockContentTypes";
 import cmsClient from "../../../block-content-ui/cmsClient";
 import ResumeExperienceItem from "../resume-experience-section/ResumeExperienceItem";
 import ResumePortfolioEntry from "../resume-portfolio-section/ResumePortfolioEntry";
 import ResumeSkillSetItem from "./ResumeSkillSetItem";
+import PageContext from "../../../page-context/PageContext";
 
 interface IProps {
     skill?: ResumeSkill
@@ -16,11 +14,13 @@ interface IProps {
 const ResumeSkillReferences: FunctionComponent<IProps> = (props: IProps) => {
     const [referenceResults, setReferenceResults] = React.useState<[]>()
 
+    const pageContext = useContext(PageContext)
+
     const searchCMS = async () => {
-        console.log("about to search full text")
+        // console.log("about to search full text")
         if (props.skill) {
-            const cmsResponse = await cmsClient.skillReferenceSearch(props.skill)
-            console.log("results", cmsResponse)
+            const cmsResponse = await cmsClient.skillReferenceSearch(props.skill, pageContext.page?._id ?? "")
+
             setReferenceResults(cmsResponse)
         }
     }
@@ -28,24 +28,54 @@ const ResumeSkillReferences: FunctionComponent<IProps> = (props: IProps) => {
     React.useEffect(() => {
         // find the rerences of this skill
         searchCMS().then()
-
     }, [])
-    
-    const [currentItem, setCurrentItem] = React.useState<ResumePortfolioItem>()
 
-    const [isOpen, setIsOpen] = React.useState<boolean>(false)
+
     return (<Grid container item spacing={2}>
         {
-            referenceResults?.map((searchResult: any) => {
+            referenceResults?.map((searchResult: any, index) => {
+
+
                 switch (searchResult?._type) {
                     case "ResumeExperience":
-                        return <ResumeExperienceItem experience={searchResult}/>
+                        return <Grid container item>
+                            <Grid container>
+                                {<Typography color='textPrimary' variant='subtitle2'
+                                             textTransform={'uppercase'} sx={{
+                                    borderLeft: "1px solid red",
+                                    paddingLeft: "4px"
+                                }}>My Job Experience</Typography>}
+                            </Grid>
+                            <ResumeExperienceItem
+                                experience={searchResult}/>
+                        </Grid>
                     case "ResumePortfolioItem":
-                        return <ResumePortfolioEntry portfolioItem={searchResult}/>
+                        return <Grid xs={12} sm={6} lg={4} xl={4} item>
+                            <Typography color='textPrimary'
+                                        variant='subtitle2'
+                                        fontWeight={'bold'}
+                                        textTransform={'uppercase'} sx={{
+                                borderLeft: "1px solid red",
+                                paddingLeft: "4px",
+                                marginBottom: "4px"
+                            }}>My Portfolio item</Typography>
+                            <ResumePortfolioEntry portfolioItem={searchResult}/>
+                        </Grid>
                     case "ResumeSkillSection":
                         return <></>
                     case "ResumeSkillset":
-                        return <Grid container item><ResumeSkillSetItem skillset={searchResult}/></Grid>
+                        return <Grid container item>
+                            <Grid container>
+                                {<Typography color='textPrimary' variant='subtitle2'
+                                             fontWeight={'bold'}
+                                             textTransform={'uppercase'} sx={{
+                                    borderLeft: "1px solid red",
+                                    paddingLeft: "4px"
+                                }}>My Related
+                                    Skills</Typography>}
+                            </Grid>
+                            <ResumeSkillSetItem skillset={searchResult}/>
+                        </Grid>
                     // case "PortfolioItem":
                     //     return <>{searchResult.title}</>
                     default: