Skip to content

Commit

Permalink
chore: run prettier (#41)
Browse files Browse the repository at this point in the history
* chore: run prettier

* chore: add prettierignore, revert readme changes
  • Loading branch information
KevinWu098 authored Jan 5, 2024
1 parent 7a5ac31 commit c87d241
Show file tree
Hide file tree
Showing 18 changed files with 495 additions and 482 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "next/core-web-vitals"
"extends": "next/core-web-vitals"
}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README.md
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# GE-Z

> ### The only tool built for University Students that finds online, <ins>
*articulatable*</ins> GE courses at California CCs
> ### The only tool built for University Students that finds online, <ins>_articulatable_</ins> GE courses at California CCs
<p align="center">
Built with: <br>
Expand Down Expand Up @@ -33,19 +32,19 @@ for university students.

### Currently Supports:

* UCI ✅
* UCSB ✅
- UCI ✅
- UCSB ✅

### In the Works:

* All UCs and CSUs
* Dark Mode 🐙
- All UCs and CSUs
- Dark Mode 🐙

## Features

* Search across universities and general education requirements
* Find courses eligible for instant enrollment, zero textbook fees, and more
* Sort courses by units, tuition, timeframe, and more!
- Search across universities and general education requirements
- Find courses eligible for instant enrollment, zero textbook fees, and more
- Sort courses by units, tuition, timeframe, and more!

## Screenshots

Expand All @@ -67,5 +66,6 @@ Access GE-Z live! Click this link: [GE-Z](https://ge-z.vercel.app)

See the backend here: [GE-Z Backend](https://github.com/laurelin60/GE-Z-Backend)

---------------
Made with ❤️ by Andrew Wang, Uno Pasadhika, Kevin Wu, Alan Tran
---

Made with ❤️ by Andrew Wang, Uno Pasadhika, Kevin Wu, Alan Tran
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ export default function Home() {
<main className="flex min-h-[calc(100vh-96px)] flex-col items-center">
<div className="wrapper mt-20 flex flex-col items-center gap-y-5 text-center md:mt-24">
<div className="flex flex-col items-center gap-y-5 text-center">
<h1 className="flex-center xs:text-5xl max-w-2xl flex-col text-4xl font-bold sm:text-6xl">
<h1 className="flex-center max-w-2xl flex-col text-4xl font-bold xs:text-5xl sm:text-6xl">
<span className="hidden md:flex">
Online, Async, and{" "}
</span>
<span className="flex text-center md:hidden">
Online, Async,
</span>
<span className="xs:text-6xl bg-gradient-to-r from-blue-500 to-purple-500 bg-clip-text text-5xl text-transparent sm:text-7xl md:text-8xl">
<span className="bg-gradient-to-r from-blue-500 to-purple-500 bg-clip-text text-5xl text-transparent xs:text-6xl sm:text-7xl md:text-8xl">
Articulatable
</span>
</h1>
Expand Down
32 changes: 16 additions & 16 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "app/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "app/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
12 changes: 5 additions & 7 deletions components/search/ScrollToTop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,15 @@ const ScrollToTop = () => {
return (
<div
className={`${
isVisible ? "visible opacity-60 hover:w-40 hover:opacity-100" : "opacity-0 invisible"
isVisible
? "visible opacity-60 hover:w-40 hover:opacity-100"
: "invisible opacity-0"
} group fixed bottom-4 right-4 z-50 flex h-11 w-11 cursor-pointer items-center justify-center rounded-full bg-primary px-3 transition-all`}
onClick={scrollToTop}
>
<div className="flex items-center justify-center">
<FaChevronUp style={{color: "white"}}/>
<span
className={
"hidden px-2 group-hover:inline-flex"
}
>
<FaChevronUp style={{ color: "white" }} />
<span className={"hidden px-2 group-hover:inline-flex"}>
<p className="line-clamp-1 overflow-hidden truncate text-clip font-medium tracking-wide text-white">
Back to top
</p>
Expand Down
4 changes: 2 additions & 2 deletions components/search/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ const Search = () => {
searchGE={ge}
/>
<div className="mt-8 flex flex-row gap-4 md:mt-16 md:gap-8">
<div className="bg-bg_secondary hidden h-fit rounded-xl p-8 xl:flex xl:flex-col">
<div className="hidden h-fit rounded-xl bg-bg_secondary p-8 xl:flex xl:flex-col">
<div className="mb-8 text-3xl font-medium">
Search Filters
</div>
Expand Down Expand Up @@ -317,7 +317,7 @@ const Search = () => {
</button>

<div className="flex items-center gap-4 md:flex-row">
<div className="text-gray hidden sm:flex">
<div className="hidden text-gray sm:flex">
Sort By:
</div>
<SortDropdown
Expand Down
93 changes: 47 additions & 46 deletions components/ui/button.tsx
Original file line number Diff line number Diff line change
@@ -1,56 +1,57 @@
import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"
import * as React from "react";
import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";

import { cn } from "@/lib/utils"
import { cn } from "@/lib/utils";

const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
{
variants: {
variant: {
default: "bg-primary text-primary-foreground hover:bg-primary/90",
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
},
size: {
default: "h-10 px-4 py-2",
sm: "h-9 rounded-md px-3",
lg: "h-11 rounded-md px-8",
icon: "h-10 w-10",
},
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
{
variants: {
variant: {
default:
"bg-primary text-primary-foreground hover:bg-primary/90",
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
},
size: {
default: "h-10 px-4 py-2",
sm: "h-9 rounded-md px-3",
lg: "h-11 rounded-md px-8",
icon: "h-10 w-10",
},
},
defaultVariants: {
variant: "default",
size: "default",
},
},
defaultVariants: {
variant: "default",
size: "default",
},
}
)
);

export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
}

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button"
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
)
}
)
Button.displayName = "Button"
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button";
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
);
},
);
Button.displayName = "Button";

export { Button, buttonVariants }
export { Button, buttonVariants };
125 changes: 66 additions & 59 deletions components/ui/card.tsx
Original file line number Diff line number Diff line change
@@ -1,79 +1,86 @@
import * as React from "react"
import * as React from "react";

import { cn } from "@/lib/utils"
import { cn } from "@/lib/utils";

const Card = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn(
"rounded-lg border bg-card text-card-foreground shadow-sm",
className
)}
{...props}
/>
))
Card.displayName = "Card"
<div
ref={ref}
className={cn(
"rounded-lg border bg-card text-card-foreground shadow-sm",
className,
)}
{...props}
/>
));
Card.displayName = "Card";

const CardHeader = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn("flex flex-col space-y-1.5 p-6", className)}
{...props}
/>
))
CardHeader.displayName = "CardHeader"
<div
ref={ref}
className={cn("flex flex-col space-y-1.5 p-6", className)}
{...props}
/>
));
CardHeader.displayName = "CardHeader";

const CardTitle = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
>(({ className, ...props }, ref) => (
<h3
ref={ref}
className={cn(
"text-2xl font-semibold leading-none tracking-tight",
className
)}
{...props}
/>
))
CardTitle.displayName = "CardTitle"
<h3
ref={ref}
className={cn(
"text-2xl font-semibold leading-none tracking-tight",
className,
)}
{...props}
/>
));
CardTitle.displayName = "CardTitle";

const CardDescription = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => (
<p
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
{...props}
/>
))
CardDescription.displayName = "CardDescription"
<p
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
{...props}
/>
));
CardDescription.displayName = "CardDescription";

const CardContent = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => (
<div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
))
CardContent.displayName = "CardContent"
<div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
));
CardContent.displayName = "CardContent";

const CardFooter = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn("flex items-center p-6 pt-0", className)}
{...props}
/>
))
CardFooter.displayName = "CardFooter"
<div
ref={ref}
className={cn("flex items-center p-6 pt-0", className)}
{...props}
/>
));
CardFooter.displayName = "CardFooter";

export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
export {
Card,
CardHeader,
CardFooter,
CardTitle,
CardDescription,
CardContent,
};
Loading

0 comments on commit c87d241

Please sign in to comment.