Skip to content

Commit

Permalink
Merge branch 'preview'
Browse files Browse the repository at this point in the history
  • Loading branch information
pdelfan committed Sep 6, 2024
2 parents 40b4f4b + 5a6432c commit 2ab1317
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
17 changes: 10 additions & 7 deletions src/app/not-found.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"use client";

import Button from "@/components/actions/button/Button";
import Image from "next/image";
import { useRouter } from "next/navigation";

export default function NotFound() {
const router = useRouter();

return (
<main className="flex h-[100svh] flex-col items-center justify-center p-3">
<div className="flex items-center gap-3">
<Image
src="/ouranos.svg"
alt="Ouranos logo"
width={40}
height={40}
className="block transition-transform duration-700 ease-in-out hover:rotate-180"
/>
<Image src="/ouranos.svg" alt="Ouranos logo" width={40} height={40} />
<Image
src="/ouranosText.svg"
alt="Ouranos text"
Expand All @@ -21,6 +21,9 @@ export default function NotFound() {
<h1 className="mt-2 text-center text-lg sm:text-xl">
The page you are looking for could not be found
</h1>
<div className="mt-6 flex justify-center">
<Button onClick={() => router.push("/dashboard/home")}>Go Home</Button>
</div>
</main>
);
}
12 changes: 10 additions & 2 deletions src/containers/settings/settingsContainer/SettingsContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "react-icons/bi";
import { MdRemoveRedEye } from "react-icons/md";
import { BiSolidBellOff } from "react-icons/bi";
import { BsPersonFillSlash } from "react-icons/bs";
import { BsFillInfoCircleFill, BsPersonFillSlash } from "react-icons/bs";
import { TbLicense } from "react-icons/tb";
import { getSessionFromServer } from "@/lib/api/auth/session";
import { getProfile } from "@/lib/api/bsky/actor";
Expand Down Expand Up @@ -151,7 +151,7 @@ export default async function SettingsContainer() {
</section>
<section>
<h3 className="text-skin-base mx-3 mb-2 text-xl font-semibold md:mx-0">
About
Learn More
</h3>
<div className="flex flex-col">
<Link
Expand All @@ -170,6 +170,14 @@ export default async function SettingsContainer() {
<TbLicense className="text-skin-icon-base text-xl" />
License
</Link>
<Link
href="/about"
target="_blank"
className="border-skin-base text-skin-base hover:bg-skin-secondary flex items-center gap-2 border border-x-0 p-3 last:border-b md:border-x md:first:rounded-t-2xl md:last:rounded-b-2xl odd:[&:not(:last-child)]:border-b-0 even:[&:not(:last-child)]:border-b-0"
>
<BsFillInfoCircleFill className="text-skin-icon-base text-xl" />
About
</Link>
</div>
</section>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ export default function SettingsContainerSkeleton() {
</section>
<section>
<h3 className="text-skin-base mx-3 mb-2 text-xl font-semibold md:mx-0">
About
Learn More
</h3>
<section className="flex flex-col">
<SettingsItemSkeleton />
<SettingsItemSkeleton />
<SettingsItemSkeleton />
</section>
</section>
</section>
Expand Down

0 comments on commit 2ab1317

Please sign in to comment.