Merge pull request #32 from sinamics/dev

Dev
sinamics · Apr 6, 2023 · ce641df · ce641df
2 parents af3290f + a24867d
commit ce641df
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/.github/workflows/ci-tag-release.yml b/.github/workflows/ci-tag-release.yml
@@ -0,0 +1,20 @@
+name: "Create new release tag"
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  tagged-release:
+    name: "Tagged Release"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alfa') }}
+          files: |
+            LICENSE
+            README.md
diff --git a/.github/workflows/ci-tag.yml b/.github/workflows/ci-tag.yml
@@ -1,7 +1,7 @@
 # Build new docker image when a new tag is pushed, and generate changelog and release notes and use the tag as the release name.
 # if the tag has beta or alfa in the name, set the release as a pre-release.
 
-name: Push Tag build container
+name: Build release image
 
 on:
   push:
@@ -62,12 +62,14 @@ jobs:
             ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
             ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:${{ steps.extract_version.outputs.version_number }}
 
-      - uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alfa') }}
-          automatic_release_tag: ${{ github.event.inputs.version || steps.previoustag.outputs.tag }}
-          title: ${{ steps.previoustag.outputs.tag }}
-          files: |
-            LICENSE
-            README.md
+      # - uses: "marvinpinto/action-automatic-releases@latest"
+      #   with:
+      #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
+      #     prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alfa') }}
+      #     files: |
+      #       LICENSE
+      #       README.md
+
+#          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alfa') }}
+#          automatic_release_tag: ${{ github.event.inputs.version || steps.previoustag.outputs.tag }}
+#          title: ${{ steps.previoustag.outputs.tag }}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -39,7 +39,7 @@ services:
     platform: "linux/amd64"
     working_dir: /app
     volumes:
-      - zerotier:/var/lib/zerotier-one
+      - zerotier:/var/lib/zerotier-one:ro
     restart: unless-stopped
     ports:
       - 3000:3000

diff --git a/src/components/elements/inputField.tsx b/src/components/elements/inputField.tsx
@@ -113,9 +113,9 @@ const InputField = ({
       ) : (
         <dd className="mt-1 flex items-center gap-2 text-sm">
           {placeholder ?? fields[0].placeholder}
-          {badge && (
+          {badge ? (
             <div className={`badge badge-${badge.color}`}>{badge.text}</div>
-          )}
+          ) : null}
         </dd>
       )}
     </>

diff --git a/src/utils/ztApi.ts b/src/utils/ztApi.ts
@@ -184,9 +184,15 @@ export const network_create = async (
     if (axios.isAxiosError(error)) {
       const axiosError = error as AxiosError;
       // eslint-disable-next-line no-console
-      console.error(axiosError.response?.statusText || "Unknown error");
+      console.error(`Axios error: ${axiosError.message}`);
+      // eslint-disable-next-line no-console
+      console.error(`Status code: ${axiosError.response?.status}`);
+      // eslint-disable-next-line no-console
+      console.error(`Status text: ${axiosError.response?.statusText}`);
       throw axiosError;
     }
+    // eslint-disable-next-line no-console
+    console.error(`Unknown error: ${error.message}`);
     throw error;
   }
 };