Skip to content

Commit

Permalink
Merge branch 'preview'
Browse files Browse the repository at this point in the history
  • Loading branch information
pdelfan committed Dec 16, 2023
2 parents c8733a1 + 1f4c7c7 commit efbef7b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 1 deletion.
27 changes: 27 additions & 0 deletions src/app/not-found.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import Image from "next/image";
import Link from "next/link";

export default function NotFound() {
return (
<main className="flex flex-col items-center justify-center p-3 h-[100svh]">
<div className="flex items-center gap-3">
<Image
src="/ouranos.svg"
alt="Ouranos logo"
width={40}
height={40}
className="block transition-transform ease-in-out duration-700 hover:rotate-180"
/>
<Image
src="/ouranosText.svg"
alt="Ouranos text"
width={70}
height={20}
/>
</div>
<h1 className="text-center text-lg sm:text-xl mt-2">
The page you are looking for could not be found
</h1>
</main>
);
}
1 change: 0 additions & 1 deletion src/containers/thread/PostThreadContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Button from "@/components/actions/button/Button";
import { useRouter } from "next/navigation";
import FeedPostSkeleton from "@/components/contentDisplay/feedPost/FeedPostSkeleton";
import FeedAlert from "@/components/feedback/feedAlert/FeedAlert";
import { ThreadViewResult } from "../../../types/feed";
import { sortThread } from "@/lib/utils/feed";

interface Props {
Expand Down
1 change: 1 addition & 0 deletions src/lib/utils/feed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ export const sortThread = (
return Math.random() - 0.5;
}

// this is applied in addition to the sort
if (threadPrefs.prioritizeFollowedUsers) {
const aIsFollowed = a.post.author.viewer?.following;
const bIsFollowed = b.post.author.viewer?.following;
Expand Down

0 comments on commit efbef7b

Please sign in to comment.