Skip to content

Commit 4d032b6

Browse files
author
Peter Brendel
authored
Merge pull request magrathealabs#6 from peterbrendel/front-navbar
Defined navbar style
2 parents da0eaa4 + fd3be33 commit 4d032b6

File tree

4 files changed

+70
-11
lines changed

4 files changed

+70
-11
lines changed

frontend/src/App.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import React from 'react';
22
import './App.css';
3-
import Login from './components/login';
3+
import Navbar from './components/navbar';
44

55
function App() {
6-
let bool = true;
76

87
return (
98
<div className="App">
10-
<Login/>
9+
<Navbar/>
1110
</div>
1211
);
1312
}

frontend/src/components/login/index.js

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import React from "react";
2+
3+
const SVGComponent = (props) => (
4+
<svg viewBox="0 0 18 16" width="32px" {...props}>
5+
<path
6+
d="M 8 0 C 3.58 0 0 3.58 0 7.998 C 0 11.537 2.29 14.526 5.47 15.585 C 5.87 15.655 6.02 15.415 6.02 15.206 C 6.02 15.016 6.01 14.386 6.01 13.716 C 4 14.085 3.48 13.227 3.32 12.776 C 3.23 12.546 2.84 11.836 2.5 11.647 C 2.22 11.496 1.82 11.127 2.49 11.117 C 3.12 11.106 3.57 11.697 3.72 11.936 C 4.44 13.147 5.59 12.806 6.05 12.597 C 6.12 12.077 6.33 11.727 6.56 11.527 C 4.78 11.327 2.92 10.636 2.92 7.578 C 2.92 6.708 3.23 5.988 3.74 5.428 C 3.66 5.228 3.38 4.41 3.82 3.309 C 3.82 3.309 4.49 3.098 6.02 4.129 C 6.66 3.949 7.34 3.86 8.02 3.86 C 8.7 3.86 9.38 3.949 10.02 4.129 C 11.55 3.089 12.22 3.309 12.22 3.309 C 12.66 4.41 12.38 5.228 12.3 5.428 C 12.81 5.988 13.12 6.698 13.12 7.578 C 13.12 10.647 11.25 11.327 9.47 11.527 C 9.76 11.776 10.01 12.257 10.01 13.006 C 10.01 14.076 10 14.936 10 15.206 C 10 15.415 10.15 15.665 10.55 15.585 C 13.806 14.487 15.999 11.433 16 7.998 C 16 3.58 12.42 0 8 0 Z"
7+
style={{
8+
fill: "rgb(255, 255, 255)",
9+
}}
10+
/>
11+
<path
12+
style={{
13+
fill: "rgb(124, 211, 92)",
14+
}}
15+
transform="matrix(0.920497, -0.39075, 0.39075, 0.920497, 1.304367, 7.955522)"
16+
d="M 6.695 5.409 H 13.743 V 7.659 A 2.952 2.25 0 0 1 10.791 9.909 H 3.743 V 7.659 A 2.952 2.25 0 0 1 6.695 5.409 Z"
17+
data-bx-shape="rect 3.743 5.409 10 4.5 2.952 0 2.952 0 1@cae4d38d"
18+
/>
19+
<text
20+
transform="matrix(0.920505, -0.390732, 0.390732, 0.920505, -3.953467, 6.231951)"
21+
style={{
22+
fill: "rgb(255, 255, 255)",
23+
fontFamily: "K2D",
24+
fontSize: 4,
25+
fontWeight: 900,
26+
letterSpacing: "-0.5px",
27+
textAnchor: "middle",
28+
textTransform: "uppercase",
29+
whiteSpace: "pre",
30+
}}
31+
x={12.778}
32+
y={12.736}
33+
>
34+
{"TAG"}
35+
</text>
36+
</svg>
37+
);
38+
39+
export default SVGComponent;
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { Navbar, Form, InputGroup, FormControl, Button } from 'react-bootstrap';
2+
import React from 'react';
3+
import Image from './github';
4+
5+
export default () => { return (
6+
<>
7+
<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>
27+
</Navbar>
28+
</>
29+
);}

0 commit comments

Comments
 (0)