diff --git a/frontend/src/layouts/DashboardLayout.spec.js b/frontend/src/layouts/DashboardLayout.spec.js
index efed52c78..68fcb5ad5 100644
--- a/frontend/src/layouts/DashboardLayout.spec.js
+++ b/frontend/src/layouts/DashboardLayout.spec.js
@@ -15,6 +15,7 @@ const routerPushMock = jest.fn()
const stubs = {
RouterLink: RouterLinkStub,
RouterView: true,
+ LastTransactions: true,
}
const mocks = {
@@ -29,6 +30,9 @@ const mocks = {
meta: {
hideFooter: false,
},
+ path: {
+ replace: jest.fn(),
+ },
},
$router: {
push: routerPushMock,
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index e5bf394f2..148a0cb59 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -35,7 +35,87 @@
:balance="balance"
:GdtBalance="GdtBalance"
:totalUsers="totalUsers"
- />
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +126,20 @@
:transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount"
@set-tunneled-email="setTunneledEmail"
- />
+ >
+
+
+
+
+
+
+
+
@@ -75,7 +168,20 @@
:transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount"
@set-tunneled-email="setTunneledEmail"
- />
+ >
+
+
+
+
+
+
+
+
@@ -102,6 +208,12 @@ import { logout } from '@/graphql/mutations'
import ContentFooter from '@/components/ContentFooter.vue'
import { FadeTransition } from 'vue2-transitions'
import CONFIG from '@/config'
+import GddAmount from '@/components/Template/ContentHeader/GddAmount.vue'
+import GdtAmount from '@/components/Template/ContentHeader/GdtAmount.vue'
+import CommunityMember from '@/components/Template/ContentHeader/CommunityMember.vue'
+import NavCommunity from '@/components/Template/ContentHeader/NavCommunity.vue'
+import LastTransactions from '@/components/Template/RightSide/LastTransactions.vue'
+import ContributionInfo from '@/components/Template/RightSide/ContributionInfo.vue'
export default {
name: 'DashboardLayout',
@@ -116,6 +228,12 @@ export default {
ContentFooter,
FadeTransition,
Breadcrumb,
+ GddAmount,
+ GdtAmount,
+ CommunityMember,
+ NavCommunity,
+ LastTransactions,
+ ContributionInfo,
},
data() {
return {
diff --git a/frontend/src/layouts/templates/ContentHeader.vue b/frontend/src/layouts/templates/ContentHeader.vue
index 58ba90cae..407d8dcad 100644
--- a/frontend/src/layouts/templates/ContentHeader.vue
+++ b/frontend/src/layouts/templates/ContentHeader.vue
@@ -1,116 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+