Skip to content
This repository was archived by the owner on Aug 28, 2021. It is now read-only.

User and re1uest details, footer, #4

Open
nassif7 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

User and re1uest details, footer, #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c628a7
olifante updates
Jul 20, 2017
62cb717
adding footer and improving the index
Jul 20, 2017
a40a600
user details and fixing home
nassif7 Jul 21, 2017
0f4d0c9
request details
nassif7 Jul 22, 2017
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
1 change: 1 addition & 0 deletions components/BootstrapHead.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ let BootstrapHead = function(props) {
<title>
{props.title}
</title>
<link rel="stylesheet" href="static/main.css" />
<link
rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css"
Expand Down
81 changes: 29 additions & 52 deletions components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,60 +12,37 @@ import {
} from "react-bootstrap"
import React from "react"

const logoContainerStyle = {
position: "relative"
}

const logoImgStyle = {
width: "40px",
position: "absolute",
top: "5px",
left: "10px"
}

const logoTextStyle = {
marginLeft: "50px"
}

const Header = function() {
return (
<div>
<Navbar inverse collapseOnSelect>
<Navbar.Header>
<div style={logoContainerStyle}>
<img style={logoImgStyle} src="../static/logo.png" />
<Navbar.Brand>
<a href="#" style={logoTextStyle}>Zungebot</a>
</Navbar.Brand>
</div>
<Navbar.Toggle />
</Navbar.Header>
<Navbar.Collapse>
<Nav pullRight>
<Link href="/">
<NavItem eventKey={1}>
Home
</NavItem>
</Link>
<Link href="/users">
<NavItem eventKey={2}>
Users
</NavItem>
</Link>
<Link href="/requests">
<NavItem eventKey={3}>
Requests
</NavItem>
</Link>
<Link href="/about">
<NavItem eventKey={4}>
About
</NavItem>
</Link>
</Nav>
</Navbar.Collapse>
</Navbar>
</div>
<Navbar collapseOnSelect>
<Navbar.Header>
<Navbar.Brand>
<Link href='/'>
<a className='navbar-brand'>
<img src="../static/logo.png" width={40} style={{ margin: '-10px 0', display: 'inline' }} />
<span> Zungebot</span>
</a>
</Link>
</Navbar.Brand>
<Navbar.Toggle />
</Navbar.Header>
<Navbar.Collapse>
<Nav pullRight>
<Link href="/">
<NavItem eventKey={1}>Home</NavItem>
</Link>
<Link href="/users">
<NavItem eventKey={2}>Users</NavItem>
</Link>
<Link href="/requests">
<NavItem eventKey={3}>Requests</NavItem>
</Link>
<Link href="/about">
<NavItem eventKey={4}>About</NavItem>
</Link>
</Nav>
</Navbar.Collapse>
</Navbar>
)
}

Expand Down
15 changes: 7 additions & 8 deletions components/MyLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import Header from "./Header"
import React from "react"

const layoutStyle = {
margin: 20,
padding: 20,
border: "1px solid #DDD"
}
import Grid from 'react-bootstrap/lib/Grid'
import Footer from "./footer"

const Layout = function(props) {
return (
<div style={layoutStyle}>
<div>
<Header />
{props.children}
<Grid>
{props.children}
</Grid>
<Footer />
</div>
)
}
Expand Down
34 changes: 34 additions & 0 deletions components/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from "react"
import {
Jumbotron,
Button,
Panel,
Grid,
Row,
Col,
Thumbnail,
PageHeader,
Image,
Label
} from "react-bootstrap"

const footerStyle = {
padding: "50px 100px",
backgroundColor: "#eee"
}


let Footer = function(){
return(
<Row style={footerStyle}>
<Col xs={12} sm={6}>
<p> Made with love by <a href="#"> <strong>ReDI Frontend Class</strong></a></p>
</Col>
<Col xs={12} sm={6}>

</Col>
</Row>
)
}

export default Footer
Loading