Loading .vscode/tasks.json +17 −8 Original line number Diff line number Diff line Loading @@ -6,34 +6,43 @@ { "label": "Start Dev", "group": "build", "dependsOn": ["dev: start server", "dev: start client"] "dependsOn": [ "dev: start server", "dev: start client" ] }, { "label": "dev: start server", "command": "yarn", "args": ["run", "dev:server"], "args": [ "run", "dev:server" ], "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "shared", "showReuseMessage": true, "clear": false, "clear": false }, "problemMatcher": [] }, { "label": "dev: start client", "command": "yarn", "args": ["run", "dev:client"], "args": [ "run", "dev:client" ], "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "shared", "showReuseMessage": true, "clear": false, }, }, "clear": false } } ] } No newline at end of file packages/client/package.json +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ "@fortawesome/free-brands-svg-icons": "^7.2.0", "@fortawesome/free-solid-svg-icons": "^7.2.0", "@fortawesome/react-fontawesome": "^3.3.1", "@heroui/react": "^2.8.9", "@heroui/react": "^2.8.10", "@icons-pack/react-simple-icons": "^13.11.2", "@sc07-canvas/chat": "workspace:^", "@sc07-canvas/lib": "workspace:^", Loading packages/client/src/components/App.tsx +3 −3 Original line number Diff line number Diff line Loading @@ -20,9 +20,9 @@ import { ToastWrapper } from "./ToastWrapper"; import { Moderator, ModeratorContext } from "../Moderator/Moderator"; import { DialogContext } from "../contexts/DialogContext"; import { ChatInfoDialog } from "./Chat/ChatInfoDialog"; import { LoginModal } from "./LoginModal/LoginModal"; import { ThanksForJoining } from "./EventDates/ThanksForJoining"; import { LoginModal } from "./Login/LoginModal"; import { Chat, ChatContext } from "./Chat/utils"; import { EventInfoModal } from "./EventInfo/EventInfo"; console.log("Client init with version " + __COMMIT_HASH__); Loading Loading @@ -60,7 +60,7 @@ const AppInner = () => { <ToastWrapper /> <DynamicModals /> <ThanksForJoining /> <EventInfoModal /> </div> </> ); Loading packages/client/src/components/EventDates/ThanksForJoining.tsxdeleted 100644 → 0 +0 −67 Original line number Diff line number Diff line import { Button, Link, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, } from "@heroui/react"; import { MatrixButton } from "../Info/buttons/Matrix"; import { DiscordButton } from "../Info/buttons/Discord"; import { LemmyButton } from "../Info/buttons/Lemmy"; import { MastodonButton } from "../Info/buttons/Mastodon"; import { useState } from "react"; import { TipButton } from "../Info/buttons/Tip"; import { useEventDates } from "./useEventDates"; export const ThanksForJoining = () => { const [show, setShow] = useState(true); const { state } = useEventDates(); return ( <Modal isOpen={show && state === "AFTER"} onClose={() => setShow(false)}> <ModalContent> {(onClose) => ( <> <ModalHeader>Thank you for participating!</ModalHeader> <ModalBody> <h1 className="text-3xl text-center font-bold">Canvas 2025</h1> <h2 className="text-2xl text-center">...has concluded!</h2> <p> Timelapses of the event will be available on our socials as soon as they are ready </p> <p> <strong>If you've enjoyed the event, send a tip!</strong> <br /> Tips are split between server maintenance/development and the event moderators <br /> <TipButton variant="solid" size="md" className="w-full" /> </p> <p> <Button as={Link} href="https://sc07.shop/product/canvas-2025/" target="_blank" > Get a poster print! </Button> </p> <div className="flex gap-1"> <MatrixButton /> <DiscordButton /> <LemmyButton /> <MastodonButton /> </div> </ModalBody> <ModalFooter> <Button onPress={onClose}>Show Canvas</Button> </ModalFooter> </> )} </ModalContent> </Modal> ); }; packages/client/src/components/EventDates/EventDatesCard.tsx→packages/client/src/components/EventInfo/EventDatesCard.tsx +0 −0 File moved. View file Loading
.vscode/tasks.json +17 −8 Original line number Diff line number Diff line Loading @@ -6,34 +6,43 @@ { "label": "Start Dev", "group": "build", "dependsOn": ["dev: start server", "dev: start client"] "dependsOn": [ "dev: start server", "dev: start client" ] }, { "label": "dev: start server", "command": "yarn", "args": ["run", "dev:server"], "args": [ "run", "dev:server" ], "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "shared", "showReuseMessage": true, "clear": false, "clear": false }, "problemMatcher": [] }, { "label": "dev: start client", "command": "yarn", "args": ["run", "dev:client"], "args": [ "run", "dev:client" ], "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "shared", "showReuseMessage": true, "clear": false, }, }, "clear": false } } ] } No newline at end of file
packages/client/package.json +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ "@fortawesome/free-brands-svg-icons": "^7.2.0", "@fortawesome/free-solid-svg-icons": "^7.2.0", "@fortawesome/react-fontawesome": "^3.3.1", "@heroui/react": "^2.8.9", "@heroui/react": "^2.8.10", "@icons-pack/react-simple-icons": "^13.11.2", "@sc07-canvas/chat": "workspace:^", "@sc07-canvas/lib": "workspace:^", Loading
packages/client/src/components/App.tsx +3 −3 Original line number Diff line number Diff line Loading @@ -20,9 +20,9 @@ import { ToastWrapper } from "./ToastWrapper"; import { Moderator, ModeratorContext } from "../Moderator/Moderator"; import { DialogContext } from "../contexts/DialogContext"; import { ChatInfoDialog } from "./Chat/ChatInfoDialog"; import { LoginModal } from "./LoginModal/LoginModal"; import { ThanksForJoining } from "./EventDates/ThanksForJoining"; import { LoginModal } from "./Login/LoginModal"; import { Chat, ChatContext } from "./Chat/utils"; import { EventInfoModal } from "./EventInfo/EventInfo"; console.log("Client init with version " + __COMMIT_HASH__); Loading Loading @@ -60,7 +60,7 @@ const AppInner = () => { <ToastWrapper /> <DynamicModals /> <ThanksForJoining /> <EventInfoModal /> </div> </> ); Loading
packages/client/src/components/EventDates/ThanksForJoining.tsxdeleted 100644 → 0 +0 −67 Original line number Diff line number Diff line import { Button, Link, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, } from "@heroui/react"; import { MatrixButton } from "../Info/buttons/Matrix"; import { DiscordButton } from "../Info/buttons/Discord"; import { LemmyButton } from "../Info/buttons/Lemmy"; import { MastodonButton } from "../Info/buttons/Mastodon"; import { useState } from "react"; import { TipButton } from "../Info/buttons/Tip"; import { useEventDates } from "./useEventDates"; export const ThanksForJoining = () => { const [show, setShow] = useState(true); const { state } = useEventDates(); return ( <Modal isOpen={show && state === "AFTER"} onClose={() => setShow(false)}> <ModalContent> {(onClose) => ( <> <ModalHeader>Thank you for participating!</ModalHeader> <ModalBody> <h1 className="text-3xl text-center font-bold">Canvas 2025</h1> <h2 className="text-2xl text-center">...has concluded!</h2> <p> Timelapses of the event will be available on our socials as soon as they are ready </p> <p> <strong>If you've enjoyed the event, send a tip!</strong> <br /> Tips are split between server maintenance/development and the event moderators <br /> <TipButton variant="solid" size="md" className="w-full" /> </p> <p> <Button as={Link} href="https://sc07.shop/product/canvas-2025/" target="_blank" > Get a poster print! </Button> </p> <div className="flex gap-1"> <MatrixButton /> <DiscordButton /> <LemmyButton /> <MastodonButton /> </div> </ModalBody> <ModalFooter> <Button onPress={onClose}>Show Canvas</Button> </ModalFooter> </> )} </ModalContent> </Modal> ); };
packages/client/src/components/EventDates/EventDatesCard.tsx→packages/client/src/components/EventInfo/EventDatesCard.tsx +0 −0 File moved. View file