Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beet protocol deeplinks + QR codes + UX changes #213

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a22ed75
Create node.js.yml
grctest Sep 10, 2022
fa8cb94
Build ops fixes
grctest Sep 12, 2022
46a34d8
Build packages for macos linux
grctest Sep 12, 2022
d7810ce
Fix add account bug
grctest Sep 15, 2022
6eb4eef
Initial support for deeplinks
grctest Sep 27, 2022
27005b8
main to render comms
grctest Sep 27, 2022
ef2fa78
OTC page
grctest Sep 28, 2022
5a88eb3
Operations
grctest Sep 28, 2022
01f76b3
Work on TOTP page
grctest Sep 28, 2022
1ef3167
Generate TOPT on demand
grctest Sep 28, 2022
f9e6558
Handling args and prompting
grctest Sep 28, 2022
33ca205
Continued totp development
grctest Sep 29, 2022
0c3cc7a
Update totp.vue
grctest Sep 29, 2022
a637668
Update totp.vue
grctest Sep 29, 2022
1d78616
More protocol development
grctest Sep 30, 2022
18f228b
Fix timeout
grctest Sep 30, 2022
59ed6f0
Protocol nearing completion
grctest Oct 4, 2022
462963a
UX tweaks
grctest Oct 5, 2022
91f5780
UX work
grctest Oct 5, 2022
a779ee5
UX changes
grctest Oct 5, 2022
4428a15
QR Codes scannable
grctest Oct 6, 2022
0ba3c20
QR commit
grctest Oct 6, 2022
ea57fe7
Fixes and features
grctest Oct 7, 2022
164e50c
Refactoring
grctest Oct 7, 2022
67909da
New operations component
grctest Oct 7, 2022
41d8f97
Additional operation fields
grctest Oct 7, 2022
94230fa
bug fixes
grctest Oct 8, 2022
171317b
account select
grctest Oct 8, 2022
8fa84cb
QR UX
grctest Oct 8, 2022
d4493e8
QR progress
grctest Oct 11, 2022
07548dd
QR Scanning
grctest Oct 12, 2022
a8364f3
Handle custom QRs
grctest Oct 13, 2022
685a3b2
QR & TOTP changes
grctest Oct 13, 2022
4306013
QR Scan component fixes
grctest Oct 14, 2022
3c5dd44
Additional info in prompts
grctest Oct 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 151 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
name: Build/release

on:
push:
tags:
- "v*.*.*"

jobs:
create_release:
name: Create Release
runs-on: ubuntu-latest
steps:
- name: Create Release
id: create_release
uses: BTS-CM/action-gh-release@cd28b0f5ee8571b76cfdaa62a30d51d752317477
with:
name: ${{ github.ref_name }}
draft: false
prerelease: false
generate_release_notes: false

build:
name: build_release
needs: create_release
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
include:
- os: windows-latest
release_suffix: windows
release_format: exe
- os: ubuntu-latest
release_suffix: ubuntu
release_format: deb
- os: macos-latest
release_suffix: macos
release_format: dmg
runs-on: ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'npm'

- run: npm install
- run: npm run-script dist:${{ matrix.os }}

- name: Upload .${{ matrix.release_format }} file
uses: actions/upload-artifact@v3
with:
name: BeetSetup.${{ matrix.release_format }}
path: dist/BeetSetup.${{ matrix.release_format }}

- name: Upload linux appimage
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v3
with:
name: BeetSetup.AppImage
path: dist/BeetSetup.AppImage

- name: Upload .exe.blockmap
if: matrix.release_format == 'exe'
uses: actions/upload-artifact@v3
with:
name: BeetSetup.exe.blockmap
path: dist/BeetSetup.exe.blockmap

- name: Upload latest.yml file
if: matrix.release_format == 'exe'
uses: actions/upload-artifact@v3
with:
name: latest.yml
path: dist/latest.yml

- run: ls dist

generate:
name: generate files
needs: build
runs-on: ubuntu-latest
steps:
- name: Download exe
uses: actions/download-artifact@v3
with:
name: BeetSetup.exe
path: ~/
- name: Download exe blockmap
uses: actions/download-artifact@v3
with:
name: BeetSetup.exe.blockmap
path: ~/
- name: Download latest yml
uses: actions/download-artifact@v3
with:
name: latest.yml
path: ~/
- name: Download dmg
uses: actions/download-artifact@v3
with:
name: BeetSetup.dmg
path: ~/
- name: Download deb
uses: actions/download-artifact@v3
with:
name: BeetSetup.deb
path: ~/
- name: Download AppImage
uses: actions/download-artifact@v3
with:
name: BeetSetup.AppImage
path: ~/
- name: Calculate hashes
id: calc_hash
run: |
echo "::set-output name=blockmaphash::$(sha256sum /home/runner/BeetSetup.exe.blockmap|cut -c-64)"
echo "::set-output name=ymlhash::$(sha256sum /home/runner/latest.yml|cut -c-64)"
echo "::set-output name=exehash::$(sha256sum /home/runner/BeetSetup.exe|cut -c-64)"
echo "::set-output name=dmghash::$(sha256sum /home/runner/BeetSetup.dmg|cut -c-64)"
echo "::set-output name=debhash::$(sha256sum /home/runner/BeetSetup.deb|cut -c-64)"
echo "::set-output name=apphash::$(sha256sum /home/runner/BeetSetup.AppImage|cut -c-64)"
- name: Perform release
uses: BTS-CM/action-gh-release@cd28b0f5ee8571b76cfdaa62a30d51d752317477
with:
files: |
/home/runner/BeetSetup.exe
/home/runner/BeetSetup.dmg
/home/runner/BeetSetup.deb
/home/runner/BeetSetup.AppImage
/home/runner/BeetSetup.exe.blockmap
/home/runner/latest.yml
tag_name: ${{ needs.create_release.outputs.tag-name }}
body: |
Release Notes
_________________________________
Binaries for download
--------
| Platform | SHA256 Checksum |
|---|---|
|[Microsoft Windows](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.exe)|`${{steps.calc_hash.outputs.exehash}}`|
|[MacOS](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.dmg)|`${{steps.calc_hash.outputs.dmghash}}`|
|[Linux Deb](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.deb)|`${{steps.calc_hash.outputs.debhash}}`|
|[Linux AppImage](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.AppImage)|`${{steps.calc_hash.outputs.apphash}}`|
|[EXE blockmap](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.exe.blockmap)|`${{steps.calc_hash.outputs.blockmaphash}}`|
|[Latest.yml](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/latest.yml)|`${{steps.calc_hash.outputs.ymlhash}}`|
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Binary file added app/img/beetSmall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 0 additions & 39 deletions appveyor.yml

This file was deleted.

11 changes: 9 additions & 2 deletions build/webpack.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = env => {
},
externals: [nodeExternals({
// this WILL include `jquery` and `webpack/hot/dev-server` in the bundle, as well as `lodash/*`
allowlist: ['vue','typeface-roboto','typeface-rajdhani']
allowlist: ['vue','typeface-roboto','typeface-rajdhani', '@babel/runtime']
})],
resolve: {
extensions: ['*', '.js', '.vue', '.json', '.css', '.scss'],
Expand Down Expand Up @@ -59,7 +59,14 @@ module.exports = env => {
{
test: /\.js$/,
exclude: /node_modules/,
use: ["babel-loader"]
use: {
loader: 'babel-loader',
options: {
presets: [
['@babel/preset-env', { targets: "defaults" }]
]
}
}
},
{
test: /\.css$/i,
Expand Down
Loading