pulled changes from origin and merged, restored server config that I had changed.

mbaghel · mbaghel · commit ea7310a195ad · 2021-05-25T12:16:17.000+04:00
diff --git a/server.js b/server.js
@@ -1,25 +1,26 @@
 /* global process */
-const express = require("express");
+const express = require('express');
 
 const app = express();
 
-app.use('/navbar', 
-  express.static("./dist", {
+app.use(
+  '/navbar',
+  express.static('./dist', {
     setHeaders: function setHeaders(res) {
-      res.header("Access-Control-Allow-Origin", "*");
-      res.header("Access-Control-Allow-Methods", "GET");
+      res.header('Access-Control-Allow-Origin', '*');
+      res.header('Access-Control-Allow-Methods', 'GET');
       res.header(
-        "Access-Control-Allow-Headers",
-        "Origin, X-Requested-With, Content-Type, Accept"
+        'Access-Control-Allow-Headers',
+        'Origin, X-Requested-With, Content-Type, Accept'
       );
     },
   })
 );
 
 app.get('/', function (req, res) {
-  res.send('alive')
-})
+  res.send('alive');
+});
 
-const PORT = process.env.PORT || 3002;
+const PORT = process.env.PORT || 3001;
 app.listen(PORT, '0.0.0.0');
 console.log(`App is hosted on port ${PORT}.`); // eslint-disable-line no-console
diff --git a/src/components/AllAppsMenu/styles.css b/src/components/AllAppsMenu/styles.css
@@ -34,7 +34,7 @@
 }
 
 .all-apps-menu-list-title {
-  font-family: 'Barlow Condensed', sans-serif !important;
+  font-family: "Roboto", Arial, Helvetica, sans-serif !important;
   font-weight: 500;
   font-size: 18px;
   line-height: 15px;
diff --git a/src/components/MainMenu/styles.css b/src/components/MainMenu/styles.css
@@ -79,7 +79,7 @@
 
   .main-menu-title {
     margin-top: 0;
-    font-family: 'Barlow Condensed', sans-serif;
+    font-family: "Roboto", Arial, Helvetica, sans-serif;
     font-weight: 500;
     font-size: 22px;
     text-align: left;
diff --git a/src/components/Menu/styles.css b/src/components/Menu/styles.css
@@ -2,6 +2,7 @@
 .menu-submenu {
   margin: 0;
   padding: 0;
+  font-family: "Roboto", Arial, Helvetica, sans-serif;
 }
 
 .menu > li,
diff --git a/src/components/NavBar/styles.css b/src/components/NavBar/styles.css
@@ -8,15 +8,17 @@
   padding-right: 16px;
   position: relative;
   z-index: 1;
+  font-family: "Roboto", Arial, Helvetica, sans-serif;
 }
+
 .navbar-left  {
   display: flex;
   flex-direction: row;
   align-items: center;
 }
 
 .navbar-app-title {
-  font-family: 'Barlow Condensed', sans-serif;;
+  font-family: "Roboto", Arial, Helvetica, sans-serif;
   font-weight: 500;
   font-weight: normal;
   text-transform: uppercase;
diff --git a/src/constants/apps.js b/src/constants/apps.js
@@ -1,52 +1,10 @@
 /**
  * Config for the All Apps menu.
  */
-import appReactIcon from '../assets/images/reactjs.svg';
-import appAngularIcon from '../assets/images/angularjs.svg';
+import appDocumentationIcon from '../assets/images/learn.svg';
 import appTaasIcon from '../assets/images/integrations.svg';
-const appSubmissionReviewIcon = appTaasIcon;
-import manageWorkIcon from '../assets/images/managework.svg';
-import ondemandTalentIcon from '../assets/images/ondemand-talent.svg';
-import myOrganizationIcon from '../assets/images/my-organization.svg';
-const integrationsIcon = appTaasIcon;
-const customerplatformIcon = manageWorkIcon;
-const workmanagerIcon = ondemandTalentIcon;
-import learnIcon from '../assets/images/learn.svg';
-import earnIcon from '../assets/images/earn.svg';
-import homeIcon from '../assets/images/home.svg';
-import homeGreenIcon from '../assets/images/home-green.svg';
-import projectsIcon from '../assets/images/projects.svg';
-import projectsGreenIcon from '../assets/images/projects-green.svg';
-import crowdsourceIcon from '../assets/images/crowdsource.svg';
-import crowdsourceGreenIcon from '../assets/images/crowdsource-green.svg';
 import myteamsIcon from '../assets/images/my-teams.svg';
 import myteamsGreenIcon from '../assets/images/my-teams-green.svg';
-import skillSearchIcon from '../assets/images/skill-search.svg';
-import skillSearchGreenIcon from '../assets/images/skill-search-green.svg';
-import organizationSettingsIcon from '../assets/images/organization-settings.svg';
-import organizationSettingsGreenIcon from '../assets/images/organization-settings-green.svg';
-import integrationsPluginIcon from '../assets/images/integrations-plugins.svg';
-import integrationsPluginGreenIcon from '../assets/images/integrations-plugins-green.svg';
-import apisIcon from '../assets/images/apis.svg';
-import apisGreenIcon from '../assets/images/apis-green.svg';
-import myWorkIcon from '../assets/images/my-work.svg';
-import myWorkGreenIcon from '../assets/images/my-work-green.svg';
-import findWorkIcon from '../assets/images/find-work.svg';
-import findWorkGreenIcon from '../assets/images/find-work-green.svg';
-import thriveIcon from '../assets/images/thrive.svg';
-import thriveGreenIcon from '../assets/images/thrive-green.svg';
-import skillBuilderIcon from '../assets/images/skill-builder.svg';
-import skillBuilderGreenIcon from '../assets/images/skill-builder-green.svg';
-import reportsIcon from '../assets/images/reports.svg';
-import reportsGreenIcon from '../assets/images/reports-green.svg';
-import testimonalsIcon from '../assets/images/testimonals.svg';
-import testimonalsGreenIcon from '../assets/images/testimonals-green.svg';
-import faqIcon from '../assets/images/faq.svg';
-import faqGreenIcon from '../assets/images/faq-green.svg';
-import discussionsIcon from '../assets/images/discussions.svg';
-import discussionsGreenIcon from '../assets/images/discussions-green.svg';
-import filesIcon from '../assets/images/files.svg';
-import filesGreenIcon from '../assets/images/files-green.svg';
 import createTeamIcon from '../assets/images/create-team.svg';
 import createTeamGreenIcon from '../assets/images/create-team-green.svg';
 
@@ -79,218 +37,15 @@ export const APP_CATEGORIES = [
         ],
       },
       {
-        title: 'Submission Review',
-        icon: appSubmissionReviewIcon,
-        path: '/submissions',
-        menu: [],
-      },
-      {
-        title: 'Manage Work',
-        icon: manageWorkIcon,
-        path: '/manage-work',
-        menu: [
-          {
-            title: 'Homepage',
-            path: '/manage-work',
-            icon: homeIcon,
-            activeIcon: homeGreenIcon,
-          },
-          {
-            title: 'Projects',
-            path: '/manage-work/projects',
-            icon: projectsIcon,
-            activeIcon: projectsGreenIcon,
-          },
-          {
-            title: 'Crowdsource',
-            path: '/manage-work/crowdsource',
-            icon: crowdsourceIcon,
-            activeIcon: crowdsourceGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'On-Demand Talent',
-        icon: ondemandTalentIcon,
-        path: '/ondemand-talent',
-        menu: [
-          {
-            title: 'Homepage',
-            path: '/ondemand-talent',
-            icon: homeIcon,
-            activeIcon: homeGreenIcon,
-          },
-          {
-            title: 'My Teams',
-            path: '/ondemand-talent/my-teams',
-            icon: myteamsIcon,
-            activeIcon: myteamsGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'My Organization',
-        icon: myOrganizationIcon,
-        path: '/my-organization',
-        menu: [
-          {
-            title: 'Skill Search',
-            path: '/my-organization',
-            icon: skillSearchIcon,
-            activeIcon: skillSearchGreenIcon,
-          },
-          {
-            title: 'Organization Settings',
-            path: '/my-organization/settings',
-            icon: organizationSettingsIcon,
-            activeIcon: organizationSettingsGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'Integrations',
-        icon: integrationsIcon,
-        path: '/integrations',
-        menu: [
-          {
-            title: 'Integrations Plug-Ins',
-            path: '/integrations',
-            icon: integrationsPluginIcon,
-            activeIcon: integrationsPluginGreenIcon,
-          },
-          {
-            title: 'APIs',
-            path: '/integrations/apis',
-            icon: apisIcon,
-            activeIcon: apisGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'Customer Platform',
-        icon: customerplatformIcon,
-        path: '/customer-platform',
-        menu: [
-          {
-            title: 'Catalog',
-            path: '/customer-platform',
-            icon: homeIcon,
-            activeIcon: homeGreenIcon,
-          },
-          {
-            title: 'My Work',
-            path: '/customer-platform/my-work',
-            icon: apisIcon,
-            activeIcon: apisGreenIcon,
-          },
-          {
-            title: 'Reports',
-            path: '/customer-platform/reports',
-            icon: reportsIcon,
-            activeIcon: reportsGreenIcon,
-          },
-          {
-            title: 'Testimonals',
-            path: '/customer-platform/testimonals',
-            icon: testimonalsIcon,
-            activeIcon: testimonalsGreenIcon,
-          },
-          {
-            title: 'FAQ',
-            path: '/customer-platform/FAQ',
-            icon: faqIcon,
-            activeIcon: faqGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'Work Manager',
-        icon: workmanagerIcon,
-        path: '/work-manager',
-        menu: [
-          {
-            title: 'Challenges/Tasks',
-            path: '/work-manager',
-            icon: homeIcon,
-            activeIcon: homeGreenIcon,
-          },
-          {
-            title: 'Discussions',
-            path: '/work-manager/discussions',
-            icon: discussionsIcon,
-            activeIcon: discussionsGreenIcon,
-          },
-          {
-            title: 'Files & Links',
-            path: '/work-manager/files-links',
-            icon: filesIcon,
-            activeIcon: filesGreenIcon,
-          },
-          {
-            title: 'Reports',
-            path: '/work-manager/reports',
-            icon: reportsIcon,
-            activeIcon: reportsGreenIcon,
-          },
-        ],
-      },
-    ],
-  },
-  {
-    category: 'Do',
-    apps: [
-      {
-        title: 'Earn',
-        icon: earnIcon,
-        path: '/earn',
-        menu: [],
-      },
-      {
-        title: 'Learn',
-        icon: learnIcon,
-        path: '/learn',
-        menu: [
-          {
-            title: 'Thrive',
-            path: '/learn',
-            icon: thriveIcon,
-            activeIcon: thriveGreenIcon,
-          },
-          {
-            title: 'Skill Builder',
-            path: '/learn/skill-builder',
-            icon: skillBuilderIcon,
-            activeIcon: skillBuilderGreenIcon,
-          },
-        ],
-      },
-      {
-        title: 'Tasks',
-        icon: manageWorkIcon,
-        path: '/task-marketplace',
-        menu: [],
-      },
-    ],
-  },
-  {
-    category: 'Sample',
-    apps: [
-      {
-        title: 'React Example',
-        icon: appReactIcon,
-        path: '/micro-frontends-react-route',
-        menu: [],
-      },
-      {
-        title: 'Angular Example',
-        icon: appAngularIcon,
-        path: '/micro-frontends-angular-route',
+        title: 'Documentation',
+        icon: appDocumentationIcon,
+        path: '/model',
         menu: [],
       },
       {
-        title: 'Documentation',
-        icon: appReactIcon,
-        path: '/model',
+        title: 'Community Admin',
+        icon: myteamsIcon,
+        path: '/community-admin',
         menu: [],
       },
     ],

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`.all-apps-menu-list-title {`
`37`		`- font-family: 'Barlow Condensed', sans-serif !important;`
	`37`	`+ font-family: "Roboto", Arial, Helvetica, sans-serif !important;`
`38`	`38`	`font-weight: 500;`
`39`	`39`	`font-size: 18px;`
`40`	`40`	`line-height: 15px;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`.menu-submenu {`
`3`	`3`	`margin: 0;`
`4`	`4`	`padding: 0;`
	`5`	`+ font-family: "Roboto", Arial, Helvetica, sans-serif;`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`.menu > li,`