Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions src/activity/Activity.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,6 @@ import "./activity.css";
import Events from "./Events";
import Projects from "./Projects";

/*
Create card tab Event | Project both underline + hover highlight box
v-Link tab to component -> how to link subpage
Use Hook to change card tab
Create Event and Project Container
Event Container:

Square box: Dat center large font 46px, Time below
Click view detail, box will expand

Line break

Container inlcude:
Shadow: Hover expand
Card: Image, title, Url, Description, update (except project)
*/

function Activity() {
return (
<div className="activity-container">
Expand All @@ -41,8 +24,6 @@ function Tab() {

return (
<div className="tab-container">
{/* <Link to='/activity/events' className='tab-button'>Events</Link>
<Link to='activity/projects' className='tab-button'>Projects</Link> */}
<div className="tabs">
<button
type="button"
Expand Down
17 changes: 0 additions & 17 deletions src/navbar/HeaderBar.js

This file was deleted.

28 changes: 1 addition & 27 deletions src/navbar/NavigationBar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, { useState, useRef, useEffect } from "react";
import { Link } from "react-router-dom";
import { DensityMedium, Clear } from "@mui/icons-material";
import ClubLogo from "../asset/images/club-logo.png";
import "./navbar.css";
import { DensityMedium, Clear } from "@mui/icons-material";

function NavigationBar() {
// Will refine navbar in React way
const [isSwitch, setIsSwitch] = useState(false);
const [isMobile, setIsMobile] = useState(false);
const [screenSize, getDimension] = useState({
Expand Down Expand Up @@ -68,16 +67,13 @@ function NavigationBar() {
}
to="/homepage"
>
{" "}
Home
</Link>
<div className="dropdown-content">
<Link className="dropdown-link" to="/about">
{" "}
&gt; About
</Link>
<Link className="dropdown-link" to="/opportunity">
{" "}
&gt; Opportunity
</Link>
</div>
Expand All @@ -99,11 +95,9 @@ function NavigationBar() {
</Link>
<div className="dropdown-content">
<Link className="dropdown-link" to="/activity/events">
{" "}
&gt; Events
</Link>
<Link className="dropdown-link" to="/activity/projects">
{" "}
&gt; Projects
</Link>
</div>
Expand All @@ -130,23 +124,20 @@ function NavigationBar() {
to="/resources"
state={{ option: 1 }}
>
{" "}
&gt; Tutorials
</Link>
<Link
className="dropdown-link"
to="/resources"
state={{ option: 2 }}
>
{" "}
&gt; Research
</Link>
<Link
className="dropdown-link"
to="/resources"
state={{ option: 3 }}
>
{" "}
&gt; Organizations
</Link>
</div>
Expand All @@ -160,20 +151,3 @@ function NavigationBar() {
}

export default NavigationBar;

function Dropdown() {}

const NavItemMap = [
{
title: "Home",
submenu: [],
},
{
title: "Activity",
submenu: [],
},
{
title: "Resource",
submenu: [],
},
];
41 changes: 0 additions & 41 deletions src/navbar/header_bar.css

This file was deleted.

71 changes: 0 additions & 71 deletions templates/activity-mockup.html

This file was deleted.