diff --git a/src/components/Button.tsx b/src/components/Button.tsx deleted file mode 100644 index a078c9f..0000000 --- a/src/components/Button.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React, { useState } from "react"; - -// use the ? after variable to make a function parameter optional -interface ButtonComponentProps { - content: string; - clickStay: boolean; - textSize: string; - buttonClicked?: boolean; -} - -const Button: React.FC = ({ content, clickStay, textSize, buttonClicked }) => { - - return ( - <> - - - ) -} - -export {Button}; \ No newline at end of file diff --git a/src/components/Dropdown.css b/src/components/Dropdown.css deleted file mode 100644 index ed177e3..0000000 --- a/src/components/Dropdown.css +++ /dev/null @@ -1,13 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -.dropdownBtn { - background-color: white; - width: 30%; - border: 1px solid black; - padding: 4px 10px; - border-radius: 5px; - margin-bottom: 4px; - -} \ No newline at end of file diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx deleted file mode 100644 index f0d6bfc..0000000 --- a/src/components/Dropdown.tsx +++ /dev/null @@ -1,115 +0,0 @@ -import React, { useState } from "react"; -import List from '@mui/material/List'; -// import ListItemButton from '@mui/material/ListItemButton'; -import ListItemText from '@mui/material/ListItemText'; -import MenuItem from '@mui/material/MenuItem'; -import IconButton from '@mui/material/IconButton'; -import Menu from '@mui/material/Menu'; -import { IoMdMore } from "react-icons/io"; -// https://mui.com/material-ui/react-select/ - -const Dropdown: React.FC = () => { - const [anchorEl, setAnchorEl] = useState(null); - const [selectedIndex, setSelectedIndex] = useState(1); - - - const open = Boolean(anchorEl); - const handleClickListItem = (event: React.MouseEvent) => { - setAnchorEl(event.currentTarget); - }; - - const handleMenuItemClick = ( - event: React.MouseEvent, - index: number, - ) => { - setSelectedIndex(index); - setAnchorEl(null); - }; - - - const handleCloseMenu = () => { - setAnchorEl(null); - }; - - const actionOptions = [ - 'Actions', - 'Save Search', - // 'Reset', - 'Reset CMUCal Events', - 'Manage Saved Search', - ]; - - const actionOptionsShort = [ - 'Actions', - 'Save', - 'Reset', - 'Manage', - ]; - - return ( -
- - - {/* */} - - - - - {/* */} - - - - {actionOptions.map((option, index) => ( - handleMenuItemClick(event, index)} - > - {index===0 && ({option})} - {index != 0 && option} - - ))} - - -
- ) -} - -export {Dropdown}; diff --git a/src/components/Search.tsx b/src/components/Search.tsx index 6ea8fa2..a648818 100644 --- a/src/components/Search.tsx +++ b/src/components/Search.tsx @@ -1,10 +1,7 @@ import React, { useEffect, useState } from "react"; // search input -import { IoSearch } from "react-icons/io5"; -import { RxCross1 } from "react-icons/rx"; import { SearchCard, SavedSearchBtn, SearchBar } from "./index"; import Fuse from 'fuse.js' -import DropInData from "../../backend/scraper/drop_in.json"; // for date picker import dayjs, { Dayjs } from 'dayjs'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; @@ -19,11 +16,9 @@ import Select, { SelectChangeEvent } from '@mui/material/Select'; import Checkbox from '@mui/material/Checkbox'; import { categoryListAcademics, categoryListClubs, categoryListCareer } from "../types"; // selectable dropdown -// import { Dropdown } from "./Dropdown"; -import { Button } from "./Button"; - import "react-dropdown/style.css"; import "./Search.css"; + // import useSearch from "../../utils/hooks/useSearch"; import DITData from "../../backend/scraper/drop_in.json"; import PTData from "../../backend/scraper/peer_tutoring.json"; diff --git a/src/components/index.ts b/src/components/index.ts index bb69988..55575fe 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,9 +1,8 @@ -export * from "./Dropdown"; export * from "./MyCalendar"; export * from "./Navbar"; -export * from "./Search"; -export * from "./SearchCard"; -export * from "./SecondNav"; export * from "./Footer"; +export * from "./Search"; export * from "./SearchBar"; export * from "./SavedSearches"; +export * from "./SearchCard"; +export * from "./SecondNav"; diff --git a/src/pages/UploadManual.tsx b/src/pages/UploadManual.tsx index d61ac09..b949f0c 100644 --- a/src/pages/UploadManual.tsx +++ b/src/pages/UploadManual.tsx @@ -2,77 +2,96 @@ import React from 'react'; import { UploadNavBar, UploadButton } from "./index"; import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker'; import { Footer } from "../components"; -import { DemoContainer } from '@mui/x-date-pickers/internals/demo'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; +interface InputProps { + title: string; + requiredBool: boolean; +} + +const Input: React.FC = ({ title, requiredBool }) => { + return ( +
+ + +
+ ) +} + +const Category: React.FC = () => { + return ( +
+ + +
+ ) +} + +const Time: React.FC = () => { + return ( +
+
+
+ + + + +
+
+ + + + +
+
+ +
+ ) +} + +const Note: React.FC = () => { + return ( +
+ + + +
+ ) +} const UploadManual: React.FC = () => { return (
-
-
+
-
- - -
-
- - -
-
-
-
- - - - -
-
- - - - -
-
-
-
- - -
-
- - -
-
- - -
+ + +