From 34d1018d27e1351a0cf03cf601670d891d409121 Mon Sep 17 00:00:00 2001
From: Lucas Schoenfelder <les17@inf.ufpr.br>
Date: Fri, 4 Dec 2020 10:25:59 -0300
Subject: [PATCH] temporarily removed gamification related tabs from user page
---
src/Components/MenuBar.js | 9 ++++-----
src/Components/MobileDrawerMenu.js | 6 +++---
src/Pages/UserPage.js | 14 ++++++--------
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index 2d49f259..b8769636 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -117,11 +117,10 @@ export default function MenuBar(props){
const minhaArea = [
{ name: "Perfil e Atividades", href: "/perfil", value : '0'},
- { name: "Status e Conquistas", href: "/perfil", value: '1'},
- { name: "Recursos Publicados", href: "/perfil", value : '2'},
- { name: "Favoritos", href: "/perfil", value : '3'},
- { name: "Coleções", href: "/perfil", value : '4'},
- { name: "Rede", href: "/perfil", value : '5'},
+ { name: "Recursos Publicados", href: "/perfil", value : '1'},
+ { name: "Favoritos", href: "/perfil", value : '2'},
+ { name: "Coleções", href: "/perfil", value : '3'},
+ { name: "Rede", href: "/perfil", value : '4'},
{ name: "Configurações", href: "/editarperfil"},
]
diff --git a/src/Components/MobileDrawerMenu.js b/src/Components/MobileDrawerMenu.js
index 479ccc04..19201b3d 100644
--- a/src/Components/MobileDrawerMenu.js
+++ b/src/Components/MobileDrawerMenu.js
@@ -70,10 +70,10 @@ export default function MobileDrawerMenu (props) {
{/*main user actions array */}
const minhaArea = [
{ name: "Publicar Recurso", href: "/termos-publicar-recurso", icon : <CloudUploadIcon/>},
- { name: "Recursos Publicados", href: "/perfil", icon : <CloudDoneIcon/>, value : '2'},
+ { name: "Recursos Publicados", href: "/perfil", icon : <CloudDoneIcon/>, value : '1'},
{ name: "Perfil e Atividades", href: "/perfil", icon : <HistoryIcon/>, value : '0'},
- { name: "Favoritos", href: "/perfil", icon : <FavoriteBorderIcon/>, value : '3'},
- { name: "Coleções", href: "/perfil", icon : <FolderOpenIcon/>, value : '4'},
+ { name: "Favoritos", href: "/perfil", icon : <FavoriteBorderIcon/>, value : '2'},
+ { name: "Coleções", href: "/perfil", icon : <FolderOpenIcon/>, value : '3'},
]
{/*dispatches log out actions to Store.js*/}
diff --git a/src/Pages/UserPage.js b/src/Pages/UserPage.js
index 83acf71d..6c1359d6 100644
--- a/src/Pages/UserPage.js
+++ b/src/Pages/UserPage.js
@@ -65,7 +65,7 @@ export default function UserPage (props){
Number(props.location.state) || 0
);
const [tabs, setTabs] = useState([
- 'Atividades', 'Status e Conquistas', 'Meus Recursos', 'Favoritos', 'Coleções', 'Rede'
+ 'Atividades', 'Meus Recursos', 'Favoritos', 'Coleções', 'Rede'
])
const handleChangeTab = (event, newValue) => {
setTabValue(newValue)
@@ -84,7 +84,7 @@ export default function UserPage (props){
if((response.data.role_ids.includes(4))) {
setTabs([
- 'Atividades', 'Status e Conquistas', 'Meus Recursos', 'Favoritos', 'Coleções', 'Rede', 'Curadoria'
+ 'Atividades', 'Meus Recursos', 'Favoritos', 'Coleções', 'Rede', 'Curadoria'
])
}
},
@@ -162,16 +162,14 @@ export default function UserPage (props){
{tabValue === 0 &&
<TabPanelAtividades id={id} config={GetHeaderConfig()}/>}
{tabValue === 1 &&
- <TabPanelStatusEConquistas id={id} config={GetHeaderConfig()}/>}
- {tabValue === 2 &&
<TabPanelMeusRecursos id={id} config={GetHeaderConfig()}/>}
- {tabValue === 3 &&
+ {tabValue === 2 &&
<TabPanelFavoritos id={id} config={GetHeaderConfig()}/>}
- {tabValue === 4 &&
+ {tabValue === 3 &&
<TabPanelColecoes id={id} config={GetHeaderConfig()}/>}
- {tabValue === 5 &&
+ {tabValue === 4 &&
<TabPanelRede id={id} config={GetHeaderConfig()}/>}
- {tabValue === 6 &&
+ {tabValue === 5 &&
<TabPanelCuradoria id={id} config={GetHeaderConfig()}/>}
</Grid>
</Grid>
--
GitLab