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.

Sign up for GitHub

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 for setting not able to keep change setting, added ts type, remove console log #48

Merged
merged 28 commits into from
Jan 5, 2024
Merged

bug fixes for setting not able to keep change setting, added ts type, remove console log #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
93db175
update
Sir-Thom Dec 29, 2023
7388bdc
Merge branch 'main' into Dev
Sir-Thom Dec 29, 2023
e9f0999
Bump axum from 0.7.2 to 0.7.3 in /src-tauri
dependabot[bot] Jan 1, 2024
044deb8
Update GDK_BACKEND and package dependencies, fix titlebar styling, an…
Sir-Thom Jan 4, 2024
ee8d06c
Fix formatting and remove console logs, added types , bugs fixes in p…
Sir-Thom Jan 5, 2024
9df98b1
Bump serde from 1.0.193 to 1.0.194 in /src-tauri
dependabot[bot] Jan 5, 2024
cc0d84d
Bump serde_json from 1.0.108 to 1.0.111 in /src-tauri
dependabot[bot] Jan 5, 2024
eb23ae0
Bump @vitest/coverage-v8 from 1.1.0 to 1.1.3
dependabot[bot] Jan 5, 2024
2667d18
Merge pull request #42 from Sir-Thom/dependabot/cargo/src-tauri/Dev/s…
Sir-Thom Jan 5, 2024
9b294ea
Merge branch 'Dev' into dependabot/cargo/src-tauri/Dev/serde-1.0.194
Sir-Thom Jan 5, 2024
c8477c8
Merge pull request #41 from Sir-Thom/dependabot/cargo/src-tauri/Dev/s…
Sir-Thom Jan 5, 2024
46498e4
Merge branch 'Dev' into dependabot/npm_and_yarn/Dev/vitest/coverage-v…
Sir-Thom Jan 5, 2024
d613181
Merge pull request #43 from Sir-Thom/dependabot/npm_and_yarn/Dev/vite…
Sir-Thom Jan 5, 2024
3118c62
Bump jsdom from 23.0.1 to 23.1.0
dependabot[bot] Jan 5, 2024
c8ae7f4
Merge branch 'Dev' into dependabot/npm_and_yarn/Dev/jsdom-23.1.0
Sir-Thom Jan 5, 2024
b5a5792
Bump vitest from 1.1.0 to 1.1.3
dependabot[bot] Jan 5, 2024
22c7678
Merge pull request #44 from Sir-Thom/dependabot/npm_and_yarn/Dev/jsdo…
Sir-Thom Jan 5, 2024
88674d5
Merge branch 'Dev' into dependabot/npm_and_yarn/Dev/vitest-1.1.3
Sir-Thom Jan 5, 2024
812bc22
Merge pull request #45 from Sir-Thom/dependabot/npm_and_yarn/Dev/vite…
Sir-Thom Jan 5, 2024
52aa1bb
Bump @tabler/icons-react from 2.44.0 to 2.45.0
dependabot[bot] Jan 5, 2024
98ccd38
Merge branch 'Dev' into dependabot/npm_and_yarn/Dev/tabler/icons-reac…
Sir-Thom Jan 5, 2024
004809d
Merge pull request #46 from Sir-Thom/dependabot/npm_and_yarn/Dev/tabl…
Sir-Thom Jan 5, 2024
f753049
Bump @vitest/ui from 1.1.0 to 1.1.3
dependabot[bot] Jan 5, 2024
3d57f36
Merge branch 'Dev' into dependabot/npm_and_yarn/Dev/vitest/ui-1.1.3
Sir-Thom Jan 5, 2024
0cfc45e
Merge pull request #47 from Sir-Thom/dependabot/npm_and_yarn/Dev/vite…
Sir-Thom Jan 5, 2024
1ad3022
Merge branch 'Dev' into dependabot/cargo/src-tauri/axum-0.7.3
Sir-Thom Jan 5, 2024
93caf37
Merge pull request #39 from Sir-Thom/dependabot/cargo/src-tauri/axum-…
Sir-Thom Jan 5, 2024
8b1fe00
Merge branch 'main' into Dev
Sir-Thom Jan 5, 2024
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
3 changes: 3 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"prettier" ],
"ignorePatterns": ["**/tests/*.test.*"],
"rules": {
"no-unused-vars":1,
"@typescript-eslint/no-unused-vars": 1,
"@typescript-eslint/no-explicit-any": 1,
"no-console": 1, // Means warning
"prettier/prettier": 0 // Means error }
}


}
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "magic-eye",
"description": "A magic eye app",
"version": "0.9.1",
"version": "0.9.2",
"type": "module",
"scripts": {
"check-format": "prettier . --check",
Expand All @@ -19,13 +19,16 @@
"dependencies": {
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.1.1",
"@tabler/icons-react": "^2.44.0",
"@tabler/icons-react": "^2.45.0",
"@tailwindcss/forms": "^0.5.7",
"@tauri-apps/api": "^2.0.0-alpha",
"@tauri-apps/plugin-app": "^2.0.0-alpha",
"@tauri-apps/plugin-dialog": "^2.0.0-alpha.5",
"@tauri-apps/plugin-window": "^2.0.0-alpha",
"framer-motion": "^10.16.16",
"hls-video-element": "^1.1.1",
"hls.js": "^1.4.14",
"media-chrome": "^2.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.12.0",
Expand All @@ -42,20 +45,20 @@
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.15.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.1.0",
"@vitest/ui": "^1.1.0",
"@vitest/ui": "^1.1.3",
"@vitest/coverage-v8": "^1.1.3",
"autoprefixer": "^10.4.16",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.2",
"jsdom": "^23.0.1",
"jsdom": "^23.1.0",
"json-loader": "^0.5.7",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"tailwind-scrollbar": "^3.0.5",
"tailwindcss": "^3.4.0",
"typescript": "^5.3.3",
"vite": "^5.0.10",
"vitest": "^1.1.0"
"vitest": "^1.1.3"
}
}
Loading