From f6c0bd83ddbab03e2b4c38daa991f04f6c6dbbd7 Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Sat, 25 Nov 2023 05:02:01 -0500 Subject: [PATCH 01/17] back to handsomestnerd project settings from pull requests Fixed Customized Themeprovider values - fixes responsiveness and fonts passthru from theme Removed TheWebsiteTheme in favor of useTheme or useContext(CustomizedThemeContext) --- .firebaserc | 2 +- .github/workflows/firebase-hosting-merge.yml | 4 +- .../firebase-hosting-pull-request.yml | 2 +- package-lock.json | 514 ++++++++---------- package.json | 10 +- public/manifest.json | 4 +- sanityIo/package.json | 2 +- sanityIo/sanity.config.js | 4 +- sanityIo/sanity.json | 8 +- sanityIo/schemas/mui/MuiTypography.js | 12 +- .../sanityIo/BlockContentAnnotations.tsx | 7 +- .../sanityIo/BlockContentMarkRenderers.tsx | 17 +- .../BlockContentLayoutContainer.tsx | 16 +- src/components/BusinessCard.tsx | 28 +- .../FooterBlockContentLayoutContainer.tsx | 37 +- .../HeaderBlockContentLayoutContainer.tsx | 41 +- .../CustomizedThemeProvider.tsx | 44 +- .../filtered-menu-items/FilteredMenuItems.tsx | 16 +- .../filtered-menu-items/PopupStateWrapper.tsx | 19 +- .../loading-button/LoadingButton.tsx | 118 ++-- src/components/logo/AlternatingText.tsx | 4 +- src/components/logo/Logo.tsx | 3 +- .../mackenzies-mind/footer/Footer.tsx | 14 +- .../footer/FooterMenuContainer.tsx | 145 +++-- .../footer/FooterMenuGroup.tsx | 14 +- .../mackenzies-mind/header/AppBarWrapper.tsx | 14 +- .../header/FilteredMenuItems.tsx | 4 +- .../mackenzies-mind/header/FullTextSearch.tsx | 46 +- .../mackenzies-mind/header/Header.tsx | 56 +- .../mackenzies-mind/header/MainMenu.tsx | 48 +- .../header/MainMenuSubMenu.tsx | 47 +- .../mackenzies-mind/header/SubMenu.tsx | 10 +- .../mackenzies-mind/pages/PageLayout.tsx | 14 +- .../ResumeContactUsSection.tsx | 240 ++++---- .../resume-bio-section/ResumeBioSection.tsx | 155 +++--- .../ResumeEducationSection.tsx | 133 +++-- .../ResumeExperienceSection.tsx | 22 +- .../ResumeFeedbackSection.tsx | 13 +- .../ResumePortfolioSection.tsx | 206 ++++--- .../ResumeSkillsSection.tsx | 11 +- .../social-media-block/SocialMediaBlock.tsx | 107 ++-- .../transform-hw/AmenitiesSection.tsx | 19 +- .../transform-hw/HeaderMenuGroupButton.tsx | 11 +- .../transform-hw/ThwContactUsSection.tsx | 2 +- .../transform-hw/ThwMottoSection.tsx | 11 +- .../transform-hw/ThwWhyChooseUsSection.tsx | 101 ++-- .../pages/BusinessCardSubmitEmail.tsx | 32 +- .../pages/error-page/FourOhFour.tsx | 9 +- .../service-education-page/OtherServices.tsx | 8 +- .../ThwServiceEducationPage.tsx | 37 +- .../web-dev-site/dev-footer/WebDevFooter.tsx | 98 ++-- .../dev-footer/WebDevFooterMenuGroup.tsx | 10 +- src/sanityClient.ts | 2 +- .../transform/ThwContactUsSection.stories.tsx | 9 +- src/theme/Theme.ts | 178 +++--- 55 files changed, 1324 insertions(+), 1414 deletions(-) diff --git a/.firebaserc b/.firebaserc index e24e500f..1efb67d8 100644 --- a/.firebaserc +++ b/.firebaserc @@ -1,6 +1,6 @@ { "projects": { - "chowworks-website": "chowworks-website" + "the-handsomest-nerd-internal": "the-handsomest-nerd-internal" }, "targets": {}, "etags": {} diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index e9d5ca0c..e4d19ddf 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -16,6 +16,6 @@ jobs: - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_THE_HANDSOMEST_NERD }}' channelId: live - projectId: chowworks-website + projectId: the-handsomest-nerd-internal diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 5ff1da7b..16c653fc 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -14,4 +14,4 @@ jobs: with: repoToken: '${{ secrets.GITHUB_TOKEN }}' firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}' - projectId: chowworks-website + projectId: the-handsomest-nerd-internal diff --git a/package-lock.json b/package-lock.json index bf4e4519..74973460 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { - "name": "chowworks-website", + "name": "the-handsomestnerd-internal", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "chowworks-website", + "name": "the-handsomestnerd-internal", "version": "0.0.0", "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.14.11", + "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", - "@mui/styles": "^5.14.11", + "@mui/styles": "^5.14.18", "@storybook/addon-mdx-gfm": "^7.4.6", "@storybook/react-webpack5": "^7.4.6", "@tanstack/react-query": "^4.36.1", @@ -77,7 +77,7 @@ "@types/react-router": "^5.1.19", "@types/react-router-dom": "^5.3.3", "@types/react-syntax-highlighter": "^13.5.0", - "@types/uuid": "^8.3.4", + "@types/uuid": "^9.0.0", "@types/validator": "^13.7.7", "storybook-addon-material-ui": "^0.9.0-alpha.24", "url-loader": "^4.1.1" @@ -130,11 +130,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz", + "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==", "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -302,19 +302,19 @@ } }, "node_modules/@babel/eslint-parser/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz", + "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==", "dependencies": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.4", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -475,9 +475,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -638,9 +638,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "engines": { "node": ">=6.9.0" } @@ -688,9 +688,9 @@ } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -765,9 +765,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz", + "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1896,9 +1896,9 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -2446,18 +2446,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz", + "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/code-frame": "^7.23.4", + "@babel/generator": "^7.23.4", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", + "@babel/parser": "^7.23.4", + "@babel/types": "^7.23.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2487,11 +2487,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz", + "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -4153,9 +4153,9 @@ } }, "node_modules/@grpc/grpc-js/node_modules/protobufjs": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz", - "integrity": "sha512-4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -5133,11 +5133,11 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.14.11", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.11.tgz", - "integrity": "sha512-aHReLasBuS/+hhPzbZCgZ0eTcZ2QRnoC2WNK7XvdAf3l+LjC1flzjh6GWw1tZJ5NHnZ+bivdwtLFQ8XTR96JkA==", + "version": "5.14.18", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.18.tgz", + "integrity": "sha512-o2z49R1G4SdBaxZjbMmkn+2OdT1bKymLvAYaB6pH59obM1CYv/0vAVm6zO31IqhwtYwXv6A7sLIwCGYTaVkcdg==", "dependencies": { - "@babel/runtime": "^7.22.15" + "@babel/runtime": "^7.23.2" }, "engines": { "node": ">=12.0.0" @@ -5314,15 +5314,15 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/@mui/styles": { - "version": "5.14.11", - "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.14.11.tgz", - "integrity": "sha512-43TTaH/QBNAvwFfN0Dz1UREZLs5Yd8X4XrsiYgIJJgdGsr2TtlKz/WRHqDNwWkNg/gs3qcWIbtNweTIoTkov/g==", + "version": "5.14.18", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.14.18.tgz", + "integrity": "sha512-dllIn149Fd6xzlf743y5jGbr61V/8qR1JWiwsOc5NAx5eTIooHpJxEfiVErHDpChCaHjlfR6upxvcNDq8IvT2w==", "dependencies": { - "@babel/runtime": "^7.22.15", + "@babel/runtime": "^7.23.2", "@emotion/hash": "^0.9.1", - "@mui/private-theming": "^5.14.11", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.11", + "@mui/private-theming": "^5.14.18", + "@mui/types": "^7.2.9", + "@mui/utils": "^5.14.18", "clsx": "^2.0.0", "csstype": "^3.1.2", "hoist-non-react-statics": "^3.3.2", @@ -12868,9 +12868,9 @@ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" }, "node_modules/@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz", + "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==", "dev": true }, "node_modules/@types/validator": { @@ -13594,9 +13594,9 @@ } }, "node_modules/@xmldom/xmldom": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.3.tgz", - "integrity": "sha512-Lv2vySXypg4nfa51LY1nU8yDAGo/5YwF+EY/rUZgIbfvwVARcd67ttCM8SMsTeJy51YhHYavEq+FS6R0hW9PFQ==", + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", "engines": { "node": ">=10.0.0" } @@ -14420,9 +14420,9 @@ } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -16745,9 +16745,9 @@ } }, "node_modules/editorconfig/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -17564,9 +17564,9 @@ } }, "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -17637,9 +17637,9 @@ } }, "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -18048,13 +18048,10 @@ } }, "node_modules/eventsource": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", - "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz", + "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==", "dev": true, - "dependencies": { - "original": "^1.0.0" - }, "engines": { "node": ">=0.12.0" } @@ -18553,9 +18550,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "funding": [ { "type": "individual", @@ -19131,9 +19128,9 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "node_modules/graphql": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", - "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==", + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", + "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } @@ -20495,9 +20492,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -24512,15 +24509,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "dependencies": { - "url-parse": "^1.4.3" - } - }, "node_modules/os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -24905,9 +24893,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -26171,9 +26159,12 @@ } }, "node_modules/prismjs": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", - "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz", + "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==", + "engines": { + "node": ">=6" + } }, "node_modules/process": { "version": "0.11.10", @@ -26261,9 +26252,9 @@ "dev": true }, "node_modules/protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", + "version": "6.11.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz", + "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -26722,9 +26713,9 @@ } }, "node_modules/react-dev-utils/node_modules/loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", "engines": { "node": ">= 12.13.0" } @@ -27351,25 +27342,14 @@ } }, "node_modules/recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", - "dependencies": { - "minimatch": "3.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/recursive-readdir/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", "dependencies": { - "brace-expansion": "^1.1.7" + "minimatch": "^3.0.5" }, "engines": { - "node": "*" + "node": ">=6.0.0" } }, "node_modules/redent": { @@ -27386,13 +27366,13 @@ } }, "node_modules/refractor": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", - "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz", + "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==", "dependencies": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", - "prismjs": "~1.25.0" + "prismjs": "~1.27.0" }, "funding": { "type": "github", @@ -29480,9 +29460,9 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -29680,9 +29660,9 @@ } }, "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dependencies": { "minimist": "^1.2.0" }, @@ -30134,9 +30114,9 @@ } }, "node_modules/url-parse": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -30975,9 +30955,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "engines": { "node": ">=0.10.0" } @@ -31442,11 +31422,11 @@ } }, "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz", + "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==", "requires": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "dependencies": { @@ -31569,18 +31549,18 @@ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, "@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz", + "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==", "requires": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.4", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -31703,9 +31683,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -31817,9 +31797,9 @@ } }, "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==" }, "@babel/helper-validator-identifier": { "version": "7.22.20", @@ -31852,9 +31832,9 @@ } }, "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "requires": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -31913,9 +31893,9 @@ } }, "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz", + "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.22.15", @@ -32609,9 +32589,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -33015,18 +32995,18 @@ } }, "@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz", + "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==", "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/code-frame": "^7.23.4", + "@babel/generator": "^7.23.4", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", + "@babel/parser": "^7.23.4", + "@babel/types": "^7.23.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -33047,11 +33027,11 @@ } }, "@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz", + "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==", "requires": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } @@ -34210,9 +34190,9 @@ } }, "protobufjs": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz", - "integrity": "sha512-4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -34973,11 +34953,11 @@ "integrity": "sha512-yFpF35fEVDV81nVktu0BE9qn2dD/chs7PsQhlyaV3EnTeZi9RZBuvoEfRym1/jmhJ2tcfeWXiRuHG942mQXJJQ==" }, "@mui/icons-material": { - "version": "5.14.11", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.11.tgz", - "integrity": "sha512-aHReLasBuS/+hhPzbZCgZ0eTcZ2QRnoC2WNK7XvdAf3l+LjC1flzjh6GWw1tZJ5NHnZ+bivdwtLFQ8XTR96JkA==", + "version": "5.14.18", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.18.tgz", + "integrity": "sha512-o2z49R1G4SdBaxZjbMmkn+2OdT1bKymLvAYaB6pH59obM1CYv/0vAVm6zO31IqhwtYwXv6A7sLIwCGYTaVkcdg==", "requires": { - "@babel/runtime": "^7.22.15" + "@babel/runtime": "^7.23.2" } }, "@mui/material": { @@ -35077,15 +35057,15 @@ } }, "@mui/styles": { - "version": "5.14.11", - "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.14.11.tgz", - "integrity": "sha512-43TTaH/QBNAvwFfN0Dz1UREZLs5Yd8X4XrsiYgIJJgdGsr2TtlKz/WRHqDNwWkNg/gs3qcWIbtNweTIoTkov/g==", + "version": "5.14.18", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.14.18.tgz", + "integrity": "sha512-dllIn149Fd6xzlf743y5jGbr61V/8qR1JWiwsOc5NAx5eTIooHpJxEfiVErHDpChCaHjlfR6upxvcNDq8IvT2w==", "requires": { - "@babel/runtime": "^7.22.15", + "@babel/runtime": "^7.23.2", "@emotion/hash": "^0.9.1", - "@mui/private-theming": "^5.14.11", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.11", + "@mui/private-theming": "^5.14.18", + "@mui/types": "^7.2.9", + "@mui/utils": "^5.14.18", "clsx": "^2.0.0", "csstype": "^3.1.2", "hoist-non-react-statics": "^3.3.2", @@ -40310,9 +40290,9 @@ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" }, "@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz", + "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==", "dev": true }, "@types/validator": { @@ -40790,9 +40770,9 @@ } }, "@xmldom/xmldom": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.3.tgz", - "integrity": "sha512-Lv2vySXypg4nfa51LY1nU8yDAGo/5YwF+EY/rUZgIbfvwVARcd67ttCM8SMsTeJy51YhHYavEq+FS6R0hW9PFQ==" + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==" }, "@xtuc/ieee754": { "version": "1.2.0", @@ -41428,9 +41408,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -43117,9 +43097,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "yallist": { @@ -43773,9 +43753,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -43819,9 +43799,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -44019,13 +43999,10 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, "eventsource": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", - "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", - "dev": true, - "requires": { - "original": "^1.0.0" - } + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz", + "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==", + "dev": true }, "execa": { "version": "5.1.1", @@ -44423,9 +44400,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==" }, "for-each": { "version": "0.3.3", @@ -44839,9 +44816,9 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "graphql": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", - "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==" + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", + "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==" }, "gunzip-maybe": { "version": "1.4.2", @@ -45773,9 +45750,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -48742,15 +48719,6 @@ "wcwidth": "^1.0.1" } }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -49039,9 +49007,9 @@ } }, "postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", @@ -49739,9 +49707,9 @@ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" }, "prismjs": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", - "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz", + "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==" }, "process": { "version": "0.11.10", @@ -49818,9 +49786,9 @@ "dev": true }, "protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", + "version": "6.11.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz", + "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -50161,9 +50129,9 @@ } }, "loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==" }, "locate-path": { "version": "6.0.0", @@ -50602,21 +50570,11 @@ } }, "recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", "requires": { - "minimatch": "3.0.4" - }, - "dependencies": { - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - } + "minimatch": "^3.0.5" } }, "redent": { @@ -50630,13 +50588,13 @@ } }, "refractor": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", - "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz", + "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==", "requires": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", - "prismjs": "~1.25.0" + "prismjs": "~1.27.0" } }, "regenerate": { @@ -52199,9 +52157,9 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "requires": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -52315,9 +52273,9 @@ }, "dependencies": { "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "requires": { "minimist": "^1.2.0" } @@ -52642,9 +52600,9 @@ } }, "url-parse": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -53227,9 +53185,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==" }, "wordwrap": { "version": "1.0.0", diff --git a/package.json b/package.json index 93991b3d..3e4f17f5 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "chowworks-website", - "version": "0.0.0", + "name": "the-handsomestnerd-internal", + "version": "0.0.1", "private": true, "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.14.11", + "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", - "@mui/styles": "^5.14.11", + "@mui/styles": "^5.14.18", "@storybook/addon-mdx-gfm": "^7.4.6", "@storybook/react-webpack5": "^7.4.6", "@tanstack/react-query": "^4.36.1", @@ -112,7 +112,7 @@ "@types/react-router": "^5.1.19", "@types/react-router-dom": "^5.3.3", "@types/react-syntax-highlighter": "^13.5.0", - "@types/uuid": "^8.3.4", + "@types/uuid": "^9.0.0", "@types/validator": "^13.7.7", "storybook-addon-material-ui": "^0.9.0-alpha.24", "url-loader": "^4.1.1" diff --git a/public/manifest.json b/public/manifest.json index 651ac945..4be77695 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Chow Works Webpage", - "name": "Chow Works Webpage", + "short_name": "React Website Builder", + "name": "The Handsomest Nerd React Website Builder", "icons": [ { "src": "favicon.ico", diff --git a/sanityIo/package.json b/sanityIo/package.json index 5f0f42a7..2f94bb71 100644 --- a/sanityIo/package.json +++ b/sanityIo/package.json @@ -1,7 +1,7 @@ { "name": "the-handsomest-nerd-sanity", "private": true, - "version": "0.0.0", + "version": "0.0.1", "description": "", "main": "package.json", "author": "theHandsomestNerd ", diff --git a/sanityIo/sanity.config.js b/sanityIo/sanity.config.js index 2009464d..9c0a3320 100644 --- a/sanityIo/sanity.config.js +++ b/sanityIo/sanity.config.js @@ -4,8 +4,8 @@ import schemas from './schemas/schema' import {visionTool} from "@sanity/vision"; export default defineConfig({ - title: "Chow Works Website", - projectId: "rhjxlvuj", + title: "The Handsomest Nerd", + projectId: "e5l5k4i5", dataset: "development", plugins: [deskTool(), visionTool()], schema: { diff --git a/sanityIo/sanity.json b/sanityIo/sanity.json index 46736d28..da4e7f24 100644 --- a/sanityIo/sanity.json +++ b/sanityIo/sanity.json @@ -1,18 +1,18 @@ { "root": true, "api": { - "projectId": "rhjxlvuj", + "projectId": "e5l5k4i5", "dataset": "production" }, "project": { - "name": "Chow Works Website" + "name": "The Handsomest Nerd" }, "__experimental_spaces": [ { "name": "production", "title": "Production", "api": { - "projectId": "rhjxlvuj", + "projectId": "e5l5k4i5", "dataset": "production" } }, @@ -21,7 +21,7 @@ "title": "Development", "default": true, "api": { - "projectId": "rhjxlvuj", + "projectId": "e5l5k4i5", "dataset": "development" } } diff --git a/sanityIo/schemas/mui/MuiTypography.js b/sanityIo/schemas/mui/MuiTypography.js index 2d0a1ece..9114d2a5 100644 --- a/sanityIo/schemas/mui/MuiTypography.js +++ b/sanityIo/schemas/mui/MuiTypography.js @@ -14,12 +14,12 @@ export default { type: "array", of:[{type: "string", options: { list: [ - {value: "OSWALD", title: "Oswald"}, - {value: "INTER", title: "Inter"}, - {value: "PROMPT", title: "Prompt"}, - {value: "RALEWAY", title: "Raleway"}, - {value: "POPPINS", title: "Poppins"}, - {value: "MONTESERRAT", title: "Monteserrat"} + {value: "Oswald", title: "Oswald"}, + {value: "Inter", title: "Inter"}, + {value: "Prompt", title: "Prompt"}, + {value: "Raleway", title: "Raleway"}, + {value: "Poppins", title: "Poppins"}, + {value: "Monteserrat", title: "Monteserrat"} ] }}], diff --git a/src/common/sanityIo/BlockContentAnnotations.tsx b/src/common/sanityIo/BlockContentAnnotations.tsx index f8a75b9b..739b96df 100644 --- a/src/common/sanityIo/BlockContentAnnotations.tsx +++ b/src/common/sanityIo/BlockContentAnnotations.tsx @@ -65,7 +65,10 @@ export const ButtonMarkRender = (props: React.PropsWithChildren<{}> & BlockConte return @@ -88,6 +88,8 @@ const MainMenu: FunctionComponent = ({menu, anchor}) => { ); + const theme = useTheme() + return ( )) diff --git a/src/components/templates/mackenzies-mind/header/SubMenu.tsx b/src/components/templates/mackenzies-mind/header/SubMenu.tsx index 11748521..a8d8671f 100644 --- a/src/components/templates/mackenzies-mind/header/SubMenu.tsx +++ b/src/components/templates/mackenzies-mind/header/SubMenu.tsx @@ -1,8 +1,7 @@ import React, {FunctionComponent, useContext, useState} from 'react' -import {Button, Grid, List, ListItem, Typography} from '@mui/material' +import {Button, Grid, List, ListItem, Typography, useTheme} from '@mui/material' import {v4 as uuidv4} from 'uuid' import {SanityMenuGroup, SanityMenuItem} from "../../../../common/sanityIo/Types"; -import TheWebsiteTheme from "../../../../theme/Theme"; import ModalContext from "../../../snackbar-context/ModalContext"; @@ -13,21 +12,22 @@ interface SubMenuProps { const SubMenu: FunctionComponent = (props) => { const modalContext = useContext(ModalContext) + const theme = useTheme() return ( { props.subMenu?.links?.map((theLink: SanityMenuItem, index: number) => { - console.log("submenu link", theLink) + // console.log("submenu link", theLink) return 0 ? undefined : props.handleClose} key={uuidv4() + index} button style={{height: "48px",padding: 0}}> - - - {/*{props.sectionData.cvFile && props.sectionData.cvFile.url.length > 0 && */} - {/* CV}*/} - - + + MAIL + {props.homePage.businessContact?.address} + + + + + + + + + + + + + + {/*{props.sectionData.cvFile && props.sectionData.cvFile.url.length > 0 && */} + {/* CV}*/} + - + + ); } diff --git a/src/components/templates/my-digital-resume/resume-education-section/ResumeEducationSection.tsx b/src/components/templates/my-digital-resume/resume-education-section/ResumeEducationSection.tsx index 34aae1ba..98752c1a 100644 --- a/src/components/templates/my-digital-resume/resume-education-section/ResumeEducationSection.tsx +++ b/src/components/templates/my-digital-resume/resume-education-section/ResumeEducationSection.tsx @@ -1,11 +1,8 @@ -import React, {FunctionComponent, useContext} from 'react' -import {ThemeProvider} from "@mui/material/styles"; +import React, {FunctionComponent} from 'react' import {Grid, Typography, useMediaQuery, useTheme} from '@mui/material' import {ResumeEducation, ResumeEducationSectionType} from "../../../BlockContentTypes"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {COLORS} from "../../../../theme/common/ColorPalette"; -import TheWebsiteTheme from "../../../../theme/Theme"; -import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; interface IProps { @@ -16,78 +13,74 @@ const ResumeEducationSection: FunctionComponent = (props: IProps) => { const globalClasses = useThwCommonStyles() const theme = useTheme() - const customizedThemeContext = useContext(CustomizedThemeContext) - const xsOnly = useMediaQuery(customizedThemeContext.customizedTheme.breakpoints.only('xs')) + const xsOnly = useMediaQuery(theme.breakpoints.only('xs')) return ( - - - - - - {props.sectionData.title} - . - - - - {props.sectionData.introduction} - - - { - props.sectionData.educationExperiences?.map((experience: ResumeEducation, index2: number) => { - return = (props.sectionData.educationExperiences?.length ?? 0) - 2 ? "transparent" : COLORS.LIGHTGRAY}`, - // padding: theme.spacing(1.75, 0) - }} xs={12}> - - - {experience.institutionName} - - - - + + + + + {props.sectionData.title} + . + + + + {props.sectionData.introduction} + + + { + props.sectionData.educationExperiences?.map((experience: ResumeEducation, index2: number) => { + return = (props.sectionData.educationExperiences?.length ?? 0) - 2 ? "transparent" : COLORS.LIGHTGRAY}`, + // padding: theme.spacing(1.75, 0) + }} xs={12}> + + + {experience.institutionName} + + + + - {experience.qualification} - - - - - {experience.dateStart?.toString().replaceAll('-', '.')} - — - {experience.dateEnd?.toString().replaceAll('-', '.')} - - - - {experience.description} - + {experience.qualification} - }) - } - - + + + + {experience.dateStart?.toString().replaceAll('-', '.')} + — + {experience.dateEnd?.toString().replaceAll('-', '.')} + + + + {experience.description} + + + }) + } - + + ); } diff --git a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx index a30e8735..f134009e 100644 --- a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx +++ b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx @@ -1,11 +1,8 @@ -import React, {FunctionComponent, useContext} from 'react' +import React, {FunctionComponent} from 'react' import {Chip, Grid, Typography, useMediaQuery, useTheme} from '@mui/material' import {ResumeExperience, ResumeExperienceSectionType} from "../../../BlockContentTypes"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {COLORS} from "../../../../theme/common/ColorPalette"; -import {ThemeProvider} from "@mui/material/styles"; -import TheWebsiteTheme from "../../../../theme/Theme"; -import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; interface IProps { sectionData: ResumeExperienceSectionType @@ -15,12 +12,10 @@ const ResumeExperienceSection: FunctionComponent = (props: IProps) => { const classes = useThwCommonStyles() const theme = useTheme() - const customizedThemeContext = useContext(CustomizedThemeContext) - const xsOnly = useMediaQuery(customizedThemeContext.customizedTheme.breakpoints.only('xs')) + const xsOnly = useMediaQuery(theme.breakpoints.only('xs')) return ( - = (props: IProps) => { > - {props.sectionData.title}. + {props.sectionData.title}. {props.sectionData.introduction} @@ -88,7 +84,8 @@ const ResumeExperienceSection: FunctionComponent = (props: IProps) => { style={{overflowX: "scroll", paddingBottom: theme.spacing(1)}} wrap='nowrap'> { experience.skillsUsed?.map((skill, index) => { - return }) } @@ -99,7 +96,6 @@ const ResumeExperienceSection: FunctionComponent = (props: IProps) => { - ); } diff --git a/src/components/templates/my-digital-resume/resume-feedback-section/ResumeFeedbackSection.tsx b/src/components/templates/my-digital-resume/resume-feedback-section/ResumeFeedbackSection.tsx index 1a729d08..5edb14da 100644 --- a/src/components/templates/my-digital-resume/resume-feedback-section/ResumeFeedbackSection.tsx +++ b/src/components/templates/my-digital-resume/resume-feedback-section/ResumeFeedbackSection.tsx @@ -1,11 +1,10 @@ import React, {FunctionComponent, useContext} from 'react' import {ThemeProvider} from "@mui/material/styles"; -import {Grid, Typography, useMediaQuery} from '@mui/material' +import {Grid, Typography, useMediaQuery, useTheme} from '@mui/material' import {ResumeFeedback, ResumeFeedbackSectionType} from "../../../BlockContentTypes"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; import {COLORS} from "../../../../theme/common/ColorPalette"; -import TheWebsiteTheme from "../../../../theme/Theme"; import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; @@ -17,16 +16,15 @@ const ResumeFeedbackSection: FunctionComponent = (props: IProps) => { const globalClasses = useThwCommonStyles() // const theme = useTheme() - const customizedThemeContext = useContext(CustomizedThemeContext) + const customizedThemeContext = useTheme() - const xsOnly = useMediaQuery(customizedThemeContext.customizedTheme.breakpoints.only('xs')) + const xsOnly = useMediaQuery(customizedThemeContext.breakpoints.only('xs')) return ( - = (props: IProps) => { - ); } 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 580ceb9b..ce0cf3b3 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 @@ -1,8 +1,6 @@ import React, {FunctionComponent} from 'react' -import {StyledEngineProvider, ThemeProvider} from "@mui/material/styles"; import {Button, ButtonGroup, Chip, Grid, IconButton, Modal, Typography, useTheme} from '@mui/material' import {ResumePortfolioItem, ResumePortfolioSectionType} from "../../../BlockContentTypes"; -import TheWebsiteTheme from "../../../../theme/Theme"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; import {Close} from "@mui/icons-material"; @@ -26,117 +24,115 @@ const ResumePortfolioSection: FunctionComponent = (props: IProps) => { } return ( - - - - - - {props.sectionData.title} - . - - - - {props.sectionData.introduction} - - - { - props.sectionData.portfolioEntries?.map((portfolioItem: ResumePortfolioItem, index2: number) => { - return - - - }) - } + + + + + {props.sectionData.title} + . + + + {props.sectionData.introduction} - - - setIsOpen(false)} - size="large"> - - {currentItem?.detailTitle} - - {currentItem?.detailDescription} - - {currentItem?.skillsHighlighted?.map((skill) => ( - - ))} - - {currentItem?.inceptionDate?.toString()} - - - {currentItem?.imageGallery?.map((image) => ( - - - {'imageGalleryEntry'} + + { + props.sectionData.portfolioEntries?.map((portfolioItem: ResumePortfolioItem, index2: number) => { + return + + }) + } + + + + + setIsOpen(false)} + size="large"> + + {currentItem?.detailTitle} + + {currentItem?.detailDescription} + + {currentItem?.skillsHighlighted?.map((skill) => ( + + ))} + + {currentItem?.inceptionDate?.toString()} + - - - - + {currentItem?.imageGallery?.map((image) => ( + + + {'imageGalleryEntry'} + + ))} + + + + + + - - - + + + ); } diff --git a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx index 60585d8f..2d4fe12d 100644 --- a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx +++ b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx @@ -1,12 +1,11 @@ import React, {FunctionComponent, useContext} from 'react' -import {Theme, ThemeProvider} from "@mui/material/styles"; +import {Theme, ThemeProvider, useTheme} from "@mui/material/styles"; import makeStyles from '@mui/styles/makeStyles'; import {Grid, Typography} from '@mui/material' import {ResumeSkillSectionType, ResumeSkillSet} from "../../../BlockContentTypes"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {COLORS} from "../../../../theme/common/ColorPalette"; import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; -import TheWebsiteTheme from "../../../../theme/Theme"; export const useStyles = makeStyles((theme: Theme) => ({ @@ -20,18 +19,15 @@ interface IProps { const ResumeSkillsSection: FunctionComponent = (props: IProps) => { // const classes = useStyles() const globalClasses = useThwCommonStyles() - const themeContext = useContext(CustomizedThemeContext) + const theme = useTheme() return ( - @@ -69,7 +65,6 @@ const ResumeSkillsSection: FunctionComponent = (props: IProps) => { - ); } diff --git a/src/components/templates/my-digital-resume/social-media-block/SocialMediaBlock.tsx b/src/components/templates/my-digital-resume/social-media-block/SocialMediaBlock.tsx index 294ebef6..c307c2b9 100644 --- a/src/components/templates/my-digital-resume/social-media-block/SocialMediaBlock.tsx +++ b/src/components/templates/my-digital-resume/social-media-block/SocialMediaBlock.tsx @@ -1,20 +1,13 @@ -import React, {FunctionComponent} from 'react' +import React, {FunctionComponent, useContext} from 'react' import makeStyles from '@mui/styles/makeStyles'; import {Grid, IconButton, PropTypes, ThemeProvider} from '@mui/material'; -import {SanityTransformHwHomePage} from "../../../../common/sanityIo/Types"; import {Facebook, GitHub, Instagram, LinkedIn, Twitter} from "@mui/icons-material"; import clsx from "clsx"; import {GridSpacing} from "@mui/material/Grid/Grid"; -import TheWebsiteTheme from "../../../../theme/Theme"; +import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; + -export const useStyles = makeStyles(({ - buttonBackground: { - backgroundColor: TheWebsiteTheme.palette.primary.main, - borderRadius: 40, - padding: TheWebsiteTheme.spacing(1) - }, -})) interface IProps { // homePage?: SanityTransformHwHomePage @@ -29,51 +22,59 @@ interface IProps { } const SocialMediaBlock: FunctionComponent = (props: IProps) => { + const customizedThemeContext = useContext(CustomizedThemeContext) + const useStyles = makeStyles(({ + buttonBackground: { + backgroundColor: customizedThemeContext.customizedTheme.palette.primary.main, + borderRadius: 40, + padding: customizedThemeContext.customizedTheme.spacing(1) + }, + })) const classes = useStyles() return ( - - - {props.facebook && - - - - } - {props.twitter && - - - - } - {props.instagram && - - - - } - {props.linkedIn && - - - - } - {props.github && - - - - } + + + {props.facebook && + + + + } + {props.twitter && + + + + } + {props.instagram && + + + + } + {props.linkedIn && + + + + } + {props.github && + + + + } ); } diff --git a/src/components/templates/transform-hw/AmenitiesSection.tsx b/src/components/templates/transform-hw/AmenitiesSection.tsx index 323255b9..00568059 100644 --- a/src/components/templates/transform-hw/AmenitiesSection.tsx +++ b/src/components/templates/transform-hw/AmenitiesSection.tsx @@ -1,9 +1,8 @@ import React, {FunctionComponent, useContext} from 'react' import {Theme} from "@mui/material/styles"; import makeStyles from '@mui/styles/makeStyles'; -import {Grid, List} from '@mui/material' +import {Grid, List, useTheme} from '@mui/material' import {ArrowLeft, ArrowRight} from "@mui/icons-material"; -import TheWebsiteTheme from "../../../theme/Theme"; import {ThwServiceItemNoRefType} from "../../BlockContentTypes"; import AmenityContext from "../../amenity-context/AmenityContext"; import {useIsHorizontalOverflow} from "../../../utils/useIsHorizontalOverflow"; @@ -19,7 +18,8 @@ interface IProps { const AmenitiesSection: FunctionComponent = (props: IProps) => { const ref = React.useRef(null); - const isOverflow = useIsHorizontalOverflow(ref, ()=>{}) + const isOverflow = useIsHorizontalOverflow(ref, () => { + }) // const [showAmenity, setShowAmenity] = React.useState() const amenityContext = useContext(AmenityContext) @@ -47,7 +47,7 @@ const AmenitiesSection: FunctionComponent = (props: IProps) => { React.useEffect(() => { const newElements = amenityContext.getElements && amenityContext.getElements(props.service.slug.current) if (newElements) { - console.log("setting the new elements in the component", props.service.slug.current) + // console.log("setting the new elements in the component", props.service.slug.current) setElements(newElements) } }, [amenityContext.getElements && amenityContext.getElements(props.service.slug.current)]) @@ -69,6 +69,7 @@ const AmenitiesSection: FunctionComponent = (props: IProps) => { // } // }, [amenityContext.elements]) + const theme = useTheme() return ( = (props: IProps) => { = (props: IProps) => { // marginTop: TransformHWTheme.spacing(2), // margin: 0, // display: 'flex', flexDirection: 'row', padding: 0, - paddingLeft: isOverflow?TheWebsiteTheme -.spacing(2):TheWebsiteTheme -.spacing(0), + paddingLeft: isOverflow ? theme + .spacing(2) : theme + .spacing(0), overflowY: "hidden", overflowX: "scroll", height: "100%", diff --git a/src/components/templates/transform-hw/HeaderMenuGroupButton.tsx b/src/components/templates/transform-hw/HeaderMenuGroupButton.tsx index 2cb67655..cdb799e6 100644 --- a/src/components/templates/transform-hw/HeaderMenuGroupButton.tsx +++ b/src/components/templates/transform-hw/HeaderMenuGroupButton.tsx @@ -1,6 +1,5 @@ import React, {FunctionComponent} from 'react' -import {Button, Typography} from '@mui/material' -import TheWebsiteTheme from "../../../theme/Theme"; +import {Button, Typography, useTheme} from '@mui/material' import {ArrowDropDown} from "@mui/icons-material"; import {bindTrigger} from "material-ui-popup-state"; import {SanityMenuGroup} from "../../../common/sanityIo/Types"; @@ -12,17 +11,19 @@ interface HeaderMenuItemButtonProps { } const HeaderMenuGroupButton: FunctionComponent = ({popupState,menuGroup}) => { + const theme = useTheme() + return ( // } - - -export default { - LightRender, - BoldRender, - DropCapRender, - HighlightRender: TextColorRender, - UnderlineRender, - TypographyRender, - LargeBodyTextRender, - KeystrokeRender -} \ No newline at end of file diff --git a/src/components/BusinessCard.tsx b/src/components/BusinessCard.tsx index afb02ccc..29ec3e01 100644 --- a/src/components/BusinessCard.tsx +++ b/src/components/BusinessCard.tsx @@ -200,7 +200,7 @@ const BusinessCard: FunctionComponent = ({anchor, homePage}) => { style={{height: "80px"}} onClick={() => share(homePage.website ?? "")}> - website QR code Qr @@ -249,7 +249,7 @@ const BusinessCard: FunctionComponent = ({anchor, homePage}) => { */} - 0) && !isEmail(email)))} - clickHandler={createLead} - color="secondary" variant="contained">Send Message - - - {getHelperText()} - - + className={classes.inputAdornmentTextBlockContainer}> + + + + ), + className: classes.formInput + }} + /> + + + {/**/} + 0) && !isEmail(email)))} + clickHandler={createLead} + color="secondary" variant="contained">Send Message + + + {getHelperText()} - - - + + + ); } diff --git a/src/components/templates/transform-hw/ThwHeroContentSection.tsx b/src/components/templates/transform-hw/ThwHeroContentSection.tsx index 80f41d60..f3e7af22 100644 --- a/src/components/templates/transform-hw/ThwHeroContentSection.tsx +++ b/src/components/templates/transform-hw/ThwHeroContentSection.tsx @@ -5,9 +5,8 @@ import clsx from "clsx"; import PageContext from "../../page-context/PageContext"; import useCustomStyles from "../mackenzies-mind/pages/Styles"; import firebaseAnalyticsClient from "../../../common/firebase/FirebaseAnalyticsClient"; -import TransformHWTheme from "../../../theme/TransformHWTheme"; import {Theme, ThemeProvider} from "@mui/material/styles"; -import {Button, Grid, Typography} from "@mui/material"; +import {Button, Grid, Typography, useTheme} from "@mui/material"; import makeStyles from "@mui/styles/makeStyles"; interface IProps { @@ -19,30 +18,31 @@ interface CSSProps { heroOverlay?: string | null } -export const useStyles = makeStyles((theme: Theme) => ({ - marketingBackground: (props: CSSProps) => ({ - backgroundRepeat: 'no-repeat', - backgroundImage: `url('${props.heroBaseImageUrl}'), url('${props.heroOverlay}')`, - backgroundSize: 'cover, contain', - minHeight: '521px', - backgroundColor: 'transparent', - position: "relative" - }), - contentSection: { - height: '510px', - marginTop: '16px', - backgroundColor: 'transparent', - }, - contentBullets: { - borderLeft: `4px solid ${TransformHWTheme.palette.primary.main}`, - paddingLeft: '26px', - } -})) - const ThwHeroContentSection: FunctionComponent = (props) => { + const theme = useTheme() + let classParameters: CSSProps = { heroBaseImageUrl: urlFor(props.sectionData.heroImage).url() ?? '', } + const useStyles = makeStyles((theme: Theme) => ({ + marketingBackground: (props: CSSProps) => ({ + backgroundRepeat: 'no-repeat', + backgroundImage: `url('${props.heroBaseImageUrl}'), url('${props.heroOverlay}')`, + backgroundSize: 'cover, contain', + minHeight: '521px', + backgroundColor: 'transparent', + position: "relative" + }), + contentSection: { + height: '510px', + marginTop: '16px', + backgroundColor: 'transparent', + }, + contentBullets: { + borderLeft: `4px solid ${theme.palette.primary.main}`, + paddingLeft: '26px', + } + })) if (props.sectionData.heroImageBackground) { classParameters = { @@ -55,7 +55,6 @@ const ThwHeroContentSection: FunctionComponent = (props) => { const classes = useStyles(classParameters) const globalClasses = useCustomStyles({}) return ( - @@ -66,7 +65,7 @@ const ThwHeroContentSection: FunctionComponent = (props) => { {props.sectionData.contentWelcomeMessage} + style={{color: theme.palette.text.secondary}}>{props.sectionData.contentWelcomeMessage} = (props) => { - ) } diff --git a/src/components/templates/transform-hw/ThwPositivePsychology.tsx b/src/components/templates/transform-hw/ThwPositivePsychology.tsx index 8a414c79..20704316 100644 --- a/src/components/templates/transform-hw/ThwPositivePsychology.tsx +++ b/src/components/templates/transform-hw/ThwPositivePsychology.tsx @@ -34,7 +34,7 @@ const PositivePsychologySection: FunctionComponent = (props) => { const mdUp = useMediaQuery(customizedThemeContext.customizedTheme.breakpoints.up('md')) return ( - + @@ -87,7 +87,7 @@ const PositivePsychologySection: FunctionComponent = (props) => { - + ); } diff --git a/src/components/templates/web-dev-site/WebDevHeroContentSection.tsx b/src/components/templates/web-dev-site/WebDevHeroContentSection.tsx index 1d53dc48..4b8a94eb 100644 --- a/src/components/templates/web-dev-site/WebDevHeroContentSection.tsx +++ b/src/components/templates/web-dev-site/WebDevHeroContentSection.tsx @@ -48,7 +48,6 @@ const WebDevHeroContentSection: FunctionComponent = (props) => { const classes = useStyles(classParameters) const globalClasses = useCustomStyles({}) return ( - @@ -87,7 +86,6 @@ const WebDevHeroContentSection: FunctionComponent = (props) => { - ) } diff --git a/src/stories/data/ThwAboutTheProprietorData.ts b/src/stories/data/ThwAboutTheProprietorData.ts index e5fae9ab..9a13242a 100644 --- a/src/stories/data/ThwAboutTheProprietorData.ts +++ b/src/stories/data/ThwAboutTheProprietorData.ts @@ -1,9 +1,4 @@ -import { - ThwAboutProprietorSectionType, - ThwMottoSectionType, - ThwPositivePsychologySectionType -} from "../../components/BlockContentTypes"; -import ThwAboutTheProprietorData from "./ThwAboutTheProprietorData"; +import {ThwAboutProprietorSectionType} from "../../components/BlockContentTypes"; const thwAboutProprietorData:ThwAboutProprietorSectionType = { "proprietorImageAltText": "Julie Green MSW, LCSW-C", diff --git a/src/stories/transform/ThwAboutProprietorSection.stories.tsx b/src/stories/transform/ThwAboutProprietorSection.stories.tsx index 6e7c4873..6689c6e3 100644 --- a/src/stories/transform/ThwAboutProprietorSection.stories.tsx +++ b/src/stories/transform/ThwAboutProprietorSection.stories.tsx @@ -1,13 +1,12 @@ import type {Meta, StoryObj} from '@storybook/react'; -import thwMottoData from "../data/ThwMottoData"; -import ThwPositivePsychology from "../../components/templates/transform-hw/ThwPositivePsychology"; -import thwPositivePsychologyData from "../data/ThwPositivePsychologyData"; import AboutTheProprietorSection from "../../components/templates/transform-hw/AboutTheProprietorSection"; import thwAboutProprietorData from "../data/ThwAboutTheProprietorData"; +import {ThemeProvider} from "@mui/material/styles"; +import TransformHWTheme from "../../theme/TransformHWTheme"; const meta: Meta = { - title:"THW/Section/THW About the Proprietor Section", + title: "THW/Section/THW About the Proprietor Section", component: AboutTheProprietorSection, }; @@ -22,8 +21,8 @@ type Story = StoryObj; */ export const Primary: Story = { - args:{ - sectionData:thwAboutProprietorData + args: { + sectionData: thwAboutProprietorData }, - render: ({sectionData}) => , + render: ({sectionData}) => , }; diff --git a/src/stories/transform/ThwAboutUsSection.stories.tsx b/src/stories/transform/ThwAboutUsSection.stories.tsx index 36635e5b..469d240c 100644 --- a/src/stories/transform/ThwAboutUsSection.stories.tsx +++ b/src/stories/transform/ThwAboutUsSection.stories.tsx @@ -2,6 +2,8 @@ import type {Meta, StoryObj} from '@storybook/react'; import thwMottoData from "../data/ThwMottoData"; import ThwPositivePsychology from "../../components/templates/transform-hw/ThwPositivePsychology"; import thwPositivePsychologyData from "../data/ThwPositivePsychologyData"; +import TransformHWTheme from "../../theme/TransformHWTheme"; +import {ThemeProvider} from "@mui/material/styles"; const meta: Meta = { @@ -23,5 +25,5 @@ export const Primary: Story = { args:{ sectionData:thwPositivePsychologyData }, - render: ({sectionData}) => , + render: ({sectionData}) => , }; diff --git a/src/stories/transform/ThwContactUsSection.stories.tsx b/src/stories/transform/ThwContactUsSection.stories.tsx index 4094cdeb..6c036e77 100644 --- a/src/stories/transform/ThwContactUsSection.stories.tsx +++ b/src/stories/transform/ThwContactUsSection.stories.tsx @@ -6,6 +6,8 @@ import ThwContactUsSection from "../../components/templates/transform-hw/ThwCont import thwContactUsData from "../data/ThwContactUsData"; import CustomizedThemeProvider from "../../components/customized-theme-provider/CustomizedThemeProvider"; import DigitalResumeThemeData from "../data/DigitalResumeThemeData"; +import TransformHWTheme from "../../theme/TransformHWTheme"; +import {ThemeProvider} from "@mui/material/styles"; const meta: Meta = { title: "THW/Section/THW Contact Us Section", @@ -27,11 +29,11 @@ export const Primary: Story = { sectionData: thwContactUsData }, render: ({sectionData}) => - + - + , }; diff --git a/src/stories/transform/ThwHeroSection.stories.tsx b/src/stories/transform/ThwHeroSection.stories.tsx index ae0a1ce4..0a2fedf8 100644 --- a/src/stories/transform/ThwHeroSection.stories.tsx +++ b/src/stories/transform/ThwHeroSection.stories.tsx @@ -1,6 +1,8 @@ import type {Meta, StoryObj} from '@storybook/react'; import ThwHeroContentSection from "../../components/templates/transform-hw/ThwHeroContentSection"; import ThwHeroContentSectionData from "../data/ThwHeroContentSectionData"; +import TransformHWTheme from "../../theme/TransformHWTheme"; +import {ThemeProvider} from "@mui/material/styles"; const meta: Meta = { @@ -19,5 +21,5 @@ type Story = StoryObj; */ export const Primary: Story = { - render: () => , + render: () => , }; diff --git a/src/stories/transform/ThwMottoSection.stories.tsx b/src/stories/transform/ThwMottoSection.stories.tsx index a0feb0ab..b4fcf408 100644 --- a/src/stories/transform/ThwMottoSection.stories.tsx +++ b/src/stories/transform/ThwMottoSection.stories.tsx @@ -2,6 +2,8 @@ import type {Meta, StoryObj} from '@storybook/react'; import ThwMottoSection from "../../components/templates/transform-hw/ThwMottoSection"; import homePageResumeData from "../data/HomePageData"; import thwMottoData from "../data/ThwMottoData"; +import TransformHWTheme from "../../theme/TransformHWTheme"; +import {ThemeProvider} from "@mui/material/styles"; const meta: Meta = { @@ -23,5 +25,5 @@ export const Primary: Story = { args:{ sectionData:thwMottoData }, - render: ({sectionData}) => , + render: ({sectionData}) => , }; diff --git a/src/stories/transform/ThwServicesSection.stories.tsx b/src/stories/transform/ThwServicesSection.stories.tsx index bae9bb41..48ba7cae 100644 --- a/src/stories/transform/ThwServicesSection.stories.tsx +++ b/src/stories/transform/ThwServicesSection.stories.tsx @@ -1,10 +1,11 @@ import type {Meta, StoryObj} from '@storybook/react'; import ThwServicesSection from "../../components/templates/transform-hw/ThwServicesSection"; import thwServicesSectionData from "../data/ThwServicesSectionData"; -import HomePageResumeData from "../data/HomePageData"; import PageProvider from "../../components/page-context/PageProvider"; import AmenityProvider from "../../components/amenity-context/AmenityProvider"; import ThwHomePageData from "../data/ThwHomePageData"; +import {ThemeProvider} from "@mui/material/styles"; +import TransformHWTheme from "../../theme/TransformHWTheme"; const meta: Meta = { @@ -26,10 +27,10 @@ export const Primary: Story = { args: { sectionData: thwServicesSectionData }, - render: ({sectionData}) => + render: ({sectionData}) => - , + , }; diff --git a/src/stories/transform/ThwWhyChooseUsSection.stories.tsx b/src/stories/transform/ThwWhyChooseUsSection.stories.tsx index 5006160a..c2e9b8c9 100644 --- a/src/stories/transform/ThwWhyChooseUsSection.stories.tsx +++ b/src/stories/transform/ThwWhyChooseUsSection.stories.tsx @@ -1,12 +1,11 @@ import type {Meta, StoryObj} from '@storybook/react'; -import ThwServicesSection from "../../components/templates/transform-hw/ThwServicesSection"; -import thwServicesSectionData from "../data/ThwServicesSectionData"; -import HomePageResumeData from "../data/HomePageData"; import PageProvider from "../../components/page-context/PageProvider"; import AmenityProvider from "../../components/amenity-context/AmenityProvider"; import ThwHomePageData from "../data/ThwHomePageData"; import ThwWhyChooseUsSection from "../../components/templates/transform-hw/ThwWhyChooseUsSection"; import thwWhyChooseUsData from "../data/ThwWhyChooseUsData"; +import TransformHWTheme from "../../theme/TransformHWTheme"; +import {ThemeProvider} from "@mui/material/styles"; const meta: Meta = { @@ -28,10 +27,10 @@ export const Primary: Story = { args: { sectionData: thwWhyChooseUsData }, - render: ({sectionData}) => + render: ({sectionData}) => - , + , }; diff --git a/src/stories/web-dev-company/WebDevHeroSection.stories.tsx b/src/stories/web-dev-company/WebDevHeroSection.stories.tsx index 31bc1fd4..5d71340d 100644 --- a/src/stories/web-dev-company/WebDevHeroSection.stories.tsx +++ b/src/stories/web-dev-company/WebDevHeroSection.stories.tsx @@ -5,6 +5,11 @@ import {Grid} from "@mui/material"; import WebDevHeroContentSection from "../../components/templates/web-dev-site/WebDevHeroContentSection"; import WebDevHeroSectionData from "../data/WebDevHeroContentSectionData"; import ThwHeroContentSection from "../../components/templates/transform-hw/ThwHeroContentSection"; +import DigitalResumeThemeData from "../data/DigitalResumeThemeData"; +import React from "react"; +import CustomizedThemeProvider from "../../components/customized-theme-provider/CustomizedThemeProvider"; +import {ThemeProvider} from "@mui/material/styles"; +import WebDevSiteTheme from "../../theme/WebDevSiteTheme"; const meta: Meta = { @@ -23,5 +28,7 @@ type Story = StoryObj; */ export const Primary: Story = { - render: () => , + render: () => + + , }; From 88546bc6cc06af303b8fb48949013a3b436c4e7d Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Mon, 27 Nov 2023 14:52:37 -0500 Subject: [PATCH 05/17] removed some project specific values in favor of environment variables --- README.md | 2 ++ functions/package.json | 1 + functions/src/sanityClient.ts | 2 +- package.json | 2 +- public/index.html | 3 ++- sanityIo/package.json | 2 +- src/App.tsx | 13 +++---------- src/sanityClient.ts | 6 +++--- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 53f158d9..3be61b19 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Application that serves as the website builder from React Components REACT_APP_MESSAGING_SENDER_ID= REACT_APP_APP_ID= REACT_APP_FIREBASE_ANALYTICS_TRACKING_ID= + REACT_APP_BASE_ROUTE= ``` #### Firebase @@ -48,6 +49,7 @@ Application that serves as the website builder from React Components ``` SANITY_PROJECTID= SANITY_DB=development + SANITY_APIVERSION= SANITY_API_TOKEN= SENDGRID_API_KEY= SENDGRID_FROM_EMAIL= diff --git a/functions/package.json b/functions/package.json index 1010fd5b..0ff969e1 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,5 +1,6 @@ { "name": "functions", + "version": "0.3.0", "scripts": { "lint": "eslint --ext .js,.ts .", "build": "tsc", diff --git a/functions/src/sanityClient.ts b/functions/src/sanityClient.ts index 511bba35..56152759 100644 --- a/functions/src/sanityClient.ts +++ b/functions/src/sanityClient.ts @@ -3,7 +3,7 @@ const client = require("@sanity/client"); export const sanityClient = client({ projectId: process.env.SANITY_PROJECTID, dataset: process.env.SANITY_DB, - apiVersion: "2021-03-25", + apiVersion: process.env.SANITY_APIVERSION, token: process.env.SANITY_API_TOKEN, useCdn: false, }); diff --git a/package.json b/package.json index 9be718ae..2d1d8a7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "the-handsomestnerd-internal", - "version": "0.2.0", + "version": "0.3.0", "license": "GPL-3.0-or-later", "private": true, "dependencies": { diff --git a/public/index.html b/public/index.html index c88ec965..c7977b14 100644 --- a/public/index.html +++ b/public/index.html @@ -36,7 +36,8 @@ Learn how to configure a non-root public URL by running `npm run build`. --> - Chow Works + + diff --git a/sanityIo/package.json b/sanityIo/package.json index 0d5bebdd..7333fbc5 100644 --- a/sanityIo/package.json +++ b/sanityIo/package.json @@ -1,7 +1,7 @@ { "name": "the-handsomest-nerd-sanity", "private": true, - "version": "0.2.0", + "version": "0.3.0", "description": "Sanity CMS for React Website Builder", "main": "package.json", "author": "theHandsomestNerd ", diff --git a/src/App.tsx b/src/App.tsx index 624b8c42..3788d34c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -11,13 +11,6 @@ import SnackbarProvider from "./components/modal-context/SnackbarProvider"; import PageMux from "./components/templates/mackenzies-mind/pages/PageMux"; import CustomizedThemeProvider from "./components/customized-theme-provider/CustomizedThemeProvider"; -export enum RoutesEnum { - MAINROUTE = "/chow-works/:pageSlug", - HOMEROUTE = "/chow-works/home", - - ERROR = '/error' -} - function App() { const queryClient = new QueryClient({ defaultOptions: { @@ -49,11 +42,11 @@ function App() { - }/> - }/> + }/> + }/> }/> + to={"/"+process.env.REACT_APP_BASE_ROUTE+"/home"}/>}/> diff --git a/src/sanityClient.ts b/src/sanityClient.ts index 3f0b7523..4e9f641a 100644 --- a/src/sanityClient.ts +++ b/src/sanityClient.ts @@ -1,10 +1,10 @@ import sanityClient from "@sanity/client"; -// console.log("NODE.ENV", process.env) +console.log("NODE.ENV", process.env) export default sanityClient({ - projectId: "e5l5k4i5", + projectId: process.env.REACT_APP_SANITY_PROJECTID, dataset: process.env.REACT_APP_SANITY_DB, - apiVersion: "2021-03-25", + apiVersion: process.env.REACT_APP_SANITY_APIVERSION, useCdn: true, }); \ No newline at end of file From d61048e11fa5465dcc101340be7bd56aa73bec99 Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Mon, 27 Nov 2023 15:19:25 -0500 Subject: [PATCH 06/17] minor updates --- functions/package.json | 5 ++--- src/common/sanityIo/Types.ts | 4 ++-- .../customized-theme-provider/CustomizedThemeProvider.tsx | 2 +- src/stories/data/DigitalResumeThemeData.ts | 4 ++-- src/stories/data/HomePageData.ts | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/functions/package.json b/functions/package.json index 0ff969e1..2b0ff406 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "functions", - "version": "0.3.0", + "version": "0.3.1", "scripts": { "lint": "eslint --ext .js,.ts .", "build": "tsc", @@ -19,7 +19,7 @@ "main": "lib/index.js", "dependencies": { "@sanity/client": "^3.4.1", - "@sanity/image-url": "^1.0.1", + "@sanity/image-url": "^1.0.2", "@sanity/types": "^2.34.0", "@sendgrid/mail": "^7.7.0", "@shopify/shopify-api": "^8.0.2", @@ -35,7 +35,6 @@ "uuid": "^9.0.1" }, "devDependencies": { - "@types/firebase": "^3.2.1", "@types/json-bigint": "^1.0.1", "@types/node-fetch": "^2.5.12", "@types/uuid": "^9.0.7", diff --git a/src/common/sanityIo/Types.ts b/src/common/sanityIo/Types.ts index 21031c56..3a9c7993 100644 --- a/src/common/sanityIo/Types.ts +++ b/src/common/sanityIo/Types.ts @@ -126,7 +126,7 @@ export type SanityMuiMediaQuery = { } export type SanityMuiTypography = { fontFamily: string[] - fontFaces: SanityMuiFontFace[] + fontFaces?: SanityMuiFontFace[] } export type SanityMuiColorPalette = { @@ -137,7 +137,7 @@ export type SanityMuiColorPalette = { primaryTextColor: string secondaryTextColor: string disabledTextColor: string - buttonOutlineColor: string + buttonOutlineColor?: string } export type SanityBlogCategory = { diff --git a/src/components/customized-theme-provider/CustomizedThemeProvider.tsx b/src/components/customized-theme-provider/CustomizedThemeProvider.tsx index 921df80f..4de270b4 100644 --- a/src/components/customized-theme-provider/CustomizedThemeProvider.tsx +++ b/src/components/customized-theme-provider/CustomizedThemeProvider.tsx @@ -148,7 +148,7 @@ const CustomizedThemeProvider: FunctionComponent = ( } } const extractSanityFontFace = (fontFaceName: string) => { - const fontFaceFromSanity = theme.typography?.fontFaces.find((fontFace: SanityMuiFontFace) => { + const fontFaceFromSanity = theme.typography?.fontFaces?.find((fontFace: SanityMuiFontFace) => { if (fontFace.name === fontFaceName) { return fontFace } diff --git a/src/stories/data/DigitalResumeThemeData.ts b/src/stories/data/DigitalResumeThemeData.ts index 67da96b9..94189779 100644 --- a/src/stories/data/DigitalResumeThemeData.ts +++ b/src/stories/data/DigitalResumeThemeData.ts @@ -13,7 +13,7 @@ const DigitalResumeThemeData:SanityMuiTheme ={ "xl": 1320 }, "colorPalette": { - "name":"Digital Resume", + // "name":"Digital Resume", "disabledTextColor": "LIGHT_GRAY", "defaultBackground": "WHITESMOKE", "defaultPaperBackgroundColor": "DARKGRAY", @@ -34,7 +34,7 @@ const DigitalResumeThemeData:SanityMuiTheme ={ "OSWALD", ], // "_type": "MuiTypography", - "title": "Oswald and Raleway" + // "title": "Oswald and Raleway" }, // "_rev": "46Ky6Oj1Dro85iJlEnmWLK", // "_type": "MuiTheme" diff --git a/src/stories/data/HomePageData.ts b/src/stories/data/HomePageData.ts index 581a7bf5..97aa283f 100644 --- a/src/stories/data/HomePageData.ts +++ b/src/stories/data/HomePageData.ts @@ -41,7 +41,7 @@ const homePageResumeData:SanityTransformHwHomePage = { "xl": 1320 }, "colorPalette": { - "name":"Digital Resume", + // "name":"Digital Resume", "disabledTextColor": "LIGHT_GRAY", "defaultBackground": "WHITESMOKE", "defaultPaperBackgroundColor": "DARKGRAY", @@ -62,7 +62,7 @@ const homePageResumeData:SanityTransformHwHomePage = { "OSWALD", ], // "_type": "MuiTypography", - "title": "Oswald and Raleway" + // "title": "Oswald and Raleway" }, // "_rev": "46Ky6Oj1Dro85iJlEnmWLK", // "_type": "MuiTheme" From 6f29020319eb40bc25c24d0d9550d1e8403709e0 Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Mon, 27 Nov 2023 15:20:01 -0500 Subject: [PATCH 07/17] package update --- package.json | 2 +- sanityIo/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d1d8a7c..d4f828c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "the-handsomestnerd-internal", - "version": "0.3.0", + "version": "0.3.1", "license": "GPL-3.0-or-later", "private": true, "dependencies": { diff --git a/sanityIo/package.json b/sanityIo/package.json index 7333fbc5..5bc047de 100644 --- a/sanityIo/package.json +++ b/sanityIo/package.json @@ -1,7 +1,7 @@ { "name": "the-handsomest-nerd-sanity", "private": true, - "version": "0.3.0", + "version": "0.3.1", "description": "Sanity CMS for React Website Builder", "main": "package.json", "author": "theHandsomestNerd ", From 678014b34d30283d24d690fd9e5e66818c22350e Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Mon, 4 Dec 2023 07:24:46 -0500 Subject: [PATCH 08/17] updates for master --- package-lock.json | 67 ++----------------- package.json | 1 + sanityIo/schemas/mui/MuiColorPalatte.js | 7 +- src/components/BusinessCard.tsx | 2 +- .../footer/FooterMenuContainer.tsx | 19 +++--- .../mackenzies-mind/header/AppBarWrapper.tsx | 3 +- .../mackenzies-mind/header/EnhancedHeader.tsx | 2 +- .../mackenzies-mind/header/Header.tsx | 3 +- .../mackenzies-mind/header/MainMenu.tsx | 4 +- .../resume-bio-section/ResumeBioSection.tsx | 4 +- .../social-media-block/SocialMediaBlock.tsx | 47 ++++++------- 11 files changed, 46 insertions(+), 113 deletions(-) diff --git a/package-lock.json b/package-lock.json index 688fbefa..590ab2fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "chowworks-website", - "version": "0.3.1", + "name": "the-handsomestnerd-internal", + "version": "0.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "chowworks-website", - "version": "0.3.1", + "name": "the-handsomestnerd-internal", + "version": "0.4.0", "license": "GPL-3.0-or-later", "dependencies": { "@emotion/react": "^11.11.1", @@ -26,7 +26,6 @@ "firebase": "^9.14.0", "framer-motion": "^10.16.5", "ga-gtag": "^1.1.5", - "google-map-react": "^2.2.1", "material-ui-popup-state": "^5.0.9", "moment": "^2.29.4", "msw": "^0.47.4", @@ -74,7 +73,6 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.5.1", "@types/aos": "^3.0.4", - "@types/google-map-react": "^2.1.10", "@types/jest": "^29.5.5", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", @@ -5037,11 +5035,6 @@ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, - "node_modules/@mapbox/point-geometry": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", - "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" - }, "node_modules/@mdx-js/react": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", @@ -12437,15 +12430,6 @@ "resolved": "https://registry.npmjs.org/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz", "integrity": "sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==" }, - "node_modules/@types/google-map-react": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/@types/google-map-react/-/google-map-react-2.1.10.tgz", - "integrity": "sha512-8/0UllZS7tF08WNBRPQlSJCkETvz3e3sZoPxzDaWkj2iV5dmFSnOKXVtoeKo8dLZSe+RkLn479t1wj6nXmLLSA==", - "dev": true, - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/google.maps": { "version": "3.53.5", "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.53.5.tgz", @@ -19168,24 +19152,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/google-map-react": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/google-map-react/-/google-map-react-2.2.1.tgz", - "integrity": "sha512-Dg8aexf5rNSmywj0XKQ5m4RNzVcWwKEM2BGDj5aPChD0um8ZRjB5Upcb/yg/i0oG1aES29asQ5+6BHVgrK5xGA==", - "dependencies": { - "@googlemaps/js-api-loader": "^1.13.8", - "@mapbox/point-geometry": "^0.1.0", - "eventemitter3": "^4.0.4", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "react": "^16.0.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" - } - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -34992,11 +34958,6 @@ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, - "@mapbox/point-geometry": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", - "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" - }, "@mdx-js/react": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", @@ -39979,15 +39940,6 @@ "resolved": "https://registry.npmjs.org/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz", "integrity": "sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==" }, - "@types/google-map-react": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/@types/google-map-react/-/google-map-react-2.1.10.tgz", - "integrity": "sha512-8/0UllZS7tF08WNBRPQlSJCkETvz3e3sZoPxzDaWkj2iV5dmFSnOKXVtoeKo8dLZSe+RkLn479t1wj6nXmLLSA==", - "dev": true, - "requires": { - "@types/react": "*" - } - }, "@types/google.maps": { "version": "3.53.5", "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.53.5.tgz", @@ -44949,17 +44901,6 @@ "slash": "^3.0.0" } }, - "google-map-react": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/google-map-react/-/google-map-react-2.2.1.tgz", - "integrity": "sha512-Dg8aexf5rNSmywj0XKQ5m4RNzVcWwKEM2BGDj5aPChD0um8ZRjB5Upcb/yg/i0oG1aES29asQ5+6BHVgrK5xGA==", - "requires": { - "@googlemaps/js-api-loader": "^1.13.8", - "@mapbox/point-geometry": "^0.1.0", - "eventemitter3": "^4.0.4", - "prop-types": "^15.7.2" - } - }, "gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", diff --git a/package.json b/package.json index ac6b47ba..6777e0ce 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/styles": "^5.14.18", + "@react-google-maps/api": "^2.19.2", "@storybook/addon-mdx-gfm": "^7.4.6", "@storybook/react-webpack5": "^7.4.6", "@tanstack/react-query": "^4.36.1", diff --git a/sanityIo/schemas/mui/MuiColorPalatte.js b/sanityIo/schemas/mui/MuiColorPalatte.js index 4450627f..7a642547 100644 --- a/sanityIo/schemas/mui/MuiColorPalatte.js +++ b/sanityIo/schemas/mui/MuiColorPalatte.js @@ -20,6 +20,7 @@ // {value: "DARK_GRAY", title: "Dark Gray"}, // {value: "LIGHTER_GRAY", title: "Lighter Gray"}, // ] + import {ColorListing} from "./ColorListing"; export default { @@ -63,12 +64,6 @@ export default { type: 'string', options: {list: ColorListing} }, - { - name: 'buttonOutlineColor', - title: 'Button Outline Color', - type: 'string', - options: {list: listing} - }, { name: 'secondaryTextColor', title: 'Secondary Text Color', diff --git a/src/components/BusinessCard.tsx b/src/components/BusinessCard.tsx index 29ec3e01..d6d3d6fe 100644 --- a/src/components/BusinessCard.tsx +++ b/src/components/BusinessCard.tsx @@ -324,7 +324,7 @@ const BusinessCard: FunctionComponent = ({anchor, homePage}) => { - Contact Info + Contact Info diff --git a/src/components/templates/mackenzies-mind/footer/FooterMenuContainer.tsx b/src/components/templates/mackenzies-mind/footer/FooterMenuContainer.tsx index 34126c18..f5d93231 100644 --- a/src/components/templates/mackenzies-mind/footer/FooterMenuContainer.tsx +++ b/src/components/templates/mackenzies-mind/footer/FooterMenuContainer.tsx @@ -23,16 +23,15 @@ const FooterMenuContainer: FunctionComponent = (props: IProps) => { const theme = useTheme() const pageContext = useContext(PageContext) - const customizedThemeContext = useTheme() const useStyles = makeStyles(({ root: { - color: customizedThemeContext.palette.text.secondary, + color: theme.palette.text.secondary, } })) - const classes = useStyles(customizedThemeContext) + const classes = useStyles(theme) - const mdDown = useMediaQuery(customizedThemeContext.breakpoints.down('md')) - const mdUp = useMediaQuery(customizedThemeContext.breakpoints.up('md')) + const mdDown = useMediaQuery(theme.breakpoints.down('md')) + const mdUp = useMediaQuery(theme.breakpoints.up('md')) return ( = (props: IProps) => { paddingLeft: "16px", paddingTop: "16px", paddingBottom: "16px", - borderLeft: `4px solid ${customizedThemeContext.palette.primary.main}`, + borderLeft: `4px solid ${theme.palette.primary.main}`, backgroundColor: COLORS.TRANSPARENTERWHITE, - borderRight: `4px solid ${customizedThemeContext.palette.primary.main}`, - } : {}} + borderRight: `4px solid ${theme.palette.primary.main}`, + } : { }} > { props.pageFooterMenu?.subMenus?.map((menuGroup: any, index: number) => { return ( - + ) @@ -109,7 +108,7 @@ const FooterMenuContainer: FunctionComponent = (props: IProps) => { {mdDown && props.isSocialMediaBlock && diff --git a/src/components/templates/mackenzies-mind/header/AppBarWrapper.tsx b/src/components/templates/mackenzies-mind/header/AppBarWrapper.tsx index 48106c52..7fadab35 100644 --- a/src/components/templates/mackenzies-mind/header/AppBarWrapper.tsx +++ b/src/components/templates/mackenzies-mind/header/AppBarWrapper.tsx @@ -21,6 +21,7 @@ export const useStyles = makeStyles((theme: Theme) => ({ interface IProps { isAppBar?: boolean, children: any + isEnhanced?: boolean } const AppBarWrapper: FunctionComponent> = (props: IProps) => { @@ -33,7 +34,7 @@ const AppBarWrapper: FunctionComponent> = (props: IPro return ( props.isAppBar ? {props.children} : <>{props.children} diff --git a/src/components/templates/mackenzies-mind/header/EnhancedHeader.tsx b/src/components/templates/mackenzies-mind/header/EnhancedHeader.tsx index 3449144c..9e25b781 100644 --- a/src/components/templates/mackenzies-mind/header/EnhancedHeader.tsx +++ b/src/components/templates/mackenzies-mind/header/EnhancedHeader.tsx @@ -92,7 +92,7 @@ const EnhancedHeader: FunctionComponent = (props) => { borderRadius: 4, backgroundColor: "black" }}> -
+
: <> diff --git a/src/components/templates/mackenzies-mind/header/Header.tsx b/src/components/templates/mackenzies-mind/header/Header.tsx index 7e0c04f0..8afbadf8 100644 --- a/src/components/templates/mackenzies-mind/header/Header.tsx +++ b/src/components/templates/mackenzies-mind/header/Header.tsx @@ -13,6 +13,7 @@ export type HeaderProps = { isAppBar?: boolean isSearch?: boolean updateIsLoading?: (value: boolean) => void + isEnhanced?: boolean } const Header: FunctionComponent = (props) => { @@ -21,7 +22,7 @@ const Header: FunctionComponent = (props) => { const mdDown = useMediaQuery(customizedTheme.breakpoints.down('md')) const [isSearchOpen, setIsSearchOpen] = React.useState(false) - return ( + return ( {props.pageHeader?.title ? diff --git a/src/components/templates/mackenzies-mind/header/MainMenu.tsx b/src/components/templates/mackenzies-mind/header/MainMenu.tsx index 6d66ee8e..a30cd1f9 100644 --- a/src/components/templates/mackenzies-mind/header/MainMenu.tsx +++ b/src/components/templates/mackenzies-mind/header/MainMenu.tsx @@ -104,9 +104,9 @@ const MainMenu: FunctionComponent = ({menu, anchor}) => { paddingRight: theme.spacing(6), }}> - + - + @@ -98,22 +96,25 @@ const MainMenu: FunctionComponent = ({menu, anchor}) => { - - - - - + + + + + - {list(anchor)} - + + ) } diff --git a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx new file mode 100644 index 00000000..443da7eb --- /dev/null +++ b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx @@ -0,0 +1,87 @@ +import React, {FunctionComponent} from 'react' + +import makeStyles from "@mui/styles/makeStyles"; +import { Theme} from "@mui/material/styles"; +import {Chip, Grid, Typography, useTheme} from "@mui/material"; +import {COLORS} from "../../../../theme/common/ColorPalette"; +import {ResumeExperience} from "../../../BlockContentTypes"; + +export const useStyles = makeStyles((theme: Theme) => ({ + root: { + }, +})) + +interface IProps { +experience: ResumeExperience +} + +const ResumeExperienceItem: FunctionComponent = (props:IProps) => { + const classes = useStyles() + + const theme = useTheme() + + React.useEffect(()=>{ + }, []) + + return (= (props.sectionData.experiences?.length ?? 0) - 1 ? "transparent" : COLORS.LIGHTGRAY}`, + // // padding: theme.spacing(1.75, 0) + // }} + xs={12}> + + + {props.experience.companyName} + + + + {props.experience.title} + + + + {props.experience.companySubtitle} + + + + + + + {props.experience.dateStart?.toString().replaceAll('-', '.')} + + {/**/} + {/**/} + — + + {/**/} + {/**/} + {props.experience.dateEnd?.toString().replaceAll('-', '.')} + + + + + + {props.experience.description} + + + { + props.experience.skillsUsed?.map((skill, index) => { + console.log(skill) + return + }) + } + + ) +} + +export default ResumeExperienceItem \ No newline at end of file diff --git a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx index f134009e..f8efbc5a 100644 --- a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx +++ b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceSection.tsx @@ -3,6 +3,7 @@ import {Chip, Grid, Typography, useMediaQuery, useTheme} from '@mui/material' import {ResumeExperience, ResumeExperienceSectionType} from "../../../BlockContentTypes"; import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {COLORS} from "../../../../theme/common/ColorPalette"; +import ResumeExperienceItem from "./ResumeExperienceItem"; interface IProps { sectionData: ResumeExperienceSectionType @@ -34,63 +35,7 @@ const ResumeExperienceSection: FunctionComponent = (props: IProps) => { { props.sectionData.experiences?.map((experience: ResumeExperience, index2: number) => { - return = (props.sectionData.experiences?.length ?? 0) - 1 ? "transparent" : COLORS.LIGHTGRAY}`, - // padding: theme.spacing(1.75, 0) - }} xs={12}> - - - {experience.companyName} - - - - {experience.title} - - - - {experience.companySubtitle} - - - - - - - {experience.dateStart?.toString().replaceAll('-', '.')} - - {/**/} - {/**/} - — - - {/**/} - {/**/} - {experience.dateEnd?.toString().replaceAll('-', '.')} - - - - - - {experience.description} - - - { - experience.skillsUsed?.map((skill, index) => { - return - }) - } - - + return }) } diff --git a/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx b/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx new file mode 100644 index 00000000..8cf6232b --- /dev/null +++ b/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx @@ -0,0 +1,87 @@ +import React, {FunctionComponent} from 'react' + +import makeStyles from "@mui/styles/makeStyles"; +import {Theme} from "@mui/material/styles"; +import {Button, ButtonGroup, Chip, Grid, IconButton, Modal, Typography, useTheme} from "@mui/material"; +import {Close} from "@mui/icons-material"; +import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; +import {ResumePortfolioItem} from "../../../BlockContentTypes"; + +export const useStyles = makeStyles((theme: Theme) => ({ + root: {}, +})) + +interface IProps { + currentItem?: ResumePortfolioItem, + isOpen?: boolean + setIsOpen: (open: boolean) => void +} + +const PortfolioItemModal: FunctionComponent = (props: IProps) => { + const theme = useTheme() + + const [isOpen, setIsOpen] = React.useState(false) + + const setOpenWrapper = (theValue:boolean)=>{ + setIsOpen(theValue) + props.setIsOpen(theValue) + } + + React.useEffect(() => { + // if (props.isOpen) { + setIsOpen(!!props.isOpen) + // } + }, [props.isOpen]) + + return ( setIsOpen(false)}> + + setIsOpen(false)} + size="large"> + + {props.currentItem?.detailTitle} + + {props.currentItem?.detailDescription} + + {props.currentItem?.skillsHighlighted?.map((skill) => ( + + ))} + + {props.currentItem?.inceptionDate?.toString()} + + + {props.currentItem?.imageGallery?.map((image) => ( + + + {'imageGalleryEntry'} + + ))} + + + + + + + + + + + ) +} + +export default PortfolioItemModal \ No newline at end of file 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 new file mode 100644 index 00000000..fffda159 --- /dev/null +++ b/src/components/templates/my-digital-resume/resume-portfolio-section/ResumePortfolioEntry.tsx @@ -0,0 +1,67 @@ +import React, {FunctionComponent} from 'react' + +import makeStyles from "@mui/styles/makeStyles"; +import { Theme} from "@mui/material/styles"; +import {Button, Grid, Typography, useTheme} from "@mui/material"; +import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; +import dateUtils from "../../../../utils/dateUtils"; +import {ResumePortfolioItem} from "../../../BlockContentTypes"; +import PortfolioItemModal from "./PortfolioItemModal"; + +export const useStyles = makeStyles((theme: Theme) => ({ + root: { + }, +})) + +interface IProps { + portfolioItem?: ResumePortfolioItem +} + +const ResumePortfolioEntry: FunctionComponent = (props:IProps) => { + const classes = useStyles() + const theme = useTheme() + + const [isOpen, setIsOpen] = React.useState(false) + + const [currentItem, setCurrentItem] = React.useState() + + return ( + + {setIsOpen(val)}}/> +) +} + +export default ResumePortfolioEntry \ No newline at end of file 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 ce0cf3b3..d87b0b70 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 @@ -5,6 +5,8 @@ import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; import {Close} from "@mui/icons-material"; import dateUtils from "../../../../utils/dateUtils"; +import ResumePortfolioEntry from "./ResumePortfolioEntry"; +import PortfolioItemModal from "./PortfolioItemModal"; interface IProps { sectionData: ResumePortfolioSectionType @@ -17,7 +19,8 @@ const ResumePortfolioSection: FunctionComponent = (props: IProps) => { const [isOpen, setIsOpen] = React.useState(false) const [currentItem, setCurrentItem] = React.useState() - const sendToModal = (portfolioItem: ResumePortfolioItem) => { + const sendToModal = (portfolioItem?: ResumePortfolioItem) => { + console.log("The current Item", portfolioItem) setCurrentItem(portfolioItem) setIsOpen(true) @@ -46,92 +49,12 @@ const ResumePortfolioSection: FunctionComponent = (props: IProps) => { { props.sectionData.portfolioEntries?.map((portfolioItem: ResumePortfolioItem, index2: number) => { - return - - + return }) } - - - setIsOpen(false)} - size="large"> - - {currentItem?.detailTitle} - - {currentItem?.detailDescription} - - {currentItem?.skillsHighlighted?.map((skill) => ( - - ))} - - {currentItem?.inceptionDate?.toString()} - - - {currentItem?.imageGallery?.map((image) => ( - - - {'imageGalleryEntry'} - - ))} - - - - - - - - - - - + {setIsOpen(value)}}/> ); } 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 new file mode 100644 index 00000000..240d931f --- /dev/null +++ b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillReferences.tsx @@ -0,0 +1,64 @@ +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 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: { + }, +})) + +interface IProps { + skill?: ResumeSkill +} + +const ResumeSkillReferences: FunctionComponent = (props:IProps) => { + const classes = useStyles() + + const [referenceResults, setReferenceResults] = React.useState<[]>() + + const searchCMS = async () => { + console.log("about to search full text") + if (props.skill) { + const cmsResponse = await cmsClient.skillReferenceSearch(props.skill) + console.log("results", cmsResponse) + setReferenceResults(cmsResponse) + } + } + + React.useEffect(()=>{ + // find the rerences of this skill + searchCMS().then() + + }, []) + + const [currentItem, setCurrentItem] = React.useState() + + 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} + } + }) + } + + ) +} + +export default ResumeSkillReferences \ No newline at end of file diff --git a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillSetItem.tsx b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillSetItem.tsx new file mode 100644 index 00000000..96683420 --- /dev/null +++ b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillSetItem.tsx @@ -0,0 +1,45 @@ +import React, {FunctionComponent} from 'react' + +import makeStyles from "@mui/styles/makeStyles"; +import { Theme} from "@mui/material/styles"; +import {Grid, Typography} from "@mui/material"; +import {COLORS} from "../../../../theme/common/ColorPalette"; +import {ResumeSkillSet} from "../../../BlockContentTypes"; + +export const useStyles = makeStyles((theme: Theme) => ({ + root: { + }, +})) + +interface IProps { + skillset: ResumeSkillSet +} + +const ResumeSkillSetItem: FunctionComponent = (props:IProps) => { + const classes = useStyles() + + React.useEffect(()=>{ + }, []) + + return (= (props.sectionData?.skillsets?.length ?? 0) - 2 ? 'transparent' : COLORS.LIGHTGRAY}` + }}> + + {props.skillset.title} + + + { + props.skillset.skills?.map((skill, index) => { + return {skill.title}{index !== (props.skillset.skills?.length ?? 0) - 1 ? ',' : ''}  + }) + } + + ) +} + +export default ResumeSkillSetItem \ No newline at end of file diff --git a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx index 2d4fe12d..bb985cc8 100644 --- a/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx +++ b/src/components/templates/my-digital-resume/resume-skills-section/ResumeSkillsSection.tsx @@ -6,6 +6,7 @@ import {ResumeSkillSectionType, ResumeSkillSet} from "../../../BlockContentTypes import useThwCommonStyles from "../../../../common/sanityIo/ThwCommonStyles"; import {COLORS} from "../../../../theme/common/ColorPalette"; import CustomizedThemeContext from "../../../customized-theme-provider/CustomizedThemeContext"; +import ResumeSkillSetItem from "./ResumeSkillSetItem"; export const useStyles = makeStyles((theme: Theme) => ({ @@ -33,33 +34,15 @@ const ResumeSkillsSection: FunctionComponent = (props: IProps) => { > - {props.sectionData.title}{props.sectionData?.title}. - {props.sectionData.introduction} + {props.sectionData?.introduction} { - props.sectionData.skillsets?.map((skillset: ResumeSkillSet, index2: number) => { - return = (props.sectionData.skillsets?.length ?? 0) - 2 ? 'transparent' : COLORS.LIGHTGRAY}` - }}> - - {skillset.title} - - - { - skillset.skills?.map((skill, index) => { - return {skill.title}{index !== (skillset.skills?.length ?? 0) - 1 ? ',' : ''}  - }) - } - - + props.sectionData?.skillsets?.map((skillset: ResumeSkillSet, index2: number) => { + return }) } From f7ce737422f045f4d4cfb3358c3277381f2abbb0 Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Tue, 5 Dec 2023 12:27:16 -0500 Subject: [PATCH 11/17] fix some alignment issues --- .../mackenzies-mind/header/FullTextSearch.tsx | 31 ++++++++++++------- .../mackenzies-mind/header/Header.tsx | 15 +++++---- .../resume-bio-section/ResumeBioSection.tsx | 16 +++++----- .../ResumePortfolioEntry.tsx | 2 +- .../ResumePortfolioSection.tsx | 22 ++++++------- 5 files changed, 50 insertions(+), 36 deletions(-) diff --git a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx index 478bbe0f..f9e71be9 100644 --- a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx +++ b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx @@ -9,15 +9,14 @@ import makeStyles from "@mui/styles/makeStyles"; import {Theme} from "@mui/material/styles"; import { AnimatedAboutUsSectionType, - HeroAnimatedContentSectionType, ResumeExperience, ResumeExperienceSectionType, ResumeSkill, ResumeSkillSet, + HeroAnimatedContentSectionType, + ResumeExperience, + ResumeSkill, SanityHeroContentSlide, ServiceItemNoRefType } from "../../../BlockContentTypes"; -import ResumeExperienceSection from "../../my-digital-resume/resume-experience-section/ResumeExperienceSection"; import ResumeExperienceItem from "../../my-digital-resume/resume-experience-section/ResumeExperienceItem"; import {COLORS} from "../../../../theme/common/ColorPalette"; -import ResumeSkillsSection from "../../my-digital-resume/resume-skills-section/ResumeSkillsSection"; -import ResumeSkillSetItem from "../../my-digital-resume/resume-skills-section/ResumeSkillSetItem"; import ResumeSkillReferences from "../../my-digital-resume/resume-skills-section/ResumeSkillReferences"; export const useStyles = makeStyles((theme: Theme) => ({ @@ -67,8 +66,8 @@ const FullTextSearch: FunctionComponent = (props: IProps) => { setSearchText(event.target.value) } - return ( - + return ( + = (props: IProps) => { , }}/> - { + { {results?.length && = (props: IProps) => { const convertedResumeExperience: ResumeExperience = theResult; console.log(convertedResumeExperience) - return + return My Experience @@ -184,11 +188,16 @@ const FullTextSearch: FunctionComponent = (props: IProps) => { const convertedResumeSkill: ResumeSkill = theResult; console.log(convertedResumeSkill) - return + return - My Skill - {convertedResumeSkill.title} + My Skill + - {convertedResumeSkill.title} - + default: return = (props) => { } - + + { + setIsSearchOpen(false) + }}> + { - setIsSearchOpen(false) - }}/> + /> + - + 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 bb643d48..32cd70be 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 @@ -72,13 +72,15 @@ const ResumeBioSection: FunctionComponent = (props: IProps) => { /> - + + + 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 fffda159..89cc85c9 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 @@ -28,7 +28,7 @@ const ResumePortfolioEntry: FunctionComponent = (props:IProps) => { return ( @@ -341,10 +342,8 @@ const BusinessCard: FunctionComponent = ({anchor, homePage}) => { position: "absolute", zIndex: 1000, - paddingLeft: theme -.spacing(4), - paddingRight: theme -.spacing(6), + paddingLeft: theme.spacing(4), + paddingRight: theme.spacing(6), }}> {/**/} @@ -358,7 +357,7 @@ const BusinessCard: FunctionComponent = ({anchor, homePage}) => { {list(anchor)} - + ); } diff --git a/src/components/templates/my-digital-resume/ResumeContactUsSection.tsx b/src/components/templates/my-digital-resume/ResumeContactUsSection.tsx index ecaff571..034c1b0d 100644 --- a/src/components/templates/my-digital-resume/ResumeContactUsSection.tsx +++ b/src/components/templates/my-digital-resume/ResumeContactUsSection.tsx @@ -11,7 +11,7 @@ import leadClient from "../transform-hw/pages/under-construction-page/leadClient import SnackbarContext from "../../modal-context/SnackbarContext"; import {Theme} from "@mui/material/styles"; import withStyles from "@mui/styles/withStyles"; -import {Grid, TextField, Typography, useTheme} from "@mui/material"; +import {Grid, TextField, Typography, useMediaQuery, useTheme} from "@mui/material"; export const useStyles = makeStyles((theme: Theme) => ({ root: { @@ -172,14 +172,15 @@ const ResumeContactUsSection: FunctionComponent = (props) => { } const theme = useTheme() + const smDown = useMediaQuery(theme.breakpoints.down('sm')) + return ( @@ -272,16 +273,18 @@ const ResumeContactUsSection: FunctionComponent = (props) => { }} /> - + + 0) && !isEmail(email)))} clickHandler={createLead} - color="primary" variant="contained">Send - Message + color="primary" variant="contained"> + Send + Message + - From b116d801a262a0e3d411921e6ec2d3693b1d82ba Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Wed, 6 Dec 2023 17:08:44 -0500 Subject: [PATCH 16/17] remove physical address from resume bio and style portfolio entries --- .../mackenzies-mind/header/FullTextSearch.tsx | 1 + .../resume-bio-section/ResumeBioSection.tsx | 12 ++++---- .../ResumeEducationSection.tsx | 4 +-- .../ResumeExperienceItem.tsx | 6 +--- .../PortfolioItemModal.tsx | 29 +++++++++++++------ .../ResumePortfolioEntry.tsx | 22 +++++++++----- .../ResumePortfolioSection.tsx | 4 +-- 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx index f9e71be9..2db23102 100644 --- a/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx +++ b/src/components/templates/mackenzies-mind/header/FullTextSearch.tsx @@ -47,6 +47,7 @@ export const useStyles = makeStyles((theme: Theme) => ({ })) interface IProps { + searchText?:string } const FullTextSearch: FunctionComponent = (props: IProps) => { 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 b4edc254..c5b626ac 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 @@ -54,12 +54,12 @@ const ResumeBioSection: FunctionComponent = (props: IProps) => { {props.homePage.businessContact?.email} - - MAIL - {props.homePage.businessContact?.address} - + {/**/} + {/* MAIL*/} + {/* {props.homePage.businessContact?.address}*/} + {/**/} = (props: IProps) => { {experience.dateStart?.toString().replaceAll('-', '.')} - — + }}>—:<>} {experience.dateEnd?.toString().replaceAll('-', '.')} diff --git a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx index b8c59593..84072abd 100644 --- a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx +++ b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx @@ -17,13 +17,9 @@ experience: ResumeExperience } const ResumeExperienceItem: FunctionComponent = (props:IProps) => { - const classes = useStyles() const theme = useTheme() - React.useEffect(()=>{ - }, []) - return ( = (props:IProps) => { style={{overflowX: "scroll", paddingBottom: theme.spacing(1)}} wrap='nowrap'> { props.experience.skillsUsed?.map((skill, index) => { - console.log(skill) + // console.log(skill) return diff --git a/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx b/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx index 8cf6232b..f347fca6 100644 --- a/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx +++ b/src/components/templates/my-digital-resume/resume-portfolio-section/PortfolioItemModal.tsx @@ -6,9 +6,14 @@ import {Button, ButtonGroup, Chip, Grid, IconButton, Modal, Typography, useTheme import {Close} from "@mui/icons-material"; import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; import {ResumePortfolioItem} from "../../../BlockContentTypes"; +import {COLORS} from "../../../../theme/common/ColorPalette"; export const useStyles = makeStyles((theme: Theme) => ({ - root: {}, + hover: { + "&:hover":{ + backgroundColor: "whitesmoke" + } + } })) interface IProps { @@ -19,12 +24,14 @@ interface IProps { const PortfolioItemModal: FunctionComponent = (props: IProps) => { const theme = useTheme() + const classes = useStyles() + const [isOpen, setIsOpen] = React.useState(false) const setOpenWrapper = (theValue:boolean)=>{ setIsOpen(theValue) - props.setIsOpen(theValue) + // props.setIsOpen(theValue) } React.useEffect(() => { @@ -33,19 +40,23 @@ const PortfolioItemModal: FunctionComponent = (props: IProps) => { // } }, [props.isOpen]) - return ( setIsOpen(false)}> + return ( setIsOpen(false)} sx={{paddingBottom: 4, overflow:"scroll"}}> + style={{ position: "relative"}}> + setIsOpen(false)} size="large"> {props.currentItem?.detailTitle} @@ -53,7 +64,7 @@ const PortfolioItemModal: FunctionComponent = (props: IProps) => { {props.currentItem?.detailDescription} - {props.currentItem?.skillsHighlighted?.map((skill) => ( + {props.currentItem?.skillsHighlighted?.map((skill, index) => ( ))} 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 89cc85c9..34a02770 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 @@ -2,11 +2,12 @@ import React, {FunctionComponent} from 'react' import makeStyles from "@mui/styles/makeStyles"; import { Theme} from "@mui/material/styles"; -import {Button, Grid, Typography, useTheme} from "@mui/material"; +import {Button, Card, Grid, Typography, useTheme} from "@mui/material"; import {urlFor} from "../../../block-content-ui/static-pages/cmsStaticPagesClient"; import dateUtils from "../../../../utils/dateUtils"; import {ResumePortfolioItem} from "../../../BlockContentTypes"; import PortfolioItemModal from "./PortfolioItemModal"; +import {COLORS} from "../../../../theme/common/ColorPalette"; export const useStyles = makeStyles((theme: Theme) => ({ root: { @@ -30,38 +31,43 @@ const ResumePortfolioEntry: FunctionComponent = (props:IProps) => { // style={{backgroundColor: index2 % 2 === 1 ? "whitesmoke" : "white"}} container item xs={12} sm={6} lg={4} xl={4} alignContent='flex-start' justifyContent='center'> - {setIsOpen(val)}}/> -) + ) } export default ResumePortfolioEntry \ No newline at end of file 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 ee7b9950..9e95255e 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 @@ -48,10 +48,10 @@ const ResumePortfolioSection: FunctionComponent = (props: IProps) => { {props.sectionData.introduction} - + { props.sectionData.portfolioEntries?.map((portfolioItem: ResumePortfolioItem, index2: number) => { - return + return }) } From e869c11340ddd7f88b69ebd2d32083b5928a1eaf Mon Sep 17 00:00:00 2001 From: "Mr. Singleton" Date: Wed, 6 Dec 2023 17:23:45 -0500 Subject: [PATCH 17/17] version bump --- functions/package.json | 2 +- package.json | 2 +- sanityIo/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/package.json b/functions/package.json index 58813022..56e3d5e3 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "functions", - "version": "0.4.0", + "version": "0.5.0", "scripts": { "lint": "eslint --ext .js,.ts .", "build": "tsc", diff --git a/package.json b/package.json index 6777e0ce..4e4d4591 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "the-handsomestnerd-internal", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "private": true, "dependencies": { diff --git a/sanityIo/package.json b/sanityIo/package.json index 6be73aa2..965ee0dd 100644 --- a/sanityIo/package.json +++ b/sanityIo/package.json @@ -1,7 +1,7 @@ { "name": "the-handsomest-nerd-sanity", "private": true, - "version": "0.4.0", + "version": "0.5.0", "description": "Sanity CMS for React Website Builder", "main": "package.json", "author": "theHandsomestNerd ",