Skip to content
This repository has been archived by the owner on Nov 26, 2019. It is now read-only.

Commit

Permalink
Merge pull request #16 from marcinwadon/basic-layout
Browse files Browse the repository at this point in the history
Create base column layout
  • Loading branch information
marcinwadon committed Jan 10, 2018
2 parents c250976 + 7d21409 commit 424a6bb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion web/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div>
<main id="root"></main>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down
7 changes: 6 additions & 1 deletion web/src/time-app/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import React from 'react'
import { Navigation } from './Navigation'
import { Table } from './Table/Table'
// import { Provider } from 'react-redux'

// import { store } from 'time-lib/store'
// import { Router } from './Router'

export const App = () => (
<div>123</div>
<div>
<Navigation/>
<Table/>
</div>
)
5 changes: 5 additions & 0 deletions web/src/time-app/Navigation.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import React from 'react'

export const Navigation = () => (
<nav>ARROWS AND (in the future) DATEPICKER COMES HERE</nav>
)
5 changes: 5 additions & 0 deletions web/src/time-app/Table/Table.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import React from 'react'

export const Table = () => (
<nav>TABLE COMES HERE</nav>
)
4 changes: 2 additions & 2 deletions web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5131,7 +5131,7 @@ react-dev-utils@^4.2.1:
strip-ansi "3.0.1"
text-table "0.2.0"

react-dom@16.2.0:
react-dom@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
dependencies:
Expand Down Expand Up @@ -5187,7 +5187,7 @@ react-scripts@1.0.17:
optionalDependencies:
fsevents "1.1.2"

react@16.2.0:
react@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
dependencies:
Expand Down

0 comments on commit 424a6bb

Please sign in to comment.