From 004ec580d34fd58ad16f388c4a2fc2b7a7fb00a0 Mon Sep 17 00:00:00 2001 From: geoffsee <> Date: Tue, 24 Jun 2025 15:51:39 -0400 Subject: [PATCH] Remove unused `ResumeComponent`, `ServicesComponent`, and related sections. Update theming for `SupportThisSiteModal`, adjust `DogecoinIcon`, and refine Cloudflare worker references. --- package.json | 2 +- .../src/components/icons/DogecoinIcon.tsx | 5 +- .../src/components/resume/ResumeComponent.tsx | 62 ------------ .../src/components/resume/SectionButton.tsx | 32 ------ .../src/components/resume/SectionContent.tsx | 98 ------------------- .../components/services/ServicesComponent.tsx | 64 ------------ .../services/ServicesComponentSection.tsx | 40 -------- .../toolbar/SupportThisSiteModal.tsx | 29 +++--- packages/cloudflare-workers/open-gsio/main.ts | 2 +- .../cloudflare-workers/open-gsio/package.json | 4 +- .../open-gsio/wrangler.jsonc | 2 +- secrets.json | 8 +- 12 files changed, 30 insertions(+), 318 deletions(-) delete mode 100644 packages/client/src/components/resume/ResumeComponent.tsx delete mode 100644 packages/client/src/components/resume/SectionButton.tsx delete mode 100644 packages/client/src/components/resume/SectionContent.tsx delete mode 100644 packages/client/src/components/services/ServicesComponent.tsx delete mode 100644 packages/client/src/components/services/ServicesComponentSection.tsx diff --git a/package.json b/package.json index 367bba2..cf21e16 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "server:dev": "bun build:client && (cd packages/server && bun run dev)", "build": "(cd packages/cloudflare-workers/open-gsio && bun run deploy:dry-run)", "build:client": "(cd packages/client && bun run vite build)", - "deploy": "(cd packages/cloudflare-workers && bun run deploy)", + "deploy": "(cd packages/cloudflare-workers/open-gsio && bun run deploy)", "deploy:secrets": "wrangler secret bulk secrets.json -c packages/cloudflare-workers/open-gsio/wrangler.jsonc", "openai:local:mlx": "packages/scripts/start_inference_server.sh mlx-omni-server", "openai:local:ollama": "packages/scripts/start_inference_server.sh ollama", diff --git a/packages/client/src/components/icons/DogecoinIcon.tsx b/packages/client/src/components/icons/DogecoinIcon.tsx index 33c0567..92e96e7 100644 --- a/packages/client/src/components/icons/DogecoinIcon.tsx +++ b/packages/client/src/components/icons/DogecoinIcon.tsx @@ -6,6 +6,7 @@ const TealDogecoinIcon = (props) => ( as="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" + stroke={"currentColor"} fill="currentColor" boxSize={props.boxSize || "1em"} {...props} @@ -26,8 +27,8 @@ const TealDogecoinIcon = (props) => ( fill-rule="evenodd" clip-rule="evenodd" d="M17.5001 9.54053C16.4888 6.92891 13.9888 6.44507 13.9888 6.44507H6.85606L6.88358 9.10523H8.30406V15.0454H6.85596V17.7007H13.7913C15.4628 17.7007 16.8026 16.0211 16.8026 16.0211C18.9482 12.9758 17.5 9.54053 17.5 9.54053H17.5001ZM13.8285 14.2314C13.8285 14.2314 13.2845 15.0163 12.6927 15.0163H11.5087L11.4806 9.11173H13.0001C13.0001 9.11173 13.7041 9.25894 14.1959 10.6521C14.1959 10.6521 14.848 12.6468 13.8285 14.2314Z" - fill="white" - fill-opacity="0.8" + // fill="white" + // fill-opacity="0.8" /> ); diff --git a/packages/client/src/components/resume/ResumeComponent.tsx b/packages/client/src/components/resume/ResumeComponent.tsx deleted file mode 100644 index 5a3be8c..0000000 --- a/packages/client/src/components/resume/ResumeComponent.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import React, { useCallback, useMemo } from "react"; -import { Box, Flex, useMediaQuery } from "@chakra-ui/react"; -import { resumeData } from "../../static-data/resume_data"; -import SectionContent from "./SectionContent"; -import SectionButton from "./SectionButton"; - -const sections = ["professionalSummary", "skills", "experience", "education"]; - -export default function ResumeComponent() { - const [activeSection, setActiveSection] = React.useState( - "professionalSummary", - ); - const [isMobile] = useMediaQuery("(max-width: 1243px)"); - - const handleSectionClick = useCallback((section) => { - setActiveSection(section); - }, []); - - const capitalizeFirstLetter = useCallback((word) => { - return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(); - }, []); - - const sectionButtons = useMemo( - () => - sections.map((section) => ( - handleSectionClick(section)} - activeSection={activeSection} - section={section} - mobile={isMobile} - callbackfn={capitalizeFirstLetter} - /> - )), - [activeSection, isMobile, handleSectionClick, capitalizeFirstLetter], - ); - - return ( - - - {sectionButtons} - - - - - - ); -} diff --git a/packages/client/src/components/resume/SectionButton.tsx b/packages/client/src/components/resume/SectionButton.tsx deleted file mode 100644 index 50f0908..0000000 --- a/packages/client/src/components/resume/SectionButton.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from "react"; -import { Button } from "@chakra-ui/react"; -import { ChevronRight } from "lucide-react"; - -function SectionButton(props: { - onClick: () => void; - activeSection: string; - section: string; - mobile: boolean; - callbackfn: (word) => string; -}) { - return ( - - ); -} - -export default SectionButton; diff --git a/packages/client/src/components/resume/SectionContent.tsx b/packages/client/src/components/resume/SectionContent.tsx deleted file mode 100644 index edeef50..0000000 --- a/packages/client/src/components/resume/SectionContent.tsx +++ /dev/null @@ -1,98 +0,0 @@ -import React from "react"; -import { - Box, - Grid, - GridItem, - Heading, - ListItem, - Text, - UnorderedList, - VStack, -} from "@chakra-ui/react"; - -const fontSize = "md"; - -const ProfessionalSummary = ({ professionalSummary }) => ( - - - - - - {professionalSummary} - - - - - -); - -const Skills = ({ skills }) => ( - - - - {skills?.map((skill, index) => ( - - {skill} - - ))} - - - -); - -const Experience = ({ experience }) => ( - - {experience?.map((job, index) => ( - - - {job.title} - - {job.company} - - {job.timeline} - - {job.description} - - ))} - -); - -const Education = ({ education }) => ( - - {education?.map((edu, index) => {edu})} - -); - -const SectionContent = ({ activeSection, resumeData }) => { - const components = { - professionalSummary: ProfessionalSummary, - skills: Skills, - experience: Experience, - education: Education, - }; - - const ActiveComponent = components[activeSection]; - - return ( - - {ActiveComponent ? ( - - ) : ( - Select a section to view details. - )} - - ); -}; - -export default SectionContent; diff --git a/packages/client/src/components/services/ServicesComponent.tsx b/packages/client/src/components/services/ServicesComponent.tsx deleted file mode 100644 index 5041458..0000000 --- a/packages/client/src/components/services/ServicesComponent.tsx +++ /dev/null @@ -1,64 +0,0 @@ -// ServicesComponent.js -import React, { useCallback, useMemo } from "react"; -import { Box, Flex, useMediaQuery } from "@chakra-ui/react"; -import { servicesData } from "../../static-data/services_data"; -import SectionButton from "../resume/SectionButton"; -import ServicesSectionContent from "./ServicesComponentSection"; - -const sections = ["servicesOverview", "offerings"]; - -export default function ServicesComponent() { - const [activeSection, setActiveSection] = React.useState("servicesOverview"); - const [isMobile] = useMediaQuery("(max-width: 1243px)"); - - const handleSectionClick = useCallback((section) => { - setActiveSection(section); - }, []); - - const capitalizeFirstLetter = useCallback((word) => { - return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(); - }, []); - - const sectionButtons = useMemo( - () => - sections.map((section) => ( - handleSectionClick(section)} - activeSection={activeSection} - section={section} - mobile={isMobile} - callbackfn={capitalizeFirstLetter} - /> - )), - [activeSection, isMobile, handleSectionClick, capitalizeFirstLetter], - ); - - return ( - - - {sectionButtons} - - - - - - ); -} diff --git a/packages/client/src/components/services/ServicesComponentSection.tsx b/packages/client/src/components/services/ServicesComponentSection.tsx deleted file mode 100644 index 43ea957..0000000 --- a/packages/client/src/components/services/ServicesComponentSection.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from "react"; -import { Box, Heading, Text, VStack } from "@chakra-ui/react"; - -const ServicesOverview = ({ servicesOverview }) => ( - {servicesOverview} -); - -const Offerings = ({ offerings }) => ( - - {offerings.map((service, index) => ( - - - {service.title} - - {service.description} - - ))} - -); - -const ServicesSectionContent = ({ activeSection, data }) => { - const components = { - servicesOverview: ServicesOverview, - offerings: Offerings, - }; - - const ActiveComponent = components[activeSection]; - - return ( - - {ActiveComponent ? ( - - ) : ( - Select a section to view details. - )} - - ); -}; - -export default ServicesSectionContent; diff --git a/packages/client/src/components/toolbar/SupportThisSiteModal.tsx b/packages/client/src/components/toolbar/SupportThisSiteModal.tsx index 9efa775..e8f37ce 100644 --- a/packages/client/src/components/toolbar/SupportThisSiteModal.tsx +++ b/packages/client/src/components/toolbar/SupportThisSiteModal.tsx @@ -89,8 +89,11 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { motionPreset="slideInBottom" zIndex={zIndex} > - - + + Support @@ -103,7 +106,7 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { @@ -111,11 +114,13 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { { clientTransactionStore.setSelectedMethod(method.name); }} > - + {" "} {method.name} @@ -137,8 +142,8 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { clientTransactionStore.setDonerId(e.target.value) } type="text" - bg="gray.700" - color="white" + bg="bg.secondary" + color="text.primary" w="100%" /> Enter the amount you wish to donate: @@ -151,14 +156,14 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { clientTransactionStore.setAmount(e.target.value) } type="number" - bg="gray.700" - color="white" + bg="bg.secondary" + // color="white" w="100%" /> @@ -181,7 +186,7 @@ const SupportThisSiteModal = observer(({ isOpen, onClose, zIndex }) => { { diff --git a/packages/cloudflare-workers/open-gsio/main.ts b/packages/cloudflare-workers/open-gsio/main.ts index 78665c5..40c9cc0 100644 --- a/packages/cloudflare-workers/open-gsio/main.ts +++ b/packages/cloudflare-workers/open-gsio/main.ts @@ -1,5 +1,5 @@ import Server from "@open-gsio/server"; -import ServerCoordinator from "packages/server/durable-objects/ServerCoordinator"; +import ServerCoordinator from "@open-gsio/server/durable-objects/ServerCoordinator"; export {ServerCoordinator} diff --git a/packages/cloudflare-workers/open-gsio/package.json b/packages/cloudflare-workers/open-gsio/package.json index b86216b..b6d4c9f 100644 --- a/packages/cloudflare-workers/open-gsio/package.json +++ b/packages/cloudflare-workers/open-gsio/package.json @@ -11,6 +11,8 @@ "dependencies": { "@cloudflare/vite-plugin": "^1.3.1", "vite": "6.3.5", - "wrangler": "^4.18.0" + "wrangler": "^4.18.0", + "@open-gsio/server": "workspace:*", + "@open-gsio/client": "workspace:*" } } diff --git a/packages/cloudflare-workers/open-gsio/wrangler.jsonc b/packages/cloudflare-workers/open-gsio/wrangler.jsonc index 02c67a1..76f7c5e 100644 --- a/packages/cloudflare-workers/open-gsio/wrangler.jsonc +++ b/packages/cloudflare-workers/open-gsio/wrangler.jsonc @@ -28,7 +28,7 @@ "migrations": [ { "new_classes": [ - "SiteCoordinator" + "ServerCoordinator" ], "tag": "v1" } diff --git a/secrets.json b/secrets.json index e0dffe0..f188048 100644 --- a/secrets.json +++ b/secrets.json @@ -1,12 +1,12 @@ { "OPENAI_API_KEY": "", "OPENAI_API_ENDPOINT": "", - "PERIGON_API_KEY": "", - "EVENTSOURCE_HOST": "", "GROQ_API_KEY": "", "ANTHROPIC_API_KEY": "", "FIREWORKS_API_KEY": "", "GEMINI_API_KEY": "", "XAI_API_KEY": "", - "CEREBRAS_API_KEY": "" -} + "CEREBRAS_API_KEY": "", + "CLOUDFLARE_API_KEY": "", + "CLOUDFLARE_ACCOUNT_ID": "" +} \ No newline at end of file