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.

Sign up for GitHub

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

Jump to bottom

Rebased PR #213 #219

Merged
merged 6 commits into from
Nov 18, 2022
Merged

Rebased PR #213 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f89e7dc
Rebased PR #213
grctest Nov 6, 2022
30a069e
Fix logout warning
grctest Nov 15, 2022
314c7a6
Update lang-select.vue
grctest Nov 15, 2022
fbf7d88
Fix reported issues
grctest Nov 15, 2022
dbfb72c
Update de.json
grctest Nov 16, 2022
97f67dd
requested changes
grctest Nov 17, 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
5 changes: 4 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
{"language": "vue", "autoFix": true}
],
"eslint.provideLintTask": true,
"eslint.run": "onSave"
"eslint.run": "onSave",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
Binary file added app/img/beetSmall.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
182 changes: 180 additions & 2 deletions package-lock.json
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "beet",
"productName": "Beet Blockchain Companion",
"version": "0.15.0-rc1",
"version": "0.16.0-rc1",
"apiversion": 3,
"description": "Beet is a stand-alone key-manager and signing app for blockchains like BitShares, Bitcoin and others.",
"author": "clockworkgr <[email protected]>",
Expand Down Expand Up @@ -63,6 +63,7 @@
"mitt": "^3.0.0",
"otpauth": "^8.0.1",
"query-string": "^7.1.1",
"qrcode-reader-vue3": "^3.1.2",
"simple-websocket": "^9.1.0",
"socket.io": "^4.5.1",
"typeface-rajdhani": "1.1.13",
Expand Down
10 changes: 2 additions & 8 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import mitt from 'mitt';

import BalmUI from 'balm-ui'; // Official Google Material Components
import BalmUIPlus from 'balm-ui/dist/balm-ui-plus'; // BalmJS Team Material Components
import BalmUINext from 'balm-ui/dist/balm-ui-next';
import 'balm-ui-css';

import router from './router/index.js';
Expand Down Expand Up @@ -53,16 +52,11 @@ window.t = (key, params) => {
app.use(VueRouter);
app.use(BalmUI, {
$theme: {
primary: '#C7088E'
primary: '#C7088E',
secondary: '#960069'
}
});
app.use(BalmUIPlus);
app.use(BalmUINext, {
// Optional. Overwrite `<ui-navigation-bar>` props with default value.
UiNavigationBar: {
// some props
}
});

app.use(router);
app.use(store);
Expand Down
Loading