Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit ea7310a

Browse files
mbaghelmbaghel
committed
pulled changes from origin and merged, restored server config that I had changed.
2 parents 180bd1a + 77dbb3e commit ea7310a

File tree

6 files changed

+24
-265
lines changed

6 files changed

+24
-265
lines changed

‎server.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
/* global process */
2-
const express = require("express");
2+
const express = require('express');
33

44
const app = express();
55

6-
app.use('/navbar',
7-
express.static("./dist", {
6+
app.use(
7+
'/navbar',
8+
express.static('./dist', {
89
setHeaders: function setHeaders(res) {
9-
res.header("Access-Control-Allow-Origin", "*");
10-
res.header("Access-Control-Allow-Methods", "GET");
10+
res.header('Access-Control-Allow-Origin', '*');
11+
res.header('Access-Control-Allow-Methods', 'GET');
1112
res.header(
12-
"Access-Control-Allow-Headers",
13-
"Origin, X-Requested-With, Content-Type, Accept"
13+
'Access-Control-Allow-Headers',
14+
'Origin, X-Requested-With, Content-Type, Accept'
1415
);
1516
},
1617
})
1718
);
1819

1920
app.get('/', function (req, res) {
20-
res.send('alive')
21-
})
21+
res.send('alive');
22+
});
2223

23-
const PORT = process.env.PORT || 3002;
24+
const PORT = process.env.PORT || 3001;
2425
app.listen(PORT, '0.0.0.0');
2526
console.log(`App is hosted on port ${PORT}.`); // eslint-disable-line no-console

‎src/components/AllAppsMenu/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535

3636
.all-apps-menu-list-title {
37-
font-family: 'Barlow Condensed', sans-serif !important;
37+
font-family: "Roboto", Arial, Helvetica, sans-serif !important;
3838
font-weight: 500;
3939
font-size: 18px;
4040
line-height: 15px;

‎src/components/MainMenu/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
.main-menu-title {
8181
margin-top: 0;
82-
font-family: 'Barlow Condensed', sans-serif;
82+
font-family: "Roboto", Arial, Helvetica, sans-serif;
8383
font-weight: 500;
8484
font-size: 22px;
8585
text-align: left;

‎src/components/Menu/styles.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.menu-submenu {
33
margin: 0;
44
padding: 0;
5+
font-family: "Roboto", Arial, Helvetica, sans-serif;
56
}
67

78
.menu > li,

‎src/components/NavBar/styles.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88
padding-right: 16px;
99
position: relative;
1010
z-index: 1;
11+
font-family: "Roboto", Arial, Helvetica, sans-serif;
1112
}
13+
1214
.navbar-left {
1315
display: flex;
1416
flex-direction: row;
1517
align-items: center;
1618
}
1719

1820
.navbar-app-title {
19-
font-family: 'Barlow Condensed', sans-serif;;
21+
font-family: "Roboto", Arial, Helvetica, sans-serif;
2022
font-weight: 500;
2123
font-weight: normal;
2224
text-transform: uppercase;

‎src/constants/apps.js‎

Lines changed: 7 additions & 252 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,10 @@
11
/**
22
* Config for the All Apps menu.
33
*/
4-
import appReactIcon from '../assets/images/reactjs.svg';
5-
import appAngularIcon from '../assets/images/angularjs.svg';
4+
import appDocumentationIcon from '../assets/images/learn.svg';
65
import appTaasIcon from '../assets/images/integrations.svg';
7-
const appSubmissionReviewIcon = appTaasIcon;
8-
import manageWorkIcon from '../assets/images/managework.svg';
9-
import ondemandTalentIcon from '../assets/images/ondemand-talent.svg';
10-
import myOrganizationIcon from '../assets/images/my-organization.svg';
11-
const integrationsIcon = appTaasIcon;
12-
const customerplatformIcon = manageWorkIcon;
13-
const workmanagerIcon = ondemandTalentIcon;
14-
import learnIcon from '../assets/images/learn.svg';
15-
import earnIcon from '../assets/images/earn.svg';
16-
import homeIcon from '../assets/images/home.svg';
17-
import homeGreenIcon from '../assets/images/home-green.svg';
18-
import projectsIcon from '../assets/images/projects.svg';
19-
import projectsGreenIcon from '../assets/images/projects-green.svg';
20-
import crowdsourceIcon from '../assets/images/crowdsource.svg';
21-
import crowdsourceGreenIcon from '../assets/images/crowdsource-green.svg';
226
import myteamsIcon from '../assets/images/my-teams.svg';
237
import myteamsGreenIcon from '../assets/images/my-teams-green.svg';
24-
import skillSearchIcon from '../assets/images/skill-search.svg';
25-
import skillSearchGreenIcon from '../assets/images/skill-search-green.svg';
26-
import organizationSettingsIcon from '../assets/images/organization-settings.svg';
27-
import organizationSettingsGreenIcon from '../assets/images/organization-settings-green.svg';
28-
import integrationsPluginIcon from '../assets/images/integrations-plugins.svg';
29-
import integrationsPluginGreenIcon from '../assets/images/integrations-plugins-green.svg';
30-
import apisIcon from '../assets/images/apis.svg';
31-
import apisGreenIcon from '../assets/images/apis-green.svg';
32-
import myWorkIcon from '../assets/images/my-work.svg';
33-
import myWorkGreenIcon from '../assets/images/my-work-green.svg';
34-
import findWorkIcon from '../assets/images/find-work.svg';
35-
import findWorkGreenIcon from '../assets/images/find-work-green.svg';
36-
import thriveIcon from '../assets/images/thrive.svg';
37-
import thriveGreenIcon from '../assets/images/thrive-green.svg';
38-
import skillBuilderIcon from '../assets/images/skill-builder.svg';
39-
import skillBuilderGreenIcon from '../assets/images/skill-builder-green.svg';
40-
import reportsIcon from '../assets/images/reports.svg';
41-
import reportsGreenIcon from '../assets/images/reports-green.svg';
42-
import testimonalsIcon from '../assets/images/testimonals.svg';
43-
import testimonalsGreenIcon from '../assets/images/testimonals-green.svg';
44-
import faqIcon from '../assets/images/faq.svg';
45-
import faqGreenIcon from '../assets/images/faq-green.svg';
46-
import discussionsIcon from '../assets/images/discussions.svg';
47-
import discussionsGreenIcon from '../assets/images/discussions-green.svg';
48-
import filesIcon from '../assets/images/files.svg';
49-
import filesGreenIcon from '../assets/images/files-green.svg';
508
import createTeamIcon from '../assets/images/create-team.svg';
519
import createTeamGreenIcon from '../assets/images/create-team-green.svg';
5210

@@ -79,218 +37,15 @@ export const APP_CATEGORIES = [
7937
],
8038
},
8139
{
82-
title: 'Submission Review',
83-
icon: appSubmissionReviewIcon,
84-
path: '/submissions',
85-
menu: [],
86-
},
87-
{
88-
title: 'Manage Work',
89-
icon: manageWorkIcon,
90-
path: '/manage-work',
91-
menu: [
92-
{
93-
title: 'Homepage',
94-
path: '/manage-work',
95-
icon: homeIcon,
96-
activeIcon: homeGreenIcon,
97-
},
98-
{
99-
title: 'Projects',
100-
path: '/manage-work/projects',
101-
icon: projectsIcon,
102-
activeIcon: projectsGreenIcon,
103-
},
104-
{
105-
title: 'Crowdsource',
106-
path: '/manage-work/crowdsource',
107-
icon: crowdsourceIcon,
108-
activeIcon: crowdsourceGreenIcon,
109-
},
110-
],
111-
},
112-
{
113-
title: 'On-Demand Talent',
114-
icon: ondemandTalentIcon,
115-
path: '/ondemand-talent',
116-
menu: [
117-
{
118-
title: 'Homepage',
119-
path: '/ondemand-talent',
120-
icon: homeIcon,
121-
activeIcon: homeGreenIcon,
122-
},
123-
{
124-
title: 'My Teams',
125-
path: '/ondemand-talent/my-teams',
126-
icon: myteamsIcon,
127-
activeIcon: myteamsGreenIcon,
128-
},
129-
],
130-
},
131-
{
132-
title: 'My Organization',
133-
icon: myOrganizationIcon,
134-
path: '/my-organization',
135-
menu: [
136-
{
137-
title: 'Skill Search',
138-
path: '/my-organization',
139-
icon: skillSearchIcon,
140-
activeIcon: skillSearchGreenIcon,
141-
},
142-
{
143-
title: 'Organization Settings',
144-
path: '/my-organization/settings',
145-
icon: organizationSettingsIcon,
146-
activeIcon: organizationSettingsGreenIcon,
147-
},
148-
],
149-
},
150-
{
151-
title: 'Integrations',
152-
icon: integrationsIcon,
153-
path: '/integrations',
154-
menu: [
155-
{
156-
title: 'Integrations Plug-Ins',
157-
path: '/integrations',
158-
icon: integrationsPluginIcon,
159-
activeIcon: integrationsPluginGreenIcon,
160-
},
161-
{
162-
title: 'APIs',
163-
path: '/integrations/apis',
164-
icon: apisIcon,
165-
activeIcon: apisGreenIcon,
166-
},
167-
],
168-
},
169-
{
170-
title: 'Customer Platform',
171-
icon: customerplatformIcon,
172-
path: '/customer-platform',
173-
menu: [
174-
{
175-
title: 'Catalog',
176-
path: '/customer-platform',
177-
icon: homeIcon,
178-
activeIcon: homeGreenIcon,
179-
},
180-
{
181-
title: 'My Work',
182-
path: '/customer-platform/my-work',
183-
icon: apisIcon,
184-
activeIcon: apisGreenIcon,
185-
},
186-
{
187-
title: 'Reports',
188-
path: '/customer-platform/reports',
189-
icon: reportsIcon,
190-
activeIcon: reportsGreenIcon,
191-
},
192-
{
193-
title: 'Testimonals',
194-
path: '/customer-platform/testimonals',
195-
icon: testimonalsIcon,
196-
activeIcon: testimonalsGreenIcon,
197-
},
198-
{
199-
title: 'FAQ',
200-
path: '/customer-platform/FAQ',
201-
icon: faqIcon,
202-
activeIcon: faqGreenIcon,
203-
},
204-
],
205-
},
206-
{
207-
title: 'Work Manager',
208-
icon: workmanagerIcon,
209-
path: '/work-manager',
210-
menu: [
211-
{
212-
title: 'Challenges/Tasks',
213-
path: '/work-manager',
214-
icon: homeIcon,
215-
activeIcon: homeGreenIcon,
216-
},
217-
{
218-
title: 'Discussions',
219-
path: '/work-manager/discussions',
220-
icon: discussionsIcon,
221-
activeIcon: discussionsGreenIcon,
222-
},
223-
{
224-
title: 'Files & Links',
225-
path: '/work-manager/files-links',
226-
icon: filesIcon,
227-
activeIcon: filesGreenIcon,
228-
},
229-
{
230-
title: 'Reports',
231-
path: '/work-manager/reports',
232-
icon: reportsIcon,
233-
activeIcon: reportsGreenIcon,
234-
},
235-
],
236-
},
237-
],
238-
},
239-
{
240-
category: 'Do',
241-
apps: [
242-
{
243-
title: 'Earn',
244-
icon: earnIcon,
245-
path: '/earn',
246-
menu: [],
247-
},
248-
{
249-
title: 'Learn',
250-
icon: learnIcon,
251-
path: '/learn',
252-
menu: [
253-
{
254-
title: 'Thrive',
255-
path: '/learn',
256-
icon: thriveIcon,
257-
activeIcon: thriveGreenIcon,
258-
},
259-
{
260-
title: 'Skill Builder',
261-
path: '/learn/skill-builder',
262-
icon: skillBuilderIcon,
263-
activeIcon: skillBuilderGreenIcon,
264-
},
265-
],
266-
},
267-
{
268-
title: 'Tasks',
269-
icon: manageWorkIcon,
270-
path: '/task-marketplace',
271-
menu: [],
272-
},
273-
],
274-
},
275-
{
276-
category: 'Sample',
277-
apps: [
278-
{
279-
title: 'React Example',
280-
icon: appReactIcon,
281-
path: '/micro-frontends-react-route',
282-
menu: [],
283-
},
284-
{
285-
title: 'Angular Example',
286-
icon: appAngularIcon,
287-
path: '/micro-frontends-angular-route',
40+
title: 'Documentation',
41+
icon: appDocumentationIcon,
42+
path: '/model',
28843
menu: [],
28944
},
29045
{
291-
title: 'Documentation',
292-
icon: appReactIcon,
293-
path: '/model',
46+
title: 'Community Admin',
47+
icon: myteamsIcon,
48+
path: '/community-admin',
29449
menu: [],
29550
},
29651
],

0 commit comments

Comments
 (0)