feat: Add Access Button in Public Site Top bar - MEED-2820 - Meeds-io…

…/meeds#1236 (#3136) Prior to this change, When logged in AND accessing the public site, then it is not possible to access the platform unless you have the link somewhere referenced. This change will introduce a new button to the user when logged in. By clicking on button, the aggregated default site opens in a new tab.
Meeds-io · Nov 7, 2023 · 4e0a384 · 4e0a384
1 parent eea8236
commit 4e0a384
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
@@ -809,7 +809,7 @@ Notification.alert.errorChangingSpaceMutingStatus=An error occurred while procee
 publicAccess.login=Login
 publicAccess.register=Sign up
 publicAccess.access=Open
-publicAccess.previewModeTooltip=Preview as visitor
+publicAccess.previewModeTooltip=Preview the page as visitor
 publicAccess.editModeTooltip=Get back to edit mode
 publicAccess.makeSiteVisible=Make the site visible
 generalSettings.publicSiteUpdatedSuccessfully=Public site visibility successfully updated

diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp
@@ -1,3 +1,5 @@
+<%@page import="org.exoplatform.social.core.identity.model.Identity"%>
+<%@page import="org.exoplatform.social.webui.Utils"%>
 <%@page import="io.meeds.portal.security.constant.UserRegistrationType"%>
 <%@page import="org.exoplatform.container.ExoContainerContext"%>
 <%@page import="io.meeds.portal.security.service.SecuritySettingService"%>
@@ -24,6 +26,8 @@
 <%
   SecuritySettingService securitySettingService = ExoContainerContext.getService(SecuritySettingService.class);
   boolean canRegister = securitySettingService.getRegistrationType() == UserRegistrationType.OPEN;
+  Identity viewerIdentity = Utils.getViewerIdentity();
+  String avatarUrl = viewerIdentity == null ? "" : viewerIdentity.getProfile().getAvatarUrl();
 %>
 <div class="VuetifyApp">
   <div data-app="true"
@@ -40,7 +44,7 @@
     </div>
     <% } %>
     <script type="text/javascript">
-      require(['PORTLET/social-portlet/TopBarLogin'], app => app.init(<%=canRegister%>));
+      require(['PORTLET/social-portlet/TopBarLogin'], app => app.init('<%=avatarUrl%>', <%=canRegister%>));
     </script>
   </div>
 </div>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue b/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue
@@ -20,8 +20,8 @@
 
 -->
 <template>
-  <v-app v-if="publicMode">
-    <div class="d-flex">
+  <v-app>
+    <div v-if="publicMode" class="d-flex">
       <v-btn
         v-if="$root.canRegister"
         id="topBarRegisterButton"
@@ -41,6 +41,18 @@
         <v-icon v-else size="16">fa-sign-in-alt</v-icon>
       </v-btn>
     </div>
+    <v-btn
+      v-else-if="authenticated"
+      id="topBarAccessButton"
+      href="/portal"
+      target="_blank"
+      class="primary"
+      outlined>
+      <v-avatar size="20" class="me-2">
+        <v-img :src="$root.avatarUrl" eager />
+      </v-avatar>
+      <span class="text-none">{{ $t('publicAccess.access') }}</span>
+    </v-btn>
   </v-app>
 </template>
 <script>

diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/main.js b/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/main.js
@@ -24,11 +24,12 @@ const lang = window.eXo?.env?.portal?.language || 'en';
 const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.Portlets-${lang}.json`;
 const appId = 'topbarLogin';
 
-export function init(canRegister) {
+export function init(avatarUrl, canRegister) {
   exoi18n.loadLanguageAsync(lang, url).then(i18n => {
     // init Vue app when locale resources are ready
     Vue.createApp({
       data: {
+        avatarUrl,
         canRegister,
       },
       template: `<top-bar-login id="${appId}" />`,