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

Begin Rework Search Filter + Bar, Adjust Styles on Header #93

Merged
merged 12 commits into from
Nov 24, 2024
Merged

Begin Rework Search Filter + Bar, Adjust Styles on Header #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b3a492
Begin Rework Search Filter + Bar, Adjust Styles on Header
banushi-a Nov 16, 2024
2760b33
Change Cycle/WorkModel to dropdowns + add search button since shi is …
banushi-a Nov 17, 2024
c1b3f1f
Search bar changes
banushi-a Nov 17, 2024
f0ea011
Lint...
banushi-a Nov 17, 2024
87f9d61
Lint again..
banushi-a Nov 17, 2024
82c0553
Merge branch 'main' into UpdateSearchBar
banushi-a Nov 23, 2024
a48d55d
Search Filters Populate Based on URL Search Params
banushi-a Nov 23, 2024
4cd269e
Rishi micromanaging (jk)
banushi-a Nov 23, 2024
403d423
Home page reroutes to roles
banushi-a Nov 23, 2024
045488f
Jank solution to reset select
banushi-a Nov 23, 2024
82482e8
Lint
banushi-a Nov 23, 2024
8df9768
Linting + Toast Issue
banushi-a 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
49 changes: 21 additions & 28 deletions apps/web/public/svg/hidingLogo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/web/src/app/(pages)/(dashboard)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default function Home() {
return (
<div className="flex h-[85vh] flex-col">
<div className="flex h-full flex-col items-center justify-center">
<SearchFilter />
<SearchFilter alternatePathname="/roles" />
</div>
</div>
);
Expand Down
26 changes: 10 additions & 16 deletions apps/web/src/app/(pages)/(dashboard)/roles/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,45 +47,39 @@ export default function Roles({
useEffect(() => {
setMounted(true);
}, []);

useEffect(() => {
if (!mounted) {
return;
}
if (!validationResult.success) {
if (mounted && !validationResult.success) {
toast({
title: "Invalid search params",
title: "Invalid Search Parameters",
description: validationResult.error.issues
.map((issue) => issue.message)
.join(", "),
variant: "destructive",
});
setMounted(false);
}
}, [
toast,
mounted,
validationResult.success,
validationResult.error?.issues,
]);
}, [toast, mounted, validationResult]);

const reviews = api.review.list.useQuery({
search: searchParams?.search,
options: validationResult.success ? validationResult.data : {},
});

const [selectedReview, setSelectedReview] = useState<ReviewType | undefined>(
reviews.data ? reviews.data[0] : undefined,
reviews.isSuccess ? reviews.data[0] : undefined,
);

useEffect(() => {
if (reviews.data) {
if (reviews.isSuccess) {
setSelectedReview(reviews.data[0]);
}
}, [reviews.data]);
}, [reviews.isSuccess, reviews.data]);

return (
<>
<SearchFilter search={searchParams?.search} />
{reviews.data && (
<SearchFilter search={searchParams?.search} {...validationResult.data} />
{reviews.isSuccess && (
<div className="mb-8 grid h-[70dvh] w-4/5 grid-cols-5 gap-4 lg:w-3/4">
<div className="col-span-2 gap-3 overflow-scroll pr-4">
{reviews.data.map((review, i) => {
Expand Down
19 changes: 9 additions & 10 deletions apps/web/src/app/_components/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ export default function Header({ session, auth }: HeaderProps) {
<header className="flex h-20 w-full grid-cols-3 items-center justify-between border-b border-b-[#9A9A9A] bg-white pr-2 drop-shadow-sm">
{/* Logo + Cooper */}
<Link href="/" className={cn("flex flex-grow items-end", outerWidth)}>
<div className="mx-4 flex min-h-20 items-end">
<div className="mx-4 flex h-20 items-end">
<Image
src="/svg/hidingLogo.svg"
height={150}
width={150}
alt="Logo Picture"
width={137}
height={60}
/>
</div>
<h1
Expand All @@ -46,25 +46,24 @@ export default function Header({ session, auth }: HeaderProps) {
</h1>
</Link>
{/* Centered Links */}
<div className="lg: mb-8 flex min-h-20 flex-shrink grid-cols-2 items-end justify-start gap-4 lg:gap-12">
<div className="flex min-h-20 flex-shrink grid-cols-2 items-end justify-start gap-4 lg:gap-12">
<Link href="/roles">
<h2
className={cn(
"font-semibold",
"mb-[1.375rem] font-semibold",
pathname.includes("roles") &&
"underline decoration-cooper-pink-500 decoration-[3px] underline-offset-[6px]",
"mb-0 after:mt-4 after:block after:h-1.5 after:w-full after:rounded-t-full after:bg-cooper-pink-500",
)}
>
{" "}
Jobs{" "}
Jobs
</h2>
</Link>
<Link href="/companies">
<h2
className={cn(
"font-semibold",
"mb-[1.375rem] font-semibold",
pathname.includes("companies") &&
"underline decoration-cooper-green-500 decoration-[3px] underline-offset-[6px]",
"mb-0 after:mt-4 after:block after:h-1.5 after:w-full after:rounded-t-full after:bg-cooper-green-500",
)}
>
Companies
Expand Down
Loading