Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into feat/eth-node-web3-client-wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulDremanovich committed Jun 29, 2024
2 parents 46c4b15 + b6c1e3e commit 95106d7
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 74 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/electron-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

steps:
- name: Checkout repository 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node version 🍀
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Install dependencies ⚙️
run: npm ci
Expand All @@ -31,7 +31,7 @@ jobs:
npm run electron:build
- name: Save artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: electron-release-app
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/electron-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:

steps:
- name: Checkout repository 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node version 🍀
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Install dependencies ⚙️
run: npm ci
Expand All @@ -37,7 +37,7 @@ jobs:
npm run electron:build
- name: Save artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: electron-release-app
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/electron-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

steps:
- name: Checkout repository 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node version 🍀
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Install dependencies ⚙️
run: npm ci
Expand All @@ -31,7 +31,7 @@ jobs:
npm run electron:build
- name: Save artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: electron-release-app
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
pull-requests: write
steps:
- name: Checkout repository 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node version 🍀
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Install dependencies ⚙️
run: npm ci
Expand All @@ -37,7 +37,7 @@ jobs:
npm run build
- name: Archive artifacts 📁
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: dist

Expand Down
1 change: 1 addition & 0 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ mac:
entitlementsInherit: './build/osx/entitlements.mac.plist'
hardenedRuntime: true
gatekeeperAssess: false
notarize: false

afterSign: 'scripts/electron/notarize.cjs'

Expand Down
73 changes: 18 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"uuid": "^9.0.1",
"vite": "^5.1.6",
"vite-plugin-electron": "^0.28.4",
"vite-plugin-pwa": "^0.19.4",
"vite-plugin-pwa": "^0.19.8",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-wasm": "^3.3.0",
"vitest": "^1.4.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/nodes/components/NodeUrl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<template v-else>
<span :class="classes.nodeName">{{ nodeHost.name }}</span>
<span :class="classes.domain">.{{ nodeHost.domain }}</span>
<span v-if="nodeHost.domain" :class="classes.domain">.{{ nodeHost.domain }}</span>
</template>

<span v-if="port" :class="classes.port">:{{ port }}</span>
Expand Down Expand Up @@ -43,7 +43,7 @@ export default {
let domain = null
if (!isIP.value) {
const regex = /([^.]*)\.(.*)/
const regex = /([^.]*)\.?(.*)/
const parts = hostname.value.match(regex)
if (parts !== null) {
name = parts[1]
Expand Down

0 comments on commit 95106d7

Please sign in to comment.