+
{{ $t('site.login.signin') }}
@@ -82,7 +82,7 @@
{{ $t('site.login.forgot_pwd') }}
-
+
{{ $t('site.login.new_wallet') }}
@@ -95,6 +95,7 @@
-
@@ -88,6 +88,10 @@ export default {
default: true,
description: 'Whether sidebar should autoclose on mobile when clicking an item',
},
+ balance: {
+ type: Number,
+ default: 0,
+ },
},
provide() {
return {
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 7d950b87d..fa4bf388b 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -2,11 +2,11 @@
// Load Package Details for some default values
// const pkg = require('../../package')
-
const environment = {
NODE_ENV: process.env.NODE_ENV,
DEBUG: process.env.NODE_ENV !== 'production' || false,
PRODUCTION: process.env.NODE_ENV === 'production' || false,
+ ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false',
}
const server = {
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 9b6e350dc..881fecf7d 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -37,6 +37,10 @@ import 'vue-good-table/dist/vue-good-table.css'
import VueMoment from 'vue-moment'
+import Loading from 'vue-loading-overlay'
+// import the styles
+import 'vue-loading-overlay/dist/vue-loading.css'
+
Object.keys(rules).forEach((rule) => {
extend(rule, {
...rules[rule], // copies rule configuration
@@ -56,6 +60,7 @@ export default {
Vue.use(VueQrcodeReader)
Vue.use(VueQrcode)
Vue.use(VueFlatPickr)
+ Vue.use(Loading)
configure({
classes: {
valid: 'is-valid',
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index 6671a8de9..189516242 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,11 +1,13 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import routes from './routes'
+import CONFIG from '../config'
Vue.use(VueRouter)
// configure router
const router = new VueRouter({
+ base: '/vue',
routes, // short for routes: routes
linkActiveClass: 'active',
mode: 'history',
@@ -20,4 +22,11 @@ const router = new VueRouter({
},
})
+if (CONFIG.ALLOW_REGISTER) {
+ router.addRoute({
+ path: '/register',
+ component: () => import('../views/Pages/Register.vue'),
+ })
+}
+
export default router
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index bfaff9de6..cb1e0eeba 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -21,20 +21,20 @@ const routes = [
requiresAuth: true,
},
},
- {
- path: '/profileedit',
- component: () => import('../views/Pages/UserProfileEdit.vue'),
- meta: {
- requiresAuth: true,
- },
- },
- {
- path: '/activity',
- component: () => import('../views/Pages/UserProfileActivity.vue'),
- meta: {
- requiresAuth: true,
- },
- },
+ //{
+ // path: '/profileedit',
+ // component: () => import('../views/Pages/UserProfileEdit.vue'),
+ // meta: {
+ // requiresAuth: true,
+ // },
+ //},
+ //{
+ // path: '/activity',
+ // component: () => import('../views/Pages/UserProfileActivity.vue'),
+ // meta: {
+ // requiresAuth: true,
+ // },
+ //},
{
path: '/transactions',
component: () => import('../views/Pages/UserProfileTransactionList.vue'),
@@ -50,10 +50,6 @@ const routes = [
path: '/thx',
component: () => import('../views/Pages/thx.vue'),
},
- {
- path: '/register',
- component: () => import('../views/Pages/Register.vue'),
- },
{
path: '/password',
component: () => import('../views/Pages/ForgotPassword.vue'),
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 82c2e6992..5c9e1bc1e 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,9 +1,32 @@
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
-import communityAPI from '../apis/communityAPI'
import createPersistedState from 'vuex-persistedstate'
+export const mutations = {
+ language: (state, language) => {
+ state.language = language
+ },
+ email: (state, email) => {
+ state.email = email
+ },
+ session_id: (state, session_id) => {
+ state.session_id = session_id
+ },
+}
+
+export const actions = {
+ login: ({ dispatch, commit }, data) => {
+ commit('session_id', data.session_id)
+ commit('email', data.email)
+ },
+ logout: ({ commit, state }) => {
+ commit('session_id', null)
+ commit('email', null)
+ sessionStorage.clear()
+ },
+}
+
export const store = new Vuex.Store({
plugins: [
createPersistedState({
@@ -14,64 +37,10 @@ export const store = new Vuex.Store({
session_id: null,
email: '',
language: 'en',
- user: {
- name: '',
- balance: 0,
- balance_gdt: 0,
- },
modals: false,
- optionAxios: {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- 'Access-Control-Allow-Origin': '*',
- 'Access-Control-Allow-Credentials': 'true',
- },
- },
},
getters: {},
// Syncronous mutation of the state
- mutations: {
- language: (state, language) => {
- state.language = language
- },
- email: (state, email) => {
- state.email = email
- },
- session_id: (state, session_id) => {
- state.session_id = session_id
- },
- user_balance: (state, balance) => {
- state.user.balance = balance / 10000
- },
- user_balance_gdt: (state, balance) => {
- state.user.balance_gdt = balance / 10000
- },
- },
- actions: {
- login: ({ dispatch, commit }, data) => {
- commit('session_id', data.session_id)
- commit('email', data.email)
- },
- passwordReset: (data) => {},
- schoepfen: (data) => {
- // http://localhost/transaction-creations/ajaxCreate
- },
- createUser: ({ commit, dispatch }, data) => {
- commit('session_id', data.session_id)
- commit('email', data.email)
- },
- logout: ({ commit, state }) => {
- commit('session_id', null)
- commit('email', null)
- sessionStorage.clear()
- },
- accountBalance: async ({ commit, dispatch, state }) => {
- const result = await communityAPI.balance(state.session_id)
- if (result.success) {
- commit('user_balance', result.result.data.balance)
- } else {
- //dispatch('logout')
- }
- },
- },
+ mutations,
+ actions,
})
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
new file mode 100644
index 000000000..ccf59dfbf
--- /dev/null
+++ b/frontend/src/store/store.test.js
@@ -0,0 +1,81 @@
+import { mutations, actions } from './store'
+
+const { language, email, session_id } = mutations
+const { login, logout } = actions
+
+describe('Vuex store', () => {
+ describe('mutations', () => {
+ describe('language', () => {
+ it('sets the state of language', () => {
+ const state = { language: 'en' }
+ language(state, 'de')
+ expect(state.language).toEqual('de')
+ })
+ })
+
+ describe('email', () => {
+ it('sets the state of email', () => {
+ const state = { email: 'nobody@knows.tv' }
+ email(state, 'someone@there.is')
+ expect(state.email).toEqual('someone@there.is')
+ })
+ })
+
+ describe('session_id', () => {
+ it('sets the state of session_id', () => {
+ const state = { session_id: null }
+ session_id(state, '1234')
+ expect(state.session_id).toEqual('1234')
+ })
+ })
+ })
+
+ describe('actions', () => {
+ describe('login', () => {
+ const commit = jest.fn()
+ const state = {}
+
+ it('calls two commits', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenCalledTimes(2)
+ })
+
+ it('commits session_id', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenNthCalledWith(1, 'session_id', 1234)
+ })
+
+ it('commits email', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenNthCalledWith(2, 'email', 'someone@there.is')
+ })
+ })
+
+ describe('logout', () => {
+ const commit = jest.fn()
+ const state = {}
+
+ it('calls two commits', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenCalledTimes(2)
+ })
+
+ it('commits session_id', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenNthCalledWith(1, 'session_id', null)
+ })
+
+ it('commits email', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenNthCalledWith(2, 'email', null)
+ })
+
+ // how can I get this working?
+ it.skip('calls sessionStorage.clear()', () => {
+ logout({ commit, state })
+ const spy = jest.spyOn(sessionStorage, 'clear')
+ expect(spy).toHaveBeenCalledTimes(1)
+ })
+ })
+ })
+})
diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue
index 7230e6326..64e71ab39 100644
--- a/frontend/src/views/KontoOverview/GddSend.vue
+++ b/frontend/src/views/KontoOverview/GddSend.vue
@@ -1,6 +1,6 @@
-
+
@@ -10,14 +10,14 @@
- 
+ 
+
+
{{ $t('form.amount') }}
-
+
{{ $t('form.max_gdd_info') }}
@@ -204,9 +204,8 @@ export default {
BIcon,
},
props: {
- row_form: { type: Boolean, default: true },
- row_check: { type: Boolean, default: false },
- row_thx: { type: Boolean, default: false },
+ balance: { type: Number, default: 0 },
+ showTransactionList: { type: Boolean, default: true },
},
data() {
return {
@@ -226,6 +225,8 @@ export default {
auto_sign: true,
},
send: false,
+ row_check: false,
+ row_thx: false,
}
},
computed: {},
@@ -234,7 +235,6 @@ export default {
this.scan = !this.scan
},
async onDecode(decodedString) {
- //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
const arr = JSON.parse(decodedString)
this.form.email = arr[0].email
this.form.amount = arr[0].amount
@@ -244,30 +244,31 @@ export default {
//event.preventDefault()
this.ajaxCreateData.email = this.form.email
this.ajaxCreateData.amount = this.form.amount
- this.ajaxCreateData.target_date = Date.now()
+ const now = new Date(Date.now()).toISOString()
+ this.ajaxCreateData.target_date = now
this.ajaxCreateData.memo = this.form.memo
-
- this.$emit('change-rows', { row_form: false, row_check: true, row_thx: false })
+ this.$emit('toggle-show-list', false)
+ this.row_check = true
+ this.row_thx = false
},
async sendTransaction() {
- this.ajaxCreateData.amount = this.ajaxCreateData.amount * 10000
-
const result = await communityAPI.send(
this.$store.state.session_id,
this.ajaxCreateData.email,
- this.ajaxCreateData.amount,
+ this.ajaxCreateData.amount * 10000,
this.ajaxCreateData.memo,
+ this.ajaxCreateData.target_date,
)
- // console.log(result)
-
if (result.success) {
- // console.log('send success')
-
- this.$emit('change-rows', { row_form: false, row_check: false, row_thx: true })
+ this.$emit('toggle-show-list', false)
+ this.row_check = false
+ this.row_thx = true
+ this.$emit('update-balance', { ammount: this.ajaxCreateData.amount })
} else {
- // console.log('send error')
alert('error')
- this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false })
+ this.$emit('toggle-show-list', true)
+ this.row_check = false
+ this.row_thx = false
}
},
onReset(event) {
@@ -275,10 +276,12 @@ export default {
this.form.email = ''
this.form.amount = ''
this.show = false
+ this.$emit('toggle-show-list', true)
+ this.row_check = false
+ this.row_thx = false
this.$nextTick(() => {
this.show = true
})
- this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false })
},
},
}
diff --git a/frontend/src/views/KontoOverview/GddStatus.spec.js b/frontend/src/views/KontoOverview/GddStatus.spec.js
index 524ba23a6..83b306ace 100644
--- a/frontend/src/views/KontoOverview/GddStatus.spec.js
+++ b/frontend/src/views/KontoOverview/GddStatus.spec.js
@@ -1,29 +1,22 @@
import { mount } from '@vue/test-utils'
import GddStatus from './GddStatus'
-import Vuex from 'vuex'
const localVue = global.localVue
describe('GddStatus', () => {
let wrapper
- let state = {
- user: {
- balance: 1234,
- balance_gdt: 9876,
- },
- }
-
- let store = new Vuex.Store({
- state,
- })
-
let mocks = {
$n: jest.fn((n) => n),
}
+ let propsData = {
+ balance: 1234,
+ GdtBalance: 9876,
+ }
+
const Wrapper = () => {
- return mount(GddStatus, { localVue, store, mocks })
+ return mount(GddStatus, { localVue, mocks, propsData })
}
describe('mount', () => {
diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue
index dec2a16d2..87a06dfb6 100644
--- a/frontend/src/views/KontoOverview/GddStatus.vue
+++ b/frontend/src/views/KontoOverview/GddStatus.vue
@@ -1,6 +1,6 @@
-
+
- {{ $n($store.state.user.balance) }} GDD
+ {{ $n(balance) }} GDD
@@ -18,7 +18,7 @@
class="mb-4 h1"
style="background-color: #ebebeba3 !important"
>
- {{ $n($store.state.user.balance_gdt) }} GDT
+ {{ $n(GdtBalance) }} GDT
@@ -29,7 +29,9 @@
export default {
name: 'GddStatus',
props: {
- row_form: { type: Boolean, default: true },
+ showTransactionList: { type: Boolean, default: true },
+ balance: { type: Number, default: 0 },
+ GdtBalance: { type: Number, default: 0 },
},
}
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index b8ba43a4e..e8e1f3cd3 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -1,6 +1,6 @@
-
+
{
})
it('has five items in the navbar', () => {
- expect(navbar.findAll('ul > li')).toHaveLength(5)
+ expect(navbar.findAll('ul > li')).toHaveLength(3)
})
it('has first item "send" in navbar', () => {
@@ -116,29 +116,29 @@ describe('DashboardLayoutGdd', () => {
expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profile')
})
- it('has fourth item "Settigs" in navbar', () => {
- expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings')
- })
+ //it('has fourth item "Settigs" in navbar', () => {
+ // expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings')
+ //})
+ //
+ //it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => {
+ // navbar.findAll('ul > li > a').at(3).trigger('click')
+ // await flushPromises()
+ // await jest.runAllTimers()
+ // await flushPromises()
+ // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit')
+ //})
- it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => {
- navbar.findAll('ul > li > a').at(3).trigger('click')
- await flushPromises()
- await jest.runAllTimers()
- await flushPromises()
- expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit')
- })
-
- it('has fifth item "Activity" in navbar', () => {
- expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity')
- })
-
- it.skip('has fourth item "Activity" linked to activity in navbar', async () => {
- navbar.findAll('ul > li > a').at(4).trigger('click')
- await flushPromises()
- await jest.runAllTimers()
- await flushPromises()
- expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity')
- })
+ //it('has fifth item "Activity" in navbar', () => {
+ // expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity')
+ //})
+ //
+ //it.skip('has fourth item "Activity" linked to activity in navbar', async () => {
+ // navbar.findAll('ul > li > a').at(4).trigger('click')
+ // await flushPromises()
+ // await jest.runAllTimers()
+ // await flushPromises()
+ // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity')
+ //})
})
})
})
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 341f63ce3..79270493a 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,7 +1,7 @@
+
{{ $t('send') }}
@@ -12,12 +12,14 @@
{{ $t('site.navbar.my-profil') }}
+
@@ -26,7 +28,11 @@
-
-