Skip to content

Commit

Permalink
Merge branch 'main' into fix-title
Browse files Browse the repository at this point in the history
  • Loading branch information
emilymarkova authored Dec 23, 2024
2 parents 993dd0f + 34d9f0b commit 6ef523f
Show file tree
Hide file tree
Showing 16 changed files with 884 additions and 275 deletions.
366 changes: 366 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"react": "^18.3.1",
"react-awesome-slider": "^4.1.0",
"react-dom": "^18.3.1",
"react-scripts": "^5.0.1",
"sass": "^1.81.0",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
Binary file added public/awards.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/hackers.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/mrnguyen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/presentation.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ h2 {
}

.info {
height: 600px;
background-color:#61dafb;
/* height: 600px;
background-color:#000000; */
}

.schedule {
Expand Down
5 changes: 4 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import Prospectus from "./components/Prospectus"
import Faqs from "./components/Faqs";
import Title from "./components/Title";
import Schedule from "./components/Schedule";
import InfoPage from './components/InfoPage';
import Carousel from "./components/Carousel";

function App() {
const home = useRef(null);
Expand Down Expand Up @@ -50,7 +52,8 @@ function App() {
<Title></Title>
</div>
<div className="info" ref={info}>
<h2>INFO</h2>
<InfoPage></InfoPage>
<Carousel></Carousel>
</div>
<div className="schedule" ref={schedule}>
<Schedule></Schedule>
Expand Down
19 changes: 19 additions & 0 deletions src/components/Carousel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import AwesomeSlider from "react-awesome-slider";
import "react-awesome-slider/dist/styles.css";

const slider = (
<AwesomeSlider
className="slider"
bullets={false} /*cssModule={AwesomeSliderStyles}*/
>
<div data-src="/presentation.jpg" />
<div data-src="/mrnguyen.jpg" />
<div data-src="/hackers.jpg" />
<div data-src="/food.jpg" />
<div data-src="/awards.jpg" />
</AwesomeSlider>
);

export default function Carousel() {
return slider;
}
Loading

0 comments on commit 6ef523f

Please sign in to comment.