diff --git a/.github/workflows/npm-build.yml b/.github/workflows/npm-build.yml
new file mode 100644
index 0000000..e8040c6
--- /dev/null
+++ b/.github/workflows/npm-build.yml
@@ -0,0 +1,23 @@
+name: NPM Build
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - name: "Checkout code"
+ uses: actions/checkout@v4
+
+ - name: "Use Node.js"
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+
+ - name: "Install npm dependencies"
+ run: npm ci
+
+ - name: "Build"
+ run: npm run build
diff --git a/.github/workflows/npm-format.yml b/.github/workflows/npm-format.yml
new file mode 100644
index 0000000..7f4f02e
--- /dev/null
+++ b/.github/workflows/npm-format.yml
@@ -0,0 +1,23 @@
+name: Check Formatting
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - name: "Checkout code"
+ uses: actions/checkout@v4
+
+ - name: "Use Node.js"
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+
+ - name: "Install npm dependencies"
+ run: npm ci
+
+ - name: "Run formatting check"
+ run: npm run format:check
diff --git a/.github/workflows/npm-lint.yml b/.github/workflows/npm-lint.yml
new file mode 100644
index 0000000..8802b9d
--- /dev/null
+++ b/.github/workflows/npm-lint.yml
@@ -0,0 +1,23 @@
+name: NPM Lint
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - name: "Checkout code"
+ uses: actions/checkout@v4
+
+ - name: "Use Node.js"
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+
+ - name: "Install npm dependencies"
+ run: npm ci
+
+ - name: "Run linter"
+ run: npm run lint
diff --git a/.github/workflows/npm-typecheck.yml b/.github/workflows/npm-typecheck.yml
new file mode 100644
index 0000000..1e975cf
--- /dev/null
+++ b/.github/workflows/npm-typecheck.yml
@@ -0,0 +1,23 @@
+name: NPM Typecheck
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - name: "Checkout code"
+ uses: actions/checkout@v4
+
+ - name: "Use Node.js"
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+
+ - name: "Install npm dependencies"
+ run: npm ci
+
+ - name: "Run type check"
+ run: npm run typecheck
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4208473..759582a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,10 +2,14 @@ name: Build/release Electron app
on:
push:
+ tags:
+ - 'v*.*.*'
jobs:
release:
runs-on: ${{ matrix.os }}
+ env:
+ SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
strategy:
matrix:
@@ -22,6 +26,10 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@v3
+ - name: Install Snapcraft
+ uses: samuelmeuli/action-snapcraft@v2
+ if: ${{ matrix.platform == 'linux' }}
+
- name: Install Node.js
uses: actions/setup-node@v3
with:
diff --git a/.github/workflows/sourcemaps.yml b/.github/workflows/sourcemaps.yml
new file mode 100644
index 0000000..214b5fa
--- /dev/null
+++ b/.github/workflows/sourcemaps.yml
@@ -0,0 +1,24 @@
+name: Upload Sentry sourcemaps
+
+on:
+ push:
+ tags:
+ - 'v*.*.*'
+
+jobs:
+ sourcemaps:
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Create Sentry release
+ uses: getsentry/action-release@v1
+ env:
+ SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+ SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+ SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+ # SENTRY_URL: https://sentry.io/
+ with:
+ environment: production
diff --git a/README.md b/README.md
index b52fa7a..cd2cbc3 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,20 @@
-# solidtime-electron
+# solidtime desktop
-An Electron application with Vue and TypeScript
+Desktop Application for Solidtime - The modern open-source time-tracker for macOS, Windows and Linux.
-## Recommended IDE Setup
+**This client is currently in alpha, if you run into any problems please open an issue.**
-- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin)
+You can find the latest versions [here](https://github.com/solidtime-io/solidtime-desktop/releases)
-## Project Setup
+Additionally you can install the app via
+
+
+ 
+
+
+## Development Setup
+
+**We do not accept any external contributions at the moment as this project is still in an early stage.**
### Install
diff --git a/electron-builder.yml b/electron-builder.yml
index e2afab4..0441590 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -24,20 +24,35 @@ nsis:
createDesktopShortcut: always
mac:
entitlementsInherit: build/entitlements.mac.plist
+ target:
+ target: default
+ arch:
+ - x64
+ - arm64
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
- notarize: false
+ notarize: true
dmg:
artifactName: ${name}-${version}.${ext}
linux:
target:
- - AppImage
- deb
+ - snap
+ - AppImage
+ - tar.gz
+ - rpm
+ - flatpak
+ desktop: # Define desktop elem
+ name: solidtime
+ exec: solidtime %U
+ MimeType: x-scheme-handler/solidtime
maintainer: solidtime.io
category: Utility
+ mimeTypes:
+ - x-scheme-handler/solidtime
appImage:
artifactName: ${name}-${version}.${ext}
npmRebuild: false
diff --git a/package-lock.json b/package-lock.json
index a285cb2..d298ecc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
{
"name": "solidtime",
- "version": "0.0.13",
+ "version": "0.0.20",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "solidtime",
- "version": "0.0.13",
+ "version": "0.0.20",
"hasInstallScript": true,
"dependencies": {
"@electron-toolkit/preload": "^3.0.0",
"@electron-toolkit/utils": "^3.0.0",
"@sentry/electron": "^5.3.0",
"@solidtime/api": "^0.0.3",
- "@solidtime/ui": "^0.0.7",
+ "@solidtime/ui": "^0.0.8",
"electron-updater": "^6.1.7"
},
"devDependencies": {
@@ -1891,9 +1891,9 @@
}
},
"node_modules/@opentelemetry/instrumentation-express": {
- "version": "0.41.0",
- "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.41.0.tgz",
- "integrity": "sha512-/B7fbMdaf3SYe5f1P973tkqd6s7XZirjpfkoJ63E7nltU30qmlgm9tY5XwZOzAFI0rHS9tbrFI2HFPAvQUFe/A==",
+ "version": "0.41.1",
+ "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.41.1.tgz",
+ "integrity": "sha512-uRx0V3LPGzjn2bxAnV8eUsDT82vT7NTwI0ezEuPMBOTOsnPpGhWdhcdNdhH80sM4TrWrOfXm9HGEdfWE3TRIww==",
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/core": "^1.8.0",
@@ -1924,6 +1924,22 @@
"@opentelemetry/api": "^1.3.0"
}
},
+ "node_modules/@opentelemetry/instrumentation-fs": {
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.14.0.tgz",
+ "integrity": "sha512-pVc8P5AgliC1DphyyBUgsxXlm2XaPH4BpYvt7rAZDMIqUpRk8gs19SioABtKqqxvFzg5jPtgJfJsdxq0Y+maLw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@opentelemetry/core": "^1.8.0",
+ "@opentelemetry/instrumentation": "^0.52.0"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "peerDependencies": {
+ "@opentelemetry/api": "^1.3.0"
+ }
+ },
"node_modules/@opentelemetry/instrumentation-graphql": {
"version": "0.42.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.42.0.tgz",
@@ -2273,9 +2289,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
- "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.1.tgz",
+ "integrity": "sha512-2thheikVEuU7ZxFXubPDOtspKn1x0yqaYQwvALVtEcvFhMifPADBrgRPyHV0TF3b+9BgvgjgagVyvA/UqPZHmg==",
"cpu": [
"arm"
],
@@ -2287,9 +2303,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
- "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.1.tgz",
+ "integrity": "sha512-t1lLYn4V9WgnIFHXy1d2Di/7gyzBWS8G5pQSXdZqfrdCGTwi1VasRMSS81DTYb+avDs/Zz4A6dzERki5oRYz1g==",
"cpu": [
"arm64"
],
@@ -2301,9 +2317,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
- "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.1.tgz",
+ "integrity": "sha512-AH/wNWSEEHvs6t4iJ3RANxW5ZCK3fUnmf0gyMxWCesY1AlUj8jY7GC+rQE4wd3gwmZ9XDOpL0kcFnCjtN7FXlA==",
"cpu": [
"arm64"
],
@@ -2315,9 +2331,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
- "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.1.tgz",
+ "integrity": "sha512-dO0BIz/+5ZdkLZrVgQrDdW7m2RkrLwYTh2YMFG9IpBtlC1x1NPNSXkfczhZieOlOLEqgXOFH3wYHB7PmBtf+Bg==",
"cpu": [
"x64"
],
@@ -2329,9 +2345,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
- "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.1.tgz",
+ "integrity": "sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==",
"cpu": [
"arm"
],
@@ -2343,9 +2359,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
- "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.1.tgz",
+ "integrity": "sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==",
"cpu": [
"arm"
],
@@ -2357,9 +2373,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
- "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.1.tgz",
+ "integrity": "sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==",
"cpu": [
"arm64"
],
@@ -2371,9 +2387,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
- "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.1.tgz",
+ "integrity": "sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==",
"cpu": [
"arm64"
],
@@ -2385,9 +2401,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
- "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.1.tgz",
+ "integrity": "sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==",
"cpu": [
"ppc64"
],
@@ -2399,9 +2415,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
- "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.1.tgz",
+ "integrity": "sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==",
"cpu": [
"riscv64"
],
@@ -2413,9 +2429,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
- "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.1.tgz",
+ "integrity": "sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==",
"cpu": [
"s390x"
],
@@ -2427,9 +2443,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
- "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.1.tgz",
+ "integrity": "sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==",
"cpu": [
"x64"
],
@@ -2441,9 +2457,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
- "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.1.tgz",
+ "integrity": "sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==",
"cpu": [
"x64"
],
@@ -2455,9 +2471,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
- "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.1.tgz",
+ "integrity": "sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==",
"cpu": [
"arm64"
],
@@ -2469,9 +2485,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
- "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.1.tgz",
+ "integrity": "sha512-tNg+jJcKR3Uwe4L0/wY3Ro0H+u3nrb04+tcq1GSYzBEmKLeOQF2emk1whxlzNqb6MMrQ2JOcQEpuuiPLyRcSIw==",
"cpu": [
"ia32"
],
@@ -2483,9 +2499,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
- "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.1.tgz",
+ "integrity": "sha512-xGiIH95H1zU7naUyTKEyOA/I0aexNMUdO9qRv0bLKN3qu25bBdrxZHqA3PTJ24YNN/GdMzG4xkDcd/GvjuhfLg==",
"cpu": [
"x64"
],
@@ -2504,112 +2520,112 @@
"license": "MIT"
},
"node_modules/@sentry-internal/browser-utils": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.20.0.tgz",
- "integrity": "sha512-GGYNiELnT4ByidHyS4/M8UF8Oxagm5R13QyTncQGq8nZcQhcFZ9mdxLnf1/R4+j44Fph2Cgzafe8jGP/AMA9zw==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.26.0.tgz",
+ "integrity": "sha512-O2Tj+WK33/ZVp5STnz6ZL0OO+/Idk2KqsH0ITQkQmyZ2z0kdzWOeqK7s7q3/My6rB1GfPcyqPcBBv4dVv92FYQ==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry-internal/feedback": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.20.0.tgz",
- "integrity": "sha512-mFvAoVpVShkDB2AgEr/dE96NSTPKI/lGMBznZMg7ZEcwZhLfH7HvLYCadIskRfzqFTLOUpbm9ciIO4SyR/4bDA==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.26.0.tgz",
+ "integrity": "sha512-hQtw1gg8n6ERK1UH47F7ZI1zOsbhu0J2VX+TrnkpaQR2FgxDW1oe9Ja6oCV4CQKuR4w+1ZI/Kj4imSt0K33kEw==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry-internal/replay": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.20.0.tgz",
- "integrity": "sha512-sCiI7SOAHq5XsxkixtoMofeSyKd/hVgDV+4145f6nN9m7nLzig4PBQwh2SgK2piJ2mfaXfqcdzA1pShPYldaJA==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.26.0.tgz",
+ "integrity": "sha512-JDY7W2bswlp5c3483lKP4kcb75fHNwGNfwD8x8FsY9xMjv7nxeXjLpR5cCEk1XqPq2+n6w4j7mJOXhEXGiUIKg==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/browser-utils": "8.20.0",
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry-internal/browser-utils": "8.26.0",
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry-internal/replay-canvas": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.20.0.tgz",
- "integrity": "sha512-LXV/pMH9KMw6CtImenMsiBkYIFIc97pDJ/rC7mVImKIROQ45fxGp/JBXM4Id0GENyA2+SySMWVQCAAapSfHZTw==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.26.0.tgz",
+ "integrity": "sha512-2CFQW6f9aJHIo/DqmqYa9PaYoLn1o36ywc0h8oyGrD4oPCbrnE5F++PmTdc71GBODu41HBn/yoCTLmxOD+UjpA==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/replay": "8.20.0",
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry-internal/replay": "8.26.0",
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry/browser": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.20.0.tgz",
- "integrity": "sha512-JDZbCreY44/fHYN28QzsAwEHXa2rc1hzM6GE4RSlXCdAhNfrjVxyYDxhw/50pVEHZg1WXxf7ZmERjocV5VJHsw==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.26.0.tgz",
+ "integrity": "sha512-e5s6eKlwLZWzTwQcBwqyAGZMMuQROW9Z677VzwkSyREWAIkKjfH2VBxHATnNGc0IVkNHjD7iH3ixo3C0rLKM3w==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/browser-utils": "8.20.0",
- "@sentry-internal/feedback": "8.20.0",
- "@sentry-internal/replay": "8.20.0",
- "@sentry-internal/replay-canvas": "8.20.0",
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry-internal/browser-utils": "8.26.0",
+ "@sentry-internal/feedback": "8.26.0",
+ "@sentry-internal/replay": "8.26.0",
+ "@sentry-internal/replay-canvas": "8.26.0",
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry/core": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.20.0.tgz",
- "integrity": "sha512-R81snuw+67VT4aCxr6ShST/s0Y6FlwN2YczhDwaGyzumn5rlvA6A4JtQDeExduNoDDyv4T3LrmW8wlYZn3CJJw==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.26.0.tgz",
+ "integrity": "sha512-g/tVmTZD4GNbLFf++hKJfBpcCAtduFEMLnbfa9iT/QEZjlmP+EzY+GsH9bafM5VsNe8DiOUp+kJKWtShzlVdBA==",
"license": "MIT",
"dependencies": {
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry/electron": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-5.3.0.tgz",
- "integrity": "sha512-6aqs5UB45stTI3VGfbNAo8k+jzrhOmwJ3BA8N/BKvrn6k+uO1S9lNAT5qI+GIuhRf2IfGj91n5d2kkd6ifKv8g==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-5.4.0.tgz",
+ "integrity": "sha512-ViJJ/7nro/QZPPFsrnniXwHW6BxxKHm+Ec79tGEDrLdrNhd4KL0oMZJF1cH+rMsG45ymQ5bO+lpA7Yf0nC/gZg==",
"license": "MIT",
"dependencies": {
- "@sentry/browser": "8.20.0",
- "@sentry/core": "8.20.0",
- "@sentry/node": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0",
+ "@sentry/browser": "8.26.0",
+ "@sentry/core": "8.26.0",
+ "@sentry/node": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0",
"deepmerge": "4.3.1"
}
},
"node_modules/@sentry/node": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.20.0.tgz",
- "integrity": "sha512-i4ywT2m0Gw65U3uwI4NwiNcyqp9YF6/RsusfH1pg4YkiL/RYp7FS0MPVgMggfvoue9S3KjCgRVlzTLwFATyPXQ==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.26.0.tgz",
+ "integrity": "sha512-N9mNLzicnfGgsq6P10ckPdTzEFusjTC7gpqPopwq5eEMF7g798hH8CcE5o6FZ4iAAR3vWliAR/jgccdoMmJMpQ==",
"license": "MIT",
"dependencies": {
"@opentelemetry/api": "^1.9.0",
@@ -2617,8 +2633,9 @@
"@opentelemetry/core": "^1.25.1",
"@opentelemetry/instrumentation": "^0.52.1",
"@opentelemetry/instrumentation-connect": "0.38.0",
- "@opentelemetry/instrumentation-express": "0.41.0",
+ "@opentelemetry/instrumentation-express": "0.41.1",
"@opentelemetry/instrumentation-fastify": "0.38.0",
+ "@opentelemetry/instrumentation-fs": "0.14.0",
"@opentelemetry/instrumentation-graphql": "0.42.0",
"@opentelemetry/instrumentation-hapi": "0.40.0",
"@opentelemetry/instrumentation-http": "0.52.1",
@@ -2635,11 +2652,11 @@
"@opentelemetry/sdk-trace-base": "^1.25.1",
"@opentelemetry/semantic-conventions": "^1.25.1",
"@prisma/instrumentation": "5.17.0",
- "@sentry/core": "8.20.0",
- "@sentry/opentelemetry": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0",
- "import-in-the-middle": "^1.10.0"
+ "@sentry/core": "8.26.0",
+ "@sentry/opentelemetry": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0",
+ "import-in-the-middle": "^1.11.0"
},
"engines": {
"node": ">=14.18"
@@ -2649,14 +2666,14 @@
}
},
"node_modules/@sentry/opentelemetry": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.20.0.tgz",
- "integrity": "sha512-NFcLK6+t9wUc4HlGKeuDn6W4KjZxZfZmWlrK2/tgC5KzG1cnVeOnWUrJzGHTa+YDDdIijpjiFUcpXGPkX3rmIg==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.26.0.tgz",
+ "integrity": "sha512-HBDheM/+ysfIz8R1OH4bBIxdgD7ZbQkKLJAUXkdAbBcfbpK/CTtwcplbauF5wY7Q+GYvwL/ShuDwvXRfW+gFyQ==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "8.20.0",
- "@sentry/types": "8.20.0",
- "@sentry/utils": "8.20.0"
+ "@sentry/core": "8.26.0",
+ "@sentry/types": "8.26.0",
+ "@sentry/utils": "8.26.0"
},
"engines": {
"node": ">=14.18"
@@ -2670,21 +2687,21 @@
}
},
"node_modules/@sentry/types": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.20.0.tgz",
- "integrity": "sha512-6IP278KojOpiAA7vrd1hjhUyn26cl0n0nGsShzic5ztCVs92sTeVRnh7MTB9irDVtAbOEyt/YH6go3h+Jia1pA==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.26.0.tgz",
+ "integrity": "sha512-zKmh6SWsJh630rpt7a9vP4Cm4m1C2gDTUqUiH565CajCL/4cePpNWYrNwalSqsOSL7B9OrczA1+n6a6XvND+ng==",
"license": "MIT",
"engines": {
"node": ">=14.18"
}
},
"node_modules/@sentry/utils": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.20.0.tgz",
- "integrity": "sha512-+1I5H8dojURiEUGPliDwheQk8dhjp8uV1sMccR/W/zjFrt4wZyPs+Ttp/V7gzm9LDJoNek9tmELert/jQqWTgg==",
+ "version": "8.26.0",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.26.0.tgz",
+ "integrity": "sha512-xvlPU9Hd2BlyT+FhWHGNwnxWqdVRk2AHnDtVcW4Ma0Ri5EwS+uy4Jeik5UkSv8C5RVb9VlxFmS8LN3I1MPJsLw==",
"license": "MIT",
"dependencies": {
- "@sentry/types": "8.20.0"
+ "@sentry/types": "8.26.0"
},
"engines": {
"node": ">=14.18"
@@ -2714,9 +2731,9 @@
}
},
"node_modules/@solidtime/ui": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/@solidtime/ui/-/ui-0.0.7.tgz",
- "integrity": "sha512-FkK+fZkwPCJUxnZ8WMINNIJr2Pb5BlCxROSONe6cHzb0gWh11JyvVw3wSG4dEB9VBLRORXuLNRFLajDo00YZBA==",
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/@solidtime/ui/-/ui-0.0.8.tgz",
+ "integrity": "sha512-PLAon7dSoVbU9wI+0tbsX+qKrQuXDfxOY42SY27pjH3DT6DL9DISKDnxpyoEJQCZJ4npRqBsQzGCugLabQ15Hg==",
"license": "AGPL-3.0",
"peerDependencies": {
"@floating-ui/vue": "^1.1.4",
@@ -2800,9 +2817,9 @@
}
},
"node_modules/@tanstack/query-core": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.52.0.tgz",
- "integrity": "sha512-U1DOEgltjUwalN6uWYTewSnA14b+tE7lSylOiASKCAO61ENJeCq9VVD/TXHA6O5u9+6v5+UgGYBSccTKDoyMqw==",
+ "version": "5.52.2",
+ "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.52.2.tgz",
+ "integrity": "sha512-9vvbFecK4A0nDnrc/ks41e3UHONF1DAnGz8Tgbxkl59QcvKWmc0ewhYuIKRh8NC4ja5LTHT9EH16KHbn2AIYWA==",
"dev": true,
"license": "MIT",
"funding": {
@@ -2822,13 +2839,13 @@
}
},
"node_modules/@tanstack/query-persist-client-core": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.52.0.tgz",
- "integrity": "sha512-D6Ppz4/ofmcA7h/vksaYUVuMSlFRfBBWGE7JSa6AATy6JDO3cXhJoCXOHVRDEK0ScxV93A/wZ1fzawfIDHR6SQ==",
+ "version": "5.52.2",
+ "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.52.2.tgz",
+ "integrity": "sha512-bzOYr1kKUPFZ8nyUL+M/LRdwZOLXh+j6RM1T4WnGtjIfXNCtL13QWGSyJYsb2f5JlqsESZ5DIKiMLmvzRK5+aw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@tanstack/query-core": "5.52.0"
+ "@tanstack/query-core": "5.52.2"
},
"funding": {
"type": "github",
@@ -2836,14 +2853,14 @@
}
},
"node_modules/@tanstack/vue-query": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.52.0.tgz",
- "integrity": "sha512-AfPLrWBIxbLy6x04eylfvpiCaAUJrIyz3MCWtANatFwme8QabQQ3F2/lskdNjeAqF0B2Tn2N2tzDrUa1aCCPVg==",
+ "version": "5.52.2",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.52.2.tgz",
+ "integrity": "sha512-AWEKGFrU5ssRbQzl0AUWoa3bejut57gjmXGstDOuPtua4nsJ9swzFMEjYowjskCEtmIW+exG/WHyebpEmF5DrA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@tanstack/match-sorter-utils": "^8.15.1",
- "@tanstack/query-core": "5.52.0",
+ "@tanstack/query-core": "5.52.2",
"@vue/devtools-api": "^6.6.3",
"vue-demi": "^0.14.10"
},
@@ -2862,9 +2879,9 @@
}
},
"node_modules/@tanstack/vue-query-devtools": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.52.0.tgz",
- "integrity": "sha512-RwR/t8fBYVtnoRtwx9fWT1XNzkTiogNQCSiwbTsW7zofjDQTbmp44DlnjmTc9mfidfpb6hFQs2zZhVpvjjz7Yg==",
+ "version": "5.52.2",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.52.2.tgz",
+ "integrity": "sha512-w41tLnRAMAbFFP5GJC7481qs0CyclTGPvPUiYx0iWI0XOyhYJKQHoNDTDwYXILJg9GoZFWRAqX+Lv8osOwWDGQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2875,7 +2892,7 @@
"url": "https://github.com/sponsors/tannerlinsley"
},
"peerDependencies": {
- "@tanstack/vue-query": "^5.52.0",
+ "@tanstack/vue-query": "^5.52.2",
"vue": "^3.3.0"
}
},
@@ -9414,9 +9431,9 @@
}
},
"node_modules/rollup": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
- "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.1.tgz",
+ "integrity": "sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -9430,22 +9447,22 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.21.0",
- "@rollup/rollup-android-arm64": "4.21.0",
- "@rollup/rollup-darwin-arm64": "4.21.0",
- "@rollup/rollup-darwin-x64": "4.21.0",
- "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
- "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
- "@rollup/rollup-linux-arm64-gnu": "4.21.0",
- "@rollup/rollup-linux-arm64-musl": "4.21.0",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
- "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
- "@rollup/rollup-linux-s390x-gnu": "4.21.0",
- "@rollup/rollup-linux-x64-gnu": "4.21.0",
- "@rollup/rollup-linux-x64-musl": "4.21.0",
- "@rollup/rollup-win32-arm64-msvc": "4.21.0",
- "@rollup/rollup-win32-ia32-msvc": "4.21.0",
- "@rollup/rollup-win32-x64-msvc": "4.21.0",
+ "@rollup/rollup-android-arm-eabi": "4.21.1",
+ "@rollup/rollup-android-arm64": "4.21.1",
+ "@rollup/rollup-darwin-arm64": "4.21.1",
+ "@rollup/rollup-darwin-x64": "4.21.1",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.21.1",
+ "@rollup/rollup-linux-arm-musleabihf": "4.21.1",
+ "@rollup/rollup-linux-arm64-gnu": "4.21.1",
+ "@rollup/rollup-linux-arm64-musl": "4.21.1",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.21.1",
+ "@rollup/rollup-linux-riscv64-gnu": "4.21.1",
+ "@rollup/rollup-linux-s390x-gnu": "4.21.1",
+ "@rollup/rollup-linux-x64-gnu": "4.21.1",
+ "@rollup/rollup-linux-x64-musl": "4.21.1",
+ "@rollup/rollup-win32-arm64-msvc": "4.21.1",
+ "@rollup/rollup-win32-ia32-msvc": "4.21.1",
+ "@rollup/rollup-win32-x64-msvc": "4.21.1",
"fsevents": "~2.3.2"
}
},
diff --git a/package.json b/package.json
index ca471d5..5f16540 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "solidtime",
- "version": "0.0.13",
+ "version": "0.0.20",
"description": "Desktop App for solidtime - the modern open-source time tracker",
"main": "./out/main/index.js",
"author": "solidtime.io",
@@ -8,6 +8,7 @@
"type": "module",
"scripts": {
"format": "prettier --write .",
+ "format:check": "prettier --check .",
"lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts,.vue --fix",
"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
"typecheck:web": "vue-tsc --noEmit -p tsconfig.web.json --composite false",
@@ -32,7 +33,7 @@
"@electron-toolkit/utils": "^3.0.0",
"@sentry/electron": "^5.3.0",
"@solidtime/api": "^0.0.3",
- "@solidtime/ui": "^0.0.7",
+ "@solidtime/ui": "^0.0.8",
"electron-updater": "^6.1.7"
},
"devDependencies": {
diff --git a/resources/linux_icon.png b/resources/linux_icon.png
new file mode 100644
index 0000000..2884f7c
Binary files /dev/null and b/resources/linux_icon.png differ
diff --git a/src/main/index.ts b/src/main/index.ts
index f7a85e8..4713ab8 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,7 +1,7 @@
import { app, BrowserWindow, ipcMain } from 'electron'
import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils'
-import icon from '../../resources/solidtime_empty@4x.png?asset'
+import icon from '../../resources/linux_icon.png?asset'
import { initializeAutoUpdater, registerAutoUpdateListeners } from './autoUpdater'
import { initializeTray, registerTrayListeners } from './tray'
import { initializeMainWindow, registerMainWindowListeners } from './mainWindow'
diff --git a/src/renderer/src/Mini.vue b/src/renderer/src/Mini.vue
index 7632698..6df6b62 100644
--- a/src/renderer/src/Mini.vue
+++ b/src/renderer/src/Mini.vue
@@ -51,14 +51,14 @@ const projects = computed(() => {
})
const shownDescription = computed(() => {
- if (isRunning.value && currentTimeEntry.value.description !== '') {
- return currentTimeEntry.value.description
- } else if (!isRunning.value && lastTimeEntry.value.description !== '') {
- return lastTimeEntry.value.description
+ if (isRunning.value) {
+ return currentTimeEntry.value.description !== '' ? currentTimeEntry.value.description : currentTask.value?.name
+ } else if (!isRunning.value) {
+ return lastTimeEntry.value.description !== '' ? lastTimeEntry.value.description : currentTask.value?.name
}
- return 'No Description'
+ return null
})
-const shownTask = computed(() => {
+const currentTask = computed(() => {
if (isRunning.value) {
return tasks.value?.find((task) => task.id === currentTimeEntry.value.task_id)
} else {
@@ -142,7 +142,7 @@ const currentTimer = computed(() => {
{{ shownTask?.name ?? shownDescription }}{{ shownDescription ?? 'No Description' }}
diff --git a/src/renderer/src/components/SettingsModal.vue b/src/renderer/src/components/SettingsModal.vue
index 767c110..fe3d061 100644
--- a/src/renderer/src/components/SettingsModal.vue
+++ b/src/renderer/src/components/SettingsModal.vue
@@ -72,7 +72,7 @@ function triggerUpdate() {
diff --git a/src/renderer/src/utils/oauth.ts b/src/renderer/src/utils/oauth.ts
index af343ed..d804441 100644
--- a/src/renderer/src/utils/oauth.ts
+++ b/src/renderer/src/utils/oauth.ts
@@ -1,7 +1,6 @@
import { computed, ref } from 'vue'
import { useStorage } from '@vueuse/core'
import { showMainWindow } from './window'
-import { currentMembershipId } from './myMemberships'
const challenge = ref('')
const state = ref('')
@@ -97,7 +96,6 @@ export async function initializeAuth() {
}
export async function logout() {
- currentMembershipId.value = null
accessToken.value = ''
window.localStorage.removeItem('refresh_token')
window.localStorage.removeItem('verifier')