Skip to content
Open
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
13 changes: 6 additions & 7 deletions asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"files": {
"main.css": "/static/css/main.a050b483.css",
"main.js": "/static/js/main.c215fc8c.js",
"main.css": "/static/css/main.0c1be896.css",
"main.js": "/static/js/main.3b8a997d.js",
"static/media/light_green.jpg": "/static/media/light_green.7010efcd90708a2bdb62.jpg",
"static/media/med_blue.jpg": "/static/media/med_blue.4295e322817e15eaf333.jpg",
"static/media/hack_logo.png": "/static/media/hack_logo.d7102c0819a667e667e0.png",
"static/media/green-clear.jpg": "/static/media/green-clear.7e2ad78f0d7fd8a16f1c.jpg",
"static/media/dog_logo.png": "/static/media/dog_logo.dba3d79187b418b81207.png",
Expand All @@ -22,11 +21,11 @@
"static/media/northrop.png": "/static/media/northrop.e3e3ed5b0b9777db762e.png",
"static/media/CWIT.png": "/static/media/CWIT.69415606645ce160cbdd.png",
"index.html": "/index.html",
"main.a050b483.css.map": "/static/css/main.a050b483.css.map",
"main.c215fc8c.js.map": "/static/js/main.c215fc8c.js.map"
"main.0c1be896.css.map": "/static/css/main.0c1be896.css.map",
"main.3b8a997d.js.map": "/static/js/main.3b8a997d.js.map"
},
"entrypoints": [
"static/css/main.a050b483.css",
"static/js/main.c215fc8c.js"
"static/css/main.0c1be896.css",
"static/js/main.3b8a997d.js"
]
}
68 changes: 62 additions & 6 deletions hackumbc-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions hackumbc-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@testing-library/react": "^13.1.1",
"@testing-library/user-event": "^13.5.0",
"aos": "^2.3.4",
"axios": "^1.5.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-icons": "^4.3.1",
Expand Down
2 changes: 2 additions & 0 deletions hackumbc-client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import React from "react";
import { Route, Routes } from "react-router-dom";

import { Home } from "./pages/Home.js";
import { Privacy } from "./pages/Privacy.js";

function App() {
return (
<Routes>
<Route path="/" element={<Home />} />
<Route path="/privacy" element={<Privacy />} />
</Routes>
);
}
Expand Down
4 changes: 2 additions & 2 deletions hackumbc-client/src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ const Navbar = () => {
{/*<a id='left-nav-button' className='nav-link' href="https://oldlemonpepper.github.io/ILSBMap/" target='_blank'>Map</a>*/}
<Link
id="left-nav-button"
to=""
to="schedule"
smooth={true}
duration={500}
className="nav-link"
>
Social
Schedule
</Link>
</div>

Expand Down
70 changes: 38 additions & 32 deletions hackumbc-client/src/components/ScheduleBlock.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
import React from 'react'
import { useEffect, useState } from 'react';
import '../css/Home.css'
import '../css/Schedule.css'
import React from "react";
import { useEffect, useState } from "react";
import "../css/Home.css";
import "../css/Schedule.css";

import Aos from "aos";
import "aos/dist/aos.css";

// realizing after the fact that this does not need its own component but we can keep it for now its not too bad
const ScheduleBlock = ({time, title, details}) => {
const [isHovering, setIsHovering] = useState(false);
const ScheduleBlock = ({ time, title, location, details }) => {
const [isHovering, setIsHovering] = useState(false);

const handleMouseOver = () => {
setIsHovering(true);
};
const handleMouseOut = () => {
setIsHovering(false);
};
useEffect(()=>{
Aos.init({
once: 'true',
duration: 1000
});
}, [])
const handleMouseOver = () => {
setIsHovering(true);
};

const handleMouseOut = () => {
setIsHovering(false);
};
useEffect(() => {
Aos.init({
once: "true",
duration: 1000,
});
}, []);

return (
<div onMouseOver={handleMouseOver} onMouseOut={handleMouseOut} className="schedule-container">
<div data-aos='fade-up' className='schedule-title'>
<h2>{time}</h2>
<hr/>
<h2>{title}</h2>
</div>
{isHovering && (
<div className='schedule-details'>
<h3> {details}</h3>
<div
onMouseOver={handleMouseOver}
onMouseOut={handleMouseOut}
className="schedule-container"
>
<div data-aos="fade-up" className="schedule-title">
<h2>{title}</h2>
<hr />
<h2>{time}</h2>
<hr />
<h2>{location}</h2>
</div>
{isHovering && (
<div className="schedule-details">
<h3> {details}</h3>
</div>
)}
)}
</div>
)
}
);
};

export default ScheduleBlock
export default ScheduleBlock;
47 changes: 27 additions & 20 deletions hackumbc-client/src/components/SectionTitle.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
import React from 'react'
import { useEffect } from 'react';
import '../css/Home.css'
import React from "react";
import { useEffect } from "react";
import "../css/Home.css";

import Aos from "aos";
import "aos/dist/aos.css";

// realizing after the fact that this does not need its own component but we can keep it for now its not too bad
const SectionTitle = ({title}) => {

useEffect(()=>{
Aos.init({
once: 'true',
duration: 1000
});
}, [])


const SectionTitle = ({ title }) => {
useEffect(() => {
Aos.init({
once: "true",
duration: 1000,
});
}, []);
if (title === " ") {
return (
<div className='title-container'>
<h1 data-aos='fade-up' className='section-title'>{title}</h1>
</div>
)

}
<>
<br />
<br />
<br />
</>
);
}
return (
<div className="title-container">
<h1 data-aos="fade-up" className="section-title">
{title}
</h1>
</div>
);
};

export default SectionTitle
export default SectionTitle;
4 changes: 2 additions & 2 deletions hackumbc-client/src/css/FAQ.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
/* Center and scale the image nicely */
overflow: hidden;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
background-repeat: repeat;
background-size: contain;
width: 100vw;
height: 280%;
display: flex;
Expand Down
6 changes: 3 additions & 3 deletions hackumbc-client/src/css/Home.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
html{
overflow-x: hidden;
background-image: url("../assets/med_blue.jpg");
/* background-image: url("../assets/med_blue.jpg"); */
background-position: center;
background-repeat: no-repeat;
/* background-size: cover; */
Expand Down Expand Up @@ -223,8 +223,8 @@ html.sponsors-bg{
margin-top: 90px;
width: 100%;
height: 3px;
color: var(--lilac-purple);
background-color: var(--lilac-purple);
color: white;
background-color: white;
border: 0;
}

Expand Down
34 changes: 34 additions & 0 deletions hackumbc-client/src/css/Privacy.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.privacy-page{
background-color: #ffffff;
color: black;
font-family: Arial, sans-serif;
margin: 20px;
padding: 20px;
text-align: center; /* Center-align all text in the body */


}

h1 {
font-size: 24px;
margin-bottom: 20px;
text-align: center; /* Center-align all text in the body */

}
p {
font-size: 16px;
line-height: 1.5;
margin-bottom: 10px;
text-align: center; /* Center-align all text in the body */

}

ul {
list-style: none;
}

img {
width: 100px;
height: auto;
margin: 20px auto;
}
Loading