diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml new file mode 100644 index 0000000..ebdc1c5 --- /dev/null +++ b/.github/workflows/format-check.yml @@ -0,0 +1,25 @@ +name: Format Check + +on: + pull_request: + branches: [ main ] + +jobs: + format: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + + - name: Setup Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install dependencies + run: npm ci + + - name: Check formatting + run: npm run format:check diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..6b78363 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "plugins": ["prettier-plugin-svelte"], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] +} diff --git a/README.md b/README.md index c9341a2..5accb73 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,9 @@ npm run tauri dev # Build for production npm run tauri build + +# Build for local mac(Bypass code signing) +npm run tauri build -- --bundles app --config "{\"bundle\":{\"macOS\":{\"signingIdentity\":null}}}" ``` ## Contributing diff --git a/package-lock.json b/package-lock.json index dcaaa47..84e3690 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,8 @@ "@sveltejs/kit": "^2.7.0", "@sveltejs/vite-plugin-svelte": "^4.0.0", "@tauri-apps/cli": "^2.0.4", + "prettier": "^3.3.3", + "prettier-plugin-svelte": "^3.2.7", "svelte": "^5.0.0", "svelte-check": "^4.0.0", "typescript": "^5.5.0", @@ -1410,6 +1412,33 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-svelte": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.7.tgz", + "integrity": "sha512-/Dswx/ea0lV34If1eDcG3nulQ63YNr5KPDfMsjbdtpSWOxKKJ7nAc2qlVuYwEvCr4raIuredNoR7K4JCkmTGaQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "prettier": "^3.0.0", + "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" + } + }, "node_modules/readdirp": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", diff --git a/package.json b/package.json index b577773..ce11b97 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch", - "tauri": "tauri" + "tauri": "tauri", + "format": "prettier --write ./src && cargo fmt --manifest-path src-tauri/Cargo.toml", + "format:check": "prettier --check ./src && cargo fmt --manifest-path src-tauri/Cargo.toml -- --check" }, "license": "MIT", "dependencies": { @@ -25,6 +27,8 @@ "@sveltejs/kit": "^2.7.0", "@sveltejs/vite-plugin-svelte": "^4.0.0", "@tauri-apps/cli": "^2.0.4", + "prettier": "^3.3.3", + "prettier-plugin-svelte": "^3.2.7", "svelte": "^5.0.0", "svelte-check": "^4.0.0", "typescript": "^5.5.0", diff --git a/src/app.css b/src/app.css index 5835c71..a3bb5be 100644 --- a/src/app.css +++ b/src/app.css @@ -62,4 +62,4 @@ body { ::-webkit-scrollbar-corner { background: var(--mantle); -} \ No newline at end of file +} diff --git a/src/app.html b/src/app.html index 1dc3fb7..f833291 100644 --- a/src/app.html +++ b/src/app.html @@ -1,16 +1,14 @@ +
+ + + +