Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PortalMEC-React
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Harbor Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PortalMEC
PortalMEC-React
Commits
c6e6596a
Commit
c6e6596a
authored
4 years ago
by
lfr20
Browse files
Options
Downloads
Patches
Plain Diff
Add routes to gamefication
parent
5e4fe833
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Admin/Components/Components/DisplayIcon.js
+2
-0
2 additions, 0 deletions
src/Admin/Components/Components/DisplayIcon.js
src/App.js
+10
-1
10 additions, 1 deletion
src/App.js
with
12 additions
and
1 deletion
src/Admin/Components/Components/DisplayIcon.js
+
2
−
0
View file @
c6e6596a
...
@@ -37,6 +37,7 @@ import TimelineRoundedIcon from "@material-ui/icons/TimelineRounded";
...
@@ -37,6 +37,7 @@ import TimelineRoundedIcon from "@material-ui/icons/TimelineRounded";
import
SettingsRoundedIcon
from
"
@material-ui/icons/SettingsRounded
"
;
import
SettingsRoundedIcon
from
"
@material-ui/icons/SettingsRounded
"
;
import
ExitToAppRoundedIcon
from
"
@material-ui/icons/ExitToAppRounded
"
;
import
ExitToAppRoundedIcon
from
"
@material-ui/icons/ExitToAppRounded
"
;
import
AllOutIcon
from
"
@material-ui/icons/AllOut
"
;
import
AllOutIcon
from
"
@material-ui/icons/AllOut
"
;
import
SportsEsportsRoundedIcon
from
'
@material-ui/icons/SportsEsportsRounded
'
;
//This file manipulate the icon that will be displayed in the left navigation menu
//This file manipulate the icon that will be displayed in the left navigation menu
...
@@ -62,6 +63,7 @@ const icons = [
...
@@ -62,6 +63,7 @@ const icons = [
<
BlockRoundedIcon
style
=
{{
fill
:
pink
}}
/>
,
<
BlockRoundedIcon
style
=
{{
fill
:
pink
}}
/>
,
<
AnnouncementRoundedIcon
style
=
{{
fill
:
purple
}}
/>
,
<
AnnouncementRoundedIcon
style
=
{{
fill
:
purple
}}
/>
,
<
EmailRoundedIcon
style
=
{{
fill
:
blue
}}
/>
,
<
EmailRoundedIcon
style
=
{{
fill
:
blue
}}
/>
,
<
SportsEsportsRoundedIcon
style
=
{{
fill
:
orange
}}
/>
,
<
TimelineRoundedIcon
style
=
{{
fill
:
orange
}}
/>
,
<
TimelineRoundedIcon
style
=
{{
fill
:
orange
}}
/>
,
<
SettingsRoundedIcon
style
=
{{
fill
:
pink
}}
/>
,
<
SettingsRoundedIcon
style
=
{{
fill
:
pink
}}
/>
,
<
ExitToAppRoundedIcon
style
=
{{
fill
:
purple
}}
/>
,
<
ExitToAppRoundedIcon
style
=
{{
fill
:
purple
}}
/>
,
...
...
This diff is collapsed.
Click to expand it.
src/App.js
+
10
−
1
View file @
c6e6596a
...
@@ -96,7 +96,7 @@ import UserPermissions from "./Admin/Pages/Pages/SubPages/Permissions";
...
@@ -96,7 +96,7 @@ import UserPermissions from "./Admin/Pages/Pages/SubPages/Permissions";
import
EditRole
from
"
./Admin/Components/Components/Inputs/EditRoles
"
;
import
EditRole
from
"
./Admin/Components/Components/Inputs/EditRoles
"
;
import
CreateRole
from
"
./Admin/Components/Components/Inputs/CreateRole
"
;
import
CreateRole
from
"
./Admin/Components/Components/Inputs/CreateRole
"
;
import
BlockedUser
from
"
./Admin/Pages/Pages/SubPages/BlockedUsers
"
;
import
BlockedUser
from
"
./Admin/Pages/Pages/SubPages/BlockedUsers
"
;
import
Gamefication
from
"
./Admin/Pages/Pages/SubPages/Gamefication
"
import
PropTypes
from
"
prop-types
"
;
import
PropTypes
from
"
prop-types
"
;
import
Typography
from
"
@material-ui/core/Typography
"
;
import
Typography
from
"
@material-ui/core/Typography
"
;
import
Box
from
"
@material-ui/core/Box
"
;
import
Box
from
"
@material-ui/core/Box
"
;
...
@@ -356,6 +356,13 @@ export default function App() {
...
@@ -356,6 +356,13 @@ export default function App() {
component
=
{
Link
}
component
=
{
Link
}
{...
a11yProps
(
15
)}
{...
a11yProps
(
15
)}
/
>
/
>
<
Tab
label
=
"
Gameficação
"
to
=
"
/admin/gamefication
"
icon
=
{
<
DisplayIcon
i
=
{
16
}
/>
}
component
=
{
Link
}
{...
a11yProps
(
16
)}
/
>
<
/Tabs
>
<
/Tabs
>
<
/AppBar
>
<
/AppBar
>
<
div
style
=
{{
padding
:
"
2em
"
}}
>
<
div
style
=
{{
padding
:
"
2em
"
}}
>
...
@@ -424,6 +431,8 @@ export default function App() {
...
@@ -424,6 +431,8 @@ export default function App() {
<
Route
path
=
"
/admin/CreateRole
"
component
=
{
CreateRole
}
/
>
<
Route
path
=
"
/admin/CreateRole
"
component
=
{
CreateRole
}
/
>
<
Route
path
=
"
/admin/BlockedUsers
"
component
=
{
BlockedUser
}
/
>
<
Route
path
=
"
/admin/BlockedUsers
"
component
=
{
BlockedUser
}
/
>
<
Route
path
=
"
/admin/sendEmail/:email
"
component
=
{
SendEmail
}
/
>
<
Route
path
=
"
/admin/sendEmail/:email
"
component
=
{
SendEmail
}
/
>
<
Route
path
=
"
/admin/gamefication
"
component
=
{
Gamefication
}
/
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/Switch
>
<
/Switch
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment