Skip to content

Commit 159f095

Browse files
lorowlorow
authored
Merge pull request #49 from EyeTrackVR/feature/gui-redesign
GUI redesign
2 parents aeca03c + 637e49e commit 159f095

195 files changed

Lines changed: 16282 additions & 10292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"plugin:@typescript-eslint/recommended",
1010
"plugin:solid/typescript",
1111
"plugin:import/typescript",
12-
"plugin:import/recommended"
12+
"plugin:import/recommended",
13+
"plugin:storybook/recommended"
1314
],
1415
"parser": "@typescript-eslint/parser",
1516
"parserOptions": {
@@ -19,14 +20,30 @@
1920
"jsx": true
2021
}
2122
},
22-
"plugins": ["@typescript-eslint", "solid", "import"],
23+
"plugins": [
24+
"@typescript-eslint",
25+
"solid",
26+
"import"
27+
],
2328
"rules": {
2429
"solid/reactivity": "warn",
2530
"solid/no-destructure": "warn",
2631
"solid/jsx-no-undef": "error",
27-
"indent": ["error", 4 , { "SwitchCase": 1 }],
28-
"quotes": ["error", "single"],
29-
"semi": ["error", "never"],
32+
"indent": [
33+
"error",
34+
4,
35+
{
36+
"SwitchCase": 1
37+
}
38+
],
39+
"quotes": [
40+
"error",
41+
"single"
42+
],
43+
"semi": [
44+
"error",
45+
"never"
46+
],
3047
"arrow-body-style": "off",
3148
"import/no-unresolved": "error",
3249
"import/extensions": [
@@ -70,4 +87,4 @@
7087
"node": "true"
7188
}
7289
}
73-
}
90+
}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
node_modules
2-
dist
2+
dist
3+
*storybook.log
4+
storybook-static

‎.storybook/main.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import type { StorybookConfig } from 'storybook-solidjs-vite';
2+
3+
const config: StorybookConfig = {
4+
"stories": [
5+
"../src/**/*.mdx",
6+
"../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"
7+
],
8+
"addons": [
9+
"@storybook/addon-docs"
10+
],
11+
"framework": {
12+
"name": "storybook-solidjs-vite",
13+
"options": {}
14+
}
15+
};
16+
export default config;

‎.storybook/preview.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import type { Preview } from 'storybook-solidjs-vite'
2+
import '../src/styles/imports.css'
3+
4+
const preview: Preview = {
5+
parameters: {
6+
controls: {
7+
matchers: {
8+
color: /(background|color)$/i,
9+
date: /Date$/i,
10+
},
11+
},
12+
},
13+
}
14+
15+
export default preview

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
"WROOMS",
1616
"XAIO",
1717
"XIAOSENSES"
18-
]
18+
],
1919
}

‎index.html‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,7 @@
4343
</head>
4444
<body>
4545
<noscript>You need to enable JavaScript to run this app.</noscript>
46-
<div class="main-div" id="root">
47-
<div data-tauri-drag-region class="titlebar" id="titlebar">
48-
<div class="titlebar-button" id="titlebar-minimize">
49-
<svg width="1em" height="1em" viewBox="0 0 24 24">
50-
<path fill="#ffffff" d="M20 14H4v-4h16" />
51-
</svg>
52-
</div>
53-
<div class="titlebar-button" id="titlebar-maximize">
54-
<svg width="1em" height="1em" viewBox="0 0 24 24">
55-
<path fill="#ffffff" d="M4 4h16v16H4zm2 4v10h12V8z" />
56-
</svg>
57-
</div>
58-
<div class="titlebar-button" id="titlebar-close">
59-
<svg width="1em" height="1em" viewBox="0 0 24 24">
60-
<path
61-
fill="white"
62-
d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12z" />
63-
</svg>
64-
</div>
65-
</div>
66-
</div>
46+
<div class="main-div" id="root" />
6747
<script type="module" src="./src/main.tsx"></script>
6848
<script type="text/javascript" data-sqs-type="imageloader-bootstrapper">
6949
;(function () {

‎package.json‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"dev": "vite dev",
1010
"build": "vite build",
1111
"start": "vite start",
12+
"test": "vitest run",
13+
"test:watch": "vitest",
1214
"serve": "vite preview",
1315
"setup": "pnpm install && pnpm run specta:post-install",
1416
"tauri:dev": "tauri dev",
@@ -24,14 +26,18 @@
2426
"lint": "eslint --ext .js,.ts,.jsx,.tsx src",
2527
"format": "pnpm run lint --fix & pnpm prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
2628
"update-deps": "pnpm up -Li",
27-
"typecheck": "tsc --noEmit"
29+
"typecheck": "tsc --noEmit",
30+
"storybook": "storybook dev -p 6006",
31+
"build-storybook": "storybook build"
2832
},
2933
"devDependencies": {
3034
"@babel/core": "^7.26.0",
3135
"@babel/preset-env": "^7.26.0",
36+
"@storybook/addon-docs": "9.1.10",
3237
"@tailwindcss/forms": "^0.5.10",
3338
"@tauri-apps/api": "1.6.0",
3439
"@tauri-apps/cli": "1.6.3",
40+
"@types/lodash": "^4.17.21",
3541
"@types/node": "^22.10.7",
3642
"@typescript-eslint/eslint-plugin": "^8.20.0",
3743
"@typescript-eslint/parser": "^8.20.0",
@@ -46,15 +52,20 @@
4652
"eslint-plugin-autofix": "^2.2.0",
4753
"eslint-plugin-import": "^2.31.0",
4854
"eslint-plugin-solid": "^0.14.5",
55+
"eslint-plugin-storybook": "9.1.10",
4956
"https-localhost": "^4.7.1",
5057
"jsdoc": "^4.0.4",
58+
"jsdom": "^27.0.0",
5159
"postcss": "^8.5.1",
5260
"postcss-import": "^16.1.0",
5361
"prettier": "^3.4.2",
62+
"storybook": "9.1.10",
63+
"storybook-solidjs-vite": "9.0.3",
5464
"tailwindcss": "^3.4.17",
5565
"typescript": "^5.7.3",
5666
"vite": "^6.0.7",
57-
"vite-plugin-solid": "^2.11.0"
67+
"vite-plugin-solid": "^2.11.0",
68+
"vitest": "^3.2.4"
5869
},
5970
"dependencies": {
6071
"@kobalte/core": "^0.13.7",
@@ -67,6 +78,7 @@
6778
"@solidjs/router": "^0.15.3",
6879
"@stitches/core": "^1.2.8",
6980
"@tailwindcss/typography": "^0.5.16",
81+
"@testing-library/jest-dom": "^6.9.1",
7082
"babel-preset-solid": "^1.9.3",
7183
"class-variance-authority": "^0.7.1",
7284
"esptool-js": "^0.5.4",
@@ -88,4 +100,4 @@
88100
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store",
89101
"tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload"
90102
}
91-
}
103+
}

0 commit comments

Comments
 (0)