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.

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

chore: add prettier tailwind #14

Merged
merged 2 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/default-issue.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: Default Issue
about: Default template for issues
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

## Description

<! -- ### Deadline-->

## TODOs

- [ ] First
- [ ] Second
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"prettier-plugin-packagejson": "2.4.6",
"prettier-plugin-prisma": "5.0.0",
"prettier-plugin-svelte": "3.1.2",
"prettier-plugin-tailwindcss": "^0.5.9",
"prisma": "5.6.0",
"sst": "2.36.6",
"svelte": "4.2.7",
Expand Down
56 changes: 56 additions & 0 deletions pnpm-lock.yaml

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

7 changes: 6 additions & 1 deletion prettier.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
*/
const config = {
printWidth: 100,
plugins: ["prettier-plugin-packagejson", "prettier-plugin-prisma", "prettier-plugin-svelte"],
plugins: [
"prettier-plugin-packagejson",
"prettier-plugin-prisma",
"prettier-plugin-svelte",
"prettier-plugin-tailwindcss",
],
overrides: [{ files: "*.svelte", options: { parser: "svelte" } }],
};

Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/summary/GroupsCarousel.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import { groups } from "$lib/stores/summaryStores";
</script>

<div class="flex gap-2 overflow-x-auto md:gap-4 snap-x snap-mandatory scroll-smooth">
<div class="flex snap-x snap-mandatory gap-2 overflow-x-auto scroll-smooth md:gap-4">
{#each $groups as group (group.id)}
<a href={group.link} target="_blank" referrerpolicy="no-referrer">
<div
class="flex h-24 p-3 bg-center bg-cover rounded-lg md:h-36 snap-start w-36 md:w-64 card"
class="card flex h-24 w-36 snap-start rounded-lg bg-cover bg-center p-3 md:h-36 md:w-64"
style="background-image:url({group.img})"
>
<p class="mt-auto text-lg font-bold text-white md:text-xl line-clamp-2 max-h-12">
<p class="mt-auto line-clamp-2 max-h-12 text-lg font-bold text-white md:text-xl">
{group.name}
</p>
</div>
Expand Down
16 changes: 8 additions & 8 deletions src/lib/components/summary/ScheduledMeetingsList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,40 @@
</script>

{#each Object.keys(sortedMeetings) as date}
<div class="p-2 card variant-glass">
<div class="card variant-glass p-2">
<h2 class="mb-2 text-xl font-bold md:text-2xl">{convertIsoToWeekdayDate(date)}</h2>

<div class="flex flex-col gap-2">
{#each sortedMeetings[date] as meeting}
<div
class="flex flex-col justify-between gap-4 p-3 bg-center bg-cover rounded-lg md:items-center h-fit md:flex-row card hover:variant-ghost"
class="card flex h-fit flex-col justify-between gap-4 rounded-lg bg-cover bg-center p-3 hover:variant-ghost md:flex-row md:items-center"
>
<div class="flex flex-wrap items-center justify-between w-full gap-2">
<div class="flex w-full flex-wrap items-center justify-between gap-2">
<div class="flex flex-col gap-y-1">
<a href={meeting.link} target="_blank" referrerpolicy="no-referrer">
<p class="text-xl font-bold md:text-2xl line-clamp-1 max-h-12">
<p class="line-clamp-1 max-h-12 text-xl font-bold md:text-2xl">
{meeting.name}
</p>
</a>

<div class="flex flex-row flex-wrap gap-x-4">
<p class="flex items-center gap-1 text-md md:text-lg">
<p class="text-md flex items-center gap-1 md:text-lg">
<ClockIcon />
{convertTo12HourFormat(meeting.startTime)} - {convertTo12HourFormat(
meeting.endTime,
)}
</p>
<p class="flex items-center gap-1 text-md md:text-lg">
<p class="text-md flex items-center gap-1 md:text-lg">
<LocationIcon />
{meeting.location}
</p>
</div>
</div>
</div>

<div class="flex justify-center w-full md:w-fit">
<div class="flex w-full justify-center md:w-fit">
<RadioGroup
class="flex items-center h-fit w-fit"
class="flex h-fit w-fit items-center"
active="variant-filled-primary"
hover="hover:variant-soft-primary"
>
Expand Down
12 changes: 6 additions & 6 deletions src/lib/components/summary/UnscheduledMeetingsList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
<div class="flex flex-col gap-2">
{#each sortedMeetings as meeting}
<div
class="flex flex-col justify-between gap-4 p-3 bg-center bg-cover rounded-lg md:items-center h-fit md:flex-row card hover:variant-ghost"
class="card flex h-fit flex-col justify-between gap-4 rounded-lg bg-cover bg-center p-3 hover:variant-ghost md:flex-row md:items-center"
>
<div class="flex flex-wrap items-center justify-between w-full gap-2">
<div class="flex w-full flex-wrap items-center justify-between gap-2">
<div class="flex flex-col gap-y-1">
<a href={meeting.link} target="_blank" referrerpolicy="no-referrer">
<p class="text-xl font-bold md:text-2xl line-clamp-1 max-h-12">
<p class="line-clamp-1 max-h-12 text-xl font-bold md:text-2xl">
{meeting.name}
</p>
</a>

<div class="flex flex-row flex-wrap gap-x-4">
<p class="flex items-center gap-1 text-md md:text-lg">
<p class="text-md flex items-center gap-1 md:text-lg">
<CalendarIcon />
{convertIsoToDate(meeting.startDate)} - {convertIsoToDate(meeting.endDate)}
</p>
<p class="flex items-center gap-1 text-md md:text-lg">
<p class="text-md flex items-center gap-1 md:text-lg">
<ClockIcon />
{convertTo12HourFormat(meeting.startTime)} - {convertTo12HourFormat(meeting.endTime)}
</p>
<p class="flex items-center gap-1 text-md md:text-lg">
<p class="text-md flex items-center gap-1 md:text-lg">
<LocationIcon />
{meeting.location}
</p>
Expand Down
4 changes: 2 additions & 2 deletions src/routes/summary/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

<div class="flex flex-col gap-8 px-4 pt-8 md:px-32">
<div class="flex flex-col gap-4">
<h1 class="text-4xl font-bold border-b border-surface-400-500-token">Groups</h1>
<h1 class="border-surface-400-500-token border-b text-4xl font-bold">Groups</h1>
<GroupList />
</div>

<div class="flex flex-col gap-4">
<TabGroup>
<div class="flex flex-col w-full gap-x-10 gap-y-2">
<div class="flex w-full flex-col gap-x-10 gap-y-2">
<h1 class="text-4xl font-bold">Meetings</h1>
<div class="flex justify-center gap-5">
<Tab bind:group={tabSet} name="scheduledTab" value={0}>Scheduled</Tab>
Expand Down