From 6838e9672378988ba8e822e2609b3d80f4dc7ae2 Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Wed, 26 Jul 2023 11:47:18 -0500 Subject: [PATCH] Run yarn prettier, check it in CI (#192) --- .github/workflows/format.yml | 16 + .prettierignore | 6 + .vscode/settings.json | 4 +- src/App.test.tsx | 10 +- src/Auth.tsx | 24 +- src/colors.css | 478 ++++++++++++------------ src/components/Toggle/Toggle.module.css | 32 +- src/hooks/useBackdropHighlight.ts | 10 +- src/index.css | 10 +- src/index.tsx | 10 +- src/setupTests.ts | 3 +- src/useStore.ts | 37 +- 12 files changed, 338 insertions(+), 302 deletions(-) create mode 100644 .github/workflows/format.yml create mode 100644 .prettierignore diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml new file mode 100644 index 000000000..057e3984a --- /dev/null +++ b/.github/workflows/format.yml @@ -0,0 +1,16 @@ +# on pull requests, setup node, run `yarn prettier --check` + +name: Check formatting + +on: [pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '16.x' + - run: yarn install + - run: yarn prettier --check src diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..c63179e28 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,6 @@ +# Ignore artifacts: +build +coverage + +# Ignore Rust projects: +src/wasm-lib \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 95725b469..3702c0bb8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,7 @@ { "cSpell.words": [ "geos" - ] + ], + "editor.tabSize": 2, + "editor.insertSpaces": true, } \ No newline at end of file diff --git a/src/App.test.tsx b/src/App.test.tsx index 9728dcd27..324db079e 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react' import { App } from './App' -import { BrowserRouter } from 'react-router-dom'; +import { BrowserRouter } from 'react-router-dom' let listener: ((rect: any) => void) | undefined = undefined ;(global as any).ResizeObserver = class ResizeObserver { @@ -13,9 +13,11 @@ let listener: ((rect: any) => void) | undefined = undefined } test('renders learn react link', () => { - render( - - ) + render( + + + + ) const linkElement = screen.getByText(/Variables/i) expect(linkElement).toBeInTheDocument() }) diff --git a/src/Auth.tsx b/src/Auth.tsx index a094e14c9..f32fcb3bb 100644 --- a/src/Auth.tsx +++ b/src/Auth.tsx @@ -4,18 +4,14 @@ import withBaseUrl from './lib/withBaseURL' import { App } from './App' import { SetToken } from './components/TokenInput' import { useStore } from './useStore' -import { - createBrowserRouter, - redirect, - RouterProvider, -} from "react-router-dom" +import { createBrowserRouter, redirect, RouterProvider } from 'react-router-dom' import { ErrorPage } from './components/ErrorPage' import { Settings } from './routes/Settings' import Onboarding, { onboardingRoutes } from './routes/Onboarding' const router = createBrowserRouter([ { - path: "/", + path: '/', element: , errorElement: , loader: () => { @@ -23,28 +19,28 @@ const router = createBrowserRouter([ if (store === null) { return redirect('/onboarding') } else { - const status = (JSON.parse(store)).state.onboardingStatus + const status = JSON.parse(store).state.onboardingStatus if (status !== 'done' && status !== 'dismissed') { return redirect('/onboarding/' + status) } - } + } return null - } + }, }, { - path: "/settings", + path: '/settings', element: , }, { - path: "/onboarding", - element: , + path: '/onboarding', + element: , children: onboardingRoutes, - } + }, ]) export const Auth = () => { const { data: user } = useSWR(withBaseUrl('/user'), fetcher) as any - const {token} = useStore((s) => ({ + const { token } = useStore((s) => ({ token: s.token, })) diff --git a/src/colors.css b/src/colors.css index 43f59280b..2fc1b65be 100644 --- a/src/colors.css +++ b/src/colors.css @@ -1,263 +1,263 @@ :root { - /* + /* Generated using Catmosphere Theme Builder by KittyCAD https://catmosphere-theme-builder.vercel.app/?colors=%5B%7B%22from%22:%7B%22l%22:1,%22c%22:0.01,%22h%22:78%7D,%22to%22:%7B%22l%22:0.065,%22c%22:0.05,%22h%22:182.6%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.45,%22h%22:122.4%7D,%22to%22:%7B%22l%22:0.13,%22c%22:0.031,%22h%22:137.2%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.13,%22h%22:176%7D,%22to%22:%7B%22l%22:0.116,%22c%22:0.097,%22h%22:213.1%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.169,%22h%22:144.4%7D,%22to%22:%7B%22l%22:0.12,%22c%22:0.45,%22h%22:132.7%7D,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.087,%22h%22:261.6%7D,%22to%22:%7B%22l%22:0.22,%22c%22:0.084,%22h%22:275.5%7D,%22steps%22:12,%22uuid%22:%227tpx9pf1zd6%22%7D,%7B%22from%22:%7B%22l%22:0.954,%22c%22:0.108,%22h%22:280.6%7D,%22to%22:%7B%22l%22:0.166,%22c%22:0.188,%22h%22:263.8%7D,%22steps%22:12,%22uuid%22:%22vu652mebd3%22%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.115,%22h%22:0%7D,%22to%22:%7B%22l%22:0.096,%22c%22:0.261,%22h%22:302%7D,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.185,%22h%22:19.8%7D,%22to%22:%7B%22l%22:0.368,%22c%22:0.45,%22h%22:9.4%7D,%22steps%22:8,%22uuid%22:%22g05inkd34l%22%7D,%7B%22from%22:%7B%22l%22:0.912,%22c%22:0.139,%22h%22:87%7D,%22to%22:%7B%22l%22:0.502,%22c%22:0.45,%22h%22:97.7%7D,%22steps%22:8,%22uuid%22:%22l892hcw4ef%22%7D,%7B%22from%22:%7B%22l%22:0.89,%22c%22:0.16,%22h%22:143.4%7D,%22to%22:%7B%22l%22:0.466,%22c%22:0.208,%22h%22:147.7%7D,%22steps%22:8,%22uuid%22:%22hkd09y9ov4h%22%7D%5D */ - /* Chalkboard */ - --chalkboard-10: oklch(99.70% 0.008766 102.8deg); - --chalkboard-20: oklch(91.34% 0.009353 109.0deg); - --chalkboard-30: oklch(82.99% 0.009940 115.2deg); - --chalkboard-40: oklch(74.63% 0.01053 121.4deg); - --chalkboard-50: oklch(66.27% 0.01111 127.6deg); - --chalkboard-60: oklch(57.92% 0.01170 133.9deg); - --chalkboard-70: oklch(49.56% 0.01229 140.1deg); - --chalkboard-80: oklch(41.21% 0.01288 146.3deg); - --chalkboard-90: oklch(32.85% 0.01346 152.5deg); - --chalkboard-100: oklch(24.49% 0.01405 158.7deg); - --chalkboard-110: oklch(16.14% 0.01464 164.9deg); - --chalkboard-120: oklch(7.783% 0.01522 171.1deg); + /* Chalkboard */ + --chalkboard-10: oklch(99.7% 0.008766 102.8deg); + --chalkboard-20: oklch(91.34% 0.009353 109deg); + --chalkboard-30: oklch(82.99% 0.00994 115.2deg); + --chalkboard-40: oklch(74.63% 0.01053 121.4deg); + --chalkboard-50: oklch(66.27% 0.01111 127.6deg); + --chalkboard-60: oklch(57.92% 0.0117 133.9deg); + --chalkboard-70: oklch(49.56% 0.01229 140.1deg); + --chalkboard-80: oklch(41.21% 0.01288 146.3deg); + --chalkboard-90: oklch(32.85% 0.01346 152.5deg); + --chalkboard-100: oklch(24.49% 0.01405 158.7deg); + --chalkboard-110: oklch(16.14% 0.01464 164.9deg); + --chalkboard-120: oklch(7.783% 0.01522 171.1deg); - /* Energy */ - --energy-10: oklch(93.31% 0.2270 122.3deg); - --energy-20: oklch(86.01% 0.2092 123.6deg); - --energy-30: oklch(78.71% 0.1914 125.0deg); - --energy-40: oklch(71.41% 0.1736 126.3deg); - --energy-50: oklch(64.10% 0.1557 127.7deg); - --energy-60: oklch(56.80% 0.1379 129.1deg); - --energy-70: oklch(49.50% 0.1201 130.4deg); - --energy-80: oklch(42.20% 0.1023 131.8deg); - --energy-90: oklch(34.90% 0.08446 133.1deg); - --energy-100: oklch(27.60% 0.06664 134.5deg); - --energy-110: oklch(20.30% 0.04882 135.8deg); - --energy-120: oklch(13.00% 0.03100 137.2deg); + /* Energy */ + --energy-10: oklch(93.31% 0.227 122.3deg); + --energy-20: oklch(86.01% 0.2092 123.6deg); + --energy-30: oklch(78.71% 0.1914 125deg); + --energy-40: oklch(71.41% 0.1736 126.3deg); + --energy-50: oklch(64.1% 0.1557 127.7deg); + --energy-60: oklch(56.8% 0.1379 129.1deg); + --energy-70: oklch(49.5% 0.1201 130.4deg); + --energy-80: oklch(42.2% 0.1023 131.8deg); + --energy-90: oklch(34.9% 0.08446 133.1deg); + --energy-100: oklch(27.6% 0.06664 134.5deg); + --energy-110: oklch(20.3% 0.04882 135.8deg); + --energy-120: oklch(13% 0.031 137.2deg); - /* Liquid */ - --liquid-10: oklch(93.45% 0.1002 193.1deg); - --liquid-20: oklch(86.21% 0.09511 198.7deg); - --liquid-30: oklch(78.97% 0.09003 204.2deg); - --liquid-40: oklch(71.74% 0.08495 209.8deg); - --liquid-50: oklch(64.50% 0.07988 215.3deg); - --liquid-60: oklch(57.26% 0.07480 220.9deg); - --liquid-70: oklch(50.03% 0.06972 226.4deg); - --liquid-80: oklch(42.79% 0.06465 232.0deg); - --liquid-90: oklch(35.56% 0.05957 237.5deg); - --liquid-100: oklch(28.32% 0.05450 243.1deg); - --liquid-110: oklch(21.08% 0.04942 248.6deg); - --liquid-120: oklch(13.85% 0.04434 254.2deg); + /* Liquid */ + --liquid-10: oklch(93.45% 0.1002 193.1deg); + --liquid-20: oklch(86.21% 0.09511 198.7deg); + --liquid-30: oklch(78.97% 0.09003 204.2deg); + --liquid-40: oklch(71.74% 0.08495 209.8deg); + --liquid-50: oklch(64.5% 0.07988 215.3deg); + --liquid-60: oklch(57.26% 0.0748 220.9deg); + --liquid-70: oklch(50.03% 0.06972 226.4deg); + --liquid-80: oklch(42.79% 0.06465 232deg); + --liquid-90: oklch(35.56% 0.05957 237.5deg); + --liquid-100: oklch(28.32% 0.0545 243.1deg); + --liquid-110: oklch(21.08% 0.04942 248.6deg); + --liquid-120: oklch(13.85% 0.04434 254.2deg); - /* Fern */ - --fern-10: oklch(93.22% 0.1243 144.8deg); - --fern-20: oklch(86.59% 0.1193 144.6deg); - --fern-30: oklch(79.97% 0.1143 144.4deg); - --fern-40: oklch(73.34% 0.1093 144.2deg); - --fern-50: oklch(66.71% 0.1043 144.0deg); - --fern-60: oklch(60.09% 0.09927 143.8deg); - --fern-70: oklch(53.46% 0.09425 143.6deg); - --fern-80: oklch(46.83% 0.08924 143.3deg); - --fern-90: oklch(40.21% 0.08422 143.1deg); - --fern-100: oklch(33.58% 0.07920 142.9deg); - --fern-110: oklch(26.95% 0.07419 142.7deg); - --fern-120: oklch(20.33% 0.06917 142.5deg); + /* Fern */ + --fern-10: oklch(93.22% 0.1243 144.8deg); + --fern-20: oklch(86.59% 0.1193 144.6deg); + --fern-30: oklch(79.97% 0.1143 144.4deg); + --fern-40: oklch(73.34% 0.1093 144.2deg); + --fern-50: oklch(66.71% 0.1043 144deg); + --fern-60: oklch(60.09% 0.09927 143.8deg); + --fern-70: oklch(53.46% 0.09425 143.6deg); + --fern-80: oklch(46.83% 0.08924 143.3deg); + --fern-90: oklch(40.21% 0.08422 143.1deg); + --fern-100: oklch(33.58% 0.0792 142.9deg); + --fern-110: oklch(26.95% 0.07419 142.7deg); + --fern-120: oklch(20.33% 0.06917 142.5deg); - /* Cool */ - --cool-10: oklch(97.71% 0.03321 196.6deg); - --cool-20: oklch(90.82% 0.03783 203.8deg); - --cool-30: oklch(83.94% 0.04245 211.0deg); - --cool-40: oklch(77.06% 0.04706 218.1deg); - --cool-50: oklch(70.18% 0.05168 225.3deg); - --cool-60: oklch(63.29% 0.05630 232.5deg); - --cool-70: oklch(56.41% 0.06091 239.6deg); - --cool-80: oklch(49.53% 0.06553 246.8deg); - --cool-90: oklch(42.65% 0.07015 254.0deg); - --cool-100: oklch(35.76% 0.07477 261.2deg); - --cool-110: oklch(28.88% 0.07938 268.3deg); - --cool-120: oklch(22.00% 0.08400 275.5deg); + /* Cool */ + --cool-10: oklch(97.71% 0.03321 196.6deg); + --cool-20: oklch(90.82% 0.03783 203.8deg); + --cool-30: oklch(83.94% 0.04245 211deg); + --cool-40: oklch(77.06% 0.04706 218.1deg); + --cool-50: oklch(70.18% 0.05168 225.3deg); + --cool-60: oklch(63.29% 0.0563 232.5deg); + --cool-70: oklch(56.41% 0.06091 239.6deg); + --cool-80: oklch(49.53% 0.06553 246.8deg); + --cool-90: oklch(42.65% 0.07015 254deg); + --cool-100: oklch(35.76% 0.07477 261.2deg); + --cool-110: oklch(28.88% 0.07938 268.3deg); + --cool-120: oklch(22% 0.084 275.5deg); - /* River */ - --river-10: oklch(93.35% 0.03169 273.4deg); - --river-20: oklch(86.91% 0.04221 273.1deg); - --river-30: oklch(80.46% 0.05274 272.7deg); - --river-40: oklch(74.01% 0.06326 272.4deg); - --river-50: oklch(67.57% 0.07378 272.0deg); - --river-60: oklch(61.12% 0.08430 271.7deg); - --river-70: oklch(54.67% 0.09483 271.4deg); - --river-80: oklch(48.22% 0.1053 271.0deg); - --river-90: oklch(41.78% 0.1159 270.7deg); - --river-100: oklch(35.33% 0.1264 270.4deg); - --river-110: oklch(28.88% 0.1369 270.0deg); - --river-120: oklch(22.44% 0.1474 269.7deg); + /* River */ + --river-10: oklch(93.35% 0.03169 273.4deg); + --river-20: oklch(86.91% 0.04221 273.1deg); + --river-30: oklch(80.46% 0.05274 272.7deg); + --river-40: oklch(74.01% 0.06326 272.4deg); + --river-50: oklch(67.57% 0.07378 272deg); + --river-60: oklch(61.12% 0.0843 271.7deg); + --river-70: oklch(54.67% 0.09483 271.4deg); + --river-80: oklch(48.22% 0.1053 271deg); + --river-90: oklch(41.78% 0.1159 270.7deg); + --river-100: oklch(35.33% 0.1264 270.4deg); + --river-110: oklch(28.88% 0.1369 270deg); + --river-120: oklch(22.44% 0.1474 269.7deg); - /* Berry */ - --berry-10: oklch(93.77% 0.05212 329.0deg); - --berry-20: oklch(87.30% 0.05912 325.3deg); - --berry-30: oklch(80.82% 0.06612 321.6deg); - --berry-40: oklch(74.34% 0.07313 317.8deg); - --berry-50: oklch(67.86% 0.08013 314.1deg); - --berry-60: oklch(61.39% 0.08713 310.3deg); - --berry-70: oklch(54.91% 0.09413 306.6deg); - --berry-80: oklch(48.43% 0.1011 302.8deg); - --berry-90: oklch(41.95% 0.1081 299.1deg); - --berry-100: oklch(35.47% 0.1151 295.4deg); - --berry-110: oklch(29.00% 0.1221 291.6deg); - --berry-120: oklch(22.52% 0.1291 287.9deg); + /* Berry */ + --berry-10: oklch(93.77% 0.05212 329deg); + --berry-20: oklch(87.3% 0.05912 325.3deg); + --berry-30: oklch(80.82% 0.06612 321.6deg); + --berry-40: oklch(74.34% 0.07313 317.8deg); + --berry-50: oklch(67.86% 0.08013 314.1deg); + --berry-60: oklch(61.39% 0.08713 310.3deg); + --berry-70: oklch(54.91% 0.09413 306.6deg); + --berry-80: oklch(48.43% 0.1011 302.8deg); + --berry-90: oklch(41.95% 0.1081 299.1deg); + --berry-100: oklch(35.47% 0.1151 295.4deg); + --berry-110: oklch(29% 0.1221 291.6deg); + --berry-120: oklch(22.52% 0.1291 287.9deg); - /* Destroy */ - --destroy-10: oklch(88.21% 0.06281 14.85deg); - --destroy-20: oklch(83.23% 0.08511 16.91deg); - --destroy-30: oklch(78.25% 0.1074 18.96deg); - --destroy-40: oklch(73.27% 0.1297 21.01deg); - --destroy-50: oklch(68.29% 0.1520 23.07deg); - --destroy-60: oklch(63.31% 0.1743 25.12deg); - --destroy-70: oklch(58.33% 0.1966 27.18deg); - --destroy-80: oklch(53.35% 0.2189 29.23deg); + /* Destroy */ + --destroy-10: oklch(88.21% 0.06281 14.85deg); + --destroy-20: oklch(83.23% 0.08511 16.91deg); + --destroy-30: oklch(78.25% 0.1074 18.96deg); + --destroy-40: oklch(73.27% 0.1297 21.01deg); + --destroy-50: oklch(68.29% 0.152 23.07deg); + --destroy-60: oklch(63.31% 0.1743 25.12deg); + --destroy-70: oklch(58.33% 0.1966 27.18deg); + --destroy-80: oklch(53.35% 0.2189 29.23deg); - /* Warn */ - --warn-10: oklch(90.19% 0.1361 92.00deg); - --warn-20: oklch(84.60% 0.1388 84.84deg); - --warn-30: oklch(79.01% 0.1414 77.68deg); - --warn-40: oklch(73.42% 0.1440 70.52deg); - --warn-50: oklch(67.83% 0.1466 63.36deg); - --warn-60: oklch(62.24% 0.1492 56.20deg); - --warn-70: oklch(56.65% 0.1518 49.04deg); - --warn-80: oklch(51.06% 0.1544 41.88deg); + /* Warn */ + --warn-10: oklch(90.19% 0.1361 92deg); + --warn-20: oklch(84.6% 0.1388 84.84deg); + --warn-30: oklch(79.01% 0.1414 77.68deg); + --warn-40: oklch(73.42% 0.144 70.52deg); + --warn-50: oklch(67.83% 0.1466 63.36deg); + --warn-60: oklch(62.24% 0.1492 56.2deg); + --warn-70: oklch(56.65% 0.1518 49.04deg); + --warn-80: oklch(51.06% 0.1544 41.88deg); - /* Succeed */ - --succeed-10: oklch(89.00% 0.1600 143.4deg); - --succeed-20: oklch(83.23% 0.1608 143.3deg); - --succeed-30: oklch(77.46% 0.1616 143.1deg); - --succeed-40: oklch(71.69% 0.1623 143.0deg); - --succeed-50: oklch(65.92% 0.1631 142.9deg); - --succeed-60: oklch(60.16% 0.1639 142.8deg); - --succeed-70: oklch(54.39% 0.1647 142.6deg); - --succeed-80: oklch(48.62% 0.1654 142.5deg); + /* Succeed */ + --succeed-10: oklch(89% 0.16 143.4deg); + --succeed-20: oklch(83.23% 0.1608 143.3deg); + --succeed-30: oklch(77.46% 0.1616 143.1deg); + --succeed-40: oklch(71.69% 0.1623 143deg); + --succeed-50: oklch(65.92% 0.1631 142.9deg); + --succeed-60: oklch(60.16% 0.1639 142.8deg); + --succeed-70: oklch(54.39% 0.1647 142.6deg); + --succeed-80: oklch(48.62% 0.1654 142.5deg); - /* Base values for use with Tailwind. */ - /* Chalkboard */ - --_chalkboard-10: 99.70% 0.008766 102.8deg; - --_chalkboard-20: 91.34% 0.009353 109.0deg; - --_chalkboard-30: 82.99% 0.009940 115.2deg; - --_chalkboard-40: 74.63% 0.01053 121.4deg; - --_chalkboard-50: 66.27% 0.01111 127.6deg; - --_chalkboard-60: 57.92% 0.01170 133.9deg; - --_chalkboard-70: 49.56% 0.01229 140.1deg; - --_chalkboard-80: 41.21% 0.01288 146.3deg; - --_chalkboard-90: 32.85% 0.01346 152.5deg; - --_chalkboard-100: 24.49% 0.01405 158.7deg; - --_chalkboard-110: 16.14% 0.01464 164.9deg; - --_chalkboard-120: 7.783% 0.01522 171.1deg; + /* Base values for use with Tailwind. */ + /* Chalkboard */ + --_chalkboard-10: 99.7% 0.008766 102.8deg; + --_chalkboard-20: 91.34% 0.009353 109deg; + --_chalkboard-30: 82.99% 0.00994 115.2deg; + --_chalkboard-40: 74.63% 0.01053 121.4deg; + --_chalkboard-50: 66.27% 0.01111 127.6deg; + --_chalkboard-60: 57.92% 0.0117 133.9deg; + --_chalkboard-70: 49.56% 0.01229 140.1deg; + --_chalkboard-80: 41.21% 0.01288 146.3deg; + --_chalkboard-90: 32.85% 0.01346 152.5deg; + --_chalkboard-100: 24.49% 0.01405 158.7deg; + --_chalkboard-110: 16.14% 0.01464 164.9deg; + --_chalkboard-120: 7.783% 0.01522 171.1deg; - /* Energy */ - --_energy-10: 93.31% 0.2270 122.3deg; - --_energy-20: 86.01% 0.2092 123.6deg; - --_energy-30: 78.71% 0.1914 125.0deg; - --_energy-40: 71.41% 0.1736 126.3deg; - --_energy-50: 64.10% 0.1557 127.7deg; - --_energy-60: 56.80% 0.1379 129.1deg; - --_energy-70: 49.50% 0.1201 130.4deg; - --_energy-80: 42.20% 0.1023 131.8deg; - --_energy-90: 34.90% 0.08446 133.1deg; - --_energy-100: 27.60% 0.06664 134.5deg; - --_energy-110: 20.30% 0.04882 135.8deg; - --_energy-120: 13.00% 0.03100 137.2deg; + /* Energy */ + --_energy-10: 93.31% 0.227 122.3deg; + --_energy-20: 86.01% 0.2092 123.6deg; + --_energy-30: 78.71% 0.1914 125deg; + --_energy-40: 71.41% 0.1736 126.3deg; + --_energy-50: 64.1% 0.1557 127.7deg; + --_energy-60: 56.8% 0.1379 129.1deg; + --_energy-70: 49.5% 0.1201 130.4deg; + --_energy-80: 42.2% 0.1023 131.8deg; + --_energy-90: 34.9% 0.08446 133.1deg; + --_energy-100: 27.6% 0.06664 134.5deg; + --_energy-110: 20.3% 0.04882 135.8deg; + --_energy-120: 13% 0.031 137.2deg; - /* Liquid */ - --_liquid-10: 93.45% 0.1002 193.1deg; - --_liquid-20: 86.21% 0.09511 198.7deg; - --_liquid-30: 78.97% 0.09003 204.2deg; - --_liquid-40: 71.74% 0.08495 209.8deg; - --_liquid-50: 64.50% 0.07988 215.3deg; - --_liquid-60: 57.26% 0.07480 220.9deg; - --_liquid-70: 50.03% 0.06972 226.4deg; - --_liquid-80: 42.79% 0.06465 232.0deg; - --_liquid-90: 35.56% 0.05957 237.5deg; - --_liquid-100: 28.32% 0.05450 243.1deg; - --_liquid-110: 21.08% 0.04942 248.6deg; - --_liquid-120: 13.85% 0.04434 254.2deg; + /* Liquid */ + --_liquid-10: 93.45% 0.1002 193.1deg; + --_liquid-20: 86.21% 0.09511 198.7deg; + --_liquid-30: 78.97% 0.09003 204.2deg; + --_liquid-40: 71.74% 0.08495 209.8deg; + --_liquid-50: 64.5% 0.07988 215.3deg; + --_liquid-60: 57.26% 0.0748 220.9deg; + --_liquid-70: 50.03% 0.06972 226.4deg; + --_liquid-80: 42.79% 0.06465 232deg; + --_liquid-90: 35.56% 0.05957 237.5deg; + --_liquid-100: 28.32% 0.0545 243.1deg; + --_liquid-110: 21.08% 0.04942 248.6deg; + --_liquid-120: 13.85% 0.04434 254.2deg; - /* Fern */ - --_fern-10: 93.22% 0.1243 144.8deg; - --_fern-20: 86.59% 0.1193 144.6deg; - --_fern-30: 79.97% 0.1143 144.4deg; - --_fern-40: 73.34% 0.1093 144.2deg; - --_fern-50: 66.71% 0.1043 144.0deg; - --_fern-60: 60.09% 0.09927 143.8deg; - --_fern-70: 53.46% 0.09425 143.6deg; - --_fern-80: 46.83% 0.08924 143.3deg; - --_fern-90: 40.21% 0.08422 143.1deg; - --_fern-100: 33.58% 0.07920 142.9deg; - --_fern-110: 26.95% 0.07419 142.7deg; - --_fern-120: 20.33% 0.06917 142.5deg; + /* Fern */ + --_fern-10: 93.22% 0.1243 144.8deg; + --_fern-20: 86.59% 0.1193 144.6deg; + --_fern-30: 79.97% 0.1143 144.4deg; + --_fern-40: 73.34% 0.1093 144.2deg; + --_fern-50: 66.71% 0.1043 144deg; + --_fern-60: 60.09% 0.09927 143.8deg; + --_fern-70: 53.46% 0.09425 143.6deg; + --_fern-80: 46.83% 0.08924 143.3deg; + --_fern-90: 40.21% 0.08422 143.1deg; + --_fern-100: 33.58% 0.0792 142.9deg; + --_fern-110: 26.95% 0.07419 142.7deg; + --_fern-120: 20.33% 0.06917 142.5deg; - /* Cool */ - --_cool-10: 97.71% 0.03321 196.6deg; - --_cool-20: 90.82% 0.03783 203.8deg; - --_cool-30: 83.94% 0.04245 211.0deg; - --_cool-40: 77.06% 0.04706 218.1deg; - --_cool-50: 70.18% 0.05168 225.3deg; - --_cool-60: 63.29% 0.05630 232.5deg; - --_cool-70: 56.41% 0.06091 239.6deg; - --_cool-80: 49.53% 0.06553 246.8deg; - --_cool-90: 42.65% 0.07015 254.0deg; - --_cool-100: 35.76% 0.07477 261.2deg; - --_cool-110: 28.88% 0.07938 268.3deg; - --_cool-120: 22.00% 0.08400 275.5deg; + /* Cool */ + --_cool-10: 97.71% 0.03321 196.6deg; + --_cool-20: 90.82% 0.03783 203.8deg; + --_cool-30: 83.94% 0.04245 211deg; + --_cool-40: 77.06% 0.04706 218.1deg; + --_cool-50: 70.18% 0.05168 225.3deg; + --_cool-60: 63.29% 0.0563 232.5deg; + --_cool-70: 56.41% 0.06091 239.6deg; + --_cool-80: 49.53% 0.06553 246.8deg; + --_cool-90: 42.65% 0.07015 254deg; + --_cool-100: 35.76% 0.07477 261.2deg; + --_cool-110: 28.88% 0.07938 268.3deg; + --_cool-120: 22% 0.084 275.5deg; - /* River */ - --_river-10: 93.35% 0.03169 273.4deg; - --_river-20: 86.91% 0.04221 273.1deg; - --_river-30: 80.46% 0.05274 272.7deg; - --_river-40: 74.01% 0.06326 272.4deg; - --_river-50: 67.57% 0.07378 272.0deg; - --_river-60: 61.12% 0.08430 271.7deg; - --_river-70: 54.67% 0.09483 271.4deg; - --_river-80: 48.22% 0.1053 271.0deg; - --_river-90: 41.78% 0.1159 270.7deg; - --_river-100: 35.33% 0.1264 270.4deg; - --_river-110: 28.88% 0.1369 270.0deg; - --_river-120: 22.44% 0.1474 269.7deg; + /* River */ + --_river-10: 93.35% 0.03169 273.4deg; + --_river-20: 86.91% 0.04221 273.1deg; + --_river-30: 80.46% 0.05274 272.7deg; + --_river-40: 74.01% 0.06326 272.4deg; + --_river-50: 67.57% 0.07378 272deg; + --_river-60: 61.12% 0.0843 271.7deg; + --_river-70: 54.67% 0.09483 271.4deg; + --_river-80: 48.22% 0.1053 271deg; + --_river-90: 41.78% 0.1159 270.7deg; + --_river-100: 35.33% 0.1264 270.4deg; + --_river-110: 28.88% 0.1369 270deg; + --_river-120: 22.44% 0.1474 269.7deg; - /* Berry */ - --_berry-10: 93.77% 0.05212 329.0deg; - --_berry-20: 87.30% 0.05912 325.3deg; - --_berry-30: 80.82% 0.06612 321.6deg; - --_berry-40: 74.34% 0.07313 317.8deg; - --_berry-50: 67.86% 0.08013 314.1deg; - --_berry-60: 61.39% 0.08713 310.3deg; - --_berry-70: 54.91% 0.09413 306.6deg; - --_berry-80: 48.43% 0.1011 302.8deg; - --_berry-90: 41.95% 0.1081 299.1deg; - --_berry-100: 35.47% 0.1151 295.4deg; - --_berry-110: 29.00% 0.1221 291.6deg; - --_berry-120: 22.52% 0.1291 287.9deg; + /* Berry */ + --_berry-10: 93.77% 0.05212 329deg; + --_berry-20: 87.3% 0.05912 325.3deg; + --_berry-30: 80.82% 0.06612 321.6deg; + --_berry-40: 74.34% 0.07313 317.8deg; + --_berry-50: 67.86% 0.08013 314.1deg; + --_berry-60: 61.39% 0.08713 310.3deg; + --_berry-70: 54.91% 0.09413 306.6deg; + --_berry-80: 48.43% 0.1011 302.8deg; + --_berry-90: 41.95% 0.1081 299.1deg; + --_berry-100: 35.47% 0.1151 295.4deg; + --_berry-110: 29% 0.1221 291.6deg; + --_berry-120: 22.52% 0.1291 287.9deg; - /* Destroy */ - --_destroy-10: 88.21% 0.06281 14.85deg; - --_destroy-20: 83.23% 0.08511 16.91deg; - --_destroy-30: 78.25% 0.1074 18.96deg; - --_destroy-40: 73.27% 0.1297 21.01deg; - --_destroy-50: 68.29% 0.1520 23.07deg; - --_destroy-60: 63.31% 0.1743 25.12deg; - --_destroy-70: 58.33% 0.1966 27.18deg; - --_destroy-80: 53.35% 0.2189 29.23deg; + /* Destroy */ + --_destroy-10: 88.21% 0.06281 14.85deg; + --_destroy-20: 83.23% 0.08511 16.91deg; + --_destroy-30: 78.25% 0.1074 18.96deg; + --_destroy-40: 73.27% 0.1297 21.01deg; + --_destroy-50: 68.29% 0.152 23.07deg; + --_destroy-60: 63.31% 0.1743 25.12deg; + --_destroy-70: 58.33% 0.1966 27.18deg; + --_destroy-80: 53.35% 0.2189 29.23deg; - /* Warn */ - --_warn-10: 90.19% 0.1361 92.00deg; - --_warn-20: 84.60% 0.1388 84.84deg; - --_warn-30: 79.01% 0.1414 77.68deg; - --_warn-40: 73.42% 0.1440 70.52deg; - --_warn-50: 67.83% 0.1466 63.36deg; - --_warn-60: 62.24% 0.1492 56.20deg; - --_warn-70: 56.65% 0.1518 49.04deg; - --_warn-80: 51.06% 0.1544 41.88deg; + /* Warn */ + --_warn-10: 90.19% 0.1361 92deg; + --_warn-20: 84.6% 0.1388 84.84deg; + --_warn-30: 79.01% 0.1414 77.68deg; + --_warn-40: 73.42% 0.144 70.52deg; + --_warn-50: 67.83% 0.1466 63.36deg; + --_warn-60: 62.24% 0.1492 56.2deg; + --_warn-70: 56.65% 0.1518 49.04deg; + --_warn-80: 51.06% 0.1544 41.88deg; - /* Succeed */ - --_succeed-10: 89.00% 0.1600 143.4deg; - --_succeed-20: 83.23% 0.1608 143.3deg; - --_succeed-30: 77.46% 0.1616 143.1deg; - --_succeed-40: 71.69% 0.1623 143.0deg; - --_succeed-50: 65.92% 0.1631 142.9deg; - --_succeed-60: 60.16% 0.1639 142.8deg; - --_succeed-70: 54.39% 0.1647 142.6deg; - --_succeed-80: 48.62% 0.1654 142.5deg; -} \ No newline at end of file + /* Succeed */ + --_succeed-10: 89% 0.16 143.4deg; + --_succeed-20: 83.23% 0.1608 143.3deg; + --_succeed-30: 77.46% 0.1616 143.1deg; + --_succeed-40: 71.69% 0.1623 143deg; + --_succeed-50: 65.92% 0.1631 142.9deg; + --_succeed-60: 60.16% 0.1639 142.8deg; + --_succeed-70: 54.39% 0.1647 142.6deg; + --_succeed-80: 48.62% 0.1654 142.5deg; +} diff --git a/src/components/Toggle/Toggle.module.css b/src/components/Toggle/Toggle.module.css index 2bfaa8063..ff46fa25d 100644 --- a/src/components/Toggle/Toggle.module.css +++ b/src/components/Toggle/Toggle.module.css @@ -1,32 +1,32 @@ .toggle { - @apply flex items-center gap-2 w-fit; - --toggle-size: 1.25rem; - --padding: 0.25rem; + @apply flex items-center gap-2 w-fit; + --toggle-size: 1.25rem; + --padding: 0.25rem; } .toggle:focus-within > span { - @apply outline-none ring-2; + @apply outline-none ring-2; } .toggle input { - @apply sr-only; + @apply sr-only; } .toggle > span { - @apply relative rounded border border-chalkboard-110; - width: calc(2 * (var(--toggle-size) + var(--padding))); - height: calc(var(--toggle-size) + var(--padding)); + @apply relative rounded border border-chalkboard-110; + width: calc(2 * (var(--toggle-size) + var(--padding))); + height: calc(var(--toggle-size) + var(--padding)); } .toggle > span::after { - content: ''; - @apply absolute w-4 h-4 rounded-sm bg-chalkboard-110; - top: 50%; - left: 50%; - translate: calc(-100% - var(--padding)) -50%; - transition: translate 0.08s ease-out; + content: ''; + @apply absolute w-4 h-4 rounded-sm bg-chalkboard-110; + top: 50%; + left: 50%; + translate: calc(-100% - var(--padding)) -50%; + transition: translate 0.08s ease-out; } .toggle input:checked + span::after { - translate: calc(50% - var(--padding)) -50%; -} \ No newline at end of file + translate: calc(50% - var(--padding)) -50%; +} diff --git a/src/hooks/useBackdropHighlight.ts b/src/hooks/useBackdropHighlight.ts index 2aaa212a2..5c7f194b2 100644 --- a/src/hooks/useBackdropHighlight.ts +++ b/src/hooks/useBackdropHighlight.ts @@ -31,10 +31,12 @@ export function useBackdropHighlight(target: string): string { // initial setup of clip path useEffect(() => { if (!elem) { - const newElem = document.getElementById(target) - if (newElem === null) { - throw new Error(`Could not find element with id "${target}" to highlight`) - } + const newElem = document.getElementById(target) + if (newElem === null) { + throw new Error( + `Could not find element with id "${target}" to highlight` + ) + } setElem(document.getElementById(target)) return } diff --git a/src/index.css b/src/index.css index f144fe6d8..ec8f64e2c 100644 --- a/src/index.css +++ b/src/index.css @@ -5,7 +5,6 @@ @tailwind components; @tailwind utilities; - body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', @@ -25,12 +24,17 @@ code { monospace; } - #code-mirror-override .cm-focused .cm-cursor { width: 0px; } #code-mirror-override .cm-cursor { display: block; width: 200px; - background: linear-gradient(to right, rgb(0, 55, 94) 0%, #0084e2ff 2%, #0084e255 5%, transparent 100%); + background: linear-gradient( + to right, + rgb(0, 55, 94) 0%, + #0084e2ff 2%, + #0084e255 5%, + transparent 100% + ); } diff --git a/src/index.tsx b/src/index.tsx index b5a7d8c7e..2fef58c8a 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,10 +5,12 @@ import reportWebVitals from './reportWebVitals' import { Toaster } from 'react-hot-toast' const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement) -root.render(<> - - -) +root.render( + <> + + + +) // If you want to start measuring performance in your app, pass a function // to log results (for example: reportWebVitals(console.log)) diff --git a/src/setupTests.ts b/src/setupTests.ts index 88abbfeaa..9596e120c 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -3,8 +3,7 @@ import util from 'util' import fetch from 'isomorphic-fetch' class MockRTCPeerConnection { - constructor() { - } + constructor() {} createDataChannel() { return } diff --git a/src/useStore.ts b/src/useStore.ts index 62864dccf..b238be56f 100644 --- a/src/useStore.ts +++ b/src/useStore.ts @@ -15,7 +15,11 @@ import { recast } from './lang/recast' import { asyncLexer } from './lang/tokeniser' import { EditorSelection } from '@codemirror/state' import { BaseDirectory } from '@tauri-apps/api/fs' -import { ArtifactMap, SourceRangeMap, EngineCommandManager } from './lang/std/engineConnection' +import { + ArtifactMap, + SourceRangeMap, + EngineCommandManager, +} from './lang/std/engineConnection' export type Selection = { type: 'default' | 'line-end' | 'line-mid' @@ -159,9 +163,9 @@ export interface StoreState { setDefaultDir: (dir: DefaultDir) => void defaultProjectName: string setDefaultProjectName: (defaultProjectName: string) => void - defaultUnitSystem: UnitSystem, + defaultUnitSystem: UnitSystem setDefaultUnitSystem: (defaultUnitSystem: UnitSystem) => void - defaultBaseUnit: string, + defaultBaseUnit: string setDefaultBaseUnit: (defaultBaseUnit: string) => void showHomeMenu: boolean setHomeShowMenu: (showMenu: boolean) => void @@ -319,14 +323,15 @@ export const useStore = create()( setMediaStream: (mediaStream) => set({ mediaStream }), isStreamReady: false, setIsStreamReady: (isStreamReady) => set({ isStreamReady }), - + // tauri specific app settings defaultDir: { dir: '~/Documents/', }, setDefaultDir: (dir) => set({ defaultDir: dir }), defaultProjectName: 'new-project-$n', - setDefaultProjectName: (defaultProjectName) => set({ defaultProjectName }), + setDefaultProjectName: (defaultProjectName) => + set({ defaultProjectName }), defaultUnitSystem: 'imperial', setDefaultUnitSystem: (defaultUnitSystem) => set({ defaultUnitSystem }), defaultBaseUnit: 'in', @@ -346,16 +351,18 @@ export const useStore = create()( name: 'store', partialize: (state) => Object.fromEntries( - Object.entries(state).filter(([key]) => [ - 'code', - 'defaultDir', - 'defaultProjectName', - 'defaultUnitSystem', - 'defaultBaseUnit', - 'token', - 'debugPanel', - 'onboardingStatus', - ].includes(key)) + Object.entries(state).filter(([key]) => + [ + 'code', + 'defaultDir', + 'defaultProjectName', + 'defaultUnitSystem', + 'defaultBaseUnit', + 'token', + 'debugPanel', + 'onboardingStatus', + ].includes(key) + ) ), } )