Skip to content

changed everything #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
declanwhchan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changed everything #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14,299 changes: 7,612 additions & 6,687 deletions frontend/genai-frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions frontend/genai-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"@radix-ui/react-toggle": "1.1.2",
"@radix-ui/react-toggle-group": "1.1.2",
"@radix-ui/react-tooltip": "1.1.8",
"@react-three/drei": "^10.7.7",
"@react-three/fiber": "^9.5.0",
"@react-three/drei": "^9.122.0",
"@react-three/fiber": "^8.18.0",
"canvas-confetti": "1.9.4",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
Expand All @@ -54,6 +54,7 @@
"motion": "12.23.24",
"next-themes": "0.4.6",
"react": "18.3.1",
"react-aria-components": "^1.16.0",
"react-day-picker": "8.10.1",
"react-dnd": "16.0.1",
"react-dnd-html5-backend": "16.0.1",
Expand All @@ -64,6 +65,7 @@
"react-responsive-masonry": "2.7.1",
"react-router": "7.13.0",
"react-slick": "0.31.0",
"react-stately": "^3.45.0",
"recharts": "2.15.2",
"sonner": "2.0.3",
"tailwind-merge": "3.2.0",
Expand Down
79 changes: 66 additions & 13 deletions frontend/genai-frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { useEffect, useRef, useState } from "react";
import { SearchPanel } from "./app/components/SearchPanel";
import { HumanBody3D } from "./app/components/HumanBody3D";
import { DiseaseStagePanel } from "./app/components/DiseaseStagePanel";
import { LandingPage } from "./app/components/LandingPage";
import { DISEASES } from "./types";
import type { Disease } from "./types";

export default function App() {
const [selectedDisease, setSelectedDisease] = useState<Disease | null>(DISEASES[0]);
const [selectedDisease, setSelectedDisease] = useState<Disease | null>(
DISEASES[0]
);
const [currentStageIndex, setCurrentStageIndex] = useState(0);
const [searchTerm, setSearchTerm] = useState("");
const [showLanding, setShowLanding] = useState(true);
const [hoveredAffectedOrgan, setHoveredAffectedOrgan] = useState<
string | null
>(null);
const cursorRef = useRef<HTMLDivElement | null>(null);

useEffect(() => {
Expand All @@ -21,8 +25,13 @@ export default function App() {
let hoverState = false;
let textState = false;

const cursorOffsetX = 3;
const cursorOffsetY = 3;

const setCursorPosition = (x: number, y: number) => {
cursorEl.style.transform = `translate3d(${x}px, ${y}px, 0)`;
cursorEl.style.transform = `translate3d(${x + cursorOffsetX}px, ${
y + cursorOffsetY
}px, 0)`;
if (!visible) {
visible = true;
document.body.classList.add("cursor-visible");
Expand All @@ -47,7 +56,12 @@ export default function App() {

const onWindowLeave = () => {
visible = false;
document.body.classList.remove("cursor-visible", "cursor-hover", "cursor-pressed", "cursor-text");
document.body.classList.remove(
"cursor-visible",
"cursor-hover",
"cursor-pressed",
"cursor-text"
);
hoverState = false;
textState = false;
};
Expand Down Expand Up @@ -87,27 +101,39 @@ export default function App() {

window.addEventListener("pointermove", onPointerMove, { capture: true });
window.addEventListener("mousemove", onMouseMove, { capture: true });
window.addEventListener("pointerrawupdate", onPointerRawUpdate, { capture: true });
window.addEventListener("pointerrawupdate", onPointerRawUpdate, {
capture: true,
});
window.addEventListener("pointerdown", onPointerDown);
window.addEventListener("pointerup", onPointerUp);
window.addEventListener("blur", onWindowLeave);
document.addEventListener("mouseleave", onWindowLeave);

return () => {
window.removeEventListener("pointermove", onPointerMove, { capture: true });
window.removeEventListener("pointermove", onPointerMove, {
capture: true,
});
window.removeEventListener("mousemove", onMouseMove, { capture: true });
window.removeEventListener("pointerrawupdate", onPointerRawUpdate, { capture: true });
window.removeEventListener("pointerrawupdate", onPointerRawUpdate, {
capture: true,
});
window.removeEventListener("pointerdown", onPointerDown);
window.removeEventListener("pointerup", onPointerUp);
window.removeEventListener("blur", onWindowLeave);
document.removeEventListener("mouseleave", onWindowLeave);
document.body.classList.remove("cursor-visible", "cursor-hover", "cursor-pressed", "cursor-text");
document.body.classList.remove(
"cursor-visible",
"cursor-hover",
"cursor-pressed",
"cursor-text"
);
};
}, []);

const handleSelectDisease = (disease: Disease) => {
setSelectedDisease(disease);
setCurrentStageIndex(0);
setHoveredAffectedOrgan(null);
};

const handleSearchChange = (term: string) => {
Expand All @@ -123,6 +149,9 @@ export default function App() {
};

const currentStage = selectedDisease?.stages[currentStageIndex] ?? null;
const displayedAffectedOrgans = hoveredAffectedOrgan
? [hoveredAffectedOrgan]
: currentStage?.affectedOrgans ?? [];

const handleEnterFromLanding = (prompt: string) => {
if (prompt) {
Expand All @@ -135,13 +164,21 @@ export default function App() {
setShowLanding(false);
};

const handleStageSelect = (index: number) => {
setCurrentStageIndex(index);
setHoveredAffectedOrgan(null);
};

return (
<div className="app-grid-surface h-screen w-screen overflow-hidden p-1.5 text-slate-900 sm:p-2 lg:p-3">
{showLanding ? (
<LandingPage onEnter={handleEnterFromLanding} onSkip={handleSkipLanding} />
<LandingPage
onEnter={handleEnterFromLanding}
onSkip={handleSkipLanding}
/>
) : (
<div className="grid h-full min-h-0 grid-cols-[minmax(0,0.9fr)_minmax(320px,1.8fr)_minmax(0,1fr)] gap-1.5 sm:gap-2 lg:grid-cols-[minmax(0,0.92fr)_minmax(360px,1.7fr)_minmax(0,1.02fr)] lg:gap-3 xl:grid-cols-[minmax(0,0.95fr)_minmax(420px,1.6fr)_minmax(0,1.05fr)]">
<aside className="min-w-0 overflow-hidden rounded-[9px] border border-slate-200/90 bg-white/90 shadow-[0_18px_60px_rgba(15,23,42,0.08)] backdrop-blur-xl lg:rounded-[11px]">
<aside className="min-w-0 overflow-hidden rounded-[9px] border border-slate-200/90 bg-white shadow-[0_18px_60px_rgba(15,23,42,0.08)] backdrop-blur-xl lg:rounded-[11px]">
<SearchPanel
diseases={DISEASES}
onSelectDisease={handleSelectDisease}
Expand All @@ -151,29 +188,46 @@ export default function App() {
/>
</aside>

<<<<<<< Updated upstream
<main className="min-w-0 overflow-hidden rounded-[24px] border border-transparent bg-transparent shadow-none lg:rounded-[28px]">
{selectedDisease && currentStage ? (
<HumanBody3D
affectedOrgans={currentStage.affectedOrgans}
=======
<main className="min-w-0 flex-1 overflow-hidden rounded-[28px]">
{selectedDisease && currentStage ? (
<AnatomyViewer
affectedOrgans={displayedAffectedOrgans}
allUsedOrgans={[
...new Set(
selectedDisease.stages.flatMap((s) => s.affectedOrgans)
),
]}
>>>>>>> Stashed changes
currentStageIndex={currentStageIndex}
totalStages={selectedDisease.stages.length}
diseaseName={selectedDisease.name}
currentStage={currentStage}
/>
) : (
<<<<<<< Updated upstream
<div className="grid h-full place-items-center px-8 text-center text-slate-500">
=======
<div className="grid h-full place-items-center px-8 text-center text-slate-300">
>>>>>>> Stashed changes
Select a disease to view progression.
</div>
)}
</main>

<aside className="min-w-0 overflow-hidden rounded-[9px] border border-slate-200/90 bg-slate-50 shadow-[0_18px_60px_rgba(15,23,42,0.08)] backdrop-blur-xl lg:rounded-[11px]">
<aside className="min-w-0 overflow-hidden rounded-[9px] border border-slate-200/90 bg-white shadow-[0_18px_60px_rgba(15,23,42,0.08)] backdrop-blur-xl lg:rounded-[11px]">
{selectedDisease ? (
<DiseaseStagePanel
stages={selectedDisease.stages}
currentStageIndex={currentStageIndex}
onStageSelect={setCurrentStageIndex}
onStageSelect={handleStageSelect}
diseaseName={selectedDisease.name}
onAffectedOrganHover={setHoveredAffectedOrgan}
/>
) : (
<div className="grid h-full place-items-center px-8 text-center text-slate-500">
Expand All @@ -188,4 +242,3 @@ export default function App() {
</div>
);
}

Loading