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
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
983175bd
Commit
983175bd
authored
4 years ago
by
lfr20
Browse files
Options
Downloads
Patches
Plain Diff
Add routes to new pages
parent
2dea894c
No related branches found
No related tags found
4 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
,
!40
merge admin into develop
,
!39
Update admin system
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Admin/Pages/AdminLabelTabs/LabelTabs.js
+2
-0
2 additions, 0 deletions
src/Admin/Pages/AdminLabelTabs/LabelTabs.js
src/Admin/Pages/Pages/Admin.js
+8
-1
8 additions, 1 deletion
src/Admin/Pages/Pages/Admin.js
with
10 additions
and
1 deletion
src/Admin/Pages/AdminLabelTabs/LabelTabs.js
+
2
−
0
View file @
983175bd
...
@@ -53,6 +53,7 @@ const TabsItens = [
...
@@ -53,6 +53,7 @@ const TabsItens = [
},
},
{
{
label
:
"
Permissões do usuário
"
,
label
:
"
Permissões do usuário
"
,
href
:
"
/admin/permissions
"
,
},
},
{
{
label
:
"
Variáveis de nota
"
,
label
:
"
Variáveis de nota
"
,
...
@@ -72,6 +73,7 @@ const TabsItens = [
...
@@ -72,6 +73,7 @@ const TabsItens = [
},
},
{
{
label
:
"
Usuários bloqueados
"
,
label
:
"
Usuários bloqueados
"
,
href
:
"
/admin/BlockedUsers
"
},
},
{
{
label
:
"
Denúncias
"
,
label
:
"
Denúncias
"
,
...
...
This diff is collapsed.
Click to expand it.
src/Admin/Pages/Pages/Admin.js
+
8
−
1
View file @
983175bd
...
@@ -32,7 +32,6 @@ import Fab from '@material-ui/core/Fab';
...
@@ -32,7 +32,6 @@ import Fab from '@material-ui/core/Fab';
import
{
BrowserRouter
,
Switch
,
Route
,
Link
}
from
'
react-router-dom
'
;
import
{
BrowserRouter
,
Switch
,
Route
,
Link
}
from
'
react-router-dom
'
;
//imports from local files
//imports from local files
import
{
TabsItens
}
from
'
../AdminLabelTabs/LabelTabs
'
;
import
{
TabsItens
}
from
'
../AdminLabelTabs/LabelTabs
'
;
import
{
Store
}
from
'
../../../Store
'
;
import
Welcome
from
'
../../Components/Components/Welcome
'
;
import
Welcome
from
'
../../Components/Components/Welcome
'
;
import
NoteVariables
from
'
./SubPages/NoteVariables
'
;
import
NoteVariables
from
'
./SubPages/NoteVariables
'
;
import
Institution
from
'
./SubPages/Institutions
'
;
import
Institution
from
'
./SubPages/Institutions
'
;
...
@@ -76,6 +75,10 @@ import AproveTeacher from './SubPages/AproveTeacher';
...
@@ -76,6 +75,10 @@ import AproveTeacher from './SubPages/AproveTeacher';
import
UserCard
from
'
../../Components/Components/DataCards/UserCard
'
;
import
UserCard
from
'
../../Components/Components/DataCards/UserCard
'
;
import
EditUser
from
'
../../Components/Components/Inputs/EditUser
'
;
import
EditUser
from
'
../../Components/Components/Inputs/EditUser
'
;
import
UserList
from
'
./SubPages/Users
'
;
import
UserList
from
'
./SubPages/Users
'
;
import
UserPermissions
from
'
./SubPages/Permissions
'
import
EditRole
from
'
../../Components/Components/Inputs/EditRoles
'
;
import
CreateRole
from
'
../../Components/Components/Inputs/CreateRole
'
import
BlockedUser
from
'
./SubPages/BlockedUsers
'
;
const
useStyles
=
makeStyles
({
const
useStyles
=
makeStyles
({
list
:
{
list
:
{
...
@@ -185,6 +188,10 @@ export default function Admin() {
...
@@ -185,6 +188,10 @@ export default function Admin() {
<
Route
path
=
'
/admin/usersList
'
component
=
{
UserList
}
/
>
<
Route
path
=
'
/admin/usersList
'
component
=
{
UserList
}
/
>
<
Route
path
=
'
/admin/user/:id
'
component
=
{
UserCard
}
/
>
<
Route
path
=
'
/admin/user/:id
'
component
=
{
UserCard
}
/
>
<
Route
path
=
'
/admin/EditUser/:id
'
component
=
{
EditUser
}
/
>
<
Route
path
=
'
/admin/EditUser/:id
'
component
=
{
EditUser
}
/
>
<
Route
path
=
'
/admin/permissions
'
component
=
{
UserPermissions
}
/
>
<
Route
path
=
'
/admin/EditPermissions/:id
'
component
=
{
EditRole
}
/
>
<
Route
path
=
'
/admin/CreateRole
'
component
=
{
CreateRole
}
/
>
<
Route
path
=
'
/admin/BlockedUsers
'
component
=
{
BlockedUser
}
/
>
<
Route
path
=
'
/admin/sendEmail/:email
'
component
=
{
SendEmail
}
/
>
<
Route
path
=
'
/admin/sendEmail/:email
'
component
=
{
SendEmail
}
/
>
<
Route
path
=
'
/admin/inframe
'
component
=
{
Inframe
}
/
>
<
Route
path
=
'
/admin/inframe
'
component
=
{
Inframe
}
/
>
...
...
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