Skip to content

Commit

Permalink
Custom css, appbar; landing page complete.
Browse files Browse the repository at this point in the history
  • Loading branch information
RogerLamTd committed Feb 2, 2020
1 parent 14fa340 commit cdae0ac
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 9 deletions.
2 changes: 1 addition & 1 deletion mclet/src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import './App.css';
import {SubletMap} from "./SubletMap.js"
import { withScriptjs, withGoogleMap, GoogleMap, Marker } from "react-google-maps"
import { Marker } from "react-google-maps"

require('dotenv').config();

Expand Down
2 changes: 1 addition & 1 deletion mclet/src/SubletMap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { withScriptjs, withGoogleMap, GoogleMap, Marker } from "react-google-maps"
import { withScriptjs, withGoogleMap, GoogleMap } from "react-google-maps"



Expand Down
21 changes: 20 additions & 1 deletion mclet/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,34 @@ h1 {
font-size: 40px;
text-align: center;
font-weight: bolder;

}

img {
max-width:100%;
height: 100%;
}

p {
color: green;
font-family: 'Droid Sans';
}

.bg-custom {
background: red;
}

[title = "subtitle"] {
color: black;
font-family: sans-serif;
text-align: center;
font-weight: 300;
font-size: 17px;
margin-top: 0px;
}

label {
color:brown;
color: black;
font-family: 'sans-serif';
}

Expand Down
12 changes: 6 additions & 6 deletions mclet/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import App from './App';
import {SubletForm} from "./subletForm";
import 'bootstrap/dist/css/bootstrap.min.css';
import { Collapse, Navbar, NavbarToggler, NavbarBrand, Nav, NavItem, NavLink } from 'reactstrap';
import Typography from '@material-ui/core/Typography'


const AppBar = (props) => {
const [collapsed, setCollapsed] = useState(true);
Expand All @@ -17,16 +15,16 @@ const AppBar = (props) => {

return (
<div>
<Navbar color="dark" dark expand="md">
<NavbarBrand className="mr-auto"><Link to="/">Home </Link></NavbarBrand>
<Navbar style={{backgroundColor:'#A52A2A'}} expand="md">
<NavbarBrand className="mr-auto"><Link to="/" style={{color: 'white'}}>Home </Link></NavbarBrand>
<NavbarToggler onClick={toggleNavbar} className="mr-2" />
<Collapse isOpen={!collapsed} navbar>
<Nav navbar>
<NavItem>
<NavLink><Link to="/sublet">Sublet Map</Link></NavLink>
<NavLink><Link to="/sublet" style={{color: 'white'}}>Sublet Map</Link></NavLink>
</NavItem>
<NavItem>
<NavLink><Link to="/subletForm">Sublet Form</Link></NavLink>
<NavLink><Link to="/subletForm" style={{color: 'white'}}>Sublet Form</Link></NavLink>
</NavItem>
</Nav>
</Collapse>
Expand All @@ -39,6 +37,8 @@ const AppBar = (props) => {
const IndexPage = () => (
<>
<h1>Welcome to McLet</h1>
<p title="subtitle">Your local solution to student housing issues!</p>
<img src="https://www.mcgill.ca/sustainability/files/sustainability/mcgill-campus.png" alt="mcgill"></img>
</>
)

Expand Down
Binary file added mclet/src/mcgill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cdae0ac

Please sign in to comment.