From 0d67c5cd702b8c588c369bf1cf623031148cd139 Mon Sep 17 00:00:00 2001 From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:27:25 +0200 Subject: [PATCH] feat: Manage Wallet from rewards management page - MEED-7380 - Meeds-io#154 (#553) This PR will allow admin to Manage Wallet from rewards management page. --- .../locale/addon/Wallet_en.properties | 7 + .../wallet-reward/components/RewardApp.vue | 402 ++---------------- .../components/reward/BudgetConfiguration.vue | 43 ++ .../components/reward/CurrentBalance.vue | 135 ++++++ .../components/reward/RewardManagement.vue | 37 ++ .../vue-app/wallet-reward/initComponents.js | 6 + 6 files changed, 256 insertions(+), 374 deletions(-) create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties index acf37301e..45081f000 100644 --- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties +++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties @@ -494,6 +494,13 @@ wallet.administration.initialFundsMessagePlaceholder=Enter a default message to wallet.administration.apply=Apply wallet.administration.cancel=Cancel wallet.administration.reset=Reset +wallet.administration.fundWallet=Fund Wallet +wallet.administration.manageWallet=Manage wallet +wallet.administration.budgetConfiguration=Budget Configuration +wallet.administration.budgetConfiguration.setUp=Setup the Rewarding Budget +wallet.administration.budgetConfiguration.setBudget=Set Budget +wallet.administration.rewardManagement=Reward Management +wallet.administration.rewardManagement.noContributionsYet=No contributions to reward yet wallet.overview.rewards.title=Wallet History wallet.overview.points=Points diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue index 1809918ea..bda65a548 100644 --- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue @@ -1,382 +1,36 @@ - - diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue new file mode 100644 index 000000000..dd54d856e --- /dev/null +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue @@ -0,0 +1,43 @@ + + \ No newline at end of file diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue new file mode 100644 index 000000000..90acb3f2b --- /dev/null +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue @@ -0,0 +1,135 @@ + + + \ No newline at end of file diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue new file mode 100644 index 000000000..3861414e5 --- /dev/null +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue @@ -0,0 +1,37 @@ + + \ No newline at end of file diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js index d203667e5..50b9e23d4 100644 --- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js @@ -1,4 +1,7 @@ import RewardApp from './components/RewardApp.vue'; +import RewardManagement from './components/reward/RewardManagement.vue'; +import CurrentBalance from './components/reward/CurrentBalance.vue'; +import BudgetConfiguration from './components/reward/BudgetConfiguration.vue'; import RewardDetailModal from './components/reward/modal/RewardDetailModal.vue'; import TimeZoneSelectBox from './components/reward/TimeZoneSelectBox.vue'; import ConfigurationTab from './components/reward/ConfigurationTab.vue'; @@ -8,6 +11,9 @@ import TeamsListTab from './components/reward/TeamsListTab.vue'; const components = { 'wallet-reward-app': RewardApp, + 'wallet-reward-management': RewardManagement, + 'wallet-current-balance': CurrentBalance, + 'wallet-budget-configuration': BudgetConfiguration, 'wallet-reward-reward-detail-modal': RewardDetailModal, 'wallet-reward-timezone-selectbox': TimeZoneSelectBox, 'wallet-reward-configuration-tab': ConfigurationTab,