OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

metaverse platform project


Commit MetaInfo

修订版382867966b48127498e2f4589972eb7266b4df6b (tree)
时间2023-01-10 14:29:02
作者Nknight AMAMIYA <88763245+NknightA@user...>
CommiterNknight AMAMIYA

Log Message

Merge branch 'test-style'

fix merge conflict

更改概述

  • modified: package-lock.json (diff)
  • modified: package.json (diff)
  • delete: pages/_app.tsx
  • delete: pages/component/IndexWidgets/IndexWidgets.tsx
  • delete: pages/component/UIs.module.css
  • delete: pages/component/UIs.module.css.map
  • delete: pages/component/UIs.module.sass
  • delete: pages/component/Uis.tsx
  • delete: pages/getWindow/getWindowSize.tsx
  • delete: pages/index.tsx
  • delete: pages/styles/global.css
  • delete: pages/styles/global.css.map
  • delete: pages/styles/global.sass

差异

--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,403 @@
2828 "typescript": "4.9.4"
2929 },
3030 "devDependencies": {
31- "nodemon": "^2.0.20"
31+ "autoprefixer": "^10.4.13",
32+ "nodemon": "^2.0.20",
33+ "postcss": "^8.4.21",
34+ "tailwindcss": "^3.2.4"
35+ }
36+ },
37+ "node_modules/@ampproject/remapping": {
38+ "version": "2.2.0",
39+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
40+ "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
41+ "peer": true,
42+ "dependencies": {
43+ "@jridgewell/gen-mapping": "^0.1.0",
44+ "@jridgewell/trace-mapping": "^0.3.9"
45+ },
46+ "engines": {
47+ "node": ">=6.0.0"
48+ }
49+ },
50+ "node_modules/@babel/code-frame": {
51+ "version": "7.18.6",
52+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
53+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
54+ "dependencies": {
55+ "@babel/highlight": "^7.18.6"
56+ },
57+ "engines": {
58+ "node": ">=6.9.0"
59+ }
60+ },
61+ "node_modules/@babel/compat-data": {
62+ "version": "7.20.10",
63+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz",
64+ "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==",
65+ "peer": true,
66+ "engines": {
67+ "node": ">=6.9.0"
68+ }
69+ },
70+ "node_modules/@babel/core": {
71+ "version": "7.20.12",
72+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
73+ "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
74+ "peer": true,
75+ "dependencies": {
76+ "@ampproject/remapping": "^2.1.0",
77+ "@babel/code-frame": "^7.18.6",
78+ "@babel/generator": "^7.20.7",
79+ "@babel/helper-compilation-targets": "^7.20.7",
80+ "@babel/helper-module-transforms": "^7.20.11",
81+ "@babel/helpers": "^7.20.7",
82+ "@babel/parser": "^7.20.7",
83+ "@babel/template": "^7.20.7",
84+ "@babel/traverse": "^7.20.12",
85+ "@babel/types": "^7.20.7",
86+ "convert-source-map": "^1.7.0",
87+ "debug": "^4.1.0",
88+ "gensync": "^1.0.0-beta.2",
89+ "json5": "^2.2.2",
90+ "semver": "^6.3.0"
91+ },
92+ "engines": {
93+ "node": ">=6.9.0"
94+ },
95+ "funding": {
96+ "type": "opencollective",
97+ "url": "https://opencollective.com/babel"
98+ }
99+ },
100+ "node_modules/@babel/core/node_modules/json5": {
101+ "version": "2.2.3",
102+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
103+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
104+ "peer": true,
105+ "bin": {
106+ "json5": "lib/cli.js"
107+ },
108+ "engines": {
109+ "node": ">=6"
110+ }
111+ },
112+ "node_modules/@babel/core/node_modules/semver": {
113+ "version": "6.3.0",
114+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
115+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
116+ "peer": true,
117+ "bin": {
118+ "semver": "bin/semver.js"
119+ }
120+ },
121+ "node_modules/@babel/generator": {
122+ "version": "7.20.7",
123+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
124+ "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
125+ "peer": true,
126+ "dependencies": {
127+ "@babel/types": "^7.20.7",
128+ "@jridgewell/gen-mapping": "^0.3.2",
129+ "jsesc": "^2.5.1"
130+ },
131+ "engines": {
132+ "node": ">=6.9.0"
133+ }
134+ },
135+ "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
136+ "version": "0.3.2",
137+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
138+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
139+ "peer": true,
140+ "dependencies": {
141+ "@jridgewell/set-array": "^1.0.1",
142+ "@jridgewell/sourcemap-codec": "^1.4.10",
143+ "@jridgewell/trace-mapping": "^0.3.9"
144+ },
145+ "engines": {
146+ "node": ">=6.0.0"
147+ }
148+ },
149+ "node_modules/@babel/helper-compilation-targets": {
150+ "version": "7.20.7",
151+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
152+ "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
153+ "peer": true,
154+ "dependencies": {
155+ "@babel/compat-data": "^7.20.5",
156+ "@babel/helper-validator-option": "^7.18.6",
157+ "browserslist": "^4.21.3",
158+ "lru-cache": "^5.1.1",
159+ "semver": "^6.3.0"
160+ },
161+ "engines": {
162+ "node": ">=6.9.0"
163+ },
164+ "peerDependencies": {
165+ "@babel/core": "^7.0.0"
166+ }
167+ },
168+ "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
169+ "version": "5.1.1",
170+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
171+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
172+ "peer": true,
173+ "dependencies": {
174+ "yallist": "^3.0.2"
175+ }
176+ },
177+ "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
178+ "version": "6.3.0",
179+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
180+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
181+ "peer": true,
182+ "bin": {
183+ "semver": "bin/semver.js"
184+ }
185+ },
186+ "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
187+ "version": "3.1.1",
188+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
189+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
190+ "peer": true
191+ },
192+ "node_modules/@babel/helper-environment-visitor": {
193+ "version": "7.18.9",
194+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
195+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
196+ "peer": true,
197+ "engines": {
198+ "node": ">=6.9.0"
199+ }
200+ },
201+ "node_modules/@babel/helper-function-name": {
202+ "version": "7.19.0",
203+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
204+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
205+ "peer": true,
206+ "dependencies": {
207+ "@babel/template": "^7.18.10",
208+ "@babel/types": "^7.19.0"
209+ },
210+ "engines": {
211+ "node": ">=6.9.0"
212+ }
213+ },
214+ "node_modules/@babel/helper-hoist-variables": {
215+ "version": "7.18.6",
216+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
217+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
218+ "peer": true,
219+ "dependencies": {
220+ "@babel/types": "^7.18.6"
221+ },
222+ "engines": {
223+ "node": ">=6.9.0"
224+ }
225+ },
226+ "node_modules/@babel/helper-module-imports": {
227+ "version": "7.18.6",
228+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
229+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
230+ "dependencies": {
231+ "@babel/types": "^7.18.6"
232+ },
233+ "engines": {
234+ "node": ">=6.9.0"
235+ }
236+ },
237+ "node_modules/@babel/helper-module-transforms": {
238+ "version": "7.20.11",
239+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
240+ "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
241+ "peer": true,
242+ "dependencies": {
243+ "@babel/helper-environment-visitor": "^7.18.9",
244+ "@babel/helper-module-imports": "^7.18.6",
245+ "@babel/helper-simple-access": "^7.20.2",
246+ "@babel/helper-split-export-declaration": "^7.18.6",
247+ "@babel/helper-validator-identifier": "^7.19.1",
248+ "@babel/template": "^7.20.7",
249+ "@babel/traverse": "^7.20.10",
250+ "@babel/types": "^7.20.7"
251+ },
252+ "engines": {
253+ "node": ">=6.9.0"
254+ }
255+ },
256+ "node_modules/@babel/helper-plugin-utils": {
257+ "version": "7.20.2",
258+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
259+ "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
260+ "engines": {
261+ "node": ">=6.9.0"
262+ }
263+ },
264+ "node_modules/@babel/helper-simple-access": {
265+ "version": "7.20.2",
266+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
267+ "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
268+ "peer": true,
269+ "dependencies": {
270+ "@babel/types": "^7.20.2"
271+ },
272+ "engines": {
273+ "node": ">=6.9.0"
274+ }
275+ },
276+ "node_modules/@babel/helper-split-export-declaration": {
277+ "version": "7.18.6",
278+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
279+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
280+ "peer": true,
281+ "dependencies": {
282+ "@babel/types": "^7.18.6"
283+ },
284+ "engines": {
285+ "node": ">=6.9.0"
286+ }
287+ },
288+ "node_modules/@babel/helper-string-parser": {
289+ "version": "7.19.4",
290+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
291+ "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
292+ "engines": {
293+ "node": ">=6.9.0"
294+ }
295+ },
296+ "node_modules/@babel/helper-validator-identifier": {
297+ "version": "7.19.1",
298+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
299+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
300+ "engines": {
301+ "node": ">=6.9.0"
302+ }
303+ },
304+ "node_modules/@babel/helper-validator-option": {
305+ "version": "7.18.6",
306+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
307+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
308+ "peer": true,
309+ "engines": {
310+ "node": ">=6.9.0"
311+ }
312+ },
313+ "node_modules/@babel/helpers": {
314+ "version": "7.20.7",
315+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
316+ "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
317+ "peer": true,
318+ "dependencies": {
319+ "@babel/template": "^7.20.7",
320+ "@babel/traverse": "^7.20.7",
321+ "@babel/types": "^7.20.7"
322+ },
323+ "engines": {
324+ "node": ">=6.9.0"
325+ }
326+ },
327+ "node_modules/@babel/highlight": {
328+ "version": "7.18.6",
329+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
330+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
331+ "dependencies": {
332+ "@babel/helper-validator-identifier": "^7.18.6",
333+ "chalk": "^2.0.0",
334+ "js-tokens": "^4.0.0"
335+ },
336+ "engines": {
337+ "node": ">=6.9.0"
338+ }
339+ },
340+ "node_modules/@babel/highlight/node_modules/ansi-styles": {
341+ "version": "3.2.1",
342+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
343+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
344+ "dependencies": {
345+ "color-convert": "^1.9.0"
346+ },
347+ "engines": {
348+ "node": ">=4"
349+ }
350+ },
351+ "node_modules/@babel/highlight/node_modules/chalk": {
352+ "version": "2.4.2",
353+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
354+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
355+ "dependencies": {
356+ "ansi-styles": "^3.2.1",
357+ "escape-string-regexp": "^1.0.5",
358+ "supports-color": "^5.3.0"
359+ },
360+ "engines": {
361+ "node": ">=4"
362+ }
363+ },
364+ "node_modules/@babel/highlight/node_modules/color-convert": {
365+ "version": "1.9.3",
366+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
367+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
368+ "dependencies": {
369+ "color-name": "1.1.3"
370+ }
371+ },
372+ "node_modules/@babel/highlight/node_modules/color-name": {
373+ "version": "1.1.3",
374+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
375+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
376+ },
377+ "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
378+ "version": "1.0.5",
379+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
380+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
381+ "engines": {
382+ "node": ">=0.8.0"
383+ }
384+ },
385+ "node_modules/@babel/highlight/node_modules/has-flag": {
386+ "version": "3.0.0",
387+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
388+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
389+ "engines": {
390+ "node": ">=4"
391+ }
392+ },
393+ "node_modules/@babel/highlight/node_modules/supports-color": {
394+ "version": "5.5.0",
395+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
396+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
397+ "dependencies": {
398+ "has-flag": "^3.0.0"
399+ },
400+ "engines": {
401+ "node": ">=4"
402+ }
403+ },
404+ "node_modules/@babel/parser": {
405+ "version": "7.20.7",
406+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
407+ "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
408+ "peer": true,
409+ "bin": {
410+ "parser": "bin/babel-parser.js"
411+ },
412+ "engines": {
413+ "node": ">=6.0.0"
414+ }
415+ },
416+ "node_modules/@babel/plugin-syntax-jsx": {
417+ "version": "7.18.6",
418+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
419+ "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
420+ "dependencies": {
421+ "@babel/helper-plugin-utils": "^7.18.6"
422+ },
423+ "engines": {
424+ "node": ">=6.9.0"
425+ },
426+ "peerDependencies": {
427+ "@babel/core": "^7.0.0-0"
32428 }
33429 },
34430 "node_modules/@ampproject/remapping": {
@@ -2481,6 +2877,38 @@
24812877 "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
24822878 }
24832879 },
2880+ "node_modules/acorn-node": {
2881+ "version": "1.8.2",
2882+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
2883+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
2884+ "dev": true,
2885+ "dependencies": {
2886+ "acorn": "^7.0.0",
2887+ "acorn-walk": "^7.0.0",
2888+ "xtend": "^4.0.2"
2889+ }
2890+ },
2891+ "node_modules/acorn-node/node_modules/acorn": {
2892+ "version": "7.4.1",
2893+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
2894+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
2895+ "dev": true,
2896+ "bin": {
2897+ "acorn": "bin/acorn"
2898+ },
2899+ "engines": {
2900+ "node": ">=0.4.0"
2901+ }
2902+ },
2903+ "node_modules/acorn-walk": {
2904+ "version": "7.2.0",
2905+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
2906+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
2907+ "dev": true,
2908+ "engines": {
2909+ "node": ">=0.4.0"
2910+ }
2911+ },
24842912 "node_modules/ajv": {
24852913 "version": "6.12.6",
24862914 "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -2530,6 +2958,12 @@
25302958 "node": ">= 8"
25312959 }
25322960 },
2961+ "node_modules/arg": {
2962+ "version": "5.0.2",
2963+ "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
2964+ "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
2965+ "dev": true
2966+ },
25332967 "node_modules/argparse": {
25342968 "version": "2.0.1",
25352969 "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -2649,6 +3083,39 @@
26493083 "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
26503084 "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
26513085 },
3086+ "node_modules/autoprefixer": {
3087+ "version": "10.4.13",
3088+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
3089+ "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
3090+ "dev": true,
3091+ "funding": [
3092+ {
3093+ "type": "opencollective",
3094+ "url": "https://opencollective.com/postcss/"
3095+ },
3096+ {
3097+ "type": "tidelift",
3098+ "url": "https://tidelift.com/funding/github/npm/autoprefixer"
3099+ }
3100+ ],
3101+ "dependencies": {
3102+ "browserslist": "^4.21.4",
3103+ "caniuse-lite": "^1.0.30001426",
3104+ "fraction.js": "^4.2.0",
3105+ "normalize-range": "^0.1.2",
3106+ "picocolors": "^1.0.0",
3107+ "postcss-value-parser": "^4.2.0"
3108+ },
3109+ "bin": {
3110+ "autoprefixer": "bin/autoprefixer"
3111+ },
3112+ "engines": {
3113+ "node": "^10 || ^12 || >=14"
3114+ },
3115+ "peerDependencies": {
3116+ "postcss": "^8.1.0"
3117+ }
3118+ },
26523119 "node_modules/available-typed-arrays": {
26533120 "version": "1.0.5",
26543121 "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -2770,7 +3237,10 @@
27703237 "url": "https://tidelift.com/funding/github/npm/browserslist"
27713238 }
27723239 ],
3240+<<<<<<< HEAD
27733241 "peer": true,
3242+=======
3243+>>>>>>> test-style
27743244 "dependencies": {
27753245 "caniuse-lite": "^1.0.30001400",
27763246 "electron-to-chromium": "^1.4.251",
@@ -2812,6 +3282,15 @@
28123282 "node": ">=6"
28133283 }
28143284 },
3285+ "node_modules/camelcase-css": {
3286+ "version": "2.0.1",
3287+ "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
3288+ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
3289+ "dev": true,
3290+ "engines": {
3291+ "node": ">= 6"
3292+ }
3293+ },
28153294 "node_modules/caniuse-lite": {
28163295 "version": "1.0.30001442",
28173296 "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
@@ -3023,6 +3502,21 @@
30233502 "tiny-invariant": "^1.0.6"
30243503 }
30253504 },
3505+<<<<<<< HEAD
3506+=======
3507+ "node_modules/cssesc": {
3508+ "version": "3.0.0",
3509+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
3510+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
3511+ "dev": true,
3512+ "bin": {
3513+ "cssesc": "bin/cssesc"
3514+ },
3515+ "engines": {
3516+ "node": ">=4"
3517+ }
3518+ },
3519+>>>>>>> test-style
30263520 "node_modules/csstype": {
30273521 "version": "3.1.1",
30283522 "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
@@ -3077,6 +3571,15 @@
30773571 "url": "https://github.com/sponsors/ljharb"
30783572 }
30793573 },
3574+ "node_modules/defined": {
3575+ "version": "1.0.1",
3576+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
3577+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
3578+ "dev": true,
3579+ "funding": {
3580+ "url": "https://github.com/sponsors/ljharb"
3581+ }
3582+ },
30803583 "node_modules/depd": {
30813584 "version": "2.0.0",
30823585 "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -3099,6 +3602,32 @@
30993602 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
31003603 "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
31013604 },
3605+<<<<<<< HEAD
3606+=======
3607+ "node_modules/detective": {
3608+ "version": "5.2.1",
3609+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
3610+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
3611+ "dev": true,
3612+ "dependencies": {
3613+ "acorn-node": "^1.8.2",
3614+ "defined": "^1.0.0",
3615+ "minimist": "^1.2.6"
3616+ },
3617+ "bin": {
3618+ "detective": "bin/detective.js"
3619+ },
3620+ "engines": {
3621+ "node": ">=0.8.0"
3622+ }
3623+ },
3624+ "node_modules/didyoumean": {
3625+ "version": "1.2.2",
3626+ "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
3627+ "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
3628+ "dev": true
3629+ },
3630+>>>>>>> test-style
31023631 "node_modules/dir-glob": {
31033632 "version": "3.0.1",
31043633 "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -3110,6 +3639,12 @@
31103639 "node": ">=8"
31113640 }
31123641 },
3642+ "node_modules/dlv": {
3643+ "version": "1.1.3",
3644+ "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
3645+ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
3646+ "dev": true
3647+ },
31133648 "node_modules/doctrine": {
31143649 "version": "3.0.0",
31153650 "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -3129,8 +3664,12 @@
31293664 "node_modules/electron-to-chromium": {
31303665 "version": "1.4.284",
31313666 "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
3667+<<<<<<< HEAD
31323668 "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
31333669 "peer": true
3670+=======
3671+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
3672+>>>>>>> test-style
31343673 },
31353674 "node_modules/emoji-regex": {
31363675 "version": "9.2.2",
@@ -3251,7 +3790,10 @@
32513790 "version": "3.1.1",
32523791 "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
32533792 "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
3793+<<<<<<< HEAD
32543794 "peer": true,
3795+=======
3796+>>>>>>> test-style
32553797 "engines": {
32563798 "node": ">=6"
32573799 }
@@ -3930,6 +4472,22 @@
39304472 "node": ">= 0.6"
39314473 }
39324474 },
4475+<<<<<<< HEAD
4476+=======
4477+ "node_modules/fraction.js": {
4478+ "version": "4.2.0",
4479+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
4480+ "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
4481+ "dev": true,
4482+ "engines": {
4483+ "node": "*"
4484+ },
4485+ "funding": {
4486+ "type": "patreon",
4487+ "url": "https://www.patreon.com/infusion"
4488+ }
4489+ },
4490+>>>>>>> test-style
39334491 "node_modules/framer-motion": {
39344492 "version": "8.3.3",
39354493 "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-8.3.3.tgz",
@@ -4754,6 +5312,18 @@
47545312 "node": ">= 0.8.0"
47555313 }
47565314 },
5315+<<<<<<< HEAD
5316+=======
5317+ "node_modules/lilconfig": {
5318+ "version": "2.0.6",
5319+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
5320+ "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
5321+ "dev": true,
5322+ "engines": {
5323+ "node": ">=10"
5324+ }
5325+ },
5326+>>>>>>> test-style
47575327 "node_modules/lines-and-columns": {
47585328 "version": "1.2.4",
47595329 "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -4975,11 +5545,41 @@
49755545 }
49765546 }
49775547 },
5548+<<<<<<< HEAD
49785549 "node_modules/node-releases": {
49795550 "version": "2.0.8",
49805551 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
49815552 "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
49825553 "peer": true
5554+=======
5555+ "node_modules/next/node_modules/postcss": {
5556+ "version": "8.4.14",
5557+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
5558+ "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
5559+ "funding": [
5560+ {
5561+ "type": "opencollective",
5562+ "url": "https://opencollective.com/postcss/"
5563+ },
5564+ {
5565+ "type": "tidelift",
5566+ "url": "https://tidelift.com/funding/github/npm/postcss"
5567+ }
5568+ ],
5569+ "dependencies": {
5570+ "nanoid": "^3.3.4",
5571+ "picocolors": "^1.0.0",
5572+ "source-map-js": "^1.0.2"
5573+ },
5574+ "engines": {
5575+ "node": "^10 || ^12 || >=14"
5576+ }
5577+ },
5578+ "node_modules/node-releases": {
5579+ "version": "2.0.8",
5580+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
5581+ "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
5582+>>>>>>> test-style
49835583 },
49845584 "node_modules/nodemon": {
49855585 "version": "2.0.20",
@@ -5071,6 +5671,15 @@
50715671 "node": ">=0.10.0"
50725672 }
50735673 },
5674+ "node_modules/normalize-range": {
5675+ "version": "0.1.2",
5676+ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
5677+ "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
5678+ "dev": true,
5679+ "engines": {
5680+ "node": ">=0.10.0"
5681+ }
5682+ },
50745683 "node_modules/object-assign": {
50755684 "version": "4.1.1",
50765685 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5079,6 +5688,15 @@
50795688 "node": ">=0.10.0"
50805689 }
50815690 },
5691+ "node_modules/object-hash": {
5692+ "version": "3.0.0",
5693+ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
5694+ "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
5695+ "dev": true,
5696+ "engines": {
5697+ "node": ">= 6"
5698+ }
5699+ },
50825700 "node_modules/object-inspect": {
50835701 "version": "1.12.2",
50845702 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
@@ -5342,10 +5960,20 @@
53425960 "url": "https://github.com/sponsors/jonschlinkert"
53435961 }
53445962 },
5963+ "node_modules/pify": {
5964+ "version": "2.3.0",
5965+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
5966+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
5967+ "dev": true,
5968+ "engines": {
5969+ "node": ">=0.10.0"
5970+ }
5971+ },
53455972 "node_modules/postcss": {
5346- "version": "8.4.14",
5347- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
5348- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
5973+ "version": "8.4.21",
5974+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
5975+ "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
5976+ "dev": true,
53495977 "funding": [
53505978 {
53515979 "type": "opencollective",
@@ -5365,6 +5993,109 @@
53655993 "node": "^10 || ^12 || >=14"
53665994 }
53675995 },
5996+ "node_modules/postcss-import": {
5997+ "version": "14.1.0",
5998+ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
5999+ "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
6000+ "dev": true,
6001+ "dependencies": {
6002+ "postcss-value-parser": "^4.0.0",
6003+ "read-cache": "^1.0.0",
6004+ "resolve": "^1.1.7"
6005+ },
6006+ "engines": {
6007+ "node": ">=10.0.0"
6008+ },
6009+ "peerDependencies": {
6010+ "postcss": "^8.0.0"
6011+ }
6012+ },
6013+ "node_modules/postcss-js": {
6014+ "version": "4.0.0",
6015+ "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
6016+ "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
6017+ "dev": true,
6018+ "dependencies": {
6019+ "camelcase-css": "^2.0.1"
6020+ },
6021+ "engines": {
6022+ "node": "^12 || ^14 || >= 16"
6023+ },
6024+ "funding": {
6025+ "type": "opencollective",
6026+ "url": "https://opencollective.com/postcss/"
6027+ },
6028+ "peerDependencies": {
6029+ "postcss": "^8.3.3"
6030+ }
6031+ },
6032+ "node_modules/postcss-load-config": {
6033+ "version": "3.1.4",
6034+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
6035+ "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
6036+ "dev": true,
6037+ "dependencies": {
6038+ "lilconfig": "^2.0.5",
6039+ "yaml": "^1.10.2"
6040+ },
6041+ "engines": {
6042+ "node": ">= 10"
6043+ },
6044+ "funding": {
6045+ "type": "opencollective",
6046+ "url": "https://opencollective.com/postcss/"
6047+ },
6048+ "peerDependencies": {
6049+ "postcss": ">=8.0.9",
6050+ "ts-node": ">=9.0.0"
6051+ },
6052+ "peerDependenciesMeta": {
6053+ "postcss": {
6054+ "optional": true
6055+ },
6056+ "ts-node": {
6057+ "optional": true
6058+ }
6059+ }
6060+ },
6061+ "node_modules/postcss-nested": {
6062+ "version": "6.0.0",
6063+ "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
6064+ "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
6065+ "dev": true,
6066+ "dependencies": {
6067+ "postcss-selector-parser": "^6.0.10"
6068+ },
6069+ "engines": {
6070+ "node": ">=12.0"
6071+ },
6072+ "funding": {
6073+ "type": "opencollective",
6074+ "url": "https://opencollective.com/postcss/"
6075+ },
6076+ "peerDependencies": {
6077+ "postcss": "^8.2.14"
6078+ }
6079+ },
6080+ "node_modules/postcss-selector-parser": {
6081+ "version": "6.0.11",
6082+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
6083+ "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
6084+ "dev": true,
6085+ "dependencies": {
6086+ "cssesc": "^3.0.0",
6087+ "util-deprecate": "^1.0.2"
6088+ },
6089+ "engines": {
6090+ "node": ">=4"
6091+ }
6092+ },
6093+ "node_modules/postcss-value-parser": {
6094+ "version": "4.2.0",
6095+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
6096+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
6097+ "dev": true
6098+ },
53686099 "node_modules/prelude-ls": {
53696100 "version": "1.2.1",
53706101 "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5442,6 +6173,18 @@
54426173 }
54436174 ]
54446175 },
6176+ "node_modules/quick-lru": {
6177+ "version": "5.1.1",
6178+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
6179+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
6180+ "dev": true,
6181+ "engines": {
6182+ "node": ">=10"
6183+ },
6184+ "funding": {
6185+ "url": "https://github.com/sponsors/sindresorhus"
6186+ }
6187+ },
54456188 "node_modules/range-parser": {
54466189 "version": "1.2.1",
54476190 "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -5597,6 +6340,18 @@
55976340 }
55986341 }
55996342 },
6343+<<<<<<< HEAD
6344+=======
6345+ "node_modules/read-cache": {
6346+ "version": "1.0.0",
6347+ "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
6348+ "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
6349+ "dev": true,
6350+ "dependencies": {
6351+ "pify": "^2.3.0"
6352+ }
6353+ },
6354+>>>>>>> test-style
56006355 "node_modules/readdirp": {
56016356 "version": "3.6.0",
56026357 "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -6067,6 +6822,47 @@
60676822 "url": "https://opencollective.com/unts"
60686823 }
60696824 },
6825+ "node_modules/tailwindcss": {
6826+ "version": "3.2.4",
6827+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
6828+ "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
6829+ "dev": true,
6830+ "dependencies": {
6831+ "arg": "^5.0.2",
6832+ "chokidar": "^3.5.3",
6833+ "color-name": "^1.1.4",
6834+ "detective": "^5.2.1",
6835+ "didyoumean": "^1.2.2",
6836+ "dlv": "^1.1.3",
6837+ "fast-glob": "^3.2.12",
6838+ "glob-parent": "^6.0.2",
6839+ "is-glob": "^4.0.3",
6840+ "lilconfig": "^2.0.6",
6841+ "micromatch": "^4.0.5",
6842+ "normalize-path": "^3.0.0",
6843+ "object-hash": "^3.0.0",
6844+ "picocolors": "^1.0.0",
6845+ "postcss": "^8.4.18",
6846+ "postcss-import": "^14.1.0",
6847+ "postcss-js": "^4.0.0",
6848+ "postcss-load-config": "^3.1.4",
6849+ "postcss-nested": "6.0.0",
6850+ "postcss-selector-parser": "^6.0.10",
6851+ "postcss-value-parser": "^4.2.0",
6852+ "quick-lru": "^5.1.1",
6853+ "resolve": "^1.22.1"
6854+ },
6855+ "bin": {
6856+ "tailwind": "lib/cli.js",
6857+ "tailwindcss": "lib/cli.js"
6858+ },
6859+ "engines": {
6860+ "node": ">=12.13.0"
6861+ },
6862+ "peerDependencies": {
6863+ "postcss": "^8.0.9"
6864+ }
6865+ },
60706866 "node_modules/tapable": {
60716867 "version": "2.2.1",
60726868 "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -6274,7 +7070,10 @@
62747070 "url": "https://tidelift.com/funding/github/npm/browserslist"
62757071 }
62767072 ],
7073+<<<<<<< HEAD
62777074 "peer": true,
7075+=======
7076+>>>>>>> test-style
62787077 "dependencies": {
62797078 "escalade": "^3.1.1",
62807079 "picocolors": "^1.0.0"
@@ -6335,6 +7134,15 @@
63357134 }
63367135 }
63377136 },
7137+<<<<<<< HEAD
7138+=======
7139+ "node_modules/util-deprecate": {
7140+ "version": "1.0.2",
7141+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
7142+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
7143+ "dev": true
7144+ },
7145+>>>>>>> test-style
63387146 "node_modules/utils-merge": {
63397147 "version": "1.0.1",
63407148 "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -6412,6 +7220,15 @@
64127220 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
64137221 "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
64147222 },
7223+ "node_modules/xtend": {
7224+ "version": "4.0.2",
7225+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
7226+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
7227+ "dev": true,
7228+ "engines": {
7229+ "node": ">=0.4"
7230+ }
7231+ },
64157232 "node_modules/yallist": {
64167233 "version": "4.0.0",
64177234 "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -8258,6 +9075,31 @@
82589075 "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
82599076 "requires": {}
82609077 },
9078+ "acorn-node": {
9079+ "version": "1.8.2",
9080+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
9081+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
9082+ "dev": true,
9083+ "requires": {
9084+ "acorn": "^7.0.0",
9085+ "acorn-walk": "^7.0.0",
9086+ "xtend": "^4.0.2"
9087+ },
9088+ "dependencies": {
9089+ "acorn": {
9090+ "version": "7.4.1",
9091+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
9092+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
9093+ "dev": true
9094+ }
9095+ }
9096+ },
9097+ "acorn-walk": {
9098+ "version": "7.2.0",
9099+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
9100+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
9101+ "dev": true
9102+ },
82619103 "ajv": {
82629104 "version": "6.12.6",
82639105 "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -8291,6 +9133,12 @@
82919133 "picomatch": "^2.0.4"
82929134 }
82939135 },
9136+ "arg": {
9137+ "version": "5.0.2",
9138+ "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
9139+ "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
9140+ "dev": true
9141+ },
82949142 "argparse": {
82959143 "version": "2.0.1",
82969144 "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -8374,6 +9222,20 @@
83749222 "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
83759223 "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
83769224 },
9225+ "autoprefixer": {
9226+ "version": "10.4.13",
9227+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
9228+ "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
9229+ "dev": true,
9230+ "requires": {
9231+ "browserslist": "^4.21.4",
9232+ "caniuse-lite": "^1.0.30001426",
9233+ "fraction.js": "^4.2.0",
9234+ "normalize-range": "^0.1.2",
9235+ "picocolors": "^1.0.0",
9236+ "postcss-value-parser": "^4.2.0"
9237+ }
9238+ },
83779239 "available-typed-arrays": {
83789240 "version": "1.0.5",
83799241 "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -8464,7 +9326,10 @@
84649326 "version": "4.21.4",
84659327 "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
84669328 "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
9329+<<<<<<< HEAD
84679330 "peer": true,
9331+=======
9332+>>>>>>> test-style
84689333 "requires": {
84699334 "caniuse-lite": "^1.0.30001400",
84709335 "electron-to-chromium": "^1.4.251",
@@ -8491,6 +9356,12 @@
84919356 "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
84929357 "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
84939358 },
9359+ "camelcase-css": {
9360+ "version": "2.0.1",
9361+ "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
9362+ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
9363+ "dev": true
9364+ },
84949365 "caniuse-lite": {
84959366 "version": "1.0.30001442",
84969367 "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
@@ -8642,6 +9513,15 @@
86429513 "tiny-invariant": "^1.0.6"
86439514 }
86449515 },
9516+<<<<<<< HEAD
9517+=======
9518+ "cssesc": {
9519+ "version": "3.0.0",
9520+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
9521+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
9522+ "dev": true
9523+ },
9524+>>>>>>> test-style
86459525 "csstype": {
86469526 "version": "3.1.1",
86479527 "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
@@ -8679,6 +9559,12 @@
86799559 "object-keys": "^1.1.1"
86809560 }
86819561 },
9562+ "defined": {
9563+ "version": "1.0.1",
9564+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
9565+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
9566+ "dev": true
9567+ },
86829568 "depd": {
86839569 "version": "2.0.0",
86849570 "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -8694,6 +9580,26 @@
86949580 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
86959581 "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
86969582 },
9583+<<<<<<< HEAD
9584+=======
9585+ "detective": {
9586+ "version": "5.2.1",
9587+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
9588+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
9589+ "dev": true,
9590+ "requires": {
9591+ "acorn-node": "^1.8.2",
9592+ "defined": "^1.0.0",
9593+ "minimist": "^1.2.6"
9594+ }
9595+ },
9596+ "didyoumean": {
9597+ "version": "1.2.2",
9598+ "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
9599+ "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
9600+ "dev": true
9601+ },
9602+>>>>>>> test-style
86979603 "dir-glob": {
86989604 "version": "3.0.1",
86999605 "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -8702,6 +9608,12 @@
87029608 "path-type": "^4.0.0"
87039609 }
87049610 },
9611+ "dlv": {
9612+ "version": "1.1.3",
9613+ "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
9614+ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
9615+ "dev": true
9616+ },
87059617 "doctrine": {
87069618 "version": "3.0.0",
87079619 "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -8718,8 +9630,12 @@
87189630 "electron-to-chromium": {
87199631 "version": "1.4.284",
87209632 "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
9633+<<<<<<< HEAD
87219634 "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
87229635 "peer": true
9636+=======
9637+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
9638+>>>>>>> test-style
87239639 },
87249640 "emoji-regex": {
87259641 "version": "9.2.2",
@@ -8818,8 +9734,12 @@
88189734 "escalade": {
88199735 "version": "3.1.1",
88209736 "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
9737+<<<<<<< HEAD
88219738 "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
88229739 "peer": true
9740+=======
9741+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
9742+>>>>>>> test-style
88239743 },
88249744 "escape-html": {
88259745 "version": "1.0.3",
@@ -9348,6 +10268,15 @@
934810268 "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
934910269 "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
935010270 },
10271+<<<<<<< HEAD
10272+=======
10273+ "fraction.js": {
10274+ "version": "4.2.0",
10275+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
10276+ "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
10277+ "dev": true
10278+ },
10279+>>>>>>> test-style
935110280 "framer-motion": {
935210281 "version": "8.3.3",
935310282 "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-8.3.3.tgz",
@@ -9931,6 +10860,15 @@
993110860 "type-check": "~0.4.0"
993210861 }
993310862 },
10863+<<<<<<< HEAD
10864+=======
10865+ "lilconfig": {
10866+ "version": "2.0.6",
10867+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
10868+ "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
10869+ "dev": true
10870+ },
10871+>>>>>>> test-style
993410872 "lines-and-columns": {
993510873 "version": "1.2.4",
993610874 "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -10073,13 +11011,29 @@
1007311011 "caniuse-lite": "^1.0.30001406",
1007411012 "postcss": "8.4.14",
1007511013 "styled-jsx": "5.1.1"
11014+ },
11015+ "dependencies": {
11016+ "postcss": {
11017+ "version": "8.4.14",
11018+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
11019+ "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
11020+ "requires": {
11021+ "nanoid": "^3.3.4",
11022+ "picocolors": "^1.0.0",
11023+ "source-map-js": "^1.0.2"
11024+ }
11025+ }
1007611026 }
1007711027 },
1007811028 "node-releases": {
1007911029 "version": "2.0.8",
1008011030 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
11031+<<<<<<< HEAD
1008111032 "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
1008211033 "peer": true
11034+=======
11035+ "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
11036+>>>>>>> test-style
1008311037 },
1008411038 "nodemon": {
1008511039 "version": "2.0.20",
@@ -10145,11 +11099,23 @@
1014511099 "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
1014611100 "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
1014711101 },
11102+ "normalize-range": {
11103+ "version": "0.1.2",
11104+ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
11105+ "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
11106+ "dev": true
11107+ },
1014811108 "object-assign": {
1014911109 "version": "4.1.1",
1015011110 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
1015111111 "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
1015211112 },
11113+ "object-hash": {
11114+ "version": "3.0.0",
11115+ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
11116+ "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
11117+ "dev": true
11118+ },
1015311119 "object-inspect": {
1015411120 "version": "1.12.2",
1015511121 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
@@ -10329,16 +11295,78 @@
1032911295 "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
1033011296 "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
1033111297 },
11298+ "pify": {
11299+ "version": "2.3.0",
11300+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
11301+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
11302+ "dev": true
11303+ },
1033211304 "postcss": {
10333- "version": "8.4.14",
10334- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
10335- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
11305+ "version": "8.4.21",
11306+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
11307+ "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
11308+ "dev": true,
1033611309 "requires": {
1033711310 "nanoid": "^3.3.4",
1033811311 "picocolors": "^1.0.0",
1033911312 "source-map-js": "^1.0.2"
1034011313 }
1034111314 },
11315+ "postcss-import": {
11316+ "version": "14.1.0",
11317+ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
11318+ "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
11319+ "dev": true,
11320+ "requires": {
11321+ "postcss-value-parser": "^4.0.0",
11322+ "read-cache": "^1.0.0",
11323+ "resolve": "^1.1.7"
11324+ }
11325+ },
11326+ "postcss-js": {
11327+ "version": "4.0.0",
11328+ "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
11329+ "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
11330+ "dev": true,
11331+ "requires": {
11332+ "camelcase-css": "^2.0.1"
11333+ }
11334+ },
11335+ "postcss-load-config": {
11336+ "version": "3.1.4",
11337+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
11338+ "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
11339+ "dev": true,
11340+ "requires": {
11341+ "lilconfig": "^2.0.5",
11342+ "yaml": "^1.10.2"
11343+ }
11344+ },
11345+ "postcss-nested": {
11346+ "version": "6.0.0",
11347+ "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
11348+ "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
11349+ "dev": true,
11350+ "requires": {
11351+ "postcss-selector-parser": "^6.0.10"
11352+ }
11353+ },
11354+ "postcss-selector-parser": {
11355+ "version": "6.0.11",
11356+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
11357+ "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
11358+ "dev": true,
11359+ "requires": {
11360+ "cssesc": "^3.0.0",
11361+ "util-deprecate": "^1.0.2"
11362+ }
11363+ },
11364+ "postcss-value-parser": {
11365+ "version": "4.2.0",
11366+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
11367+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
11368+ "dev": true
11369+ },
1034211370 "prelude-ls": {
1034311371 "version": "1.2.1",
1034411372 "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -10387,6 +11415,12 @@
1038711415 "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
1038811416 "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
1038911417 },
11418+ "quick-lru": {
11419+ "version": "5.1.1",
11420+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
11421+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
11422+ "dev": true
11423+ },
1039011424 "range-parser": {
1039111425 "version": "1.2.1",
1039211426 "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -10482,6 +11516,18 @@
1048211516 "tslib": "^2.0.0"
1048311517 }
1048411518 },
11519+<<<<<<< HEAD
11520+=======
11521+ "read-cache": {
11522+ "version": "1.0.0",
11523+ "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
11524+ "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
11525+ "dev": true,
11526+ "requires": {
11527+ "pify": "^2.3.0"
11528+ }
11529+ },
11530+>>>>>>> test-style
1048511531 "readdirp": {
1048611532 "version": "3.6.0",
1048711533 "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -10798,6 +11844,37 @@
1079811844 "tslib": "^2.4.0"
1079911845 }
1080011846 },
11847+ "tailwindcss": {
11848+ "version": "3.2.4",
11849+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
11850+ "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
11851+ "dev": true,
11852+ "requires": {
11853+ "arg": "^5.0.2",
11854+ "chokidar": "^3.5.3",
11855+ "color-name": "^1.1.4",
11856+ "detective": "^5.2.1",
11857+ "didyoumean": "^1.2.2",
11858+ "dlv": "^1.1.3",
11859+ "fast-glob": "^3.2.12",
11860+ "glob-parent": "^6.0.2",
11861+ "is-glob": "^4.0.3",
11862+ "lilconfig": "^2.0.6",
11863+ "micromatch": "^4.0.5",
11864+ "normalize-path": "^3.0.0",
11865+ "object-hash": "^3.0.0",
11866+ "picocolors": "^1.0.0",
11867+ "postcss": "^8.4.18",
11868+ "postcss-import": "^14.1.0",
11869+ "postcss-js": "^4.0.0",
11870+ "postcss-load-config": "^3.1.4",
11871+ "postcss-nested": "6.0.0",
11872+ "postcss-selector-parser": "^6.0.10",
11873+ "postcss-value-parser": "^4.2.0",
11874+ "quick-lru": "^5.1.1",
11875+ "resolve": "^1.22.1"
11876+ }
11877+ },
1080111878 "tapable": {
1080211879 "version": "2.2.1",
1080311880 "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -10948,7 +12025,10 @@
1094812025 "version": "1.0.10",
1094912026 "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
1095012027 "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
12028+<<<<<<< HEAD
1095112029 "peer": true,
12030+=======
12031+>>>>>>> test-style
1095212032 "requires": {
1095312033 "escalade": "^3.1.1",
1095412034 "picocolors": "^1.0.0"
@@ -10979,6 +12059,15 @@
1097912059 "tslib": "^2.0.0"
1098012060 }
1098112061 },
12062+<<<<<<< HEAD
12063+=======
12064+ "util-deprecate": {
12065+ "version": "1.0.2",
12066+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
12067+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
12068+ "dev": true
12069+ },
12070+>>>>>>> test-style
1098212071 "utils-merge": {
1098312072 "version": "1.0.1",
1098412073 "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -11032,6 +12121,12 @@
1103212121 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
1103312122 "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
1103412123 },
12124+ "xtend": {
12125+ "version": "4.0.2",
12126+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
12127+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
12128+ "dev": true
12129+ },
1103512130 "yallist": {
1103612131 "version": "4.0.0",
1103712132 "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
--- a/package.json
+++ b/package.json
@@ -30,6 +30,9 @@
3030 "typescript": "4.9.4"
3131 },
3232 "devDependencies": {
33- "nodemon": "^2.0.20"
33+ "autoprefixer": "^10.4.13",
34+ "nodemon": "^2.0.20",
35+ "postcss": "^8.4.21",
36+ "tailwindcss": "^3.2.4"
3437 }
3538 }
--- a/pages/_app.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
1-import type { AppProps } from 'next/app';
2-import { ChakraProvider } from '@chakra-ui/react';
3-import "./styles/global.sass"
4-
5-export default function App ({ Component, pageProps }: AppProps){
6- return (
7- <ChakraProvider>
8- <Component {...pageProps}/>
9- </ChakraProvider>
10- )
11-}
--- a/pages/component/IndexWidgets/IndexWidgets.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
1- import { Box, Text } from "@chakra-ui/react"
2-
3-export const IndexWidget = () => {
4- return (
5- <>
6- <Box m={10} p={10}>
7- <Text fontSize={30}>Status</Text>
8- </Box>
9- </>
10- )
11-}
--- a/pages/component/UIs.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
1-.Main {
2- background-color: #000011;
3- color: #ff2200;
4-}
5-
6-/*# sourceMappingURL=UIs.module.css.map */
--- a/pages/component/UIs.module.css.map
+++ /dev/null
@@ -1 +0,0 @@
1-{"version":3,"sourceRoot":"","sources":["UIs.module.sass"],"names":[],"mappings":"AAGA;EACE,kBAJW;EAKX,OAJM","file":"UIs.module.css"}
\ No newline at end of file
--- a/pages/component/UIs.module.sass
+++ /dev/null
@@ -1,7 +0,0 @@
1-$background: #000011
2-$color: #ff2200
3-
4-.Main
5- background-color: $background
6- color: $color
7-
--- a/pages/component/Uis.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
1-import UItStyle from "./UIs.module.sass"
2-import { getWindowSize } from "../getWindow/getWindowSize";
3-export const Uis = ({children}: any) =>{
4- const { height, width } = getWindowSize();
5- return(
6- <div className={UItStyle.Main} style={{
7- width: width,
8- height: height
9- }}>
10- V metaverce console (for Admin)
11- {children}
12- </div>
13- )
14-}
15-
--- a/pages/getWindow/getWindowSize.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
1-import { useEffect, useState } from "react";
2-
3-export const getWindowSize = () => {
4- const [windowSize, setWindowSize] = useState({
5- width: 0,
6- height: 0,
7- });
8-
9- useEffect(() => {
10- if (typeof window !== "undefined") {
11- const handleResize = () => {
12- setWindowSize({
13- width:
14- window.innerWidth,
15- height: window.innerHeight,
16- });
17- };
18-
19- window.addEventListener("resize", handleResize);
20- handleResize();
21- return () => window.removeEventListener("resize", handleResize);
22- } else {
23- return;
24- }
25- }, []);
26- return windowSize;
27-};
\ No newline at end of file
--- a/pages/index.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
1-import { IndexWidget } from "./component/IndexWidgets/IndexWidgets"
2-
3-export default function Index (){
4- return (
5- <>
6- <IndexWidget/>
7- testing
8- </>
9- )
10-}
--- a/pages/styles/global.css
+++ /dev/null
@@ -1,6 +0,0 @@
1-* {
2- padding: 0;
3- margin: 0;
4-}
5-
6-/*# sourceMappingURL=global.css.map */
--- a/pages/styles/global.css.map
+++ /dev/null
@@ -1 +0,0 @@
1-{"version":3,"sourceRoot":"","sources":["global.sass"],"names":[],"mappings":"AAGA;EACE;EACA","file":"global.css"}
\ No newline at end of file
--- a/pages/styles/global.sass
+++ /dev/null
@@ -1,7 +0,0 @@
1-$background: #000011
2-$color: #ff2200
3-
4-*
5- padding: 0
6- margin: 0
7-