Skip to content

Commit

Permalink
fix: rebase with recent changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioRodrigues10 committed Nov 9, 2023
2 parents ed80b18 + a8c7feb commit a8e22b0
Show file tree
Hide file tree
Showing 51 changed files with 4,234 additions and 1,294 deletions.
Binary file removed .github/brand/sei-banner.png
Binary file not shown.
Binary file added .github/brand/sei-banner24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 0 additions & 42 deletions .github/workflows/deploy.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/preview.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
node-version: ["16.13.2"]
node-version: ["18.12.0"]

steps:
- name: ☁ Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.2
18.12.0
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[figma-design-2021]: https://www.figma.com/file/1phER5eukGFC5p9tFGnfk7/SEI
[figma-badge-2021]: https://img.shields.io/badge/-figma21-s?style=flat&logo=figma&color=black

# ![SEI Banner](.github/brand/sei-banner.png)
# ![SEI Banner](.github/brand/sei-banner24.png)

[![Netlify Status][netlify-status]][netlify-deploys]
[![CI Style][ci-style-status]][ci-style-workflow]
Expand Down Expand Up @@ -38,7 +38,7 @@ documentation](https://nextjs.org/docs/deployment) for more details.
<img src=".github/brand/cesium-DARK.svg#gh-light-mode-only" width="300">
<img src=".github/brand/cesium-LIGHT.svg#gh-dark-mode-only" width="300">

Copyright (c) 2021, CeSIUM.
Copyright (c) 2023, CeSIUM.

This project is licensed under the MIT License - see the [LICENSE][license]
file for details.
21 changes: 11 additions & 10 deletions components/Badge/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import Link from "next/link";

export default function Badge({ name, id, avatar, tokens, owned }) {
return (
<Link href={`/badge/${id}`}>
<a className={`h-full w-full ${owned ? "opacity-100" : "opacity-30"}`}>
<div>
<img src={avatar} alt={name}></img>
</div>
<div className="flex flex-col justify-items-center text-center font-iregular">
<div>{name}</div>
<div>{tokens} 💰 </div>
</div>
</a>
<Link
href={`/badge/${id}`}
className={`h-full w-full ${owned ? "opacity-100" : "opacity-30"}`}
>
<div>
<img src={avatar} alt={name}></img>
</div>
<div className="flex flex-col justify-items-center text-center font-iregular">
<div>{name}</div>
<div>{tokens} 💰 </div>
</div>
</Link>
);
}
52 changes: 28 additions & 24 deletions components/Base/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ const MobileNavbar = ({
</div>
<nav className="mt-5 flex-1">
{navigation.map((item) => (
<Link key={item} href={`/manager/${item}`} passHref>
<a
className={classNames(
item == href
? "bg-primary text-quinary"
: "text-white hover:bg-primary hover:bg-opacity-50",
"group flex items-center border-b-2 border-tertiary border-opacity-50 px-8 py-8 font-ibold text-xs"
)}
>
{item.toUpperCase()}
</a>
<Link
key={item}
href={`/manager/${item}`}
className={classNames(
item == href
? "bg-primary text-quinary"
: "text-white hover:bg-primary hover:bg-opacity-50",
"group flex items-center border-b-2 border-tertiary border-opacity-50 px-8 py-8 font-ibold text-xs"
)}
>
{item.toUpperCase()}
</Link>
))}
</nav>
Expand Down Expand Up @@ -128,22 +128,26 @@ export default function Dashboard({
<div className="flex flex-1 flex-col overflow-y-auto pt-5 pb-10">
<Return componentStyle="ml-4 mt-10 sm:mt-10" />
<div className="mt-20 flex flex-shrink-0 items-center px-4">
<Image src="/images/sei-logo.svg" width="220" height="120" />
<Image
src="/images/sei-logo.svg"
width="220"
height="120"
alt="SEI Logo"
/>
</div>
<nav className="mt-5 flex-1">
{navigation.map((item) => (
<Link key={item} href={`${baseHref}/${item}`} passHref>
<a
key={item}
className={classNames(
item == href
? "bg-primary text-quinary"
: "text-white hover:bg-primary hover:bg-opacity-50",
"group flex items-center border-b-2 border-tertiary border-opacity-50 px-8 py-8 font-ibold text-xs"
)}
>
{item.toUpperCase()}
</a>
<Link
key={item}
href={`${baseHref}/${item}`}
className={classNames(
item == href
? "bg-primary text-quinary"
: "text-white hover:bg-primary hover:bg-opacity-50",
"group flex items-center border-b-2 border-tertiary border-opacity-50 px-8 py-8 font-ibold text-xs"
)}
>
{item.toUpperCase()}
</Link>
))}
</nav>
Expand Down
6 changes: 3 additions & 3 deletions components/Dashboard/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default function Dashboard(props) {
src="/images/sponsors/accenture.svg"
width="220"
height="120"
alt=""
alt="Accenture"
/>
</div>
<nav className="mt-5 flex-1">
Expand All @@ -142,8 +142,8 @@ export default function Dashboard(props) {
</a>
))}
</nav>
<Link href="/" passHref>
<a className="px-4 font-iregular text-quinary">Log out 👋</a>
<Link href="/" className="px-4 font-iregular text-quinary">
Log out 👋
</Link>
</div>
</div>
Expand Down
32 changes: 17 additions & 15 deletions components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ function DefaultAnimation() {
return (
<span>
Psst. Have you checked the{" "}
<Link href="/challenges">
<a className="text-primary underline">challenges?</a>
<Link href="/challenges" className="text-primary underline">
challenges?
</Link>{" "}
Just saying.
</span>
Expand Down Expand Up @@ -88,14 +88,13 @@ export default function Footer(props: IFooterProps) {
<div className="justify-center lg:flex">
<div className="py- flex-1">
<div className="flex justify-center font-ibold lg:justify-start">
{/* eslint-disable-next-line jsx-a11y/alt-text */}
<Image
className="lg:flex-1"
src="/images/sei-logo.svg"
width="100"
height="100"
width={100}
height={100}
alt="SEI Logo"
/>
<p className="pt-4 pl-6 text-white lg:flex-1">
<p className="pl-6 text-white lg:flex-1">
Semana da <br />
Engenharia
<br />
Expand All @@ -105,20 +104,23 @@ export default function Footer(props: IFooterProps) {
</div>
<div className="flex-2 py-10">
<div className="grid grid-rows-2 justify-items-center gap-8 font-iregular text-sm text-white lg:grid-cols-2 lg:justify-items-end">
<Link passHref href="https://2022.seium.org/">
<a className="text-white hover:underline">Previous Edition</a>
<Link
href="https://2022.seium.org/"
className="text-white hover:underline"
>
Previous Edition
</Link>
<Link passHref href="/docs/regulamento.pdf">
<a className="hover:underline">General Regulation</a>
<Link href="/docs/regulamento.pdf" className="hover:underline">
General Regulation
</Link>
<Link
passHref
href="https://docs.google.com/forms/d/e/1FAIpQLSdV1bSyW2tcLuTC_jJCGdZ5NZHUlgETK7nQkOmyDzwb7eFS4Q/viewform"
className="hover:underline"
>
<a className="hover:underline">Report a Problem</a>
Report a Problem
</Link>
<Link passHref href="/docs/survival.pdf">
<a className="hover:underline">Survival Guide</a>
<Link href="/docs/survival.pdf" className="hover:underline">
Survival Guide
</Link>
</div>
<div className="flex justify-center lg:justify-end">
Expand Down
Loading

0 comments on commit a8e22b0

Please sign in to comment.