Skip to content

Commit

Permalink
Merge pull request #9 from TEDxNTUA/giannis-temp
Browse files Browse the repository at this point in the history
add 2024's event in archive
  • Loading branch information
GiannisTsagkaropoulos authored May 14, 2024
2 parents 316f9cd + 0e79723 commit 3592c56
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 3 deletions.
10 changes: 10 additions & 0 deletions data/previousEvents.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
export const PREVIOUSEVENTS = [
{
id: "ephemeral",
year: "2024",
link: "https://www.linkedin.com",
source: "ephemeral.png",
logo: "ephemeral-logo.png",
paragraph:
"This year, the organizing team of TEDxNTUA is preparing 'EPHEMERAL'.Ephemeral < originates from the greek word ἐφήμερος, meaning 'the one that lasts only one day' We will be exploring ephemerality and aiming to spread ideas around the concept of transience, how everything begins, ends and consequently evolves, in all aspects of our lives. In the context of human experience, transience highlights the uniqueness and value of each moment and experience. At our event, we will point out how reconciliation with the ephemeral nature of things turns into a motivating force and a source of inspiration.",
},

{
id: "mneme",
year: "2023",
Expand Down
Binary file added public/eventLogos/ephemeral-logo.png
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/previousEvents/ephemeral.png
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/ticket-2024.png
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/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function HomePage() {
<SecondScroll />

<div className="2024 relative mt-12">
<div className="hidden lg:block w-[80%] mx-auto max-w-[100rem] border-l-8 lg:border-our-red py-16">
{/* <div className="2024 NEW YEAR hidden lg:block w-[80%] mx-auto max-w-[100rem] border-l-8 lg:border-our-red py-16">
<div className="flex flex-row gap-8 w-[80%] h-8 mx-auto left-0 top-0 right-[23px] 2xl:right-[22px] max-w-[100rem] absolute">
<div className="h-8 w-8 rounded-full border-[3.5px] bg-our-red border-our-red" />
<div className="absolute top-[-15px] left-[100px] flex flex-col">
Expand All @@ -46,7 +46,7 @@ function HomePage() {
</p>
</div>
</div>
</div>
</div> */}
<Timeline />
</div>
{/* <div className="snap-start"> */}
Expand Down
16 changes: 15 additions & 1 deletion src/components/NavBar/NavBar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"use client";
import { useState } from "react";
import "./Navbar.css";
import Link from "next/link";
import NavLink from "./NavLink";
import SocialMediaNav from "./SocialMediaNav";
Expand Down Expand Up @@ -58,7 +59,7 @@ function NewNavbar() {
{/* Desktop Nav */}
<div
id="desktop-navbar"
className="menu hidden lg:flex flex-row-reverse "
className="menu hidden lg:flex flex-row-reverse lg:flex-row gap-8 xl:gap-16 justify-center items-center"
>
<ul className="flex lg:flex-row lg:space-x-8 xl:space-x-16">
{navLinks.map((link, index) => (
Expand Down Expand Up @@ -89,6 +90,19 @@ function NewNavbar() {
</li>
))}
</ul>

<a
// className=""
href="https://2023tedxntua.us21.list-manage.com/subscribe?u=8fb93651f7aa4956e92c4f188&id=1473802836"
target="_blank"
rel="noopener noreferrer"
>
<img
className="ticket h-[60px]"
src="./ticket-2024.png"
alt="ticket"
></img>
</a>
</div>
{/* Burger for Mobile Nav */}
<div id="burger" className="block lg:hidden">
Expand Down
19 changes: 19 additions & 0 deletions src/components/NavBar/Navbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.ticket:hover {
/* Start the shake animation and make the animation last for 0.5 seconds */
animation: shake 0.5s;

/* When the animation is finished, start again */
animation-iteration-count: infinite;
}

@keyframes shake {
0% {
transform: rotate(0.5deg);
}
50% {
transform: rotate(-0.5deg);
}
100% {
transform: rotate(0.5deg);
}
}

0 comments on commit 3592c56

Please sign in to comment.