From da05e0b44ddae253b0f47ff516631d274de15832 Mon Sep 17 00:00:00 2001 From: Brian de Paula Mello <35143307+Brian-Mello@users.noreply.github.com> Date: Tue, 7 Apr 2020 23:12:19 -0300 Subject: [PATCH] so um pr --- 19-semana/futurebook/src/data/feedDataBase.ts | 2 +- .../frontend/{futuretube => }/.gitignore | 2 +- .../frontend/{futuretube => }/README.md | 0 .../frontend/futuretube/src/actions/index.js | 22 - .../futuretube/src/components/Footer/index.js | 12 - .../src/components/Footer/styled.js | 20 - .../futuretube/src/components/Header/index.js | 15 - .../src/components/Header/styled.js | 49 - .../futuretube/src/components/Loader/index.js | 20 - .../src/components/Loader/styled.js | 15 - .../futuretube/src/components/Main/index.js | 13 - .../futuretube/src/components/Main/styled.js | 27 - .../futuretube/src/containers/App/index.js | 32 - .../src/containers/FeedPage/index.js | 66 - .../src/containers/FeedPage/styled.js | 11 - .../src/containers/LoginPage/index.js | 54 - .../src/containers/LoginPage/styled.js | 1 - .../futuretube/src/containers/Router/index.js | 27 - .../src/containers/SignUpPage/index.js | 54 - .../src/containers/images/logofutureTube.png | Bin 10865 -> 0 bytes .../frontend/futuretube/src/index.js | 6 - .../frontend/futuretube/src/reducers/index.js | 10 - .../futuretube/src/reducers/videos.js | 14 - .../frontend/futuretube/src/style/theme.js | 13 - .../{futuretube => }/package-lock.json | 6107 +++++++++-------- .../frontend/{futuretube => }/package.json | 22 +- .../{futuretube => }/public/favicon.ico | Bin .../{futuretube => }/public/index.html | 9 +- .../{futuretube => }/public/logo192.png | Bin .../{futuretube => }/public/logo512.png | Bin .../{futuretube => }/public/manifest.json | 0 .../{futuretube => }/public/robots.txt | 0 21-22-semana/futuretube/frontend/src/App.css | 38 + 21-22-semana/futuretube/frontend/src/App.js | 26 + .../futuretube/frontend/src/App.test.js | 9 + .../futuretube/frontend/src/index.css | 13 + 21-22-semana/futuretube/frontend/src/index.js | 17 + 21-22-semana/futuretube/frontend/src/logo.svg | 7 + .../futuretube/frontend/src/serviceWorker.js | 141 + .../futuretube/frontend/src/setupTests.js | 5 + 40 files changed, 3604 insertions(+), 3275 deletions(-) rename 21-22-semana/futuretube/frontend/{futuretube => }/.gitignore (95%) rename 21-22-semana/futuretube/frontend/{futuretube => }/README.md (100%) delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/actions/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Footer/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Footer/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Header/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Header/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Loader/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Loader/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Main/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/components/Main/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/App/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/FeedPage/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/FeedPage/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/LoginPage/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/LoginPage/styled.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/Router/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/SignUpPage/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/containers/images/logofutureTube.png delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/reducers/index.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/reducers/videos.js delete mode 100644 21-22-semana/futuretube/frontend/futuretube/src/style/theme.js rename 21-22-semana/futuretube/frontend/{futuretube => }/package-lock.json (82%) rename 21-22-semana/futuretube/frontend/{futuretube => }/package.json (52%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/favicon.ico (100%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/index.html (88%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/logo192.png (100%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/logo512.png (100%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/manifest.json (100%) rename 21-22-semana/futuretube/frontend/{futuretube => }/public/robots.txt (100%) create mode 100644 21-22-semana/futuretube/frontend/src/App.css create mode 100644 21-22-semana/futuretube/frontend/src/App.js create mode 100644 21-22-semana/futuretube/frontend/src/App.test.js create mode 100644 21-22-semana/futuretube/frontend/src/index.css create mode 100644 21-22-semana/futuretube/frontend/src/index.js create mode 100644 21-22-semana/futuretube/frontend/src/logo.svg create mode 100644 21-22-semana/futuretube/frontend/src/serviceWorker.js create mode 100644 21-22-semana/futuretube/frontend/src/setupTests.js diff --git a/19-semana/futurebook/src/data/feedDataBase.ts b/19-semana/futurebook/src/data/feedDataBase.ts index 2d859a3..90d4848 100644 --- a/19-semana/futurebook/src/data/feedDataBase.ts +++ b/19-semana/futurebook/src/data/feedDataBase.ts @@ -54,7 +54,7 @@ export class FeedDB extends BaseDB implements FeedGateway{ return undefined; }; - return result[0].map((post: any) => { + return await result[0].map((post: any) => { return new Feed( post.id, post.photo, diff --git a/21-22-semana/futuretube/frontend/futuretube/.gitignore b/21-22-semana/futuretube/frontend/.gitignore similarity index 95% rename from 21-22-semana/futuretube/frontend/futuretube/.gitignore rename to 21-22-semana/futuretube/frontend/.gitignore index fe83568..4d29575 100644 --- a/21-22-semana/futuretube/frontend/futuretube/.gitignore +++ b/21-22-semana/futuretube/frontend/.gitignore @@ -1,7 +1,7 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies -node_modules/ +/node_modules /.pnp .pnp.js diff --git a/21-22-semana/futuretube/frontend/futuretube/README.md b/21-22-semana/futuretube/frontend/README.md similarity index 100% rename from 21-22-semana/futuretube/frontend/futuretube/README.md rename to 21-22-semana/futuretube/frontend/README.md diff --git a/21-22-semana/futuretube/frontend/futuretube/src/actions/index.js b/21-22-semana/futuretube/frontend/futuretube/src/actions/index.js deleted file mode 100644 index 533a5f6..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/actions/index.js +++ /dev/null @@ -1,22 +0,0 @@ -import axios from 'axios'; -// import { push } from 'connected-react-router' -// import { routes } from '../containers/Router'; - -const baseUrl = "https://vj4kbpy8c0.execute-api.us-east-1.amazonaws.com/v1" - -const setVideoAction = (videos) => ({ - type: "SET_VIDEOS_ACTION", - payload: { - videos, - } -}) - -export const getVideos = () => async (dispatch) => { - try { - const response = await axios.get(`${baseUrl}/feed`) - - dispatch(setVideoAction(response.data.videos)) - } catch (err) { - window.alert("Erro de renderização") - } -} \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/index.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/index.js deleted file mode 100644 index d2522a2..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import { StyledFooter, StyledP } from './styled'; - -function Footer (props){ - return( - - created by Brian © 2020 - - ) -} - -export default Footer; \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/styled.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/styled.js deleted file mode 100644 index fd345e4..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Footer/styled.js +++ /dev/null @@ -1,20 +0,0 @@ -import styled from 'styled-components'; - -export const StyledFooter = styled.footer` - width: 100%; - height: 140px; - background-color: #6f0000; - color: white; - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: center; - position: fixed; - bottom: 0; -` - -export const StyledP = styled.p` - color: white; - position: fixed; - bottom: 0; -` \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Header/index.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Header/index.js deleted file mode 100644 index 030ad99..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Header/index.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import { StyledHeader, StyledButton, StyledInput, StyledLogoImage } from './styled'; -import Logo from '../../containers/images/logofutureTube.png'; - -function Header (props) { - return ( - - - - {props.text} - - ) -} - -export default Header; \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Header/styled.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Header/styled.js deleted file mode 100644 index 10c99b6..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Header/styled.js +++ /dev/null @@ -1,49 +0,0 @@ -import styled from 'styled-components'; - -export const StyledHeader = styled.header` - width: 100%; - height: 70px; - background-color: #a50f1e; - position: fixed; - top: 0; - display: flex; - justify-content: center; - align-items: center; -` - -export const StyledButton = styled.button ` - width: 120px; - height: 30px; - border-radius: 5px; - border: #a50f1e; - background-color: white; - color: #a50f1e; - position: fixed; - top: 20px; - right: 20px; - :hover{ - background-color: #6f0000; - color: white; - } -` - -export const StyledInput = styled.input` - min-width: 500px; - height: 25px; - outline: none; - border: 0; - position: fixed; - top: 20px; - color: black; - border-bottom: 1px solic white; - border-radius: 5px; - padding-left: 30px; -` - -export const StyledLogoImage = styled.img` - width: 80px; - height: 60px; - position: fixed; - left: 40px; - top: 5px; -` \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/index.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/index.js deleted file mode 100644 index 25ca4a0..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { Fragment } from "react"; -import { Loading, Triangle } from "./styled"; - -function Loader ( ) { - return ( - - - - Loading... - - - ) -} - -export default Loader; \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/styled.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/styled.js deleted file mode 100644 index ebd2647..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Loader/styled.js +++ /dev/null @@ -1,15 +0,0 @@ -import styled, { keyframes } from 'styled-components'; - -export const Loading = styled.text ` - font-size: 9px; - text-align: center; -` - -const dash = keyframes ` - 100% { stroke-dashoffset: 136; } -` - -export const Triangle = styled.polygon` - stroke-dasharray: 17; - animation: ${dash} 2.5s cubic-bezier(0.35, 0.04, 0.63, 0.95) infinite; -` \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Main/index.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Main/index.js deleted file mode 100644 index fae7a10..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Main/index.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import { StyledMain, StyledMenu, StyledVideoFeed } from "./styled"; - -function Main (props) { - return ( - - - - - ) -} - -export default Main; \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/components/Main/styled.js b/21-22-semana/futuretube/frontend/futuretube/src/components/Main/styled.js deleted file mode 100644 index 68d9407..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/components/Main/styled.js +++ /dev/null @@ -1,27 +0,0 @@ -import styled from 'styled-components'; - -export const StyledMain = styled.main ` - width: 100%; - position: fixed; - top: 80px; - min-height: 64vh; - display: flex; - justify-content: center; - align-items: center; -` - -export const StyledMenu = styled.menu` - width: 200px; - margin: 0; - height: 65vh; - border: none; - border-right: 1px solid #cfced1; -` - -export const StyledVideoFeed = styled.section ` - width: 100%; - padding: 5px; - height: 65vh; - display: flex; - flex-wrap: wrap; -` \ No newline at end of file diff --git a/21-22-semana/futuretube/frontend/futuretube/src/containers/App/index.js b/21-22-semana/futuretube/frontend/futuretube/src/containers/App/index.js deleted file mode 100644 index 3694e2d..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/containers/App/index.js +++ /dev/null @@ -1,32 +0,0 @@ -import React from "react"; -import { Provider } from "react-redux"; -import thunk from "redux-thunk"; -import { MuiThemeProvider, CssBaseline } from "@material-ui/core"; -import theme from "../../style/theme"; -import Router from "../Router"; -import { createBrowserHistory } from "history"; -import { createStore, applyMiddleware, compose } from "redux"; -import { generateReducers } from "../../reducers"; -import { routerMiddleware } from "connected-react-router"; - -export const history = createBrowserHistory(); - -const middlewares = [ - applyMiddleware(routerMiddleware(history), thunk), - window.__REDUX_DEVTOOLS_EXTENSION__ - ? window.__REDUX_DEVTOOLS_EXTENSION__() - : f => f -]; - -const store = createStore(generateReducers(history), compose(...middlewares)); - -export const App = () => ( - - - - - - -); - -export default App; diff --git a/21-22-semana/futuretube/frontend/futuretube/src/containers/FeedPage/index.js b/21-22-semana/futuretube/frontend/futuretube/src/containers/FeedPage/index.js deleted file mode 100644 index 6ae5bf0..0000000 --- a/21-22-semana/futuretube/frontend/futuretube/src/containers/FeedPage/index.js +++ /dev/null @@ -1,66 +0,0 @@ -import React, { Fragment } from 'react' -import { StyledBody } from './styled'; -import { push } from 'connected-react-router'; -import { routes } from '../Router'; -import { connect } from 'react-redux'; -import { getVideos } from '../../actions'; -import Loader from '../../components/Loader' -import Header from '../../components/Header'; -import Footer from '../../components/Footer'; -import Main from '../../components/Main'; - -class FeedPage extends React.Component{ - constructor(props){ - super(props); - this.state = { - - } - } - - componentDidMount(){ - this.props.getVideos() - } - - handleLogOut = () => { - localStorage.removeItem("token") - this.props.goToLoginPage() - }; - - render () { - - // const { videos } = this.state; - - const videosIsReady = this.props.videos.length === 0 ? : ( - - {this.props.videos.map((video) => -

{video.title}

- )} - - ) - - return ( - -
-
- {videosIsReady} -
-