Skip to content

Commit

Permalink
Add MainContainer component
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-tran committed Jan 20, 2019
1 parent ec95aec commit 178553c
Show file tree
Hide file tree
Showing 192 changed files with 22,858 additions and 165 deletions.
295 changes: 295 additions & 0 deletions feelsbook/feelsbook/package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions feelsbook/feelsbook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"bootstrap": "^3.3.7",
"jquery": "^3.3.1",
"popper.js": "^1.14.6",
"react": "^16.7.0",
"react-bootstrap": "^1.0.0-beta.4",
"react-dom": "^16.7.0",
"react-scripts": "2.1.3"
},
Expand Down
15 changes: 15 additions & 0 deletions feelsbook/feelsbook/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,19 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
<script
src="https://unpkg.com/react/umd/react.production.js"
crossorigin
></script>
<script
src="https://unpkg.com/react-dom/umd/react-dom.production.js"
crossorigin
></script>
<script
src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.min.js"
crossorigin
></script>
<script>
var Alert = ReactBootstrap.Alert;
</script>
</html>
17 changes: 2 additions & 15 deletions feelsbook/feelsbook/src/App.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import './App.css';
import MainContainer from './components/MainContainer';

class App extends Component {
render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<MainContainer></MainContainer>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion feelsbook/feelsbook/src/App.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
});
53 changes: 53 additions & 0 deletions feelsbook/feelsbook/src/components/MainContainer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React, { Component } from 'react';
import './css/MainContainer.css';
import { Card } from 'react-bootstrap';
import { Nav } from 'react-bootstrap';
import { Button } from 'react-bootstrap';

class MainContainer extends Component {
render() {
return (
<div className="MainContainer notebook">
{/* <Card>
<Card.Header>
<Nav variant="tabs" defaultActiveKey="#first">
<Nav.Item>
<Nav.Link href="#first">Active</Nav.Link>
</Nav.Item>
<Nav.Item>
<Nav.Link href="#link">Link</Nav.Link>
</Nav.Item>
<Nav.Item>
<Nav.Link href="#disabled" disabled>
Disabled
</Nav.Link>
</Nav.Item>
</Nav>
</Card.Header>
<Card.Body>
<Card.Title>Special title treatment</Card.Title>
<Card.Text>
With supporting text below as a natural lead-in to additional content.
</Card.Text>
<Button variant="primary">Go somewhere</Button>
</Card.Body>
</Card>; */}

<Card style={{ width: '18rem' }}>
<Card.Img variant="top" src="holder.js/100px180" />
<Card.Body>
<Card.Title>Card Title</Card.Title>
<Card.Text>
Some quick example text to build on the card title and make up the bulk of
the card's content.
</Card.Text>
<Button variant="primary">Go somewhere</Button>
</Card.Body>
</Card>;
</div>

);
}
}

export default MainContainer;
3 changes: 3 additions & 0 deletions feelsbook/feelsbook/src/components/css/MainContainer.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.notebook {
background-color: #ffe49b
}
9 changes: 2 additions & 7 deletions feelsbook/feelsbook/src/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import 'bootstrap/dist/css/bootstrap.css';
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';

ReactDOM.render(<App />, document.getElementById('root'));

// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: http://bit.ly/CRA-PWA
serviceWorker.unregister();
ReactDOM.render(<App />, document.getElementById('root'));
7 changes: 0 additions & 7 deletions feelsbook/feelsbook/src/logo.svg

This file was deleted.

135 changes: 0 additions & 135 deletions feelsbook/feelsbook/src/serviceWorker.js

This file was deleted.

22 changes: 22 additions & 0 deletions node_modules/bootstrap/LICENSE

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

0 comments on commit 178553c

Please sign in to comment.