From 1561aec5336873035a93cf9f013d53a06ebe43b4 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 23 Aug 2024 12:10:48 +0100 Subject: [PATCH 01/10] feat: Reorganize Contribute Site Navigation - MEED-7364 - Meeds-io/MIPs#155 (#2330) This change will change the navigation tree of Contribute site by introducing 'Dashboard/Overview' page as home page of the site, deleting perkstore page and add wallet into it instead. --- .../portal/contribute_en.properties | 2 + .../sites/portal-upgrade-configuration.xml | 47 ++++++++ .../sites/portal/contribute/navigation.xml | 24 ++-- .../conf/sites/portal/contribute/pages.xml | 109 ++++++++++++++++++ 4 files changed, 173 insertions(+), 9 deletions(-) diff --git a/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties b/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties index aee781a80..18957d535 100644 --- a/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties +++ b/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties @@ -17,6 +17,8 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +portal.contribute.overview=Overview portal.contribute.actions=Actions portal.contribute.programs=Programs portal.contribute.perks=Perks +portal.contribute.wallet=Wallet diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml index 0e87b003e..afb18a214 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml @@ -464,6 +464,53 @@ + + sites/contribute/7.0-cleanActionsNavigation + addUpgradePlugin + io.meeds.social.upgrade.LayoutUpgradePlugin + + + product.group.id + org.exoplatform.social + + + plugin.execution.order + 120 + + + plugin.upgrade.execute.once + true + + + enabled + true + + + contribute.site.upgrade + + + true + + + war:/conf/sites/ + + + portal + + + contribute + + + + + actions + + + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml index 5b86791f4..378a67429 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml @@ -27,10 +27,10 @@ 1 - actions - - fa fa-rocket - portal::contribute::actions + home + + fa fa-briefcase + portal::contribute::overview programs @@ -38,11 +38,17 @@ portal::contribute::programs - perks - - fa fa-shopping-cart - portal::contribute::perks + actions + + fa fa-rocket + portal::contribute::actions + + + wallet + + fa fa-credit-card + portal::contribute::wallet - \ No newline at end of file + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 9e73bd0d3..f6a980206 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -24,6 +24,95 @@ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_12 http://www.exoplatform.org/xml/ns/gatein_objects_1_12" xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_12"> + + overview + Overview + Everyone + *:/platform/rewarding + + + + + + social-portlet + Image + + + name + overivewPageBanner + + + image-path + war:/../images/pages/banner/dashboard-banner.png + false + + + + Banner + + + + + + + + gamification-portlets + topChallengers + + Leaderboard + + + + + + gamification-portlets + challengesOverview + + Actions overview + + + + + + gamification-portlets + programsOverview + + Programs Overview + + + + + + + + gamification-portlets + myContributions + + User Contributions + + + + + + gamification-portlets + myReputation + + User reputation + + + + + + gamification-portlets + myRewards + + User rewards + + + + + + actions Actions @@ -84,4 +173,24 @@ + + wallet + Wallet + Everyone + *:/platform/administrators + + + + + + wallet + Wallet + + Wallet + + + + + + From 180c51488f237dac8ca5e80b8e9b40da0499dd2b Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 26 Aug 2024 10:13:39 +0100 Subject: [PATCH 02/10] feat: Update Contribute Site navigation icons - MEED-7375 - Meeds-io/MIPs#155 (#2332) This change will: - Update icon of overview page: "rocket" - Update icon of actions page: "trophy" --- .../WEB-INF/conf/sites/portal/contribute/navigation.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml index 378a67429..791e0373f 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml @@ -29,7 +29,7 @@ home - fa fa-briefcase + fa fa-rocket portal::contribute::overview programs @@ -40,7 +40,7 @@ actions - fa fa-rocket + fa fa-trophy portal::contribute::actions From b3155db5a0c4cdd56ff31cf9992a45033b42651a Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 29 Aug 2024 15:09:31 +0100 Subject: [PATCH 03/10] feat: Improve Overview Page Layout in Contribute Site - MEED-7363 - Meeds-io/MIPs#155 (#2336) --- .../conf/sites/portal/contribute/pages.xml | 107 +++++++++++++++--- 1 file changed, 93 insertions(+), 14 deletions(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index f6a980206..71c57c52c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -58,55 +58,134 @@ gamification-portlets topChallengers + + + topChallengersPeriod + week + + + topChallengersCurrentPosition + true + + Leaderboard + 350 gamification-portlets - challengesOverview + programsOverview + + + limit + 4 + + + programsSortBy + modifiedDate + + - Actions overview + Programs Overview + 350 gamification-portlets - programsOverview + challengesOverview + + + endingRulesLimit + 0 + + + lockedRulesLimit + 0 + + + availableRulesLimit + 4 + + + upcomingRulesLimit + 0 + + + rulesSortBy + modifiedDate + + - Programs Overview + Actions overview + 350 - - + + gamification-portlets myContributions + + + myContributionsPeriod + week + + + myContributionsDisplayLegend + true + + + myContributionsProgramLimit + 4 + + User Contributions - - + + gamification-portlets - myReputation + BadgesOverview - User reputation + Badges Overview - - - + + + + + kudos + KudosOverview + + Kudos Overview + + + + gamification-portlets myRewards - User rewards + User Rewards + + + + + + + + gamification-portlets + EngagementCenterAchievements + + Achievements From 4ff48a1cdcc72d543b76a1b9e65ad8e69743ebef Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 29 Aug 2024 16:19:54 +0100 Subject: [PATCH 04/10] fix: Add Mobile Attributes for Overview Page Applications - MEED-7363 - Meeds-io/MIPs#155 (#2337) --- .../webapp/WEB-INF/conf/sites/portal/contribute/pages.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 71c57c52c..8bba4ada3 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -49,10 +49,13 @@ Banner + + true + - + From 62a83c0bddce7150454d41feaf484bd2b6f06a4d Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 30 Aug 2024 16:03:34 +0100 Subject: [PATCH 05/10] feat: Display personal achievements without review tab in overview page - MEED-7361 - Meeds-io/MIPs#155 (#2338) --- .../webapp/WEB-INF/conf/sites/portal/contribute/pages.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 8bba4ada3..123c9e90c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -187,6 +187,12 @@ gamification-portlets EngagementCenterAchievements + + + hideOwnedTab + true + + Achievements From 454140f7ba8f827a6181bfa1ddeec0e2813df21a Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 30 Aug 2024 16:50:27 +0100 Subject: [PATCH 06/10] feat: Delete Useless Reputation Widget - Meeds-io/MIPs#155 --- .../webapp/WEB-INF/conf/sites/portal/global/pages.xml | 8 ++++---- .../webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml index d8ee3e19d..30337657c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml @@ -469,12 +469,12 @@ - + - gamification-portlets - myReputation + kudos + KudosOverview - User reputation + Kudos Overview diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml index e92bc743f..4caf5907b 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml @@ -93,12 +93,12 @@ - + - gamification-portlets - myReputation + kudos + KudosOverview - User reputation + Kudos Overview From d432ebb2ad76adcfded6e3f9c0109ca5bee8248c Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Sun, 1 Sep 2024 15:26:49 +0100 Subject: [PATCH 07/10] feat: Move MyRewards Portlet to Wallet - MEED-7019 - Meeds-io/MIPs#155 --- .../main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 123c9e90c..e7c549edd 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -174,7 +174,7 @@ - gamification-portlets + wallet myRewards User Rewards From 784de90c40d4566722dd92e1b8828f8b1a060fae Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 2 Sep 2024 10:41:04 +0100 Subject: [PATCH 08/10] feat: Update MyCraft Home Page to display Stream instead of Dashboard - MEED-7407 - Meeds-io/MIPs#155 (#2343) --- .../conf/meeds/portal/meeds/navigation.xml | 6 -- .../conf/sites/portal/mycraft/navigation.xml | 2 +- .../conf/sites/portal/mycraft/pages.xml | 89 ------------------- 3 files changed, 1 insertion(+), 96 deletions(-) diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml index b00b647d9..1b3af0158 100644 --- a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml +++ b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml @@ -24,12 +24,6 @@ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_7"> 4 - - stream - - fas fa-stream - portal::global::stream - external-stream diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/navigation.xml index 0a69d29e2..8075814b3 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/navigation.xml @@ -28,7 +28,7 @@ dashboard fa fa-briefcase - portal::mycraft::dashboard + portal::global::stream tasks diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml index 4caf5907b..a35914323 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml @@ -25,95 +25,6 @@ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_12 http://www.exoplatform.org/xml/ns/gatein_objects_1_12" xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_12"> - - dashboard - Dashboard - Everyone - *:/platform/rewarding - - - - - - social-portlet - Image - - - name - overivewPageBanner - - - image-path - war:/../images/pages/banner/dashboard-banner.png - false - - - - Banner - - - - - - - - gamification-portlets - topChallengers - - Leaderboard - - - - - - gamification-portlets - challengesOverview - - Actions overview - - - - - - gamification-portlets - programsOverview - - Programs Overview - - - - - - - - gamification-portlets - myContributions - - User Contributions - - - - - - kudos - KudosOverview - - Kudos Overview - - - - - - gamification-portlets - myRewards - - User rewards - - - - - - tasks Tasks From 377770543add5163f602eb22edfffa7786d4cd6e Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 2 Sep 2024 13:39:37 +0100 Subject: [PATCH 09/10] feat: Rework Default Public site home page - MEED-7408 - Meeds-io/MIPs#155 (#2344) --- .../conf/sites/portal/public/pages.xml | 219 ++++++++++++++++-- 1 file changed, 203 insertions(+), 16 deletions(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/pages.xml index 7819e540c..34f24405c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/pages.xml @@ -22,8 +22,8 @@ --> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_13 http://www.exoplatform.org/xml/ns/gatein_objects_1_13" + xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_13"> overview @@ -32,6 +32,25 @@ manager:/platform/administrators true + + #FFFFFFFF + #20282C + 20px + bold + normal + #707070 + 20px + bold + normal + #20282C + 18px + normal + normal + #707070 + 12px + normal + normal + @@ -47,6 +66,38 @@ Public Image + + + + + + + notes + NotePageView + + + name + publicHubSummary + + + data.init + + Welcome here!\n

\n
\nSee Meeds-powered organizations in action – where speed and value creation are our trademarks 🚀\n

" + } + } + ]]> + + + + + Public Hub Description + 200 + + + social-portlet @@ -56,10 +107,85 @@ name publicLinks + + data.init + + + + Public Useful Links + 200 + + + + notes @@ -67,48 +193,109 @@ name - publicHubSummary + publicHubDescription + + + data.init + + Have a look at what happens now here" + } + } + ]]> + Public Hub Description - - - gamification-portlets - CreateProgramButton - - Create Program Button - - + gamification-portlets topChallengers + + + topChallengersPeriod + week + + + topChallengersCurrentPosition + true + + Top Challengers + 352 + + #3F8487 + 4 + gamification-portlets - challengesOverview + programsOverview + + + limit + 4 + + + programsSortBy + modifiedDate + + - Challenges Overview + Programs Overview + 352 + + #3F8487 + 4 + gamification-portlets - programsOverview + challengesOverview + + + endingRulesLimit + 0 + + + lockedRulesLimit + 0 + + + availableRulesLimit + 4 + + + upcomingRulesLimit + 0 + + + rulesSortBy + modifiedDate + + - Programs Overview + Challenges Overview + 352 + + #3F8487 + 4 + From 6e98c1fda13681919cd7c80d5f74d5b168f589a3 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Wed, 4 Sep 2024 06:55:52 +0100 Subject: [PATCH 10/10] fix: Use Dedicated Image Setting Name for new Dashboard Page - Meeds-io/MIPs#155 This change will use a dedicated setting name for Contribute site Image banner to avoid reusing the same image used in existing overview page --- .../main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index e7c549edd..a5e9ba589 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -39,7 +39,7 @@ name - overivewPageBanner + contributeOverivewPageBanner image-path