Browse Source

Something

master
Niko Hakala 5 years ago
parent
commit
921bedbcda
5 changed files with 28 additions and 12 deletions
  1. +3
    -3
      package-lock.json
  2. +13
    -3
      src/App.css
  3. +8
    -2
      src/Components/Home.js
  4. +3
    -3
      src/Components/Navigator2.js
  5. +1
    -1
      src/Components/Plants.js

+ 3
- 3
package-lock.json View File

@ -6186,9 +6186,9 @@
"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==" "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
}, },
"handlebars": { "handlebars": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.2.tgz",
"integrity": "sha512-cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==",
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
"integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
"requires": { "requires": {
"neo-async": "^2.6.0", "neo-async": "^2.6.0",
"optimist": "^0.6.1", "optimist": "^0.6.1",


+ 13
- 3
src/App.css View File

@ -79,11 +79,21 @@
} }
.nav-link{ .nav-link{
font-size: 30px;
font-size: 25px;
} }
.navbar-brand{ .navbar-brand{
padding: 3px; padding: 3px;
font-size: 40px;
font-size: 35px;
}
.home-wrapper {
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: flex-start;
}
.hometext {
padding: 20px;
} }

+ 8
- 2
src/Components/Home.js View File

@ -9,8 +9,8 @@ import MultipleGridImages from 'react-multiple-image-grid'
const Home = () => { const Home = () => {
return ( return (
<div>
<div style={{width: '60%'}}>
<div className="home-wrapper">
<div className="gridimages" style={{width: '50%'}}>
<MultipleGridImages images={[ <MultipleGridImages images={[
"../Photos/kokous1.jpeg", "../Photos/kokous1.jpeg",
"../Photos/kolvaus1.jpeg", "../Photos/kolvaus1.jpeg",
@ -25,6 +25,12 @@ const Home = () => {
"../Photos/valkosipulivk2.jpg", "../Photos/valkosipulivk2.jpg",
"../Photos/valkosipulivk3.jpg"]}/> "../Photos/valkosipulivk3.jpg"]}/>
</div> </div>
<div className="hometext">
<h3>About</h3>
<p>
Tekstiä
</p>
</div>
</div> </div>
); );


+ 3
- 3
src/Components/Navigator2.js View File

@ -12,9 +12,9 @@ const Navigator2 = () => {
<Navbar.Toggle aria-controls="responsive-navbar-nav" /> <Navbar.Toggle aria-controls="responsive-navbar-nav" />
<Navbar.Collapse id="responsive-navbar-nav"> <Navbar.Collapse id="responsive-navbar-nav">
<Nav className="mr-auto"> <Nav className="mr-auto">
<Link className="nav-link" to="/">Home</Link>
<Link className="nav-link" to="/system">System Information</Link>
<Link className="nav-link" to="/plants">My Plants</Link>
<Link className="nav-link" to="/">Home</Link>
<Link className="nav-link" to="/system">System Information</Link>
<Link className="nav-link" to="/plants">My Plants</Link>
</Nav> </Nav>
</Navbar.Collapse> </Navbar.Collapse>
</Navbar> </Navbar>


+ 1
- 1
src/Components/Plants.js View File

@ -1,7 +1,7 @@
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
const Plants = () => {
const Plants = () => {
// TODO Figure out layout and what information to pull form json // TODO Figure out layout and what information to pull form json
// Maby add pictures etc. // Maby add pictures etc.


Loading…
Cancel
Save