Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Update to Next 13 #490

Merged
merged 8 commits into from
Nov 4, 2023
Merged
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
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
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
35 changes: 15 additions & 20 deletions components/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,14 @@ export default function Layout({
<aside className="inset-y-0 hidden w-72 overflow-y-scroll border-r-2 bg-secondary px-8 py-5 lg:fixed lg:flex lg:flex-col">
<div className="flex flex-1">
<nav className="mt-10 flex flex-col">
<Link href="/">
<a className="font-iregular text-quinary">
&lt; Back to SEI website
</a>
<Link href="/" className="font-iregular text-quinary">
&lt; Back to SEI website
</Link>

<div className="my-4">
<Image
src="/images/sei-logo.svg"
alt="SEI"
alt="SEI Logo"
width="220"
height="120"
/>
Expand Down Expand Up @@ -177,15 +175,13 @@ function MobileNavbar({
<aside className="flex h-full flex-col justify-between">
<div>
<div className="flex justify-between">
<Link href="/">
<a className="font-iregular text-quinary">
<Image
src="/images/sei-logo.svg"
alt="SEI"
width="48"
height="32"
/>
</a>
<Link href="/" className="font-iregular text-quinary">
<Image
src="/images/sei-logo.svg"
alt="SEI Logo"
width="48"
height="32"
/>
</Link>

<button type="button" onClick={onClose} className="h-12 w-12">
Expand Down Expand Up @@ -230,12 +226,11 @@ function ActiveLink({ link, href, basePath }: IActiveLinkProps) {
const activeStyle = href === `/${basePath}/${link}` && "text-quinary";

return (
<Link href={`/${basePath}/${link}`}>
<a
className={`py-8 font-ibold text-xs uppercase transition duration-200 hover:text-quinary ${activeStyle}`}
>
{link}
</a>
<Link
href={`/${basePath}/${link}`}
className={`py-8 font-ibold text-xs uppercase transition duration-200 hover:text-quinary ${activeStyle}`}
>
{link}
</Link>
);
}
45 changes: 27 additions & 18 deletions components/Navbar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,36 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
<div className="flex h-16 items-center justify-between">
<div className="relative z-50 flex flex-auto">
<div className="grid w-full grid-cols-4">
<Link href="/" passHref>
<Link href="/">
<div className={`${styles.logo} pt-4 lg:pt-8`}>
<Image
className="cursor-pointer opacity-60 hover:opacity-100"
src="/images/sei-logo.svg"
width="50"
height="40"
alt="SEIUM"
alt="SEI Logo"
/>
</div>
</Link>
<div className="col-span-3 hidden justify-self-end lg:block">
<div className="flex">
<div className="mr-6 grid grid-cols-3 gap-y-4 gap-x-20 pt-4">
{navigation.map((item) => (
<Link key={item.slug} href={item.slug} passHref>
<a className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100">
{item.name}
</a>
<Link
key={item.slug}
href={item.slug}
className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100"
>
{item.name}
</Link>
))}
{isAuthenticated ? null : (
<Link key="login" href="/login" passHref>
<a className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100">
Login
</a>
<Link
key="login"
href="/login"
className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100"
>
Login
</Link>
)}
</div>
Expand All @@ -89,10 +93,14 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
<img
className="h-10 w-10 rounded-full"
src={user.avatar}
alt="Avatar"
/>
) : (
<span className="flex h-10 w-10 items-center justify-center rounded-full">
<img src="/images/mascot-head.png" />
<img
src="/images/mascot-head.png"
alt="Mascote"
/>
</span>
)}
</Menu.Button>
Expand All @@ -110,10 +118,11 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
{user &&
userNavigation(user.type).map((item) => (
<Menu.Item key={item.name}>
<Link passHref href={item.slug}>
<a className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">
{item.name}
</a>
<Link
href={item.slug}
className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
>
{item.name}
</Link>
</Menu.Item>
))}
Expand Down Expand Up @@ -157,7 +166,7 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
as="a"
className="block rounded-md py-6 text-center font-ibold text-3xl text-white hover:text-quinary"
>
<Link key={item.slug} href={item.slug} passHref>
<Link key={item.slug} href={item.slug}>
{item.name}
</Link>
</Disclosure.Button>
Expand All @@ -170,7 +179,7 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
as="a"
className="block rounded-md py-6 text-center font-ibold text-3xl text-white hover:text-quinary"
>
<Link key={item.slug} href={item.slug} passHref>
<Link key={item.slug} href={item.slug}>
{item.name}
</Link>
</Disclosure.Button>
Expand All @@ -181,7 +190,7 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
as="a"
className="block rounded-md py-6 text-center font-ibold text-3xl text-white hover:text-quinary"
>
<Link key="login" href="/login" passHref>
<Link key="login" href="/login">
Login
</Link>
</Disclosure.Button>
Expand Down
11 changes: 5 additions & 6 deletions components/Return/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ interface Props {

export default function Return({ componentStyle }: Props) {
return (
<Link href="/">
<a
className={`${componentStyle} flex items-center justify-center font-iregular text-quinary sm:absolute`}
>
&lt; Back to SEI website
</a>
<Link
href="/"
className={`${componentStyle} flex items-center justify-center font-iregular text-quinary sm:absolute`}
>
&lt; Back to SEI website
</Link>
);
}
Loading
Loading