Skip to content

Commit

Permalink
Merge pull request #1 from Computer-Progress/routers
Browse files Browse the repository at this point in the history
Add defoult routers
  • Loading branch information
mansogf authored Jun 2, 2021
2 parents 8897c8b + d6c3b40 commit 81d3714
Show file tree
Hide file tree
Showing 16 changed files with 127 additions and 9 deletions.
11 changes: 10 additions & 1 deletion components/Button/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
import { Button } from "./styles.js";
import Link from 'next/link'

export default Button
export default function Navbar({link, primary, children, ...props}) {
return (
<div>
<Link href={link || ""}>
<Button primary={primary} {...props}>{children}</Button>
</Link>
</div>
);
}
12 changes: 6 additions & 6 deletions components/NavBar/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { Wrapper, Logo, Menu, Auth } from "./styles.js";
import Button from "../Button";

export default function Navbar() {
return (
<div>
<Wrapper>
<Logo>Computer Progress</Logo>
<Logo link='/'>Computer Progress</Logo>
<Menu>
<Button>Domains</Button>
<Button>Dataset</Button>
<Button>About us</Button>
<Button link='/domains'>Domains</Button>
<Button link='/about_us'>About Us</Button>
</Menu>
<Auth>
<Button>Sign up</Button>
<Button primary>SIGN IN</Button>
<Button link='/sign_up'>Sign up</Button>
<Button link='/sign_in' primary>SIGN IN</Button>
</Auth>
</Wrapper>
</div>
Expand Down
3 changes: 2 additions & 1 deletion components/NavBar/styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import styled from "styled-components";
import Button from "../Button";

export const Wrapper = styled.div`
display: flex;
Expand All @@ -12,7 +13,7 @@ export const Wrapper = styled.div`
z-index: 10000;
`;

export const Logo = styled.a`
export const Logo = styled(Button)`
font-family: "Montserrat", sans-serif;
font-size: 24px;
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion components/Wave/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ export const Text = styled.p`
font-weight: bold;
font-size: 1.5rem;
color: ${theme.colors.white};
width: 50%;
width: 35%;
`
19 changes: 19 additions & 0 deletions containers/AboutUs/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Head from "next/head";
import { Container } from "./styles.js";
import NavBar from "../../components/NavBar";

export default function Home() {
return (
<div>
<Head>
<title>Computer Progress</title>
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</Head>
<NavBar />
<Container></Container>

<footer></footer>
</div>
);
}
7 changes: 7 additions & 0 deletions containers/AboutUs/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from "styled-components";

export const Container = styled.div`
background: gray;
font-size: 2rem;
height: 100vh;
`;
19 changes: 19 additions & 0 deletions containers/Domains/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Head from "next/head";
import { Container } from "./styles.js";
import NavBar from "../../components/NavBar";

export default function Home() {
return (
<div>
<Head>
<title>Computer Progress</title>
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</Head>
<NavBar />
<Container></Container>

<footer></footer>
</div>
);
}
7 changes: 7 additions & 0 deletions containers/Domains/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from "styled-components";

export const Container = styled.div`
background: gray;
font-size: 2rem;
height: 100vh;
`;
19 changes: 19 additions & 0 deletions containers/SignIn/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Head from "next/head";
import { Container } from "./styles.js";
import NavBar from "../../components/NavBar";

export default function Home() {
return (
<div>
<Head>
<title>Computer Progress</title>
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</Head>
<NavBar />
<Container></Container>

<footer></footer>
</div>
);
}
7 changes: 7 additions & 0 deletions containers/SignIn/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from "styled-components";

export const Container = styled.div`
background: gray;
font-size: 2rem;
height: 100vh;
`;
19 changes: 19 additions & 0 deletions containers/SignUp/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Head from "next/head";
import { Container } from "./styles.js";
import NavBar from "../../components/NavBar";

export default function Home() {
return (
<div>
<Head>
<title>Computer Progress</title>
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</Head>
<NavBar />
<Container></Container>

<footer></footer>
</div>
);
}
7 changes: 7 additions & 0 deletions containers/SignUp/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from "styled-components";

export const Container = styled.div`
background: gray;
font-size: 2rem;
height: 100vh;
`;
1 change: 1 addition & 0 deletions pages/about_us.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default} from '../containers/AboutUs';
1 change: 1 addition & 0 deletions pages/domains.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default} from '../containers/Domains';
1 change: 1 addition & 0 deletions pages/sign_in.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default} from '../containers/SignIn';
1 change: 1 addition & 0 deletions pages/sign_up.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default} from '../containers/SignUp';

1 comment on commit 81d3714

@vercel
Copy link

@vercel vercel bot commented on 81d3714 Jun 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.