-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rewriting the republic page-- Need API
- Loading branch information
Showing
4 changed files
with
39 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,6 @@ | ||
import React from "react"; | ||
import './styles/perfil.css' | ||
|
||
<<<<<<< HEAD | ||
function perfil() { | ||
return(<div> | ||
<> | ||
<meta charSet="UTF-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title>Perfil do Usuário</title> | ||
<link | ||
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" | ||
rel="stylesheet" | ||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" | ||
crossOrigin="anonymous" | ||
/> | ||
<link rel="stylesheet" href="styles\perfil.css" /> | ||
<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" }} | ||
======= | ||
class PlaceholderLogo extends React.Component { | ||
//stateless component, simply displays this Logo | ||
render() { | ||
|
@@ -51,7 +12,6 @@ class PlaceholderLogo extends React.Component { | |
x="0px" | ||
y="0px" | ||
viewBox="0,0,256,256" | ||
>>>>>>> 39ea5010d38627da6c3e1f3158f1d362d943b8a8 | ||
> | ||
<g | ||
fill="#ffc98a" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,71 +1,44 @@ | ||
import React from "react"; | ||
import './styles/republica.css' | ||
|
||
/* | ||
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" | ||
|
||
} | ||
// Home button in the republic menu | ||
return( | ||
<> | ||
<li><a href="/" style={title}>UniRep</a> </li> | ||
</> | ||
) | ||
} | ||
// NEED API | ||
|
||
function republica() { | ||
|
||
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> | ||
</a> | ||
</div> | ||
<Header /> | ||
<h2 className="RepName">Nome da república</h2> | ||
<div className="restante"> | ||
<div className="repsImages"> | ||
|
@@ -105,7 +78,7 @@ function republica() { | |
</div> | ||
<div className="repRate"></div> | ||
</div> | ||
</> | ||
|
||
|
||
|
||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters