Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fixes to v2.1.2 #21

Merged
merged 13 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
node-version: lts/*
- name: Install dependencies
run: |
corepack enable
corepack enable
yarn install
- name: Build
run: yarn bundle:demo
Expand Down
13 changes: 0 additions & 13 deletions .vscode/extensions.json

This file was deleted.

14 changes: 0 additions & 14 deletions .vscode/settings.json

This file was deleted.

12 changes: 10 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,16 @@ yarn action:devtool

## Theming

Theming is done via the [light-dark](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/light-dark) CSS color function. The theme is then being changed by setting a different `color-scheme` value in a CSS root tag. Try to follow the general styling.

Theming is done via the [light-dark](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/light-dark) CSS color function. The theme is then being changed by setting a different `color-scheme` value in a CSS root tag. `color-scheme` has the following valid values `light`,`dark` and `light dark`. The same is true for `AppContext.appearances.colorTheme`. Depending on the App-Context, a different stylesheet is being linked (see [`App.tsx`](./src/App.tsx)). Those stylesheets are:
- [`theme-light.css`](./src/theme-light.css)
- [`theme-dark.css`](./src/theme-dark.css)
- [`theme-lightdark.css`](./src/theme-lightdark.css)

As for the Styling itself, try to follow the general styling.
- Secondary color for active/selected elements, rarely accents.
- Primary color for interactive elements, unless it breaks with the overall element styling. The table row navigator buttons are a good example ([`TableBody.tsx`](./src/comps/Table/TableBody.tsx)), for when to break with theme.
- Links are underlined and mostly not focusable (`tabindex: -1;`).
- ...expect this list to grow over time

## Data Storage

Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Version v2.1.2
- bugfixes and polishing
- dependency upgrades

## Version v2.1.1
- sanding and optimizations
Expand Down
59 changes: 49 additions & 10 deletions factor.code-workspace
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"folders": [
"folders": [
{
"path": "."
}
],
"settings": {
"typescript.tsdk": "node_modules\\typescript\\lib",
"files.exclude": {
"settings": {
"typescript.tsdk": "node_modules\\typescript\\lib",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
Expand All @@ -30,10 +30,49 @@
"LICENSE": true,
"node_modules": true,
".yarn": true,
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.indentSize": "tabSize",
"editor.tabSize": 3,
},

},
"editor.indentSize": "tabSize",
"editor.tabSize": 3,
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[css]": {
"editor.defaultFormatter": "vscode.css-language-features"
},
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer"
},
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[jsonl]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[yaml]": {
"editor.insertSpaces": true,
"editor.tabSize": 2,
"editor.autoIndent": "advanced",
"diffEditor.ignoreTrimWhitespace": false
}
},
"extensions": {
"recommendations": [
"dbaeumer.vscode-eslint",
"rvest.vs-code-prettier-eslint",
"editorconfig.editorconfig",
"formulahendry.auto-rename-tag",
"aaron-bond.better-comments",
"ms-vscode.vscode-typescript",
"esbenp.prettier-vscode",
"vadimcn.vscode-lldb",
"rust-lang.rust-analyzer",
"tauri-apps.tauri-vscode"
]
}
}
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
"action:devtools": "react-devtools",
"action:format": "prettier --write .",
"action:lint": "eslint ./src -c ./eslint.config.mjs --fix",
"action:version": "node ./scripts/upgradeVersion.js",
"action:check-types": "tsc",
"build": "node ./scripts/preTauriBuild.mjs && tauri build",
"action:version": "node ./scripts/upgradeVersion.js",
"action:check-types": "tsc",
"build": "node ./scripts/preTauriBuild.js && tauri build",
"bundle:dev": "vite build -c ./vite.dev.config.ts",
"bundle:demo": "node ./scripts/preDemoBundle.mjs && vite build -c ./vite.demo.config.ts && node ./scripts/includeFiles.mjs ",
"bundle:demo": "node ./scripts/preDemoBundle.js && vite build -c ./vite.demo.config.ts && node ./scripts/includeFiles.js ",
"bundle:prod": "tsc && vite build -c ./vite.prod.config.ts",
"dev:vite": "vite -c ./vite.dev.config.ts",
"dev:demo": "node ./scripts/preDemoBundle.mjs && vite -c ./vite.demo.config.ts",
"dev:tauri": "node ./scripts/preTauriDev.mjs && tauri dev",
"dev:demo": "node ./scripts/preDemoBundle.js && vite -c ./vite.demo.config.ts",
"dev:tauri": "node ./scripts/preTauriDev.js && tauri dev",
"gen:sample-customers": "node ./scripts/genData.cli.js"
},
"dependencies": {
"@react-pdf/renderer": "^3.4.5",
"@tauri-apps/api": "^2.0.0-rc.5",
"@react-pdf/renderer": "^4.0.0",
"@tauri-apps/api": "^2.0.0-rc.6",
"@tauri-apps/plugin-fs": "^2.0.0-rc.2",
"@tauri-apps/plugin-notification": "^2.0.0-rc.1",
"@tauri-apps/plugin-shell": "^2.0.0-rc.1",
Expand All @@ -35,16 +35,16 @@
},
"devDependencies": {
"@eslint/js": "^9.11.1",
"@tauri-apps/cli": "^2.0.0-rc.16",
"@tauri-apps/cli": "^2.0.0-rc.17",
"@types/eslint__js": "^8.42.3",
"@types/node": "^20.16.8",
"@types/react": "^18.3.9",
"@types/node": "^20.16.10",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^9.11.1",
"eslint-plugin-react": "^7.36.1",
"eslint-plugin-react": "^7.37.0",
"globals": "^15.9.0",
"prettier": "^3.3.3",
"typescript": "^5.6.2",
Expand Down
Loading
Loading