Skip to content

Begin Reworking New Review Button #197

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.

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

Merged
merged 12 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
12 changes: 6 additions & 6 deletions apps/web/public/svg/hidingLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions apps/web/src/app/(pages)/(dashboard)/(roles)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function Roles() {
{roles.isSuccess && roles.data.length > 0 && (
<div className="flex h-[86dvh] w-full lg:h-[92dvh]">
{/* TODO: Confirm what background color we want to use here with the designers */}
<div className="w-[28%] gap-3 overflow-auto rounded-tr-lg border-r-[0.75px] border-t-[0.75px] border-cooper-gray-300 bg-cooper-gray-100 p-5 xl:rounded-none">
<div className="w-[28%] gap-3 overflow-y-auto rounded-tr-lg border-r-[0.75px] border-t-[0.75px] border-cooper-gray-300 bg-cooper-gray-100 p-5 xl:rounded-none">
<div className="text-right">
<DropdownMenu>
<DropdownMenuTrigger className="text-md mb-2">
Expand Down Expand Up @@ -103,7 +103,7 @@ export default function Roles() {
);
})}
</div>
<div className="col-span-3 w-[72%] overflow-auto p-1">
<div className="col-span-3 w-[72%] overflow-y-auto p-1">
{roles.data.length > 0 && roles.data[0] && (
<RoleInfo roleObj={selectedRole ?? roles.data[0]} />
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/(pages)/(dashboard)/(roles)/role/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Role() {
return (
<>
{role.isSuccess && (
<div className="col-span-3 w-[72%] overflow-auto p-1">
<div className="col-span-3 w-[72%] overflow-y-auto p-1">
<RoleInfo roleObj={role.data as RoleType} />
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function Company() {
return (
<>
{company.isSuccess ? (
<div className="mx-auto h-[86dvh] w-full max-w-[66dvw] justify-center gap-4 overflow-auto font-sans">
<div className="mx-auto h-[86dvh] w-full max-w-[66dvw] justify-center gap-4 overflow-y-auto font-sans">
<div className="mb-6 mt-6 flex items-center justify-between">
<div className="flex items-center">
<div className="mr-3 flex h-16 w-16 items-center justify-center">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/(pages)/(protected)/profile/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Image from "next/image";
import { redirect } from "next/navigation";

import HeaderLayout from "~/app/_components/header-layout";
import { NewReviewDialog } from "~/app/_components/reviews/new-review-dialogue";
import { NewReviewDialog } from "~/app/_components/reviews/new-review/new-review-dialogue";
import { ReviewCard } from "~/app/_components/reviews/review-card";
import { api } from "~/trpc/server";

Expand All @@ -18,7 +18,7 @@ export default async function Profile() {

return (
<HeaderLayout>
<div className="mx-4 mt-4 flex h-full flex-col gap-8 overflow-auto">
<div className="mx-4 mt-4 flex h-full flex-col gap-8 overflow-y-auto">
<div className="flex items-end justify-start gap-4">
<Image
src={session.user.image ?? "/svg/defaultProfile.svg"}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/_components/companies/company-about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function CompanyAbout({ companyObj }: CompanyAboutProps) {
About {companyObj?.name}
</CardTitle>
</CardHeader>
<CardContent className="h-40 overflow-scroll rounded-b-lg pt-6">
<CardContent className="h-40 overflow-y-scroll rounded-b-lg pt-6">
<p>{companyObj?.description}</p>
</CardContent>
</Card>
Expand Down
13 changes: 11 additions & 2 deletions apps/web/src/app/_components/companies/company-card-preview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { CompanyType } from "@cooper/db/schema";
import { cn } from "@cooper/ui";
import { Card, CardContent, CardHeader, CardTitle } from "@cooper/ui/card";
import Logo from "@cooper/ui/logo";

Expand All @@ -11,13 +12,21 @@ interface CompanyCardPreviewProps {
companyObj: CompanyType;
}

export function CompanyCardPreview({ companyObj }: CompanyCardPreviewProps) {
export function CompanyCardPreview({
companyObj,
className,
}: CompanyCardPreviewProps) {
const locations = api.companyToLocation.getLocationsByCompanyId.useQuery({
companyId: companyObj.id,
});

return (
<Card className="flex h-[26rem] w-[100%] flex-col justify-between overflow-hidden rounded-lg border-[0.75px] border-cooper-gray-400">
<Card
className={cn(
"flex h-[26rem] w-[100%] flex-col justify-between overflow-hidden rounded-lg border-[0.75px] border-cooper-gray-400",
className,
)}
>
<div>
<CardHeader className="pb-3">
<div className="flex items-center justify-start space-x-4">
Expand Down
28 changes: 14 additions & 14 deletions apps/web/src/app/_components/form/review-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ const steps: {
{
label: "Co-op Cycle",
fields: ["workTerm", "workYear"],
borderColor: "border-cooper-yellow-500",
textColor: "text-cooper-yellow-500",
bgColor: "bg-cooper-yellow-500",
borderColor: "border-cooper-blue-800",
textColor: "text-cooper-gray-400",
bgColor: "bg-cooper-blue-800",
},
{
label: "Ratings",
Expand All @@ -173,16 +173,16 @@ const steps: {
"interviewDifficulty",
"interviewReview",
],
borderColor: "border-cooper-yellow-600",
textColor: "text-cooper-yellow-600",
bgColor: "bg-cooper-yellow-600",
borderColor: "border-cooper-blue-800",
textColor: "text-cooper-gray-400",
bgColor: "bg-cooper-blue-800",
},
{
label: "Review",
fields: ["reviewHeadline", "textReview", "locationId", "hourlyPay"],
borderColor: "border-cooper-green-500",
textColor: "text-cooper-green-500",
bgColor: "bg-cooper-green-500",
borderColor: "border-cooper-blue-800",
textColor: "text-cooper-gray-400",
bgColor: "bg-cooper-blue-800",
},
{
label: "Company Details",
Expand All @@ -198,7 +198,7 @@ const steps: {
"otherBenefits",
],
borderColor: "border-cooper-blue-800",
textColor: "text-cooper-blue-800",
textColor: "text-cooper-gray-400",
bgColor: "bg-cooper-blue-800",
},
];
Expand Down Expand Up @@ -357,13 +357,13 @@ export function ReviewForm(props: ReviewFormProps) {
height={100}
className="max-w-full xl:hidden"
/>
<div className="z-10 -mb-4 h-4 w-full rounded-t-lg bg-cooper-blue-600" />
<div className="flex w-full items-center justify-center rounded-lg bg-white px-4 py-16 text-center text-cooper-blue-600 outline outline-2 outline-cooper-blue-600 md:py-20 xl:pl-24 xl:text-start">
<div className="z-10 -mb-4 h-4 w-full rounded-t-lg bg-cooper-blue-800" />
<div className="flex w-full items-center justify-center rounded-lg bg-white px-4 py-16 text-center text-cooper-gray-400 outline outline-2 outline-cooper-blue-800 md:py-20 xl:pl-24 xl:text-start">
<div className="flex flex-col items-center space-y-6 xl:items-start">
<h1 className="text-2xl font-bold text-cooper-blue-600 md:text-4xl">
<h1 className="border-cooper-gray-300 text-2xl font-bold md:text-4xl">
Submit a Co-op Review!
</h1>
<p className="text-lg text-cooper-blue-600 md:text-2xl">
<p className="border-cooper-gray-300 text-lg md:text-2xl">
Thank you for taking the time to leave a review of your co-op
experience! Join others in the Northeastern community and help
people like yourself make the right career decision.
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/_components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { usePathname } from "next/navigation";
import { cn } from "@cooper/ui";

import CooperLogo from "./cooper-logo";
import { NewReviewDialog } from "./reviews/new-review-dialogue";
import { NewReviewDialog } from "./reviews/new-review/new-review-dialogue";
import SearchFilter from "./search/search-filter";

interface HeaderProps {
Expand Down
38 changes: 38 additions & 0 deletions apps/web/src/app/_components/onboarding/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,44 @@ export const monthOptions = [
{ value: "12", label: "December" },
];

export const industryOptions = [
{ value: "TECHNOLOGY", label: "Technology" },
{ value: "HEALTHCARE", label: "Healthcare" },
{ value: "FINANCE", label: "Finance" },
{ value: "EDUCATION", label: "Education" },
{ value: "MANUFACTURING", label: "Manufacturing" },
{ value: "HOSPITALITY", label: "Hospitality" },
{ value: "RETAIL", label: "Retail" },
{ value: "TRANSPORTATION", label: "Transportation" },
{ value: "ENERGY", label: "Energy" },
{ value: "MEDIA", label: "Media" },
{ value: "AEROSPACE", label: "Aerospace" },
{ value: "TELECOMMUNICATIONS", label: "Telecommunications" },
{ value: "BIOTECHNOLOGY", label: "Biotechnology" },
{ value: "PHARMACEUTICAL", label: "Pharmaceutical" },
{ value: "CONSTRUCTION", label: "Construction" },
{ value: "REALESTATE", label: "Real Estate" },
{ value: "FASHIONANDBEAUTY", label: "Fashion and Beauty" },
{ value: "ENTERTAINMENT", label: "Entertainment" },
{ value: "GOVERNMENT", label: "Government" },
{ value: "NONPROFIT", label: "Nonprofit" },
{ value: "FOODANDBEVERAGE", label: "Food and Beverage" },
{ value: "GAMING", label: "Gaming" },
{ value: "SPORTS", label: "Sports" },
{ value: "MARKETING", label: "Marketing" },
{ value: "CONSULTING", label: "Consulting" },
{ value: "FITNESS", label: "Fitness" },
{ value: "ECOMMERCE", label: "Ecommerce" },
{ value: "ENVIRONMENTAL", label: "Environmental" },
{ value: "ROBOTICS", label: "Robotics" },
{ value: "MUSIC", label: "Music" },
{ value: "INSURANCE", label: "Insurance" },
{ value: "DESIGN", label: "Design" },
{ value: "PUBLISHING", label: "Publishing" },
{ value: "ARCHITECTURE", label: "Architecture" },
{ value: "VETERINARY", label: "Veterinary" },
];

// use this api to update majors: https://api.graduatenu.com/api/majors/supportedMajors
export const majors = [
"Africana Studies and English, BA",
Expand Down
154 changes: 0 additions & 154 deletions apps/web/src/app/_components/reviews/new-review-dialogue.tsx

This file was deleted.

Loading