Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Api integration on Homepage #6

Merged
merged 22 commits into from
Apr 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f8044ac
Estrutura do Login
LucasBergholz Mar 26, 2022
3c23771
Página de Login Estilizada
LucasBergholz Mar 26, 2022
b371bc4
Conecting login page with back-end (commented)
VCOliver Mar 28, 2022
bfe2c5f
Página de Registro estilizada
LucasBergholz Mar 30, 2022
a033567
Protected route created and now user stays logged
VCOliver Mar 30, 2022
289d207
Register page conected to backend
VCOliver Mar 30, 2022
e8af149
Register page connected to backend
VCOliver Mar 30, 2022
3d94c04
import scrollbar
GuilhermeRCost Mar 30, 2022
f167d1e
Merge branch 'Paginas-login-cadastro-senha' of https://github.com/DS-…
GuilhermeRCost Mar 30, 2022
17baa34
Brasao agora rediciona o usuário para homepage
GuilhermeRCost Mar 31, 2022
c9cc3a8
Página de Alterar Senha Estilizada
LucasBergholz Mar 31, 2022
7fa80b6
New API file created
bot-do-jao Apr 4, 2022
fce6cd2
Game api acquisition and image filtering
VCOliver Apr 4, 2022
469c994
Game Title in homepage
GuilhermeRCost Apr 5, 2022
ee585a1
Getting the rest of the games in homepage, still slow af, but working
bot-do-jao Apr 5, 2022
346460c
Homepage code refactor an otimization. co authored by: Aline, Guilherme
bot-do-jao Apr 7, 2022
b82e1a8
refactor of previous homepages games' requests. co authored by: Victo…
bot-do-jao Apr 12, 2022
fdaed4e
Homepage refactoring (coauthored by: Joao)
VCOliver Apr 13, 2022
239cd45
Margins and Paddings corrected
LucasBergholz Apr 14, 2022
748016e
Merge branch 'develop' into Api-integration-from-backend
GuilhermeRCost Apr 16, 2022
8e095a0
Correction of Homepage's links
GuilhermeRCost Apr 16, 2022
571c01d
Rename homepage folder (lower to upper case)
AlineLermen Apr 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^13.5.0",
"axios": "^0.26.0",
"rawger": "^1.3.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^6.2.2",
Expand Down
26 changes: 19 additions & 7 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import './Normilaze.css'
import Homepage from './Pages/homepage';
import capa from './Assets/Capa the witcher 3.png';
import ProfilePage from './Pages/Profile';
import { ProtectedRoute } from './Routes/protected.route';
//import './Normilaze.css';
import './Fonts.css';
import './Components/scrollbar/style.css';
import Homepage from './Pages/Homepage';
import ProfilePage from './Pages/Profile'
import Login from './Pages/Login/index';
import Register from './Pages/Register';
import ChangePassword from './Pages/Change Password';
import { Error } from './Pages/Error';


function App() {
Expand All @@ -13,10 +18,17 @@ function App() {

<div className='main'>
<Router>

<Routes>
<Route path='/' element={<Homepage banner={capa} />} />
<Route path='/Profile' element={<ProfilePage />} />
<Route path='/' element={<Homepage />} />
<Route path='/profile' element={<ProtectedRoute />} >
{/* Profile page is only accessible if user is logged in */}
<Route path='/profile' element={<ProfilePage />} />
{/* Profile page is only accessible if user is logged in */}
</Route>
<Route path='/login' element={<Login />} />
<Route path='/register' element={<Register/>} />
<Route path='/changepassword' element={<ChangePassword/>} />
<Route path='*' element={<Error />} />
</Routes>
</Router>
</div>
Expand Down
47 changes: 47 additions & 0 deletions src/Components/NavBar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { useNavigate } from 'react-router-dom'
import brasao from './../../Images/brasaoleao.png';
import menu from './../../Images/Sanduiche.svg';
import perfil from './../../Images/Perfil.svg';
import './style.css';

function Navbar(){

const redirect = useNavigate()

return(
<>
<div className="tudaokrl">
<div className="conteudo">
<div className="left-box">
<button type="menu"> <img src={menu} />Menu</button>
</div>

<div className="brasao">
<a href="" onClick={() => {redirect('/')}}>
<img src={brasao} alt="logofeudo"/>
</a>
</div>

<div className="right-box">
<div className="rb-input">
<input type="text" placeholder="Pesquisar.." />
</div>

<div className="rb-perfil">
<a href="">
<img src={perfil} alt="logoperfil"/>
</a>
</div>

<div className="rb-button">
<button type="button" onClick={() => {redirect('/login')}} >Login</button>
</div>
</div>

</div>
</div>
</>
);
}

export default Navbar;
116 changes: 116 additions & 0 deletions src/Components/NavBar/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
.tudaokrl{
position: relative;
background: #1B1B1B;
height: 65px;
}

.conteudo{
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;

padding-left: 58px;
padding-right: 58px;
}

.brasao{
display: flex;
flex-direction: row;
justify-content: space-around;
}

.brasao img{
width: 70px;
}

.left-box button{
font-family: Montserrat;
font-style: normal;
font-weight: 500;
font-size: 23px;

display: flex;
flex-direction: row;
align-items: center;

cursor: pointer;

color: #FFFFFF;
padding: 0;
background: none;
border: none;
}

.left-box img{
width: 20px;
margin-right: 10px;
}

.right-box{
display: flex;
flex-direction: row;
align-items: center;
}

.rb-button{
padding-left: 24px;
}

.rb-perfil{
padding-left: 24px;
}

.rb-perfil img{
width: 20px;
}

.right-box input{
background-image: url(../../Images/Lupinha.svg);
background-position: 0px 0px;
background-repeat: no-repeat;
background-color: #1B1B1B;
color: #1B1B1B;

width: 0px;
transition: all 0.4s ease-in-out;
height: 0px;

font-size: 16px;
padding: 15px 15px;
border: none;
}

.right-box input:focus{
width: 200px;
color: #FFFFFF;
background-image: none;
transition: all 0.4s ease-in-out;
}

.right-box button{
width: 90px;
height: 34.53px;
left: 1282px;
top: 12px;

cursor: pointer;

background: #410088;
border-radius: 29px;
border: none;

font-family: Montserrat;
font-style: normal;
font-weight: normal;
font-size: 20px;
color: #FFFFFF;
}

.right-box button:hover{
background: #2B0D5F;
}

.right-box button:active{
background: #410088;
}
1 change: 1 addition & 0 deletions src/Components/basic input/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
padding: 0;
margin: 0;
box-sizing: border-box;
font-family: 'Montserrat';
}

.inputin{
Expand Down
Empty file removed src/Components/exemplo
Empty file.
Loading