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

[CFD-194] Invite New User Page #527

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[CFD-194] Invite New User Page #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28b3b36
create invite new user page
elsiezhu Jan 23, 2025
14c8064
add form fields
elsiezhu Jan 23, 2025
dd5e99a
fix formatting errors
elsiezhu Jan 23, 2025
4b7647a
change css to tailwind and move navbar into separate component
elsiezhu Feb 3, 2025
8d887f1
Merge branch 'main' into elsiezhu/cfd-194-invite-new-user-page
elsiezhu Feb 3, 2025
9385840
add navbar to posts page
elsiezhu Feb 3, 2025
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
33 changes: 33 additions & 0 deletions apps/nextjs/src/components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from "react";
import { SignInButton, useAuth, UserButton } from "@clerk/nextjs";

export default function NavBar() {
const { isSignedIn } = useAuth();

return (
<div className="sticky top-0 m-0 flex max-w-[40%] flex-col justify-between bg-[#EFF2FB] p-[16px_40px]">
{isSignedIn ? "" : <SignInButton />}
<UserButton afterSignOutUrl="/" showName />
<nav style={{ display: "flex", flexDirection: "column" }}>
<button className="m-2 rounded-[24px] border border-[#2E4D90] bg-[#2E4D90] p-2 text-white">
<a href="/posts/">Forum</a>
</button>
<button className="m-2 rounded-[24px] border border-[#2E4D90] p-2">
<a href="/announcements/">Announcements</a>
</button>
<button className="m-2 rounded-[24px] border border-[#2E4D90] p-2">
<a href="/absences/">Absentees</a>
</button>
<button className="m-2 rounded-[24px] border border-[#2E4D90] p-2">
<a href="/activities/">Calendar</a>
</button>
<button className="m-2 rounded-[24px] border border-[#2E4D90] p-2">
<a href="/inviteuser/">Invite New User</a>
</button>
</nav>
<button className="m-2 rounded-[24px] border border-[#2E4D90] p-2">
<a href="/">Create New</a>
</button>
</div>
);
}
42 changes: 42 additions & 0 deletions apps/nextjs/src/pages/inviteuser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from "react";

import NavBar from "~/components/navbar";

export default function InviteUser() {
return (
<div className="absolute bottom-0 top-0 flex w-full">
<NavBar />
<div className="flex w-full flex-col justify-center">
<div className="pb-9 text-center text-2xl">Invite new user</div>
<form
onSubmit={(e) => e.preventDefault()}
className="flex flex-col justify-center pb-4"
>
<div className="mx-auto flex w-1/2 flex-col justify-center pb-6">
<label htmlFor="email" className="text-base text-black">
Email
</label>
<input
type="text"
id="email"
className="rounded-[10px] bg-[#EFF2FB] p-2"
/>
</div>
<div className="mx-auto flex w-1/2 flex-col justify-center pb-8">
<label htmlFor="password" className="text-base text-black">
Temporary Password
</label>
<input
type="password"
id="password"
className="rounded-[10px] bg-[#EFF2FB] p-2"
/>
</div>
<button className="mx-auto w-1/2 rounded-2xl bg-[#2E4D90] p-2 text-white">
Invite
</button>
</form>
</div>
</div>
);
}
29 changes: 2 additions & 27 deletions apps/nextjs/src/pages/posts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { SignInButton, useAuth, UserButton } from "@clerk/nextjs";

import NavBar from "~/components/navbar";
import { api } from "~/utils/api";
import Post from "../components/post";

Expand All @@ -18,34 +18,9 @@ function Posts() {
setMyPostToggle(false);
};

const { isSignedIn } = useAuth();

return (
<div className="absolute bottom-0 top-0 flex w-full">
<div className="sticky top-0 flex max-w-[40%] flex-col justify-between bg-[#EFF2FB] p-4">
{isSignedIn ? "" : <SignInButton />}
<UserButton afterSignOutUrl="/" showName />
<nav className="flex flex-col">
<button className="m-2 rounded-3xl border border-[#2E4D90] bg-[#2E4D90] p-2 text-white">
<a href="/posts/">Forum</a>
</button>
<button className="m-2 rounded-3xl border border-[#2E4D90] p-2">
<a href="/announcements/">Announcements</a>
</button>
<button className="m-2 rounded-3xl border border-[#2E4D90] p-2">
<a href="/absences/">Absentees</a>
</button>
<button className="m-2 rounded-3xl border border-[#2E4D90] p-2">
<a href="/activities/">Calendar</a>
</button>
<button className="m-2 rounded-3xl border border-[#2E4D90] p-2">
<a href="/activities/">Invite New User</a>
</button>
</nav>
<button className="m-2 rounded-3xl border border-[#2E4D90] p-2">
<a href="/activities/">Create New</a>
</button>
</div>
<NavBar />
<div className="flex w-full flex-col items-center pt-6">
<div className="m-2 w-max self-center rounded-3xl border border-[#2E4D90]">
{myPostToggle ? (
Expand Down