Fix merge conflict

Signed-off-by: Henrique V. Ehrenfried <hvehrenfried@inf.ufpr.br>

src/Components/MenuBarMobile.js

@@ -37,45 +37,40 @@ export default function MenuBarMobile (props) {
     };
 
     return (
+        <>
+            <MobileDrawerMenu anchor={'left'} open={drawerOpen}
+                onClose={toggleDrawer(false)}
+                openSignUp={props.openSignUp} openLogin={props.openLogin}
+            />
             <OuterDiv>
-            <Grid container>
-                <Grid item xs={3} style={{display : "flex"}}>
+                <DrawerButtonDiv style={{justifySelf : "flex-start", position : "absolute", left : 0}}>
                     <Button style={{ color: "#00bcd4" }} onClick={toggleDrawer(true)}>
                         <MenuIcon className="icon" />
                     </Button>
-                </Grid>
-
-                <Grid item xs={9} justify={'center'}>
+                </DrawerButtonDiv>
                 <div className="logo">
                     <Link to="/">
                         <img src={logo} alt={"Plataforma Integrada"} />
                     </Link>
                 </div>
-                </Grid>
-            </Grid>
-            <MobileDrawerMenu anchor={'left'} open={drawerOpen}
-                onClose={toggleDrawer(false)}
-                openSignUp = {props.openSignUp} openLogin = {props.openLogin}
-                />
             </OuterDiv>
+        </>
     )
 }
 
 const OuterDiv = styled.div`
     height : 48px;
-    margin : 5px 2px;
+    width : 100%;
     display : flex;
-    flex-direction : column;
-    align-content : stretch;
+    flex-direction : row;
+    align-items : center;
     justify-content : center;
+    position : relative; 
 
     .logo {
-        height : 50px;
-        width : 150px;
-        padding : 5px;
-        padding-top : 15px;
+        align-content : center;
+        justify-self : center;  
         text-align : center;
-
         img {
             height : 38px;
             overflow : hidden;
@@ -98,3 +93,8 @@ const OuterDiv = styled.div `
         color : inherit !important;
     }
 `
+const DrawerButtonDiv = styled.div`
+    justify-self : center; 
+    position : absolute; 
+    left : 0;
+`
\ No newline at end of file

src/Components/MobileDrawerMenu.js

@@ -36,7 +36,8 @@ import HistoryIcon from '@material-ui/icons/History';
 import FavoriteBorderIcon from '@material-ui/icons/FavoriteBorder';
 import FolderOpenIcon from '@material-ui/icons/FolderOpen';
 import SettingsIcon from '@material-ui/icons/Settings';
-import {apiDomain, apiUrl} from '../env.js'
+import {apiDomain, apiUrl} from '../env.js';
+import SearchIcon from '@material-ui/icons/Search';
 import {getAxiosConfig} from './HelperFunctions/getAxiosConfig'
 import axios from 'axios'
 
@@ -48,6 +49,7 @@ export default function MobileDrawerMenu (props) {
         { name : "Sobre a Plataforma", href : "sobre", icon : <InfoIcon/>},
         { name : "Contato", href : "contato", icon : <MailOutlineIcon/>},
         { name : "Central de Ajuda", href : "ajuda", icon : <HelpOutlineIcon/>},
+        { name: "Busca", href: `/busca?query=${state.search.query}&search_class=${state.search.class}`, icon : <SearchIcon/>},
         { name : "Termos de Uso", href : "termos", icon : <AssignmentIcon/>},
     ]
 

src/Components/TabPanels/PanelComponents/TemplateCuradoria.js

@@ -25,6 +25,7 @@ import { WhiteContainer, StyledGrid } from '../StyledComponents.js'
 import { ButtonsAreaRecurso } from './ButtonsArea'
 
 export default function Template(props) {
+    console.log(props.sliceArr);
     return (
         <WhiteContainer>
             <Title
@@ -48,18 +49,18 @@ export default function Template(props) {
                                         props.sliceArr.map((card) =>
                                             <Grid item md={3} xs={12} key={card.id}>
                                                 <ResourceCardFunction
-                                                    avatar={card.publisher.avatar}
-                                                    id={card.id}
-                                                    thumbnail={card.thumbnail}
-                                                    type={card.object_type ? card.object_type : "Outros"}
-                                                    title={card.name}
+                                                    avatar={card.submitter.avatar}
+                                                    id={card.learning_object.id}
+                                                    thumbnail={card.learning_object.thumbnail}
+                                                    type={card.learning_object.object_type ? card.learning_object.object_type : "Outros"}
+                                                    title={card.learning_object.name}
                                                     published={false}
-                                                    likeCount={card.likes_count}
-                                                    liked={card.liked}
-                                                    rating={card.review_average}
-                                                    author={card.publisher.name}
-                                                    tags={card.tags}
-                                                    href={"/recurso/" + card.id}
+                                                    likeCount={card.learning_object.likes_count}
+                                                    liked={card.learning_object.liked}
+                                                    rating={card.learning_object.review_average}
+                                                    author={card.submitter.name}
+                                                    tags={card.learning_object.tags}
+                                                    href={"/recurso/" + card.learning_object.id}
                                                     downloadableLink={card.default_attachment_location}
                                                 />
                                             </Grid>

src/Components/TabPanels/StyledComponents.js

@@ -184,11 +184,11 @@ export const UserProfileInfoDiv = styled.div`
 `
 
 export const CheckTeacherDiv = styled.div`
-    @media screen and (min-width: 500px) {
     padding-top : 10px;
     padding-left : 250px;
     margin-bottom : -10px;
-    }
+    display : absolute;
+
     p {
         margin : 0 0 10px;
         font-family: Roboto;
@@ -206,9 +206,6 @@ export const CheckTeacherDiv = styled.div`
             }
         }
     }
-    @media screen and (max-width: 499px) {
-        display : none;
-    }
 `
 
 export const StyledTabs = styled(Tabs)`

src/Components/UserPageComponents/Cover.js

@@ -27,6 +27,8 @@ import ModalAlterarCover from '../ModalAlterarCover/ModalAlterarCover.js'
 export default function Cover (props) {
     const {state} = useContext(Store)
 
+    const WIDTH = window.innerWidth; 
+
     const [currentCover, setCoverImg] = useState(state.currentUser.cover_file_name)
     const [tempCover, setTempCover] = useState('')
 
@@ -55,11 +57,21 @@ export default function Cover (props) {
                 {currentCover && <img src={apiDomain + currentCover} alt = '' style= {{width:"100%", height:"100%", objectFit : "cover" }}/>}
                 <input accept="image/*" style = {{display:"none"}} id="choose-cover-file" type="file" onChange={(e) => updateCover(e.target.files)}/>
                 <label htmlFor="choose-cover-file">
+                {
+                    WIDTH >= 545 ? 
                     <Tooltip title={<span style={{fontSize:"14px", overflow:"hidden", transition:"all .5s ease"}}>ALTERAR CAPA</span>} placement="left">
-                        <IconButton style={{position:"absolute",right:"0",top:"0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
+                        <IconButton style={{position:"absolute",right:"0",bottom: "0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
                             <PhotoCamera />
                         </IconButton>
                     </Tooltip> 
+                    : 
+                    <Tooltip title={<span style={{fontSize:"14px", overflow:"hidden", transition:"all .5s ease"}}>ALTERAR CAPA</span>} placement="left">
+                        <IconButton style={{position:"absolute",left:"0",top: "0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
+                            <PhotoCamera />
+                        </IconButton>
+                    </Tooltip>
+                }
+                    
                 </label>
             </CoverContainer>
         </>

src/Components/UserPageComponents/EditProfileButton.js

@@ -49,8 +49,8 @@ const EditProfileAnchor = styled(Link)`
       box-shadow : 0 2px 5px 0 rgba(0,0,0,.26);
       background-color : #fafafa;
       position : absolute;
-      right : 5px;
-      bottom : 0;
+      right : 10px;
+      top : 10px;
       margin-bottom : 20px;
       color : #666;
       padding : 0 10px;