Changed Resumeskillset be documents vs objects for full text search o…

…f skill

functions.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/functions" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>

functions/package.json

@@ -1,14 +1,14 @@
 {
  "name": "functions",
- "version": "0.6.1",
+ "version": "0.7.0",
  "scripts": {
  "lint": "eslint --ext .js,.ts .",
  "build": "tsc",
  "build:dev": "NODE_ENV=development tsc",
  "serve": "npm run build && firebase emulators:start --only functions",
  "shell": "npm run build && firebase functions:shell",
  "start": "npm run shell",
- "deploy": "npm run build && firebase deploy",
+ "deploy": "npm run build && npm run html && firebase deploy",
  "logs": "firebase functions:log",
  "html": "cp ../build/index.html ./lib",
  "fonts": "mv ../build/fonts ./lib/functions/src"
@@ -22,7 +22,6 @@
  "@sanity/image-url": "^1.0.2",
  "@sanity/types": "^2.34.0",
  "@sendgrid/mail": "^7.7.0",
- "@shopify/shopify-api": "^8.0.2",
  "axios": "^1.6.2",
  "dotenv": "^16.3.1",
  "es6-promise": "^4.2.8",

functions/src/groqQueries.ts

@@ -128,12 +128,10 @@ const HOMEPAGE = `_type,
  },
  "serviceAmenities": serviceAmenities[]->,
  "prosList": prosList[]->,
- "skillsets": skillsets[]{
+ "skillsets": skillsets[]->{
  ...,
  "skills": skills[]->{
- _id,
- name,
- title,
+ ...
  },
  }, 
  "experiences": experiences[]->{

package.json

@@ -1,6 +1,6 @@
 {
  "name": "the-handsomestnerd-internal",
- "version": "0.6.1",
+ "version": "0.7.0",
  "license": "GPL-3.0-or-later",
  "private": true,
  "dependencies": {

sanityIo.iml

@@ -2,7 +2,7 @@
 <module type="WEB_MODULE" version="4">
  <component name="NewModuleRootManager" inherit-compiler-output="true">
  <exclude-output />
- <content url="file://$MODULE_DIR$/sanityIo/sanityIo" />
+ <content url="file://$MODULE_DIR$/sanityIo" />
  <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>

sanityIo/package.json

@@ -1,7 +1,7 @@
 {
  "name": "the-handsomest-nerd-sanity",
  "private": true,
- "version": "0.6.1",
+ "version": "0.7.0",
  "description": "Sanity CMS for React Website Builder",
  "main": "package.json",
  "author": "theHandsomestNerd <hello@thehandsomestnerd.com>",

sanityIo/sanity.config.js

@@ -7,7 +7,7 @@ export default defineConfig({
  title: "The Handsomest Nerd",
  projectId: "e5l5k4i5",
  dataset: "development",
- plugins: [deskTool(), visionTool()],
+ plugins: [deskTool({}), visionTool()],
  schema: {
  types: schemas,
  },

sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js

@@ -1,7 +1,7 @@
 export default {
  name: 'ResumeSkillset',
  title: 'Resume Skillset',
- type: 'object',
+ type: 'document',
  fields: [
  {
  name: 'name',

sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js

@@ -28,7 +28,7 @@ export default {
  name: 'skillsets',
  title: 'Skillsets',
  type: "array",
- of: [{type: "ResumeSkillset"},
+ of: [{type: "reference", to:{type:"ResumeSkillset"}},
  ]
  },
  ]

src/common/sanityIo/groqQueries.ts

@@ -113,12 +113,10 @@ const HOMEPAGE = `_type,
  },
  "prosList": prosList[]->,
  "serviceAmenities": serviceAmenities[]->,
- "skillsets": skillsets[]{
+ "skillsets": skillsets[]->{
  ...,
  "skills": skills[]->{
- _id,
- name,
- title,
+ ...
  },
  }, 
  "experiences": experiences[]->{

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

@@ -473,6 +473,8 @@ const fullTextSearch = (textToSearch: string): Promise<any> => {
  `*[
  [
  title, 
+ careerTitle,
+ introduction,
  name, 
  contentText, 
  contentTexts, 
@@ -484,10 +486,10 @@ const fullTextSearch = (textToSearch: string): Promise<any> => {
  contentSummaryTitle,
  contentSummaryTexts,
  videoUrl,
- 
  ] match '*${textToSearch}*']{
  ..., 
  "skillsUsed" : skillsUsed[]->,
+ "skills" : skills[]->,
  }`,
  // {searchText: textToSearch}
  ).then((data: any) => {
@@ -502,6 +504,7 @@ const skillReferenceSearch = (skill: ResumeSkill): Promise<any> => {
  ..., 
  "skillsHighlighted": skillsHighlighted[]->,
  "skillsUsed" : skillsUsed[]->,
+ "skills":skills[]->,
  }`,
  {searchText: skill._id}
  ).then((data: any) => {

src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx

@@ -3,25 +3,17 @@ import React, {FunctionComponent} from 'react'
 import makeStyles from "@mui/styles/makeStyles";
 import {Theme} from "@mui/material/styles";
 import {Grid, Typography} from "@mui/material";
-import {ResumeSkill} from "../../../BlockContentTypes";
+import {ResumePortfolioItem, ResumeSkill} from "../../../BlockContentTypes";
 import cmsClient from "../../../block-content-ui/cmsClient";
 import ResumeExperienceItem from "../resume-experience-section/ResumeExperienceItem";
-import {ResumePortfolioItem} from "../../../BlockContentTypes";
 import ResumePortfolioEntry from "../resume-portfolio-section/ResumePortfolioEntry";
-import PortfolioItemModal from "../resume-portfolio-section/PortfolioItemModal";
-
-export const useStyles = makeStyles((theme: Theme) => ({
- root: {
- },
-}))
+import ResumeSkillSetItem from "./ResumeSkillSetItem";
 
 interface IProps {
  skill?: ResumeSkill
 }
 
-const ResumeSkillReferences: FunctionComponent<IProps> = (props:IProps) => {
- const classes = useStyles()
-
+const ResumeSkillReferences: FunctionComponent<IProps> = (props: IProps) => {
  const [referenceResults, setReferenceResults] = React.useState<[]>()
 
  const searchCMS = async () => {
@@ -33,7 +25,7 @@ const ResumeSkillReferences: FunctionComponent<IProps> = (props:IProps) => {
  }
  }
 
- React.useEffect(()=>{
+ React.useEffect(() => {
  // find the rerences of this skill
  searchCMS().then()
 
@@ -44,17 +36,21 @@ const ResumeSkillReferences: FunctionComponent<IProps> = (props:IProps) => {
  const [isOpen, setIsOpen] = React.useState<boolean>(false)
  return (<Grid container item spacing={2}>
  {
- referenceResults?.map((searchResult:any)=>{
- switch (searchResult?._type) {
- case "ResumeExperience":
- return <ResumeExperienceItem experience={searchResult} />
- case "ResumePortfolioItem":
- return <ResumePortfolioEntry portfolioItem={searchResult}/>
- case "ResumeSkillSection":
- return <></>
- default:
- return <Grid item container><Typography>{searchResult._type}</Typography></Grid>
- }
+ referenceResults?.map((searchResult: any) => {
+ switch (searchResult?._type) {
+ case "ResumeExperience":
+ return <ResumeExperienceItem experience={searchResult}/>
+ case "ResumePortfolioItem":
+ return <ResumePortfolioEntry portfolioItem={searchResult}/>
+ case "ResumeSkillSection":
+ return <></>
+ case "ResumeSkillset":
+ return <Grid container item><ResumeSkillSetItem skillset={searchResult}/></Grid>
+ // case "PortfolioItem":
+ // return <>{searchResult.title}</>
+ default:
+ return <Grid item container><Typography>{searchResult._type}</Typography></Grid>
+ }
  })
  }