Definição das rotas de navegação

Co-authored-by: Nathanserra <[email protected]> Co-authored-by: hryds <[email protected]> Co-authored-by: italovinicius18 <[email protected]> Co-authored-by: gabrielavelino <[email protected]>
UnBArqDsw2021-2 · Apr 15, 2022 · 568e739 · 568e739
1 parent 2318a63
commit 568e739
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 18 deletions.
diff --git a/stag.io/src/App.js b/stag.io/src/App.js
@@ -45,17 +45,18 @@ function App() {
         <Route path="/cadastroEmpresa" element={<CadastroEmpresa/>}></Route>
 
 
-        <Route path="/detalhes-candidato" element={
+        <Route path="/detalhesCandidato" element={
           //<Private>
             <DetalhesCandidato/>
           //</Private>
             }></Route>
-        <Route path="/detalhes-empresa" element={
+        <Route path="/detalhesEmpresa" element={
           //<Private>
             <DetalhesEmpresa/>
+
           //</Private>
         }></Route>
-        <Route path="/vaga-empresa" element={
+        <Route path="/vagaEmpresa" element={
           //<Private>
             <VagaEmpresa/>
           //</Private>

diff --git a/stag.io/src/components/Card.jsx b/stag.io/src/components/Card.jsx
@@ -28,8 +28,9 @@ class Card extends Component {
     }
 
     render() {
+
         return (
-            <div className="card-container">
+            <div className="card-container" onClick={() => {window.location.href = this.props.proximaPagina;}}>
                 <div className="left-container">
                     <div className="title_card">{this.props.title}</div>
                     <div className="company">{this.props.company}</div>

diff --git a/stag.io/src/components/Login/login.jsx b/stag.io/src/components/Login/login.jsx
@@ -26,7 +26,7 @@ function Popup(props){
         await schema.validate(values);
         toast.success("Usuário Logado!");
         login(values);
-        window.location.pathname = '/'
+        //window.location.pathname = '/Vagas' Só utilizar essa linha caso não desejem fazer a autenticação
     }  
     catch(error){
         if( error instanceof Yup.ValidationError){

diff --git a/stag.io/src/components/filtro.jsx b/stag.io/src/components/filtro.jsx
@@ -77,7 +77,7 @@ class Filtro extends Component {
                     <div className="content-column1">
                         {filterDropdown.map(vaga => (
                             <div>
-                                <Card tag={vaga.tags} title={vaga.vaga} company={vaga.empresa}></Card>
+                                <Card tag={vaga.tags} title={vaga.vaga} company={vaga.empresa} proximaPagina ={"DescricaoVaga"}></Card>
                             </div>
                         ))}
                     </div>

diff --git a/stag.io/src/components/navBar/NavBar.css b/stag.io/src/components/navBar/NavBar.css
@@ -32,6 +32,10 @@
     margin-right: 20px;
 }
 
+.margin_img_logo{
+    margin-left: 2em;
+}
+
 .button_Nav {
     font-family: 'Poppins';
     font-style: normal;

diff --git a/stag.io/src/components/navBar/NavBar.jsx b/stag.io/src/components/navBar/NavBar.jsx
@@ -1,11 +1,12 @@
 import React, { Component } from 'react';
 
 import './NavBar.css';
-import logo from "../../logo/logo-white.png";
+import perfil from "./assets/icone-perfil.png";
 
 
 class Navbar extends Component {
-    render() {
+    render() {      
+
         return (
             <nav className="navbar navbar-expand-lg navbar-light">
                 <a className="navbar-brand" href="/">
@@ -17,8 +18,12 @@ class Navbar extends Component {
                     <h2 className="title">Stag.io</h2>
                     </ul>
                 </div>
-                    <button className='button_Nav'>Minhas vagas</button>
-                    <button className='button_Nav'>Vagas</button>
+                    <button className='button_Nav' onClick={() => {window.location.href = 'MinhasVagas';}}>Minhas vagas</button>
+                    <button className='button_Nav' onClick={() => {window.location.href = 'Vagas';}}>Vagas</button>
+                    <a className="navbar-brand" href="/detalhesCandidato">
+                        <img className="img-fluid margin_img_logo" 
+                        src={perfil} width = "50" alt="perfil"/>
+                    </a>
             </nav>
 
         );

diff --git a/stag.io/src/components/navBar/assets/icone-perfil.png b/stag.io/src/components/navBar/assets/icone-perfil.png
diff --git a/stag.io/src/contexts/auth.jsx b/stag.io/src/contexts/auth.jsx
@@ -31,7 +31,7 @@ export const AuthProvider = ({children}) => {
       if(value.password === "secret"){ //Senha para verificar a validação de login
         console.log("Vc descobriu a senha secreta!");
         setUser(loggedUser);
-        navigate("/cadastroCandidato"); //Mudar a página de destino quando for unir o Front-end
+        navigate("/Vagas");
       }
     };
     const logout = () => {

diff --git a/stag.io/src/pages/DetalhesEmpresa/index.css b/stag.io/src/pages/DetalhesEmpresa/index.css
@@ -1,4 +1,4 @@
-.container{
+.detalhes-empresa{
     position:relative;
     /* margin-top: 100px; */
     width: 100%;

diff --git a/stag.io/src/pages/DetalhesEmpresa/index.jsx b/stag.io/src/pages/DetalhesEmpresa/index.jsx
@@ -4,22 +4,23 @@ import NavBarLogo from "../../components/NavBarLogo";
 import Vaga from "../../components/Vaga";
 
 
-const DetalhesCandidato = (props) => {
-    const { values }= props;
+const DetalhesEmpresa = (//props
+    ) => {
+    //const { values }= props;
 
 
     const getEmpresa = () => {
 
     }
     return(
-        <div className="container">
+        <div className="detalhes-empresa">
             <h1 className="title-candidate"> Nome da Empresa </h1>
 
             <div className="company">
                 <div className="company-desc">
                     <div className="description">
                         <div className="text-font"> Descrição </div>
-                        <div> {values. desc} </div>
+                        {/* <div> {values. desc} </div> */}
                     </div>
                     <div className="description">
                         <div className="text-font"> Localização </div>
@@ -40,4 +41,4 @@ const DetalhesCandidato = (props) => {
     );
 }
 
-export default DetalhesCandidato;
+export default DetalhesEmpresa;
diff --git a/stag.io/src/pages/MinhasVagas/MinhasVagas.jsx b/stag.io/src/pages/MinhasVagas/MinhasVagas.jsx
@@ -16,7 +16,7 @@ function MinhasVagas() {
             </h1>
 
             <div className="content-column1_minhas_vagas">
-                <Card tag={myArray} title="Cientista de Dados" company="Empresa DadosNature"></Card>
+                <Card tag={myArray} title="Cientista de Dados" company="Empresa DadosNature" proximaPagina ={"SituacaoVaga"}></Card>
             </div>
 
         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ function MinhasVagas() { @@
                 </h1>
                 <div className="content-column1_minhas_vagas">
-                    <Card tag={myArray} title="Cientista de Dados" company="Empresa DadosNature"></Card>
+                    <Card tag={myArray} title="Cientista de Dados" company="Empresa DadosNature" proximaPagina ={"SituacaoVaga"}></Card>
                 </div>
             </div>
@@ Expand Down @@