From ee0c4b2823107e1f4a1313817c71136e9192f62b Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Tue, 26 Dec 2023 00:40:21 -0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=F0=9F=94=A7=20add=20prettier=20ta?= =?UTF-8?q?ilwind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 56 +++++++++++++++++++++++++++++++++++++++++++++ prettier.config.cjs | 7 +++++- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index da204318..5703269d 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ecf6164d..f029ab07 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -109,6 +109,9 @@ devDependencies: prettier-plugin-svelte: specifier: 3.1.2 version: 3.1.2(prettier@3.1.0)(svelte@4.2.7) + prettier-plugin-tailwindcss: + specifier: ^0.5.9 + version: 0.5.9(prettier-plugin-svelte@3.1.2)(prettier@3.1.0) prisma: specifier: 5.6.0 version: 5.6.0 @@ -7883,6 +7886,59 @@ packages: svelte: 4.2.7 dev: true + /prettier-plugin-tailwindcss@0.5.9(prettier-plugin-svelte@3.1.2)(prettier@3.1.0): + resolution: {integrity: sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==} + engines: {node: '>=14.21.3'} + peerDependencies: + '@ianvs/prettier-plugin-sort-imports': '*' + '@prettier/plugin-pug': '*' + '@shopify/prettier-plugin-liquid': '*' + '@trivago/prettier-plugin-sort-imports': '*' + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-css-order: '*' + prettier-plugin-import-sort: '*' + prettier-plugin-jsdoc: '*' + prettier-plugin-marko: '*' + prettier-plugin-organize-attributes: '*' + prettier-plugin-organize-imports: '*' + prettier-plugin-style-order: '*' + prettier-plugin-svelte: '*' + prettier-plugin-twig-melody: '*' + peerDependenciesMeta: + '@ianvs/prettier-plugin-sort-imports': + optional: true + '@prettier/plugin-pug': + optional: true + '@shopify/prettier-plugin-liquid': + optional: true + '@trivago/prettier-plugin-sort-imports': + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-css-order: + optional: true + prettier-plugin-import-sort: + optional: true + prettier-plugin-jsdoc: + optional: true + prettier-plugin-marko: + optional: true + prettier-plugin-organize-attributes: + optional: true + prettier-plugin-organize-imports: + optional: true + prettier-plugin-style-order: + optional: true + prettier-plugin-svelte: + optional: true + prettier-plugin-twig-melody: + optional: true + dependencies: + prettier: 3.1.0 + prettier-plugin-svelte: 3.1.2(prettier@3.1.0)(svelte@4.2.7) + dev: true + /prettier@3.1.0: resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} diff --git a/prettier.config.cjs b/prettier.config.cjs index d5d22d34..5b566a06 100644 --- a/prettier.config.cjs +++ b/prettier.config.cjs @@ -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" } }], }; From 3d5d3c0d143a628759a868482339c1f4a76ee397 Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Tue, 26 Dec 2023 00:41:19 -0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=F0=9F=8E=A8=20ran=20`pnpm=20forma?= =?UTF-8?q?t`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/default-issue.md | 8 ++++---- src/lib/components/summary/GroupsCarousel.svelte | 6 +++--- .../summary/ScheduledMeetingsList.svelte | 16 ++++++++-------- .../summary/UnscheduledMeetingsList.svelte | 12 ++++++------ src/routes/summary/+page.svelte | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/default-issue.md b/.github/ISSUE_TEMPLATE/default-issue.md index a52e3236..3b227c69 100644 --- a/.github/ISSUE_TEMPLATE/default-issue.md +++ b/.github/ISSUE_TEMPLATE/default-issue.md @@ -1,10 +1,9 @@ --- name: Default Issue about: Default template for issues -title: '' -labels: '' -assignees: '' - +title: "" +labels: "" +assignees: "" --- ## Description @@ -12,5 +11,6 @@ assignees: '' ## TODOs + - [ ] First - [ ] Second diff --git a/src/lib/components/summary/GroupsCarousel.svelte b/src/lib/components/summary/GroupsCarousel.svelte index 194a3573..69121f14 100644 --- a/src/lib/components/summary/GroupsCarousel.svelte +++ b/src/lib/components/summary/GroupsCarousel.svelte @@ -2,14 +2,14 @@ import { groups } from "$lib/stores/summaryStores"; -
+
{#each $groups as group (group.id)}
-

+

{group.name}

diff --git a/src/lib/components/summary/ScheduledMeetingsList.svelte b/src/lib/components/summary/ScheduledMeetingsList.svelte index 5fce228b..eb19d8ce 100644 --- a/src/lib/components/summary/ScheduledMeetingsList.svelte +++ b/src/lib/components/summary/ScheduledMeetingsList.svelte @@ -14,30 +14,30 @@ {#each Object.keys(sortedMeetings) as date} -
+

{convertIsoToWeekdayDate(date)}

{#each sortedMeetings[date] as meeting}
-
+
-

+

{meeting.name}

-

+

{convertTo12HourFormat(meeting.startTime)} - {convertTo12HourFormat( meeting.endTime, )}

-

+

{meeting.location}

@@ -45,9 +45,9 @@
-
+
diff --git a/src/lib/components/summary/UnscheduledMeetingsList.svelte b/src/lib/components/summary/UnscheduledMeetingsList.svelte index 3bd873a6..c87491bc 100644 --- a/src/lib/components/summary/UnscheduledMeetingsList.svelte +++ b/src/lib/components/summary/UnscheduledMeetingsList.svelte @@ -15,26 +15,26 @@
{#each sortedMeetings as meeting}
-
+
-

+

{meeting.name}

-

+

{convertIsoToDate(meeting.startDate)} - {convertIsoToDate(meeting.endDate)}

-

+

{convertTo12HourFormat(meeting.startTime)} - {convertTo12HourFormat(meeting.endTime)}

-

+

{meeting.location}

diff --git a/src/routes/summary/+page.svelte b/src/routes/summary/+page.svelte index 590b149e..3da25820 100644 --- a/src/routes/summary/+page.svelte +++ b/src/routes/summary/+page.svelte @@ -12,13 +12,13 @@
-

Groups

+

Groups

-
+

Meetings

Scheduled