From e338ab8a80e2825a798397ef2a2aa0c9f99bc439 Mon Sep 17 00:00:00 2001
From: Vinicius Gabriel Machado <vgm18@inf.ufpr.br>
Date: Wed, 2 Jun 2021 11:52:17 -0300
Subject: [PATCH] added button publicar recurso in the mobile drawer menu
---
src/Components/MenuBar.js | 3 +-
src/Components/MobileDrawerMenu.js | 68 ++++++++++++++++++------------
src/Pages/ResourcePage.js | 2 +-
3 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index 7cf1153b..cd5cb4d2 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -175,8 +175,7 @@ export default function MenuBar(props) {
<CloudUploadIcon style={{ color: "white", marginLeft: "0" }} />
<span style={{ color: "#fff", textAlign: "center", alignSelf: "center", fontWeight: "500" }} >
PUBLICAR RECURSO
- </span>
-
+ </span>
</ButtonPublicarRecurso>
</Link>
</div>
diff --git a/src/Components/MobileDrawerMenu.js b/src/Components/MobileDrawerMenu.js
index 654ee7b9..91992ef2 100644
--- a/src/Components/MobileDrawerMenu.js
+++ b/src/Components/MobileDrawerMenu.js
@@ -33,6 +33,7 @@ import DefaultAvatar from '../img/default_profile0.png'
import SettingsIcon from '@material-ui/icons/Settings';
import { apiDomain } from '../env.js'
import { deleteRequest } from './HelperFunctions/getAxiosConfig'
+import CloudUploadIcon from '@material-ui/icons/CloudUpload';
export default function MobileDrawerMenu(props) {
const { state, dispatch } = useContext(Store)
@@ -126,33 +127,43 @@ export default function MobileDrawerMenu(props) {
{
/*If user is logged in, render user actions menu; else render log in/sign in buttons*/
state.userIsLoggedIn ?
- (
- <div style={{ display: "flex", flexDirection: "column", color: "#666", paddingBottom: "10px" }}>
- <MyArea>
- <div className="user-avatar">
- <img alt="user-avatar"
- src={getUserAvatar()}
- />
- </div>
- <span className="text">Minha área</span>
- </MyArea>
-
- {
- minhaArea.map((item, index) =>
- <Link to={{
- pathname: item.href,
- state: item.value
- }}
- className={`menu-buttons ${selectedIndex === (index + menuSobre.length) ? 'selected' : ''}`}
- onClick={(event) => handleMenuItemClick(event, index + menuSobre.length)}
- >
- {item.icon}
- {item.name}
- </Link>
- )
- }
-
- </div>
+ (
+ <>
+ <div style={{ display: "flex", justifyContent: "left", marginTop: "10px", marginBottom: "10px" }}>
+ <Link to="/termos-publicar-recurso">
+ <ButtonPublicarRecurso>
+ <CloudUploadIcon style={{ color: "white", marginRight: "10px" }} />
+ <span style={{ color: "white", textAlign: "center", alignSelf: "center", fontWeight: "500" }} >
+ PUBLICAR RECURSO
+ </span>
+ </ButtonPublicarRecurso>
+ </Link>
+ </div>
+ <div style={{ display: "flex", flexDirection: "column", color: "#666", paddingBottom: "10px" }}>
+ <MyArea>
+ <div className="user-avatar">
+ <img alt="user-avatar"
+ src={getUserAvatar()}
+ />
+ </div>
+ <span className="text">Minha área</span>
+ </MyArea>
+ {
+ minhaArea.map((item, index) =>
+ <Link to={{
+ pathname: item.href,
+ state: item.value
+ }}
+ className={`menu-buttons ${selectedIndex === (index + menuSobre.length) ? 'selected' : ''}`}
+ onClick={(event) => handleMenuItemClick(event, index + menuSobre.length)}
+ >
+ {item.icon}
+ {item.name}
+ </Link>
+ )
+ }
+ </div>
+ </>
)
:
(
@@ -160,7 +171,7 @@ export default function MobileDrawerMenu(props) {
<div style={{ display: "flex", justifyContent: "center", marginTop: "10px" }}>
<ButtonPublicarRecurso onClick={props.openLogin}>
PUBLICAR RECURSO?
- </ButtonPublicarRecurso>
+ </ButtonPublicarRecurso>
</div>
<div style={{ display: "flex", flexDirection: "row", margin: "10px 0", justifyContent: "center" }}>
@@ -228,6 +239,7 @@ const MyArea = styled.div`
const ButtonPublicarRecurso = styled(Button)`
font-weight : 500 !important;
border : 1.5px #666 solid !important;
+ background-color : #ff7f00 !important;
color: #666;
box-shadow: none;
margin : 0 8px !important;
diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js
index ff63e4f4..915b22b3 100644
--- a/src/Pages/ResourcePage.js
+++ b/src/Pages/ResourcePage.js
@@ -265,7 +265,7 @@ export default function LearningObjectPage(props) {
createdAt={recurso.created_at}
updatedAt={recurso.updated_at}
license={recurso.license}
- followed={recurso.publisher.followed}
+ followed={recurso.publisher ? recurso.publisher.followed : undefined}
/>
</Card>
</Grid>
--
GitLab