diff --git a/src/App.css b/src/App.css deleted file mode 100644 index 7456048..0000000 --- a/src/App.css +++ /dev/null @@ -1,27 +0,0 @@ -.logo { - height: 6em; - padding: 1.5em; - will-change: filter; - transition: filter 300ms; -} -.logo:hover { - filter: drop-shadow(0 0 2em #646cffaa); -} -.logo.react:hover { - filter: drop-shadow(0 0 2em #61dafbaa); -} - -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} - -@media (prefers-reduced-motion: no-preference) { - a:nth-of-type(2) .logo { - animation: logo-spin infinite 20s linear; - } -} \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index ff69b25..a684a97 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,8 +1,7 @@ -import "./App.css"; import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import SetUpPage from "./components/SetUpPage" import AddDegree from "./components/AddDegree/AddDegree"; -import SemesterHome from './SemesterHome'; +import SemesterHome from './app/SemesterHome/SemesterHome'; function App() { return ( @@ -11,7 +10,7 @@ function App() { } /> } /> } /> - } /> + } /> ); diff --git a/src/SemesterHome.css b/src/app/SemesterHome/SemesterHome.css similarity index 83% rename from src/SemesterHome.css rename to src/app/SemesterHome/SemesterHome.css index 3547ff8..f16dea5 100644 --- a/src/SemesterHome.css +++ b/src/app/SemesterHome/SemesterHome.css @@ -1,6 +1,13 @@ /* .body { display: block !important; } */ +.semester-home-container { + display: flex; + direction: row; + height: 100vh; + width: 100vh; +} + .content { display: flex; flex: 1; diff --git a/src/SemesterHome.tsx b/src/app/SemesterHome/SemesterHome.tsx similarity index 91% rename from src/SemesterHome.tsx rename to src/app/SemesterHome/SemesterHome.tsx index de465ef..892e03b 100644 --- a/src/SemesterHome.tsx +++ b/src/app/SemesterHome/SemesterHome.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { useLocation } from 'react-router-dom'; -import SemesterBlock from "./components/SemesterBlock" +import SemesterBlock from "../../components/SemesterBlock" import { Flex } from '@radix-ui/themes'; -import SidePanel from "./components/SidePanel/SidePanel" -import { requirements } from "./components/SidePanel/types" +import SidePanel from "../../components/SidePanel/SidePanel" +import { requirements } from "../../components/SidePanel/types" import "./SemesterHome.css" diff --git a/src/components/AddDegree/AddDegree.tsx b/src/components/AddDegree/AddDegree.tsx index 8e464e5..d4ff1ae 100644 --- a/src/components/AddDegree/AddDegree.tsx +++ b/src/components/AddDegree/AddDegree.tsx @@ -44,7 +44,7 @@ export default function AddDegree({ isMajor }: AddDegreeProps) { }; const handleConfirmClick = () => { - navigate('/next', { state : { startYear, gradYear, summerCheck } }) + navigate('/semester-home', { state : { startYear, gradYear, summerCheck } }) }; const DegreeSelect = () => ( diff --git a/src/components/SetUpPage/index.tsx b/src/components/SetUpPage/index.tsx index 2c751e9..7965d68 100644 --- a/src/components/SetUpPage/index.tsx +++ b/src/components/SetUpPage/index.tsx @@ -32,8 +32,10 @@ function SetUpPage() { return ( - Set Up - Enter your start year and graduation year +

Set Up

+

+ Enter your start year and graduation year +

@@ -55,7 +57,7 @@ function SetUpPage() { Include Summer Semesters? - +
); } diff --git a/src/components/SetUpPage/setup.css b/src/components/SetUpPage/setup.css index 9e2856b..e1a87d0 100644 --- a/src/components/SetUpPage/setup.css +++ b/src/components/SetUpPage/setup.css @@ -4,13 +4,15 @@ align-items: center; place-items: center; } + .setup-container { - width: 420px; - margin-left: 500px; - background-color: white !important; - display: flex; - justify-content: center !important; - align-items: center !important; + width: 500px; + flex-direction: column; + gap: var(--L, 32px); + align-items: flex-start; + justify-content: center; + align-self: stretch; + margin-left: 450px; } @media (max-width: 600px) { .container { @@ -18,6 +20,7 @@ } } + body { background-color: white; /* display: inline !important; */