diff --git a/src/constants.js b/src/constants.js index e0d9d9e192d..35d78153a94 100644 --- a/src/constants.js +++ b/src/constants.js @@ -70,6 +70,7 @@ export default { FILTER_PARAM: 'filter', ORDER_PARAM: 'order', DISPLAY_PARAM: 'display', + TAB_PARAM: 'tab', PRICE_ICON: PRICE_ICON, PRICE_TYPE_PRODUCT: PRICE_TYPE_PRODUCT, PRICE_TYPE_PRODUCT_ICON: PRICE_TYPE_PRODUCT_ICON, @@ -201,6 +202,11 @@ export default { { key: 'display', value: 'Display', icon: 'mdi-eye-outline' }, { key: 'edit', value: 'Edit', icon: 'mdi-pencil' }, ], + USER_DASHBOARD_TAB_LIST: [ + { key: 'consumption', value: 'MyConsumption', icon: 'mdi-cart-outline' }, + { key: 'community', value: 'OtherContributions', icon: 'mdi-account-group' }, + ], + // date regex DATE_FULL_REGEX_MATCH: /(\d{4})-(\d{2})-(\d{2})/, DATE_YEAR_MONTH_REGEX_MATCH: /(\d{4})-(\d{2})/, DATE_YEAR_REGEX_MATCH: /(\d{4})/, diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index 51d0866a760..686de5ff433 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -199,7 +199,11 @@ "Clear": "Clear", "Contributors": "Contributors", "Community": "Community", + "CommunityPrices": "Community prices", + "CommunityProofs": "Community proofs", "Consumption": "Consumption", + "ConsumptionPrices": "Consumption prices", + "ConsumptionProofs": "Consumption proofs", "Confirm": "Confirm", "Country": "Country", "Countries": "Countries", @@ -284,6 +288,7 @@ "LocationCount": "{count} locations | {count} location | {count} locations", "LocationNotFound": "Location not found", "Map": "Map", + "MyConsumption": "My consumption", "MyDashboard": "My dashboard", "MyPrices": "My prices", "MyProofs": "My proofs", @@ -305,6 +310,7 @@ "OrderProofCreatedDESC": "Addition date", "OrderProofDateDESC": "Proof date", "OrderUserCountDESC": "User count", + "OtherContributions": "Other contributions", "PersonalInfo": "Personal information", "Physical": "Physical", "Picture": "Picture", diff --git a/src/views/UserDashboard.vue b/src/views/UserDashboard.vue index cad06cb6c0f..cff37c45a7c 100644 --- a/src/views/UserDashboard.vue +++ b/src/views/UserDashboard.vue @@ -5,71 +5,100 @@ - - - - - - - - - - - - - - + + + + {{ item.icon }} + + {{ $t('Common.' + item.value) }} + +
- - - - - -
-
- - {{ $t('UserDashboard.MyPrices') }} - -
-
+ + + + + + + + + + + + + + + + + + - - {{ $t('Common.PriceCreated') }} - - - {{ $t('Common.Thanks') }} - - - {{ $t('ProofCreate.Success') }} - - - {{ $t('Home.SettingsUpdated') }} - +
+ + + + + + +
+
+ + {{ $t('UserDashboard.MyPrices') }} + +
+
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ + {{ $t('UserDashboard.MyPrices') }} + +
+
+
+