Skip to content

Commit a477f01

Browse files
mickvandijkemickvandijke
authored
Merge pull request #73 from maidsafe/development
Merge 0.2.0
2 parents a605f70 + c16e5b3 commit a477f01

File tree

19 files changed

+2376
-482
lines changed

19 files changed

+2376
-482
lines changed

‎.github/workflows/build-release.yml‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 46 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
name: 'publish'
1+
name: 'Auto Release'
22

33
on:
44
push:
55
branches:
66
- main
7+
- ci
78

89
jobs:
910
build:
@@ -14,12 +15,15 @@ jobs:
1415
- platform: 'macos-latest'
1516
args: '--target x86_64-apple-darwin'
1617
target: 'x86_64-apple-darwin'
18+
os_name: 'macos'
1719
- platform: 'ubuntu-22.04'
1820
args: ''
1921
target: 'x86_64-unknown-linux-gnu'
22+
os_name: 'linux'
2023
- platform: 'windows-latest'
2124
args: ''
2225
target: 'x86_64-pc-windows-msvc'
26+
os_name: 'windows'
2327

2428
runs-on: ${{ matrix.platform }}
2529
steps:
@@ -47,12 +51,14 @@ jobs:
4751

4852
- name: Build Tauri app
4953
run: npm run tauri build -- ${{ matrix.args }}
54+
env:
55+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
5056

5157
- name: Upload artifacts (macOS)
5258
if: matrix.platform == 'macos-latest'
5359
uses: actions/upload-artifact@v4
5460
with:
55-
name: macos-${{ matrix.target }}
61+
name: ${{ matrix.os_name }}-${{ matrix.target }}
5662
path: |
5763
src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg
5864
src-tauri/target/${{ matrix.target }}/release/bundle/macos/*.app
@@ -61,7 +67,7 @@ jobs:
6167
if: startsWith(matrix.platform, 'ubuntu')
6268
uses: actions/upload-artifact@v4
6369
with:
64-
name: linux-${{ matrix.target }}
70+
name: ${{ matrix.os_name }}-${{ matrix.target }}
6571
path: |
6672
src-tauri/target/release/bundle/deb/*.deb
6773
src-tauri/target/release/bundle/appimage/*.AppImage
@@ -70,10 +76,8 @@ jobs:
7076
if: matrix.platform == 'windows-latest'
7177
uses: actions/upload-artifact@v4
7278
with:
73-
name: windows-${{ matrix.target }}
79+
name: ${{ matrix.os_name }}-${{ matrix.target }}
7480
path: |
75-
src-tauri/target/release/bundle/msi/*.msi
76-
src-tauri/target/release/bundle/nsis/*.exe
7781
src-tauri/target/release/*.exe
7882
7983
release:
@@ -98,76 +102,50 @@ jobs:
98102
- name: Display structure of downloaded files
99103
run: ls -laR artifacts
100104

105+
- name: Create properly named assets
106+
run: |
107+
VERSION="${{ steps.get_version.outputs.VERSION }}"
108+
109+
# Create release directory
110+
mkdir -p release-assets
111+
112+
# macOS DMG
113+
find artifacts/macos-x86_64-apple-darwin -name "*.dmg" -exec cp {} release-assets/project-dave_${VERSION}_macos-x86_64-apple-darwin.dmg \;
114+
115+
# Linux AppImage
116+
find artifacts/linux-x86_64-unknown-linux-gnu -name "*.AppImage" -exec cp {} release-assets/project-dave_${VERSION}_linux-x86_64-unknown-linux-gnu.AppImage \;
117+
118+
# Linux Deb
119+
find artifacts/linux-x86_64-unknown-linux-gnu -name "*.deb" -exec cp {} release-assets/project-dave_${VERSION}_linux-x86_64-unknown-linux-gnu.deb \;
120+
121+
# Windows EXE
122+
find artifacts/windows-x86_64-pc-windows-msvc -name "*.exe" -exec cp {} release-assets/project-dave_${VERSION}_windows-x86_64-pc-windows-msvc.exe \;
123+
124+
# List final assets
125+
echo "Release assets created:"
126+
ls -la release-assets/
127+
101128
- name: Create Release
102129
id: create_release
103-
uses: actions/create-release@v1
104-
env:
105-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130+
uses: softprops/action-gh-release@v2
106131
with:
107132
tag_name: app-v${{ steps.get_version.outputs.VERSION }}
108-
release_name: Dave v${{ steps.get_version.outputs.VERSION }}
133+
name: Dave v${{ steps.get_version.outputs.VERSION }}
109134
body: |
110135
Download Dave for your platform:
111136
112-
## macOS
113-
- Intel: `project-dave_${{ steps.get_version.outputs.VERSION }}_macos-x86_64-apple-darwin.dmg`
137+
## 🍎 macOS
138+
- **Intel**: [`project-dave_${{ steps.get_version.outputs.VERSION }}_macos-x86_64-apple-darwin.dmg`](https://github.com/${{ github.repository }}/releases/download/app-v${{ steps.get_version.outputs.VERSION }}/project-dave_${{ steps.get_version.outputs.VERSION }}_macos-x86_64-apple-darwin.dmg)
114139
115-
## Linux
116-
- x64: `project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.AppImage`
117-
- x64 (Debian): `project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.deb`
140+
## 🐧 Linux
141+
- **x64 AppImage**: [`project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.AppImage`](https://github.com/${{ github.repository }}/releases/download/app-v${{ steps.get_version.outputs.VERSION }}/project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.AppImage)
142+
- **x64 Debian Package**: [`project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.deb`](https://github.com/${{ github.repository }}/releases/download/app-v${{ steps.get_version.outputs.VERSION }}/project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.deb)
118143
119-
## Windows
120-
- x64 Installer: `project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc-setup.exe`
121-
- x64 MSI: `project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc.msi`
122-
draft: false
144+
## 🪟 Windows
145+
- **x64 Executable**: [`project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc.exe`](https://github.com/${{ github.repository }}/releases/download/app-v${{ steps.get_version.outputs.VERSION }}/project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc.exe)
146+
draft: true
123147
prerelease: false
124-
125-
- name: Upload macOS DMG
126-
uses: actions/upload-release-asset@v1
127-
env:
128-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
129-
with:
130-
upload_url: ${{ steps.create_release.outputs.upload_url }}
131-
asset_path: ./artifacts/macos-x86_64-apple-darwin/project-dave_${{ steps.get_version.outputs.VERSION }}_x64.dmg
132-
asset_name: project-dave_${{ steps.get_version.outputs.VERSION }}_macos-x86_64-apple-darwin.dmg
133-
asset_content_type: application/octet-stream
134-
135-
- name: Upload Linux AppImage
136-
uses: actions/upload-release-asset@v1
137-
env:
138-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139-
with:
140-
upload_url: ${{ steps.create_release.outputs.upload_url }}
141-
asset_path: ./artifacts/linux-x86_64-unknown-linux-gnu/project-dave_${{ steps.get_version.outputs.VERSION }}_amd64.AppImage
142-
asset_name: project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.AppImage
143-
asset_content_type: application/octet-stream
144-
145-
- name: Upload Linux Deb
146-
uses: actions/upload-release-asset@v1
147-
env:
148-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149-
with:
150-
upload_url: ${{ steps.create_release.outputs.upload_url }}
151-
asset_path: ./artifacts/linux-x86_64-unknown-linux-gnu/project-dave_${{ steps.get_version.outputs.VERSION }}_amd64.deb
152-
asset_name: project-dave_${{ steps.get_version.outputs.VERSION }}_linux-x86_64-unknown-linux-gnu.deb
153-
asset_content_type: application/vnd.debian.binary-package
154-
155-
- name: Upload Windows Setup EXE
156-
uses: actions/upload-release-asset@v1
148+
files: |
149+
release-assets/*
157150
env:
158-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
159-
with:
160-
upload_url: ${{ steps.create_release.outputs.upload_url }}
161-
asset_path: ./artifacts/windows-x86_64-pc-windows-msvc/project-dave_${{ steps.get_version.outputs.VERSION }}_x64-setup.exe
162-
asset_name: project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc-setup.exe
163-
asset_content_type: application/octet-stream
164-
165-
- name: Upload Windows MSI
166-
uses: actions/upload-release-asset@v1
167-
env:
168-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
169-
with:
170-
upload_url: ${{ steps.create_release.outputs.upload_url }}
171-
asset_path: ./artifacts/windows-x86_64-pc-windows-msvc/project-dave_${{ steps.get_version.outputs.VERSION }}_x64_en-US.msi
172-
asset_name: project-dave_${{ steps.get_version.outputs.VERSION }}_windows-x86_64-pc-windows-msvc.msi
173-
asset_content_type: application/octet-stream
151+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎app.vue‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ onMounted(async () => {
122122
My Vault
123123
</NuxtLink>
124124

125+
<NuxtLink :class="`${classesLinks}`" to="/downloader">
126+
<i class="pi pi-download text-xl" style="color: #f35;"/>
127+
Downloader
128+
</NuxtLink>
129+
125130
<NuxtLink :class="`${classesLinks}`" to="/settings">
126131
<IconSettings class="w-6 h-6"/>
127132
Settings

‎components/DialogInvoice.vue‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ watchEffect(() => {
192192
:closable="false"
193193
>
194194
<template #header>
195-
<div class="flex items-center justify-between w-full">
195+
<div class="flex items-center justify-between w-full my-3">
196196
<div class="flex items-center gap-3">
197197
<IconLogo alt="Autonomi" class="h-6 filter dark:filter-none"/>
198198
</div>
@@ -298,16 +298,19 @@ watchEffect(() => {
298298
</h4>
299299
<div class="space-y-3">
300300
<div class="flex justify-between text-sm">
301-
<span class="font-semibold text-gray-900 dark:text-autonomi-text-primary-dark">Total Cost:</span>
301+
<span class="text-gray-600 dark:text-gray-400">Total Cost:</span>
302302
<div class="text-right">
303-
<div class="font-bold text-blue-600 dark:text-blue-400">
303+
<div class="font-medium text-gray-900 dark:text-autonomi-text-primary-dark">
304304
{{ formatANT(quoteData?.totalCostNano || '0') }} ANT
305305
</div>
306306
<div class="text-xs text-gray-600 dark:text-gray-400">
307307
{{ quoteData?.totalCostFormatted || '0 ATTO' }}
308308
</div>
309309
</div>
310310
</div>
311+
<div class="flex justify-center text-center text-xs text-gray-600 dark:text-gray-400">
312+
<span>Gas costs (ETH) aren't shown here, check your wallet app for these fees</span>
313+
</div>
311314
</div>
312315
</div>
313316

@@ -317,7 +320,7 @@ watchEffect(() => {
317320
</div>
318321

319322
<template #footer>
320-
<div class="flex justify-end items-center gap-3 py-3">
323+
<div class="flex justify-end items-center gap-3 mt-5">
321324
<Button
322325
label="Cancel"
323326
severity="secondary"

0 commit comments

Comments
 (0)