Skip to content

Commit 1312ca2

Browse files
nyliranylira
committed
start on an updated wallet page and redo the settings page
1 parent 265f3e6 commit 1312ca2

20 files changed

+208
-145
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

‎client/src/assets/feather/dollar-sign.svg

+1
Loading

‎client/src/components/AppFooter.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
btn-icon(type="link" icon="home" :to="{ name: 'home' }")
55
btn-icon(type="link" icon="search" :to="{ name: 'memos' }")
66
btn-icon(type="link" icon="users" :to="{ name: 'accounts' }")
7-
btn-icon(type="link" icon="mail" :to="{ name: 'messages' }")
7+
btn-icon(type="link" icon="dollar-sign" :to="{ name: 'wallet' }")
8+
// btn-icon(type="link" icon="mail" :to="{ name: 'messages' }")
89
</template>
910

1011
<script>

‎client/src/components/FormMemo.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template lang="pug">
2-
form.form-memo(@submit.prevent.default="sendMemo")
2+
form.form-memo(@submit.prevent.default="validateAndSend")
33
textarea#memo-body(v-model="memo" :placeholder="placeholderText")
44
.field-note Bytes left: {{ bytesLeft }}
55
.field-note.field-note--error(v-if="formHasError") {{ formErrorMsg }}
@@ -49,7 +49,7 @@ export default {
4949
formErrorMsg: ""
5050
}),
5151
methods: {
52-
async sendMemo() {
52+
async validateAndSend() {
5353
if (this.bytesLeft === 512) {
5454
this.formHasError = true;
5555
this.formErrorMsg = "Memo needs to have some text";
@@ -62,9 +62,9 @@ export default {
6262
this.formHasError = false;
6363
this.formErrorMessage = "";
6464
}
65-
this.send();
65+
this.sendTx();
6666
},
67-
async send() {
67+
async sendTx() {
6868
let queuedMemo = await tx.sendTx(
6969
this.fromAddress,
7070
this.type,

‎client/src/components/PageSettings.vue

-55
This file was deleted.

‎client/src/components/SectionDefault.vue

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template lang="pug">
2-
.section-default: slot
2+
.section-default
3+
.section-title(v-if="$slots['section-title']"): slot(name="section-title")
4+
.section-body: slot
35
</template>
46

57
<script>
@@ -11,6 +13,19 @@ export default {
1113
<style scoped lang="stylus">
1214
.section-default
1315
border-bottom 1px solid var(--bc)
14-
width 100%
16+
17+
.section-default:last-child
18+
border-bottom 1px solid var(--bc)
19+
20+
.section-title
21+
font-weight bold
22+
line-height 2rem
23+
border-bottom 1px solid var(--bc)
24+
padding 0 1rem
25+
background #f6f6f6
26+
27+
.section-body
1528
padding 1rem
29+
p:not(:last-child)
30+
margin-bottom 0.75rem
1631
</style>

‎client/src/router/index.js

+20-24
Original file line numberDiff line numberDiff line change
@@ -18,69 +18,67 @@ export default new Router({
1818
path: "/",
1919
name: "home",
2020
component: () =>
21-
import(/* webpackChunkName: "home" */ "../components/PageHome.vue")
21+
import(/* webpackChunkName: "home" */ "../views/Home.vue")
2222
},
2323
{
2424
path: "/accounts",
2525
component: () =>
26-
import(
27-
/* webpackChunkName: "accounts" */ "@/components/PageAccounts.vue"
28-
),
26+
import(/* webpackChunkName: "accounts" */ "@/views/Accounts.vue"),
2927
children: [
3028
{
3129
path: "/",
3230
name: "accounts",
3331
component: () =>
3432
import(
35-
/* webpackChunkName: "accounts-index" */ "@/components/PageAccountsIndex.vue"
33+
/* webpackChunkName: "accounts-index" */ "@/views/AccountsIndex.vue"
3634
)
3735
},
3836
{
3937
path: ":address",
4038
name: "account",
4139
component: () =>
4240
import(
43-
/* webpackChunkName: "account" */ "@/components/PageAccountsAccount.vue"
41+
/* webpackChunkName: "account" */ "@/views/AccountsAccount.vue"
4442
)
4543
}
4644
]
4745
},
46+
{
47+
path: "/login",
48+
name: "login",
49+
component: () =>
50+
import(/* webpackChunkName: "login" */ "../views/Login.vue")
51+
},
4852
{
4953
path: "/messages",
5054
name: "messages",
5155
component: () =>
52-
import(
53-
/* webpackChunkName: "messages" */ "../components/PageMessages.vue"
54-
)
56+
import(/* webpackChunkName: "messages" */ "../views/Messages.vue")
5557
},
5658
{
5759
path: "/memos",
5860
component: () =>
59-
import(/* webpackChunkName: "memos" */ "@/components/PageMemos.vue"),
61+
import(/* webpackChunkName: "memos" */ "@/views/Memos.vue"),
6062
children: [
6163
{
6264
path: "/",
6365
name: "memos",
6466
component: () =>
6567
import(
66-
/* webpackChunkName: "memos-index" */ "@/components/PageMemosIndex.vue"
68+
/* webpackChunkName: "memos-index" */ "@/views/MemosIndex.vue"
6769
)
6870
},
6971
{
7072
path: "new",
7173
name: "memos-new",
7274
component: () =>
73-
import(
74-
/* webpackChunkName: "memos-new" */ "@/components/PageMemosNew.vue"
75-
)
75+
import(/* webpackChunkName: "memos-new" */ "@/views/MemosNew.vue")
7676
},
7777
{
7878
path: ":memo",
7979
name: "memo",
8080
component: () =>
81-
import(
82-
/* webpackChunkName: "memo" */ "@/components/PageMemosMemo.vue"
83-
)
81+
import(/* webpackChunkName: "memo" */ "@/views/MemosMemo.vue")
8482
}
8583
]
8684
},
@@ -89,22 +87,20 @@ export default new Router({
8987
name: "notifications",
9088
component: () =>
9189
import(
92-
/* webpackChunkName: "notifications" */ "../components/PageNotifications.vue"
90+
/* webpackChunkName: "notifications" */ "../views/Notifications.vue"
9391
)
9492
},
9593
{
9694
path: "/settings",
9795
name: "settings",
9896
component: () =>
99-
import(
100-
/* webpackChunkName: "settings" */ "../components/PageSettings.vue"
101-
)
97+
import(/* webpackChunkName: "settings" */ "../views/Settings.vue")
10298
},
10399
{
104-
path: "/login",
105-
name: "login",
100+
path: "/wallet",
101+
name: "wallet",
106102
component: () =>
107-
import(/* webpackChunkName: "login" */ "../components/PageLogin.vue")
103+
import(/* webpackChunkName: "notifications" */ "../views/Wallet.vue")
108104
}
109105
]
110106
});

‎client/src/components/PageAccounts.vue renamed to ‎client/src/views/Accounts.vue

File renamed without changes.

‎client/src/components/PageAccountsAccount.vue renamed to ‎client/src/views/AccountsAccount.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import { orderBy, pickBy } from "lodash";
1818
import { mapGetters } from "vuex";
1919
import h from "../scripts/helpers.js";
2020
21-
import AppHeader from "./AppHeader";
22-
import AppFooter from "./AppFooter";
23-
import BtnIcon from "./BtnIcon";
24-
import BtnLoadMore from "./BtnLoadMore";
25-
import CardLoading from "./CardLoading";
26-
import ImgAvatar from "./ImgAvatar";
27-
import InfiniteFeed from "./InfiniteFeed";
21+
import AppHeader from "@/components/AppHeader";
22+
import AppFooter from "@/components/AppFooter";
23+
import BtnIcon from "@/components/BtnIcon";
24+
import BtnLoadMore from "@/components/BtnLoadMore";
25+
import CardLoading from "@/components/CardLoading";
26+
import ImgAvatar from "@/components/ImgAvatar";
27+
import InfiniteFeed from "@/components/InfiniteFeed";
2828
export default {
2929
name: "page-accounts-account",
3030
components: {

‎client/src/components/PageAccountsIndex.vue renamed to ‎client/src/views/AccountsIndex.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template lang="pug">
22
.page-accounts-index
3-
app-header(page-title="Contacts")
3+
app-header(page-title="Dither Users")
44
template(v-if="userSignedIn")
55
btn-icon(slot="btn-left" type="link" :to="{ name: 'settings' }" icon="settings")
66
template(v-if="Object.keys(accounts).length > 0")
@@ -19,12 +19,12 @@ import { orderBy } from "lodash";
1919
2020
import { mapGetters } from "vuex";
2121
import h from "../scripts/helpers.js";
22-
import AppFooter from "./AppFooter";
23-
import AppHeader from "./AppHeader";
24-
import CardLoading from "./CardLoading";
25-
import BtnIcon from "./BtnIcon";
26-
import BtnLoadMore from "./BtnLoadMore";
27-
import ImgAvatar from "./ImgAvatar";
22+
import AppFooter from "@/components/AppFooter";
23+
import AppHeader from "@/components/AppHeader";
24+
import CardLoading from "@/components/CardLoading";
25+
import BtnIcon from "@/components/BtnIcon";
26+
import BtnLoadMore from "@/components/BtnLoadMore";
27+
import ImgAvatar from "@/components/ImgAvatar";
2828
export default {
2929
name: "page-accounts-index",
3030
components: {

‎client/src/components/PageHome.vue renamed to ‎client/src/views/Home.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<script>
1818
import { orderBy, pickBy } from "lodash";
1919
import { mapGetters } from "vuex";
20-
import AppFooter from "./AppFooter";
21-
import BtnIcon from "./BtnIcon";
22-
import BtnLoadMore from "./BtnLoadMore";
23-
import CardLoading from "./CardLoading";
24-
import InfiniteFeed from "./InfiniteFeed";
25-
import AppHeader from "./AppHeader";
20+
import AppFooter from "@/components/AppFooter";
21+
import BtnIcon from "@/components/BtnIcon";
22+
import BtnLoadMore from "@/components/BtnLoadMore";
23+
import CardLoading from "@/components/CardLoading";
24+
import InfiniteFeed from "@/components/InfiniteFeed";
25+
import AppHeader from "@/components/AppHeader";
2626
export default {
2727
name: "page-index",
2828
components: {

‎client/src/components/PageLogin.vue renamed to ‎client/src/views/Login.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { Firebase } from "../store/firebase.js";
1010
import * as firebaseui from "firebaseui";
1111
import "firebaseui/dist/firebaseui.css";
1212
13-
import AppHeader from "./AppHeader";
14-
import BtnIcon from "./BtnIcon";
13+
import AppHeader from "@/components/AppHeader";
14+
import BtnIcon from "@/components/BtnIcon";
1515
export default {
1616
name: "page-login",
1717
components: {

‎client/src/components/PageMemos.vue renamed to ‎client/src/views/Memos.vue

File renamed without changes.

‎client/src/components/PageMemosIndex.vue renamed to ‎client/src/views/MemosIndex.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<script>
1111
import { mapGetters } from "vuex";
12-
import AppFooter from "./AppFooter";
13-
import AppHeader from "./AppHeader";
14-
import BtnIcon from "./BtnIcon";
15-
import CardWip from "./CardWip";
12+
import AppFooter from "@/components/AppFooter";
13+
import AppHeader from "@/components/AppHeader";
14+
import BtnIcon from "@/components/BtnIcon";
15+
import CardWip from "@/components/CardWip";
1616
export default {
1717
name: "page-memos-index",
1818
components: {

‎client/src/components/PageMemosMemo.vue renamed to ‎client/src/views/MemosMemo.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import { pickBy, orderBy } from "lodash";
1616
1717
import { mapGetters } from "vuex";
18-
import AppHeader from "./AppHeader";
19-
import AppFooter from "./AppFooter";
20-
import BtnIcon from "./BtnIcon";
21-
import FormMemo from "./FormMemo";
22-
import CardLoading from "./CardLoading";
23-
import CardMemo from "./CardMemo";
24-
import InfiniteFeed from "./InfiniteFeed";
25-
import SectionDefault from "./SectionDefault";
18+
import AppHeader from "@/components/AppHeader";
19+
import AppFooter from "@/components/AppFooter";
20+
import BtnIcon from "@/components/BtnIcon";
21+
import FormMemo from "@/components/FormMemo";
22+
import CardLoading from "@/components/CardLoading";
23+
import CardMemo from "@/components/CardMemo";
24+
import InfiniteFeed from "@/components/InfiniteFeed";
25+
import SectionDefault from "@/components/SectionDefault";
2626
export default {
2727
name: "page-memos-memo",
2828
components: {

‎client/src/components/PageMemosNew.vue renamed to ‎client/src/views/MemosNew.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
section-default(v-else)
99
| You can't send memos without any ATOM.
1010
= ' '
11-
router-link(:to="{ name: 'settings' }") Create a wallet &raquo;
11+
router-link(:to="{ name: 'wallet' }") Create a wallet &raquo;
1212
app-footer
1313
</template>
1414

1515
<script>
1616
import { mapGetters } from "vuex";
17-
import AppHeader from "./AppHeader";
18-
import AppFooter from "./AppFooter";
19-
import BtnIcon from "./BtnIcon";
20-
import FormMemo from "./FormMemo";
21-
import SectionDefault from "./SectionDefault";
17+
import AppHeader from "@/components/AppHeader";
18+
import AppFooter from "@/components/AppFooter";
19+
import BtnIcon from "@/components/BtnIcon";
20+
import FormMemo from "@/components/FormMemo";
21+
import SectionDefault from "@/components/SectionDefault";
2222
export default {
2323
name: "page-settings",
2424
components: {

‎client/src/components/PageMessages.vue renamed to ‎client/src/views/Messages.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</template>
77

88
<script>
9-
import AppFooter from "./AppFooter";
10-
import AppHeader from "./AppHeader";
11-
import CardWip from "./CardWip";
9+
import AppFooter from "@/components/AppFooter";
10+
import AppHeader from "@/components/AppHeader";
11+
import CardWip from "@/components/CardWip";
1212
export default {
1313
name: "page-messages",
1414
components: {

0 commit comments

Comments
 (0)