Merge pull request #110 from cs3216-a3-group-4/seeleng/add-bookmarks

fix(frontend): random things
jippy-the-frog · Sep 27, 2024 · 795b87f · 795b87f
2 parents 384356b + 52a9d76
commit 795b87f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/backend/src/events/router.py b/backend/src/events/router.py
@@ -51,6 +51,7 @@ def get_events(
     if limit is not None:
         event_query = event_query.limit(limit)
     if offset is not None:
+        offset = max(0, offset)
         event_query = event_query.offset(offset)
 
     event_query = event_query.order_by(Event.rating.desc(), Event.date.desc())

diff --git a/frontend/app/(authenticated)/bookmarks/page.tsx b/frontend/app/(authenticated)/bookmarks/page.tsx
@@ -36,7 +36,7 @@ const Page = ({ params }: { params: { id: string } }) => {
 
   const pageStr = searchParams.get("page");
 
-  const page = isNumeric(pageStr) ? parseInt(pageStr!) : 1;
+  const page = isNumeric(pageStr) && pageStr !== "0" ? parseInt(pageStr!) : 1;
 
   const [categoryName, setCategoryName] = useState<string>(""); // eslint-disable-line
 

diff --git a/frontend/app/(unauthenticated)/login/page.tsx b/frontend/app/(unauthenticated)/login/page.tsx
@@ -134,7 +134,7 @@ function LoginPage() {
           </Box>
         </CardContent>
       </Card>
-      <div className="flex gap-x-2 w-full justify-center">
+      <div className="flex gap-x-2 w-full justify-center items-baseline">
         <p className="text-sm text-muted-foreground">Not registered yet?</p>
         <Link href="/register" size="sm">
           Create an account

diff --git a/frontend/app/(unauthenticated)/register/page.tsx b/frontend/app/(unauthenticated)/register/page.tsx
@@ -139,7 +139,7 @@ function RegisterPage() {
           </Box>
 
           {/* Login button */}
-          <div className="flex gap-x-2 w-full justify-center">
+          <div className="flex gap-x-2 w-full justify-center items-baseline">
             <p className="text-sm text-muted-foreground">
               Already have an account?
             </p>

diff --git a/...d/app/(unauthenticated)/reset-password/_components/reset-password-create-request-form.tsx b/...d/app/(unauthenticated)/reset-password/_components/reset-password-create-request-form.tsx
@@ -103,7 +103,7 @@ export default function ResetPasswordCreateRequestForm() {
           </Box>
         </CardContent>
       </Card>
-      <div className="flex gap-x-2 w-full justify-center">
+      <div className="flex gap-x-2 w-full justify-center items-baseline">
         <p className="text-sm text-muted-foreground">Not registered yet?</p>
         <Link href="/register" size="sm">
           Create an account

diff --git a/frontend/components/layout/content-layout.tsx b/frontend/components/layout/content-layout.tsx
@@ -3,6 +3,7 @@
 import { ReactNode } from "react";
 import { usePathname } from "next/navigation";
 
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import useBreakpointMediaQuery from "@/hooks/use-breakpoint-media-query";
 import { useUserStore } from "@/store/user/user-store-provider";
 import { MediaBreakpoint } from "@/utils/media";
@@ -42,8 +43,8 @@ const ContentLayout = ({ isLoading, children }: ContentLayoutProps) => {
   // TODO: fix all loading elements
   if (isLoading)
     return (
-      <div className="flex flex-1 w-full h-full max-h-full !overflow-y-auto">
-        loading
+      <div className="flex flex-1 w-full h-full max-h-full !overflow-y-auto justify-center items-center">
+        <LoadingSpinner className="w-24 h-24" />
       </div>
     );