Skip to content

Commit

Permalink
Merge branch 'frontend-rewrite' of https://github.com/unb-mds/2024-1-…
Browse files Browse the repository at this point in the history
…Squad08 into frontend-rewrite
  • Loading branch information
RA-Salles committed Aug 12, 2024
2 parents d4ab2b8 + 511fc0c commit d7f739d
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 124 deletions.
6 changes: 4 additions & 2 deletions src/components/pages/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class PersonLogo extends React.Component {
render() {
return (
<div>
<a href="perfil" className="logo">
<a href="/perfil" className="logo">
<svg viewBox="0 0 74 65" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
fillRule="evenodd"
Expand All @@ -44,7 +44,7 @@ class Search extends React.Component {
render() {
return (
<div className="imagem">
<img src={homeImage} alt="" style={{ marginTop: 30 }} />
<img src={homeImage} alt="" style={{position: "absolute", top:"50%",left:"50%", transform:"translate(-50%,-50%)"}} />
<div className="search">
<input
type="text"
Expand Down Expand Up @@ -101,6 +101,8 @@ class home extends React.Component {
<NavbarLink reference="#Casas" text="Casas" />
<NavbarLink reference="#Apartamentos" text="Apartamentos"/>
<PersonLogo />


</div>
<Search/>
<div className="choice"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/notFound.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
//import './styles/notFound.css';
// import './styles/notFound.css';

class notFound extends React.Component {
render() {
Expand Down
182 changes: 77 additions & 105 deletions src/components/pages/republica.js
Original file line number Diff line number Diff line change
@@ -1,114 +1,86 @@
import React from "react";
//import './styles/republica.css'

class republica extends React.Component {
constructor(props) {
super(props)
this.republicId = props.id
/*
Yo wtf is going on here? LOL
Objeticves:
1- Re-style this
2- Request from the database
Methods:
1- While re-designing, prepare the placeholders and sign them with a comment to warn about the database request
Notes:
1- Tried to change the main colors. Kinda worked but still looks goofy
2- The idea here is simple: Get the republic name, host, price and photos. All of that is only possible of happening once the API is... something
*/

const Header = () => {
const title = {
color: "white",
fontFamily: "Sans-sheriff",
fontStyle: "normal",
fontWeight: "400",
fontSize: "70px",
textAlign: "center"

}
render() {
return (
<div>
<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
<link rel="stylesheet" href="styles\republica.css" />
<link
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
crossOrigin="anonymous"
/>
<div className="col colunaCima">
<h1 className="titulo">UniRep</h1>
<a href="/" className="logo">
<svg
xmlns="http://www.w3.org/2000/svg"
x="0px"
y="0px"
viewBox="0,0,256,256"
>
<g
fill="#ffc98a"
fillRule="nonzero"
stroke="none"
strokeWidth={1}
strokeLinecap="butt"
strokeLinejoin="miter"
strokeMiterlimit={10}
strokeDasharray=""
strokeDashoffset={0}
fontFamily="none"
fontWeight="none"
fontSize="none"
textAnchor="none"
style={{ mixBlendMode: "normal" }}
>
<path d="M0,256v-256h256v256z" id="bgRectangle" />
</g>
<g
fill="#ffffff"
fillRule="nonzero"
stroke="none"
strokeWidth={1}
strokeLinecap="butt"
strokeLinejoin="miter"
strokeMiterlimit={10}
strokeDasharray=""
strokeDashoffset={0}
fontFamily="none"
fontWeight="none"
fontSize="none"
textAnchor="none"
style={{ mixBlendMode: "normal" }}
>
<g transform="scale(8,8)">
<path d="M16,2.59375l-0.71875,0.6875l-13,13l1.4375,1.4375l1.28125,-1.28125v11.5625h9v-10h4v10h9v-11.5625l1.28125,1.28125l1.4375,-1.4375l-13,-13zM16,5.4375l9,9v11.5625h-5v-10h-8v10h-5v-11.5625z" />
</g>
</g>
</svg>
// Home button in the republic menu
return(
<>
<li><a href="/" style={title}>UniRep</a> </li>
</>
)
}
// NEED API

function republica() {

return(
<div>
<Header />
<h2 className="RepName">Nome da república</h2>
<div className="restante">
<div className="repsImages">
<img src="images/image1.jpg" className="imagem" />
<div className="imagem-dividida">
<img
src="images/image2.jpg"
className="sub-imagem"
style={{ borderTopRightRadius: 40 }}
/>
<img
src="images/image4.jpg"
className="sub-imagem"
style={{ borderBottomRightRadius: 40, marginTop: 10 }}
/>
</div>
</div>
<div className="repInfos">
<div>
<label htmlFor="" className="Valor">
R$1500,00
</label>
</div>
<div className="fotoContainer">
<label htmlFor="" style={{ fontSize: 25 }}>
Anfritrião
</label>
<a href="">
<img src="images/teste.png" className="fotoImage" alt="" />
</a>
<a href="">
<label htmlFor="" className="nomeAnfitriao">
Adair de Souza
</label>
</a>
</div>
<h2 className="RepName">Nome da república</h2>
<div className="restante">
<div className="repsImages">
<img src="images/image1.jpg" className="imagem" />
<div className="imagem-dividida">
<img
src="images/image2.jpg"
className="sub-imagem"
style={{ borderTopRightRadius: 40 }}
/>
<img
src="images/image4.jpg"
className="sub-imagem"
style={{ borderBottomRightRadius: 40, marginTop: 10 }}
/>
</div>
</div>
<div className="repInfos">
<div>
<label htmlFor="" className="Valor">
R$1500,00
</label>
</div>
<div className="fotoContainer">
<label htmlFor="" style={{ fontSize: 25 }}>
Anfritrião
</label>
<a href="">
<img src="images/teste.png" className="fotoImage" alt="" />
</a>
<a href="">
<label htmlFor="" className="nomeAnfitriao">
Adair de Souza
</label>
</a>
</div>
</div>
<div className="repRate"></div>
</div>
<div className="repRate"></div>
</div>
)
}



</div>
)
} export default republica
2 changes: 1 addition & 1 deletion src/components/pages/styles/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
display: flex;
align-items: center;
justify-content: space-between;
text-align: center;
text-align: right;
}

.search__input {
Expand Down
17 changes: 2 additions & 15 deletions src/components/pages/styles/republica.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
:root{
--corPrincipal: #FFC98A;
--corSecundaria: #D99F6B;
--corPrincipal: #FEC20C;
--corSecundaria: #FDDB53;
}

.titulo{
font-family: 'Pacifico';
font-style: normal;
font-weight: 400;
font-size: 50px;
color: #FFFFFF;
text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
margin-bottom: auto;
margin-top: 0;
margin-left: 50px;
}

.logo {
display: inline-block; /* Isso impede que o link ocupe toda a largura */
height: 70px;
Expand Down

0 comments on commit d7f739d

Please sign in to comment.