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.

Sign up for GitHub

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

Re-create log in page #136

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Re-create log in page #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4b55ec
Create new sign up form
harryrigg Nov 23, 2024
3b06c6f
Fix confirm password error
harryrigg Nov 23, 2024
e299f70
Clean up import
harryrigg Nov 23, 2024
233ac45
Create new sign in form
harryrigg Nov 23, 2024
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
168 changes: 159 additions & 9 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"prepare": "cd .. && husky client/.husky"
},
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@hookform/resolvers": "^3.9.1",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-slot": "^1.1.0",
"@tanstack/react-query": "^5.45.1",
Expand All @@ -44,11 +44,12 @@
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.1",
"react-hook-form": "^7.53.1",
"react-icons": "^5.2.1",
"sonner": "^1.6.1",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7",
"validator": "^13.12.0",
"zod": "^3.23.8",
"zustand": "^5.0.1",
"zustand-persist": "^0.4.0"
Expand All @@ -60,6 +61,7 @@
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/validator": "^13.12.2",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"eslint": "^8.57.0",
Expand Down
8 changes: 4 additions & 4 deletions client/src/components/main/EventPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import Link from "next/link";

import RsvpButton from "@/components/main/RsvpButton";
import RsvpListModal from "@/components/main/RsvpListModal";
import LogInModal from "@/components/ui/LogInModal";
import SignInModal from "@/components/modal/sign-in";
import SignUpModal from "@/components/modal/sign-up";
import PageCard from "@/components/ui/page-card";
import SignUpModal from "@/components/ui/SignUpModal";
import { useUser } from "@/hooks/useUser";
import type { Event } from "@/types/event";

Expand Down Expand Up @@ -58,11 +58,11 @@ export const EventPage = ({
</a>
</SignUpModal>{" "}
or{" "}
<LogInModal>
<SignInModal>
<a className="cursor-pointer text-[#9DAD93] hover:text-[#6B7B6B]">
login
</a>
</LogInModal>{" "}
</SignInModal>{" "}
to proceed.
</span>
);
Expand Down
9 changes: 4 additions & 5 deletions client/src/components/main/header/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Image from "next/image";
import Link from "next/link";
import { useState } from "react";

import LogInModal from "@/components/ui/LogInModal";
import SignUpModal from "@/components/ui/SignUpModal";
import SignInModal from "@/components/modal/sign-in";
import SignUpModal from "@/components/modal/sign-up";
import { useAuth } from "@/context/AuthProvider";

import { DropDownNav } from "./DropDown";
Expand Down Expand Up @@ -35,9 +34,9 @@ function Links({ isHiddenWhenLg }: { isHiddenWhenLg: boolean }) {
</Link>
) : (
<div className="flex flex-col items-center justify-center lg:flex-row lg:gap-5">
<LogInModal>
<SignInModal>
<button className={`${onHoverStyle}`}>Log in</button>
</LogInModal>
</SignInModal>
<SignUpModal>
<button className={outlineStyle}>Sign up</button>
</SignUpModal>
Expand Down
Loading
Loading