diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/App.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/App.js index f24ce60..206f6c9 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/App.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/App.js @@ -10,15 +10,15 @@ import { BrowserRouter } from "react-router-dom"; const App =() => { const token = localStorage.getItem ("token") - const [rightButtonText, setRigthButtonText] = useState (token ? "Logout": "Login") + const [rightButtonText, setRightButtonText] = useState (token ? "Logout": "Login") return ( -
- +
+ diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginForm.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginForm.js index 979df22..470a7c1 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginForm.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginForm.js @@ -8,7 +8,7 @@ import { useHistory } from "react-router-dom" import CircularProgress from '@material-ui/core/CircularProgress' -const LoginForm = ({setRigthButtonText}) =>{ +const LoginForm = ({setRightButtonText}) =>{ const [form, onChange, clear] = useForm ({email:"", password:""}) const history = useHistory() @@ -16,7 +16,7 @@ const LoginForm = ({setRigthButtonText}) =>{ const onSubmitForm = (event) =>{ event.preventDefault() - login(form,clear, history, setRigthButtonText,setIsLoading) + login(form,clear, history, setRightButtonText,setIsLoading) } diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginPage.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginPage.js index 26481b3..d45b66e 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginPage.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/LoginPage.js @@ -11,16 +11,15 @@ import useUnProtectedPage from "../hooks/useUnProtectedPage" -const LoginPage = ({setRigthButtonText}) =>{ +const LoginPage = ({setRightButtonText}) =>{ useUnProtectedPage() const history = useHistory () return ( - - +
- - + + - - - - +
) diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/styled.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/styled.js index 89f5781..99d6545 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/styled.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/LoginPage/styled.js @@ -4,11 +4,21 @@ export const ScreenContainer = styled.div` display: flex; flex-direction: column; - align-items: center; width: 100vw; - margin-top: 5vh; - margi-bottom: 10vh; + margin-top: 50vh; + margin-bottom: 10vh; + + @media (max-width:420px){ + position:absolute; + bottom:30px; + } + + @media (max-width:380px){ + position:absolute; + bottom:10px; + + } ` @@ -39,13 +49,36 @@ export const SignUpButtonContainer = styled.div` ` export const LogoImage = styled.img` - width: 70vw; + position:absolute; + width: 250px; max-width: 300px; - margin-right: 800px; - margin-left: 120vh; + bottom:280px; + /* margin-right: 800px; */ + margin-left: 73vh; margin-bottom: 3vh; border-radius: 20px; + /* @media (max-width:420px){ + margin-left: 108vh; + + } */ + @media (max-width:420px){ + position:absolute; + width:250px; + margin-left:70px; + bottom:360px; + + } + @media (max-width:380px){ + position:absolute; + width:200px; + bottom:320px; + margin-left:75px; + + + } + + ` diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpForm.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpForm.js index ca2e5a4..571f371 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpForm.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpForm.js @@ -9,7 +9,7 @@ import useForm from '../hooks/useForm' import {signUp} from "../services/user" import CircularProgress from '@material-ui/core/CircularProgress' -const SignUpForm = ({setRigthButtonText}) =>{ +const SignUpForm = ({setRightButtonText}) =>{ const history = useHistory () const [form, onChange, clear] = useForm ({name:"", email:"", password:""}) @@ -17,7 +17,7 @@ const SignUpForm = ({setRigthButtonText}) =>{ const onSubmitForm = (event) => { event.preventDefault() - signUp(form, clear, history, setRigthButtonText, setIsLoading) + signUp(form, clear, history, setRightButtonText, setIsLoading) } diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpPage.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpPage.js index 33bc27e..ae8f6e5 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpPage.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/SignUpPage.js @@ -6,13 +6,13 @@ import { LogoImage } from "./styled" import useUnProtectedPage from "../hooks/useUnProtectedPage" -const SignUpPage = ({setRigthButtonText}) =>{ +const SignUpPage = ({setRightButtonText}) =>{ useUnProtectedPage() return ( - + ) diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/styled.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/styled.js index 31be2e6..f2f883b 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/styled.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/SignUpPage/styled.js @@ -31,4 +31,14 @@ export const LogoImage = styled.img` max-width: 350px; margin-bottom: 3vh; border-radius: 20px; + + @media (max-width: 420px){ + width:60vw; + margin-right:25px; + } + + @media (max-width: 380px){ + width:60vw; + margin-right:25px; + } ` diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/assets/logo.jpg b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/assets/logo.jpg index 466a9e2..a7c0d83 100644 Binary files a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/assets/logo.jpg and b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/assets/logo.jpg differ diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/components/Header/Header.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/components/Header/Header.js index 34b4a3e..3a625d8 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/components/Header/Header.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/components/Header/Header.js @@ -32,7 +32,7 @@ const Header = ({rightButtonText, setRightButtonText}) => { - + diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/routes/Router.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/routes/Router.js index 7951a2b..384ef3e 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/routes/Router.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/routes/Router.js @@ -9,18 +9,18 @@ import SignUpPage from "../SignUpPage/SignUpPage" import ErroPage from "../ErroPage/ErroPage" -const Router = ({setRigthButtonText}) =>{ +const Router = ({setRightButtonText}) =>{ return ( - + - + //Esse aqui é a minha Home do site... é o feed das receitas.... diff --git a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/services/user.js b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/services/user.js index 7aa0206..fa85ece 100644 --- a/modulo3/projeto-cookenu/projeto-cookenu-completo/src/services/user.js +++ b/modulo3/projeto-cookenu/projeto-cookenu-completo/src/services/user.js @@ -2,7 +2,7 @@ import axios from "axios" import {goToRecipesList} from "../routes/coordinator" - export const login = (body, clear, history, setRigthButtonText,setIsLoading) => { + export const login = (body, clear, history, setRightButtonText,setIsLoading) => { setIsLoading(true) axios.post ("https://cookenu-api.herokuapp.com/user/login",body) .then((res)=> { @@ -10,7 +10,7 @@ import {goToRecipesList} from "../routes/coordinator" clear() setIsLoading(false) goToRecipesList (history) - setRigthButtonText ("Logout") + setRightButtonText ("Logout") }) .catch((err) => { @@ -20,7 +20,7 @@ import {goToRecipesList} from "../routes/coordinator" } -export const signUp = (body, clear, history, setRigthButtonText,setIsLoading) => { +export const signUp = (body, clear, history, setRightButtonText,setIsLoading) => { setIsLoading(true) axios.post("https://cookenu-api.herokuapp.com/user/signup", body) .then((res) => { @@ -28,7 +28,7 @@ export const signUp = (body, clear, history, setRigthButtonText,setIsLoading) => clear() setIsLoading(true) goToRecipesList (history) - setRigthButtonText ("Logout") + setRightButtonText ("Logout") }) .catch((err) => { diff --git a/modulo5/testes-unitarios-mocks/testes-unitarios-mocks.txt b/modulo5/testes-unitarios-mocks/testes-unitarios-mocks.txt new file mode 100644 index 0000000..e69de29