Skip to content

Commit

Permalink
Merge branch 'main' into feat-webhooks
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelhthomas committed Nov 11, 2023
2 parents 1ccf9ad + 1bafb9f commit 9a2c976
Show file tree
Hide file tree
Showing 42 changed files with 345 additions and 86 deletions.
12 changes: 10 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
"singleQuote": true,
"trailingComma": "none",
"printWidth": 88,
"plugins": ["prettier-plugin-svelte"],
"plugins": ["prettier-plugin-svelte", "@trivago/prettier-plugin-sort-imports"],
"pluginSearchDirs": ["."],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
"importOrder": [
"^(assert|buffer|child_process|cluster|crypto|dgram|dns|domain|events|fs|http|https|net|os|path|punycode|querystring|readline|stream|string_decoder|timers|tls|tty|url|util|v8|vm|zlib)",
"<THIRD_PARTY_MODULES>",
"^\\$lib/(.*)$",
"^[./]"
],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@sveltejs/kit": "^1.25.2",
"@tailwindcss/forms": "0.5.6",
"@tailwindcss/typography": "0.5.10",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/d3-scale-chromatic": "^3.0.1",
"@types/node": "20.8.6",
"@typescript-eslint/eslint-plugin": "^6.7.5",
Expand Down
215 changes: 215 additions & 0 deletions pnpm-lock.yaml

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

5 changes: 2 additions & 3 deletions src/hooks.client.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
// Initialize day.js and plugins
import { ArcElement, Chart, Tooltip } from 'chart.js';
import dayjs from 'dayjs';
import advancedFormat from 'dayjs/plugin/advancedFormat';
import quarterOfYear from 'dayjs/plugin/quarterOfYear';

// Initialize day.js and plugins
dayjs.extend(advancedFormat);
dayjs.extend(quarterOfYear);

// Initialize chart.js and plugins
import { Chart, ArcElement, Tooltip } from 'chart.js';

Chart.register(ArcElement);
Chart.register(Tooltip);
2 changes: 1 addition & 1 deletion src/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, it, expect } from 'vitest';
import { describe, expect, it } from 'vitest';

describe('sum test', () => {
it('adds 1 + 2 to equal 3', () => {
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/Alert.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<script lang="ts">
import { Alert } from 'flowbite-svelte';
import Icon from './Icon.svelte';
import type { AlertProps } from 'flowbite-svelte/dist/alert/Alert.svelte';
import { twMerge } from 'tailwind-merge';
import Icon from './Icon.svelte';
export let color: AlertProps['color'] = undefined;
export let icon: string | undefined = undefined;
export let label: string | undefined = undefined;
Expand Down
1 change: 1 addition & 0 deletions src/lib/components/Button.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script lang="ts">
import { Button } from 'flowbite-svelte';
import Icon from './Icon.svelte';
export let icon: string | null = null;
Expand Down
Loading

0 comments on commit 9a2c976

Please sign in to comment.