Skip to content

Commit

Permalink
Merge branch 'main' into jl/add-2023-data
Browse files Browse the repository at this point in the history
  • Loading branch information
joaodiaslobo authored Oct 13, 2023
2 parents e52a007 + adee601 commit d43243b
Show file tree
Hide file tree
Showing 22 changed files with 300 additions and 223 deletions.
25 changes: 25 additions & 0 deletions components/Background/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
export default function Background() {
return (
<div className="wrap overflow-hidden opacity-30 select-none block">
<object className="shape x1" data="/images/props/shapes_3.svg" />
<object className="shape x2" data="/images/props/shapes_2.svg" />
<object
className="shape x3 hidden sm:block"
data="/images/props/shapes_1.svg"
/>
<object className="shape x4" data="/images/props/shapes_3.svg" />
<object
className="shape x5 hidden sm:block"
data="/images/props/shapes_2.svg"
/>
<object
className="shape x6 hidden sm:block"
data="/images/props/shapes_3.svg"
/>
<object className="shape x7" data="/images/props/shapes_2.svg" />
<object className="shape x8" data="/images/props/shapes_1.svg" />
<object className="shape x9" data="/images/props/shapes_3.svg" />
<object className="shape x10" data="/images/props/shapes_2.svg" />
</div>
);
}
2 changes: 1 addition & 1 deletion components/Faq/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function Faq({ faq }) {
return (
<div
onClick={toggleFaq}
className="cursor-pointer rounded-lg bg-gray1 border border-gray2 shadow-sm hover:border-purple px-4 py-6"
className="cursor-pointer rounded-lg bg-gray1 border border-gray2 shadow-sm hover:border-primary transition duration-200 ease-in-out px-4 py-6"
>
<div>
{isOpen ? (
Expand Down
10 changes: 5 additions & 5 deletions components/Navbar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ export default function Navbar({ current_page, children }) {
<div className="flex row ml-6 cursor-pointer opacity-70 hover:opacity-100">
{/* eslint-disable @next/next/no-img-element */}
<img
className="w-[60px] h-[60px] pt-2"
className="w-[40px] h-[40px] mr-2 self-center"
src="/images/logos/codeweek-icon-white.svg"
alt=""
/>
<a className="text-white text-md font-semibold sm:text-lg sm:font-bold px-1 py-5">
<a className="text-white text-md font-ocr uppercase font-semibold sm:text-lg sm:font-bold px-1 py-5">
Code Week
</a>
</div>
Expand All @@ -44,9 +44,9 @@ export default function Navbar({ current_page, children }) {
href={item.slug}
className={classNames(
current_page == item.name
? "border-purple text-white"
? "border-primary text-white"
: "border-transparent text-white text-opacity-50 hover:text-opacity-100",
"whitespace-nowrap py-7 px-1 border-b text-sm font-bold"
"whitespace-nowrap py-7 px-1 border-b text-base font-bold font-ocr"
)}
>
{item.name}
Expand Down Expand Up @@ -108,7 +108,7 @@ export default function Navbar({ current_page, children }) {
current_page == item.name
? " "
: " text-opacity-50 hover:text-opacity-100",
"block whitespace-nowrap py-4 px-2 text-center text-xl font-bold uppercase text-white"
"block whitespace-nowrap py-4 px-2 font-ocr text-center text-xl font-bold uppercase text-white"
)}
>
{item.name}
Expand Down
4 changes: 2 additions & 2 deletions components/PersonCard/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function PersonCard({ person, isSpeakers }) {
function RenderOverlayOrganization() {
if (!isSpeakers) {
return (
<div className="hidden group-hover:block absolute top-0 left-0 right-0 z-40 bg-gradient-to-b from-purple p-2">
<div className="opacity-0 group-hover:block absolute top-0 left-0 right-0 z-40 bg-gradient-to-b from-primary p-2 transition duration-200 ease-in-out group-hover:opacity-100">
{/* eslint-disable-next-line @next/next/no-img-element */}
<img
className="w-12 sm:w-20"
Expand All @@ -21,7 +21,7 @@ export default function PersonCard({ person, isSpeakers }) {
}
return (
<div className="h-full">
<div className="h-full space-y-4 cursor-pointer group relative rounded-lg border border-gray-300 bg-gray1 border-gray2 shadow-sm hover:border-purple overflow-hidden">
<div className="h-full space-y-4 cursor-pointer group relative rounded-lg border border-gray-300 bg-gray1 border-gray2 shadow-sm transition duration-200 ease-in-out hover:border-primary overflow-hidden">
<div>
<RenderOverlayOrganization />

Expand Down
1 change: 1 addition & 0 deletions pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { config } from "@fortawesome/fontawesome-svg-core";
config.autoAddCss = false; /* eslint-disable import/first */

import "../styles/globals.css";
import "../styles/background.css";

function MyApp({ Component, pageProps }) {
return <Component {...pageProps} />;
Expand Down
2 changes: 1 addition & 1 deletion pages/activity/[slug].js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function Activity() {
{activity.speakers &&
activity.speakers.map((speaker) => (
<div
className="cursor-pointer group w-3/4 relative rounded-lg border border-gray-300 bg-gray1 border-gray2 px-6 py-5 shadow-sm hover:border-purple"
className="cursor-pointer group w-3/4 relative rounded-lg border border-gray-300 bg-gray1 border-gray2 px-6 py-5 shadow-sm hover:border-primary transition duration-200 ease-in-out"
key={speaker}
>
<div className="flex items-center space-x-3 rounded-sm border-gray3">
Expand Down
4 changes: 3 additions & 1 deletion pages/faqs.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ export default function FAQs() {

<main className="flex w-full flex-1 flex-col bg-black my-auto">
<div className="px-10 mb-10">
<p className="text-white text-[40px] mt-14 font-extrabold">FAQs</p>
<p className="text-white text-[40px] mt-14 font-extrabold font-ocr uppercase">
FAQs
</p>
<p className="text-gray3 text-md mt-4">
Have all your questions answered.
</p>
Expand Down
32 changes: 14 additions & 18 deletions pages/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Head from "next/head";

import Navbar from "/components/Navbar";
import Background from "/components/Background";

function Home() {
return (
Expand All @@ -11,28 +12,23 @@ function Home() {
</Head>

<Navbar>
<main className="flex w-full flex-1 flex-col items-center justify-center text-center bg-black my-auto ">
<div className="space">
<div className="stars" />
<div className="stars" />
<div className="stars" />
<div className="stars" />
<div className="stars" />
</div>
<div className="md:max-w-[700px] px-4">
<p className="text-white text-5xl font-bold sm:text-6xl sm:font-extrabold">
EU Code Week 2023 @ University of Minho
</p>
<div className="grid grid-cols-3 p-6">
<p className="text-purple text-lg sm:text-2xl self-center">
October 16 - 19, 2023
<main className="flex w-full flex-1 flex-col items-center justify-center bg-black text-center my-auto ">
<div className="md:max-w-[700px] px-4 select-none">
<object
data="images/logos/codeweek-2023.svg"
className="w-full sm:mx-0 sm:w-[300px]"
alt="Code Week 2023"
/>
<div>
<p className="text-white uppercase font-ocr text-lg sm:text-2xl mt-4 text-left">
16 - 20 October
</p>
<p className="flex text-white text-xl border-r-2 h-[70px] self-center justify-self-center" />
<p className="text-purple text-lg sm:text-2xl self-center p-4">
Building 7, Gualtar Campus
<p className="text-primary uppercase font-ocr text-lg sm:text-xl self-center text-left mt-2">
Building 7, <br /> Gualtar Campus
</p>
</div>
</div>
<Background />
</main>
</Navbar>
</div>
Expand Down
10 changes: 6 additions & 4 deletions pages/schedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Schedule() {

<main className="flex w-full flex-1 flex-col bg-black my-auto">
<div className="px-10 mb-10">
<p className="text-white text-[40px] mt-14 font-extrabold">
<p className="text-white text-[40px] mt-14 font-extrabold font-ocr uppercase">
Schedule
</p>
<p className="text-gray3 text-md mt-4">
Expand All @@ -30,8 +30,10 @@ export default function Schedule() {

{schedule.map((day, i0) => (
<div className="sm:flex border-t border-gray2 sm:py-4" key={day}>
<div className="px-10 py-4 sm:py-0 sm:p-10 flex-shrink-0 sm:mr-4">
<p className="text-purple text-4xl font-extrabold">{day.date}</p>
<div className="px-10 py-4 sm:py-0 sm:p-10 flex-shrink-0">
<p className="text-primary text-4xl font-extrabold font-ocr uppercase">
{day.date}
</p>
</div>
<div className="px-10 overflow-x-auto flex gap-4 pb-4 sm:pb-0 sm:py-4">
{day.activities.map((activity, i1) => (
Expand All @@ -41,7 +43,7 @@ export default function Schedule() {
</div>
<>
<Link href={`/activity/${i1}?day_id=${i0}`}>
<div className="cursor-pointer group w-80 mt-2 relative rounded-lg border border-gray-300 bg-gray1 border-gray2 px-6 py-5 shadow-sm hover:border-purple">
<div className="cursor-pointer group w-80 mt-2 relative rounded-lg border border-gray-300 bg-gray1 border-gray2 px-6 py-5 shadow-sm hover:border-primary transition duration-200 ease-in-out">
<div className="flex justify-between items-center">
<p className="text-white text-xl font-bold">
{activity.title}
Expand Down
2 changes: 1 addition & 1 deletion pages/speakers.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function Speakers() {
<Navbar current_page="Speakers">
<main className="flex w-full flex-1 flex-col bg-black my-auto">
<div className="px-10 mb-10">
<p className="text-white text-[40px] mt-14 font-extrabold">
<p className="text-white text-[40px] mt-14 font-extrabold font-ocr uppercase">
Speakers
</p>
<p className="text-gray3 text-md mt-4">
Expand Down
4 changes: 3 additions & 1 deletion pages/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export default function Team() {
<Navbar current_page="Team">
<main className="flex w-full flex-1 flex-col bg-black my-auto">
<div className="px-10 mb-10">
<p className="text-white text-[40px] mt-14 font-extrabold">Team</p>
<p className="text-white text-[40px] mt-14 font-extrabold font-ocr uppercase">
Team
</p>
<p className="text-gray3 text-md mt-4">
CeSIUM and NECC joined forces and became almost as strong as a
semicolon in C. Look at us: hard working people, code enthusiasts,
Expand Down
Binary file added public/fonts/OCRAEXT.TTF
Binary file not shown.
1 change: 1 addition & 0 deletions public/images/logos/codeweek-2023.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/images/logos/codeweek-icon-purple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/props/shapes_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/props/shapes_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/props/shapes_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d43243b

Please sign in to comment.