Skip to content

Commit

Permalink
Merge pull request #32 from 90lucasgabriel/feature/WJ-12
Browse files Browse the repository at this point in the history
WJ-12 - Create Footer component
  • Loading branch information
90lucasgabriel authored Aug 23, 2020
2 parents e9073e3 + e52cbd5 commit a5ae5bf
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 3 deletions.
39 changes: 39 additions & 0 deletions src/containers/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React from 'react';
import { Link } from 'react-router-dom';

import { ReactComponent as Logo } from 'assets/logo.svg';
import { Color } from 'shared/enums';
import RouteEnum from 'routes/enums/Route';

import { Wrapper } from 'components/Layout';
import { Container, LogoContainer, LinksContainer } from './styles';

const Footer: React.FC = () => {
return (
<Wrapper theme="primary">
<Container>
<LinksContainer>
<a href="https://github.com/90lucasgabriel">
Desenvolvido por Lucas Gabriel
</a>
<a href="/">Proposta do projeto</a>
<a href="https://www.figma.com/file/um4dcEJCOlEvB6kCe9KCOD/Cinejump">
Protótipo no Figma
</a>
<a href="/">Apresentação ao Comitê</a>
<a href="https://github.com/90lucasgabriel/cinejump-web/wiki">
Documentação
</a>
</LinksContainer>

<LogoContainer>
<Link to={RouteEnum.BASE}>
<Logo fill={Color.Fill} />
</Link>
</LogoContainer>
</Container>
</Wrapper>
);
};

export default Footer;
44 changes: 44 additions & 0 deletions src/containers/Footer/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import styled from 'styled-components';

import { Color, Size } from 'shared/enums';
import { Container as DefaultContainer } from 'components/Layout';

export const Container = styled(DefaultContainer)`
display: flex;
flex-direction: row-reverse;
flex-wrap: wrap;
padding: ${Size.Default};
`;

export const LogoContainer = styled.div`
display: flex;
flex: 1 1 440px;
align-items: center;
justify-content: center;
@media (max-width: 915px) {
margin-top: ${Size.Large};
}
`;

export const LinksContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
flex: 1 1 440px;
font-size: ${Size.Small};
a {
padding: ${Size.Smallest};
color: ${Color.Fill};
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
@media (max-width: 915px) {
text-align: center;
}
`;
3 changes: 3 additions & 0 deletions src/screens/Home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ import React from 'react';

import { ColumnLayout } from 'components/Layout';
import Header from 'containers/Header';
import Footer from 'containers/Footer';
import { HeaderBackground } from './styles';

const Home: React.FC = () => {
return (
<ColumnLayout>
<Header />
<div style={{ flex: 1 }}></div>
<Footer />
<HeaderBackground />
</ColumnLayout>
);
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Signup/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const Signup: React.FC = () => {
variant="outlined"
onClick={() => history.push(Route.LOGIN)}
>
ENTRAR
LOGIN
</Button>
</LoginContainer>
</RowLayout>
Expand Down
13 changes: 11 additions & 2 deletions src/shared/styles/global.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createGlobalStyle } from 'styled-components';
import { Color } from 'shared/enums';
import { Color, Size } from 'shared/enums';

export default createGlobalStyle`
* {
Expand All @@ -23,16 +23,25 @@ export default createGlobalStyle`
body {
background: ${Color.Fill};
color: ${Color.Text};
font-size: ${Size.Default};
-webkit-font-smoothing: antialiased;
}
body, input, button {
font-family: 'Ubuntu', -apple-system, system-ui, sans-serif;
font-weight: 400;
font-weight: 100;
}
h1, h2, h3, h4, h5, h6, strong {
font-weight: 400,
}
button {
cursor: pointer;
}
input,
textarea,
button,
select,
a {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
`;

0 comments on commit a5ae5bf

Please sign in to comment.