Skip to content

Commit 1a08177

Browse files
author
Peter Brendel
authored
Merge pull request magrathealabs#8 from peterbrendel/front-main
Front main
2 parents 765468e + 9c372e4 commit 1a08177

File tree

4 files changed

+117
-26
lines changed

4 files changed

+117
-26
lines changed

frontend/src/App.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
}
1414
}
1515

16-
.teste {
17-
font-size: 120px;
18-
background-color: aqua;
19-
}
20-
2116
.App-header {
2217
background-color: #282c34;
2318
min-height: 100vh;
@@ -41,3 +36,9 @@
4136
transform: rotate(360deg);
4237
}
4338
}
39+
40+
.Card-folder {
41+
margin-top: 20px;
42+
display: flex;
43+
justify-content: center;
44+
}

frontend/src/App.js

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,71 @@
1-
import React from 'react';
1+
import React, { useState } from 'react';
22
import './App.css';
3-
import Navbar from './components/navbar';
3+
import Navbar from './components/navbar/Navbar';
4+
import CardDeck from 'react-bootstrap/CardDeck';
5+
import Card from './components/card/Card';
6+
47

58
function App() {
69

10+
const [tags, setTags] = useState(
11+
[
12+
{
13+
variant:'secondary',
14+
text: 'Javascript'
15+
},
16+
{
17+
variant:'success',
18+
text: 'C++'
19+
},
20+
{
21+
variant:'secondary',
22+
text: "Ana"
23+
},
24+
{
25+
variant:'light',
26+
text: "ovo"
27+
},
28+
{
29+
variant:'light',
30+
text: "ovo"
31+
}
32+
]
33+
);
34+
735
return (
836
<div className="App">
937
<Navbar/>
38+
<CardDeck className="Card-folder">
39+
<Card
40+
repository="Test Repo"
41+
author="unkown"
42+
readme="Little experimental text to check if card is doing ok"
43+
tags={tags}/>
44+
45+
<Card
46+
repository="Test Repo"
47+
author="unkown"
48+
readme="Little experimental text to check if card is doing ok"
49+
tags={tags}/>
50+
51+
<Card
52+
repository="Test Repo"
53+
author="unkown"
54+
readme="Little experimental text to check if card is doing ok"
55+
tags={tags}/>
56+
57+
<Card
58+
repository="Test Repo"
59+
author="unkown"
60+
readme="Little experimental text to check if card is doing ok"
61+
tags={tags}/>
62+
63+
<Card
64+
repository="Test Repo"
65+
author="unkown"
66+
readme="Little experimental text to check if card is doing ok"
67+
tags={tags}/>
68+
</CardDeck>
1069
</div>
1170
);
1271
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { Navbar, Form, InputGroup, FormControl, Button } from 'react-bootstrap';
2+
import React from 'react';
3+
import Image from './github';
4+
5+
export default () => {
6+
return (
7+
<>
8+
<Navbar className="bg-dark justify-content-between">
9+
<Form inline>
10+
<Navbar.Brand href="#home">
11+
<Image/>
12+
</Navbar.Brand>
13+
<InputGroup>
14+
<InputGroup.Prepend>
15+
<InputGroup.Text id="basic-addon1">/</InputGroup.Text>
16+
</InputGroup.Prepend>
17+
<FormControl
18+
placeholder="Username"
19+
aria-label="Username"
20+
aria-describedby="basic-addon1"
21+
/>
22+
<Button type="search" style={{ "border-radius": "0px 5px 5px 0px"}}>Search Repos</Button>
23+
</InputGroup>
24+
</Form>
25+
<Form inline>
26+
<Button type="login">Login with Github</Button>
27+
</Form>
28+
</Navbar>
29+
</>
30+
);
31+
}

frontend/src/components/navbar/index.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ import Image from './github';
55
export default () => { return (
66
<>
77
<Navbar className="bg-dark justify-content-between">
8-
<Form inline>
9-
<Navbar.Brand href="#home">
10-
<Image/>
11-
</Navbar.Brand>
12-
<InputGroup>
13-
<InputGroup.Prepend>
14-
<InputGroup.Text id="basic-addon1">/</InputGroup.Text>
15-
</InputGroup.Prepend>
16-
<FormControl
17-
placeholder="Username"
18-
aria-label="Username"
19-
aria-describedby="basic-addon1"
20-
/>
21-
<Button type="search" style={{ "border-radius": "0px 5px 5px 0px"}}>Search Repos</Button>
22-
</InputGroup>
23-
</Form>
24-
<Form inline>
25-
<Button type="login">Login with Github</Button>
26-
</Form>
8+
<Form inline>
9+
<Navbar.Brand href="#home">
10+
<Image/>
11+
</Navbar.Brand>
12+
<InputGroup>
13+
<InputGroup.Prepend>
14+
<InputGroup.Text id="basic-addon1">/</InputGroup.Text>
15+
</InputGroup.Prepend>
16+
<FormControl
17+
placeholder="Username"
18+
aria-label="Username"
19+
aria-describedby="basic-addon1"
20+
/>
21+
<Button type="search" style={{ "border-radius": "0px 5px 5px 0px"}}>Search</Button>
22+
</InputGroup>
23+
</Form>
24+
<Form inline>
25+
<Button type="login">Login with Github</Button>
26+
</Form>
2727
</Navbar>
2828
</>
2929
);}

0 commit comments

Comments
 (0)