Changes on the interface

.gitignore

@@ -19,4 +19,6 @@ server/temp/*.*
 server/temp/uploads/*.*
 server/!temp/.gitkeep
 
-*.psd
+*.psd
+
+backup/

interface/.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
     'array-callback-retur': 0,
     '@typescript-eslint/no-explicit-any': 0,
     'jsx-a11y/label-has-associated-control': 0,
-    'camelcase': 0
+    camelcase: 0,
+    'react/jsx-props-no-spreading': 0,
   },
 };

interface/package.json

@@ -6,50 +6,56 @@
   "author": "Leonardo Ronne",
   "license": "MIT",
   "dependencies": {
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
+    "@material-ui/core": "^4.11.0",
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.0.4",
     "@testing-library/user-event": "^7.1.2",
     "@types/jest": "^24.0.0",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9.0",
     "@types/react-dom": "^16.9.0",
-    "@types/react-router-dom": "^5.1.5",
-    "axios": "^0.19.2",
-    "date-fns": "^2.14.0",
-    "formik": "^2.1.4",
+    "axios": "^0.20.0",
+    "date-fns": "^2.16.1",
+    "formik": "^2.1.5",
     "history": "^5.0.0",
-    "i18next": "^19.6.0",
+    "i18next": "^19.7.0",
     "i18next-xhr-backend": "^3.2.2",
-    "polished": "^3.6.5",
+    "polished": "^3.6.7",
     "react": "^16.13.1",
-    "react-animated-css": "^1.2.1",
+    "react-cookie-consent": "^5.1.4",
     "react-day-picker": "^7.4.8",
     "react-dom": "^16.13.1",
-    "react-flip-toolkit": "^7.0.12",
     "react-google-recaptcha": "^2.1.0",
-    "react-history": "^0.18.2",
+    "react-i18next": "^11.7.1",
     "react-icons": "^3.10.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1",
-    "react-spinners": "^0.9.0",
-    "react-i18next": "^11.7.0",
-    "react-toastify": "^6.0.8",
     "react-spring": "^8.0.27",
-    "react-tooltip": "^4.2.7",
+    "react-toastify": "^6.0.8",
     "styled-components": "^5.1.1",
-    "styled-icons": "^10.6.0",
-    "typescript": "~3.7.2",
-    "yup": "^0.29.1"
+    "typescript": "^4.0.3",
+    "yup": "^0.29.3"
   },
   "scripts": {
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
-    "test": "react-app-rewired test",
+    "test": "react-app-rewired test --env=jest-environment-jsdom-sixteen",
+    "test:cover": "react-scripts test --coverage --watchAll false --env=jest-environment-jsdom-sixteen",
     "eject": "react-app-rewired eject"
   },
   "eslintConfig": {
     "extends": "react-app"
   },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/pages/**/*.tsx",
+      "!src/pages/index.tsx",
+      "src/components/**/*.tsx",
+      "!src/components/index.tsx",
+      "src/hooks/*.tsx",
+      "!src/hooks/index.tsx"
+    ]
+  },
   "browserslist": {
     "production": [
       ">0.2%",
@@ -63,30 +69,31 @@
     ]
   },
   "devDependencies": {
+    "@testing-library/react-hooks": "^3.4.2",
+    "@types/axios": "^0.14.0",
     "@types/i18next": "^13.0.0",
     "@types/i18next-xhr-backend": "^1.4.2",
-    "@types/styled-components": "^5.1.0",
-    "@types/yup": "^0.29.3",
+    "@types/react-icons": "^3.0.0",
+    "@types/react-router-dom": "^5.1.5",
+    "@types/react-toastify": "^4.1.0",
+    "@types/styled-components": "^5.1.2",
     "@typescript-eslint/eslint-plugin": "^3.6.0",
     "@typescript-eslint/parser": "^3.6.0",
     "babel-eslint": "^10.0.3",
     "babel-plugin-root-import": "^6.4.1",
     "customize-cra": "^0.9.1",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
-    "eslint-config-airbnb": "^18.2.0",
+    "eslint-config-airbnb": "^18.1.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-import-helpers": "^1.0.2",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
+    "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.20.3",
+    "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^2.5.1",
-    "jest-dom": "^4.0.0",
+    "jest-environment-jsdom-sixteen": "^1.0.3",
     "prettier": "^2.0.5",
-    "react-app-rewired": "^2.1.6",
-    "react-test-render": "^1.1.2"
+    "react-app-rewired": "^2.1.6"
   }
 }

interface/public/index.html

@@ -4,14 +4,16 @@
     <meta charset="utf-8" />
     <link rel="manifest" href="./manifest.json" />
     <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;0,900;1,300;1,400;1,500&display=swap" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@300;400;500;600;700;800&display=swap" rel="stylesheet" />
-    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
-    <meta name="msapplication-TileColor" content="#ffffff" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@300;400;500;600;700&family=Roboto:wght@300;400;500;700&family=DM+Sans:wght@400;500;700&family=Didact+Gothic&family=Josefin+Sans:wght@300;400;500;600;700&display=swap"
+      rel="stylesheet"
+    />
+    <meta name="msapplication-TileColor" content="#7159c1" />
+    <meta name="theme-color" content="#7159c1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="#7159c1" />
+    <meta name="msapplication-navbutton-color" content="#7159c1" />
     <meta name="msapplication-TileImage" content="./logo512.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <meta name="theme-color" content="#7159c1" />
     <meta name="description" content="Go Barber is an app for hair salons appointments and scheduling." />
     <meta name="author" content="Leonardo Ronne" />
     <meta name="keywords" content="Leonardo Ronne, Go Barber, Rocketseat, Go Stack, Go Stack Bootcamp, Diego Fernandes, Frontend, Reactjs, TypeScript, Styled Components" />

interface/public/locales/en/translation.json

@@ -6,13 +6,55 @@
   "validmail": "Invalid email",
   "requiredemail": "Email is a required field",
   "password": "Password",
-  "validpassword": "Weak password",
+  "validPassword": "Weak password",
   "requiredpassword": "Password is a required field",
   "passwordtooltip": "Your password must contain at least 6 characters, including: a lowercase letter, a capital letter and a number",
   "sessionStart": "Logon to your account",
   "createAccount": "Create an account",
-  "sessionStartButton": "Login",
+  "login": "Login",
+  "profile": "Profile",
+  "dashboard": "Dashboard",
   "register": "Register",
+  "logout": "Logout",
+  "createPassword": "Password Redefinition",
   "forgotpassword": "Forgot your password?",
-  "userCreated": "User registered successfully"
+  "userCreated": "User registered successfully",
+  "send": "Send",
+  "passwordResetMessage": "We will send you an email so you can reset your password",
+  "passwordEmail": "Request sent successfully, check your email",
+  "matchPassword": "The passwords must match",
+  "passwordConfirmation": "Confirm your password",
+  "newPassword": "Create a new password",
+  "noToken": "Password reset token not provided",
+  "passwordCreated": "Password successfully updated",
+  "scheduledAppointments": "Scheduled Appointments",
+  "today": "Today",
+  "jan": "January",
+  "feb": "February",
+  "mar": "March",
+  "apr": "April",
+  "may": "May",
+  "jun": "July",
+  "jul": "Julho",
+  "aug": "August",
+  "sept": "September",
+  "out": "October",
+  "nov": "November",
+  "dec": "December",
+  "shortSunday": "S",
+  "shortMonday": "M",
+  "shortTuesday": "T",
+  "shortWednesday": "W",
+  "shortThursday": "T",
+  "shortFriday": "F",
+  "shortSaturday": "S",
+  "morning": "Morning",
+  "afternoon": "Afternoon",
+  "designed": "Designed by",
+  "confirm": "Confirm",
+  "noAppointments": "No appointments scheduled",
+  "nextAppointmenst": "Next appointments",
+  "cookie1": "We use cookies to ensure you get the best experience on our website",
+  "cookie2": "and continue browsing without changing your settings, we assume that you accept this practice. If you wish, you can change your cookie settings at any time.",
+  "accept": "Accept"
 }

interface/public/locales/pt/translation.json

@@ -11,8 +11,50 @@
   "requiredpassword": "Senha é um campo obrigatório",
   "sessionStart": "Faça seu logon",
   "createAccount": "Crie uma conta",
-  "sessionStartButton": "Entrar",
+  "login": "Entrar",
+  "profile": "Perfil",
+  "dashboard": "Dashboard",
   "register": "Registrar",
+  "logout": "Sair",
+  "createPassword": "Redefinição de Senha",
   "forgotpassword": "Esqueceu sua senha?",
-  "userCreated": "Registro realizado com sucesso"
+  "userCreated": "Registro realizado com sucesso",
+  "send": "Enviar",
+  "passwordResetMessage": "Iremos te enviar um e-mail para que você possa redefinir sua senha",
+  "passwordEmail": "Solicitação enviada com sucesso, cheque o seu email",
+  "matchPassword": "As senhas devem coincidir",
+  "passwordConfirmation": "Confirme sua senha",
+  "newPassword": "Crie uma nova senha",
+  "noToken": "Token de redefinição de senha não fornecido",
+  "passwordCreated": "Senha atualizada com sucesso",
+  "scheduledAppointments": "Horários agendados",
+  "today": "Hoje",
+  "jan": "Janeiro",
+  "feb": "Fevereiro",
+  "mar": "Março",
+  "apr": "Abril",
+  "may": "Maio",
+  "jun": "Junho",
+  "jul": "Julho",
+  "aug": "Agosto",
+  "sept": "Setembro",
+  "out": "Outubro",
+  "nov": "Novembro",
+  "dec": "Dezembro",
+  "shortSunday": "D",
+  "shortMonday": "S",
+  "shortTuesday": "T",
+  "shortWednesday": "Q",
+  "shortThursday": "Q",
+  "shortFriday": "S",
+  "shortSaturday": "S",
+  "morning": "Morning",
+  "afternoon": "Tarde",
+  "designed": "Desenhado por",
+  "confirm": "Confirmar",
+  "noAppointments": "Nenhum agendamento marcado nesse período",
+  "nextAppointmenst": "Agendamento a seguir",
+  "cookie1": "Usamos cookies para garantir a você a melhor experiência no nosso site",
+  "cookie2": "e continuar navegando sem alterar as suas configurações, supomos que você aceita esta prática. Se desejar, você pode alterar as configurações de cookies a qualquer momento.",
+  "accept": "Aceitar"
 }

interface/src/App.tsx

@@ -1,25 +1,27 @@
 import React from 'react';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { BrowserRouter } from 'react-router-dom';
+import { ThemeProvider } from 'styled-components';
 import { ToastContainer } from 'react-toastify';
 
-import { AuthProvider } from './hooks/auth';
-
 import Routes from './routes';
 
-import GlobalStyles from './styles/GlobalStyles';
+import { useChangeTheme } from './hooks';
 
+import GlobalStyles from './styles/GlobalStyles';
 import './styles/ReactToastify.css';
 
 const App: React.FC = () => {
+  const { currentTheme } = useChangeTheme();
+
   return (
     <>
-      <Router>
-        <ToastContainer />
-        <AuthProvider>
+      <BrowserRouter>
+        <ThemeProvider theme={currentTheme}>
+          <ToastContainer />
+          <GlobalStyles />
           <Routes />
-        </AuthProvider>
-        <GlobalStyles />
-      </Router>
+        </ThemeProvider>
+      </BrowserRouter>
     </>
   );
 };