diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index eb1ad57..b6c9bc2 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Variable Gathering id: gathervars @@ -33,13 +33,13 @@ jobs: echo "NOT_PREVIOUSLY_PUBLISHED=$NOT_PREVIOUSLY_PUBLISHED" >> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v2 - name: Log in to the Container registry - uses: docker/login-action@v3 + uses: docker/login-action@v2 if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} with: registry: ghcr.io @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker Image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v4 if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} with: build-args: | @@ -60,7 +60,7 @@ jobs: push: true - name: Extract build out of docker image - uses: shrink/actions-docker-extract@v3 + uses: shrink/actions-docker-extract@v2 if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} id: extract with: @@ -73,14 +73,33 @@ jobs: cd "${{ steps.extract.outputs.destination }}" 7z a headscale-ui.zip web - - name: Create Release - uses: softprops/action-gh-release@v2 + - name: Create Draft Release + id: create_release + uses: actions/create-release@v1 if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ env.VERSION }} - name: headscale-ui - files: ${{ steps.extract.outputs.destination }}/headscale-ui.zip - generate_release_notes: true - make_latest: true \ No newline at end of file + release_name: headscale-ui + draft: true + prerelease: false + + - name: upload asset to releases + uses: actions/upload-release-asset@v1.0.1 + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ steps.extract.outputs.destination }}/headscale-ui.zip + asset_name: headscale-ui.zip + asset_content_type: application/zip + + - name: publish release + uses: eregon/publish-release@v1 + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + release_id: ${{ steps.create_release.outputs.id }} diff --git a/docker/development/scripts/install-openvscode-server.sh b/docker/development/scripts/install-openvscode-server.sh index 204cc4a..bae7aab 100644 --- a/docker/development/scripts/install-openvscode-server.sh +++ b/docker/development/scripts/install-openvscode-server.sh @@ -1,5 +1,5 @@ # script variables -OPENVSCODE_VERSION="1.103.1" +OPENVSCODE_VERSION="1.98.0" OPENVSCODE_URL="https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v$OPENVSCODE_VERSION/openvscode-server-v$OPENVSCODE_VERSION-linux-x64.tar.gz" OPENVSCODE_RELEASE="openvscode-server-v$OPENVSCODE_VERSION-linux-x64" diff --git a/package-lock.json b/package-lock.json index 8b14a9d..a036237 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "headscale-ui", - "version": "2025.07.12", + "version": "2025.03.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "headscale-ui", - "version": "2025.07.12", + "version": "2025.03.21", "devDependencies": { "@sveltejs/adapter-auto": "^4", "@sveltejs/adapter-static": "^3", diff --git a/package.json b/package.json index 600addf..8ec7a28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "headscale-ui", - "version": "2025.08.23", + "version": "2025.05.22", "scripts": { "dev": "vite dev --port 8080 --host 0.0.0.0", "build": "vite build", @@ -33,4 +33,4 @@ "typescript": "^5" }, "type": "module" -} +} \ No newline at end of file diff --git a/src/lib/common/apiFunctions.svelte b/src/lib/common/apiFunctions.svelte index 960b367..26d4939 100644 --- a/src/lib/common/apiFunctions.svelte +++ b/src/lib/common/apiFunctions.svelte @@ -464,7 +464,7 @@ }); } - export async function moveDevice(deviceID: string, userID: string): Promise { + export async function moveDevice(deviceID: string, user: string): Promise { // variables in local storage let headscaleURL = localStorage.getItem('headscaleURL') || ''; @@ -480,7 +480,7 @@ Authorization: `Bearer ${headscaleAPIKey}` }, body: JSON.stringify({ - user: parseInt(userID) + user: user }) }) .then((response) => { diff --git a/src/lib/common/classes.ts b/src/lib/common/classes.ts index d66c622..2bd9120 100644 --- a/src/lib/common/classes.ts +++ b/src/lib/common/classes.ts @@ -10,7 +10,7 @@ export class Device { public approvedRoutes: string[] = []; public availableRoutes: string[] = []; public subnetRoutes: string[] = []; - public user: User = new User(); + public user: { name: string } = { name: '' }; public online?: boolean; public constructor(init?: Partial) { @@ -56,7 +56,6 @@ export class PreAuthKey { export class User { public id: string = ''; public name: string = ''; - public email: string = ''; public createdAt: string = ''; public constructor(init?: Partial) { Object.assign(this, init); diff --git a/src/lib/devices/CreateDevice.svelte b/src/lib/devices/CreateDevice.svelte index 2b73888..7d32a7f 100644 --- a/src/lib/devices/CreateDevice.svelte +++ b/src/lib/devices/CreateDevice.svelte @@ -65,7 +65,7 @@ diff --git a/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRoute.svelte b/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRoute.svelte index d454488..9d0b73d 100644 --- a/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRoute.svelte +++ b/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRoute.svelte @@ -1,15 +1,15 @@ {route} {#if device.approvedRoutes.includes(route)} - + {:else} {/if} diff --git a/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRouteAPI.svelte b/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRouteAPI.svelte index 1f28ecb..23e24a6 100644 --- a/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRouteAPI.svelte +++ b/src/lib/devices/DeviceCard/DeviceRoutes/DeviceRouteAPI.svelte @@ -1,6 +1,6 @@ {#if !cardEditing} - {user.id}: {user.name.length > 1 ? user.name : user.email} + {user.id}: {user.name}