diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6acac044..09a459d5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
+
+
\ No newline at end of file
diff --git a/functions.iml b/functions.iml
new file mode 100644
index 00000000..82ba1762
--- /dev/null
+++ b/functions.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/functions/package.json b/functions/package.json
index 23ba0b9c..fc5ebc30 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -1,6 +1,6 @@
{
"name": "functions",
- "version": "0.6.1",
+ "version": "0.7.0",
"scripts": {
"lint": "eslint --ext .js,.ts .",
"build": "tsc",
@@ -8,7 +8,7 @@
"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",
diff --git a/functions/src/groqQueries.ts b/functions/src/groqQueries.ts
index a6cbc002..8dd4df1c 100644
--- a/functions/src/groqQueries.ts
+++ b/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[]->{
diff --git a/package.json b/package.json
index 3967990f..20ee6f11 100644
--- a/package.json
+++ b/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": {
diff --git a/sanityIo.iml b/sanityIo.iml
index 5e952420..d545a644 100644
--- a/sanityIo.iml
+++ b/sanityIo.iml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/sanityIo/package-lock.json b/sanityIo/package-lock.json
index 7e10afd1..15e00ff1 100644
--- a/sanityIo/package-lock.json
+++ b/sanityIo/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "the-handsomest-nerd-sanity",
- "version": "0.4.0",
+ "version": "0.6.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "the-handsomest-nerd-sanity",
- "version": "0.4.0",
+ "version": "0.6.1",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sanity/block-content-to-react": "^3.0.0",
diff --git a/sanityIo/package.json b/sanityIo/package.json
index a75f392e..d8a529d5 100644
--- a/sanityIo/package.json
+++ b/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 ",
diff --git a/sanityIo/sanity.config.js b/sanityIo/sanity.config.js
index 9c0a3320..e7aebb5d 100644
--- a/sanityIo/sanity.config.js
+++ b/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,
},
diff --git a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js
index a9795612..965678df 100644
--- a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillSet.js
+++ b/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',
diff --git a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js b/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js
index d48a370e..0fe8c874 100644
--- a/sanityIo/schemas/sections/resume/resume-skills/ResumeSkillsSection.js
+++ b/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"}},
]
},
]
diff --git a/src/common/sanityIo/groqQueries.ts b/src/common/sanityIo/groqQueries.ts
index 76b45d6f..4ccd4920 100644
--- a/src/common/sanityIo/groqQueries.ts
+++ b/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[]->{
diff --git a/src/components/block-content-ui/cmsClient.ts b/src/components/block-content-ui/cmsClient.ts
index 93e35bd8..dd4e20a8 100644
--- a/src/components/block-content-ui/cmsClient.ts
+++ b/src/components/block-content-ui/cmsClient.ts
@@ -473,6 +473,8 @@ const fullTextSearch = (textToSearch: string): Promise => {
`*[
[
title,
+ careerTitle,
+ introduction,
name,
contentText,
contentTexts,
@@ -484,10 +486,10 @@ const fullTextSearch = (textToSearch: string): Promise => {
contentSummaryTitle,
contentSummaryTexts,
videoUrl,
-
] match '*${textToSearch}*']{
...,
"skillsUsed" : skillsUsed[]->,
+ "skills" : skills[]->,
}`,
// {searchText: textToSearch}
).then((data: any) => {
@@ -502,6 +504,7 @@ const skillReferenceSearch = (skill: ResumeSkill): Promise => {
...,
"skillsHighlighted": skillsHighlighted[]->,
"skillsUsed" : skillsUsed[]->,
+ "skills":skills[]->,
}`,
{searchText: skill._id}
).then((data: any) => {
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 240d931f..5c087df1 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
@@ -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 = (props:IProps) => {
- const classes = useStyles()
-
+const ResumeSkillReferences: FunctionComponent = (props: IProps) => {
const [referenceResults, setReferenceResults] = React.useState<[]>()
const searchCMS = async () => {
@@ -33,7 +25,7 @@ const ResumeSkillReferences: FunctionComponent = (props:IProps) => {
}
}
- React.useEffect(()=>{
+ React.useEffect(() => {
// find the rerences of this skill
searchCMS().then()
@@ -44,17 +36,21 @@ const ResumeSkillReferences: FunctionComponent = (props:IProps) => {
const [isOpen, setIsOpen] = React.useState(false)
return (
{
- referenceResults?.map((searchResult:any)=>{
- switch (searchResult?._type) {
- case "ResumeExperience":
- return
- case "ResumePortfolioItem":
- return
- case "ResumeSkillSection":
- return <>
- default:
- return {searchResult._type}
- }
+ referenceResults?.map((searchResult: any) => {
+ switch (searchResult?._type) {
+ case "ResumeExperience":
+ return
+ case "ResumePortfolioItem":
+ return
+ case "ResumeSkillSection":
+ return <>
+ case "ResumeSkillset":
+ return
+ // case "PortfolioItem":
+ // return <>{searchResult.title}
+ default:
+ return {searchResult._type}
+ }
})
}