From ae68e1cc7863e1f68bf8e8df58749a798601da4d Mon Sep 17 00:00:00 2001
From: Daniel-Alvarenga <daniel07alvarenga2023@gmail.com>
Date: Thu, 16 May 2024 18:37:41 -0300
Subject: [PATCH] Finalized empresa clients, change some english words to pt-br
 and fix prisma schema

---
 client/src/components/ContactUs.vue           |   2 +-
 client/src/components/Footer.vue              |   2 +-
 client/src/components/Header.vue              |   2 +-
 client/src/router/guards/guards.js            | 135 +++---
 client/src/router/routes/aluno.js             |   5 +-
 client/src/router/routes/empresa.js           |  31 +-
 client/src/router/routes/funcionario.js       |   4 +-
 client/src/router/routes/professor.js         |   4 +-
 client/src/services/api/empresa.js            |   2 +-
 client/src/util/mixins.js                     |  11 +-
 .../src/views/admin/RegisterFuncionario.vue   |   1 -
 client/src/views/aluno/Register.vue           |   6 +-
 client/src/views/aluno/ValidateRegister.vue   |   1 -
 client/src/views/empresa/Login.vue            |   2 +-
 client/src/views/empresa/Recovery.vue         |   3 +-
 client/src/views/empresa/Register.vue         | 450 ++++++++++++++++++
 client/src/views/empresa/Validate.vue         | 423 ++++++----------
 client/src/views/empresa/ValidateRecovery.vue |  43 +-
 client/src/views/funcionario/Validate.vue     |   2 +-
 client/src/views/professor/Validate.vue       |   2 +-
 server/prisma/schema.prisma                   |   2 +-
 .../modules/controllers/empresaControllers.ts |   6 +-
 server/src/modules/interfaces/empresaDTOs.ts  |   2 +-
 .../empresa/RecoveryEmpresaUseCase.ts         |   2 +-
 .../empresa/ValidateRecoveryEmpresa.ts        |   6 +-
 .../empresa/registerEmpresaUseCase.ts         |   8 +-
 server/src/router/routes/empresa.routes.ts    |   7 +-
 27 files changed, 757 insertions(+), 407 deletions(-)
 create mode 100644 client/src/views/empresa/Register.vue

diff --git a/client/src/components/ContactUs.vue b/client/src/components/ContactUs.vue
index 0c9c71e..fa2ebba 100644
--- a/client/src/components/ContactUs.vue
+++ b/client/src/components/ContactUs.vue
@@ -1,7 +1,7 @@
 <template>
     <section class="contact-us">
         <div class="box" id="box1">
-            <h1>Contact Us</h1>
+            <h1>Fale Conosco</h1>
             <p>
                 Estamos comprometidos em oferecer soluções inovadoras e de qualidade que superem suas expectativas,
                 tornando sua experiência conosco memorável.
diff --git a/client/src/components/Footer.vue b/client/src/components/Footer.vue
index 9517fa4..86557de 100644
--- a/client/src/components/Footer.vue
+++ b/client/src/components/Footer.vue
@@ -5,7 +5,7 @@
         <nav>
             <ul>
                 <li>
-                    <router-link to="/">About Us</router-link>
+                    <router-link to="/">Sobre Nós</router-link>
                 </li>
                 <li>
                     <a href="https://github.com/VitorCarvalho67/Boot" target="_blank">GitHub</a>
diff --git a/client/src/components/Header.vue b/client/src/components/Header.vue
index c4483d2..cebcae4 100644
--- a/client/src/components/Header.vue
+++ b/client/src/components/Header.vue
@@ -16,7 +16,7 @@
                         </ul>
                     </div>
                 </li>
-                <li><router-link to="/">About Us</router-link></li>
+                <li><router-link to="/">Sobre Nós</router-link></li>
                 <!-- <li><router-link to="/register">Cadastre-se Agora</router-link></li> -->
                 <li><router-link to="/login">Entrar</router-link></li>
             </ul>
diff --git a/client/src/router/guards/guards.js b/client/src/router/guards/guards.js
index 3841722..55d3267 100644
--- a/client/src/router/guards/guards.js
+++ b/client/src/router/guards/guards.js
@@ -5,6 +5,21 @@ import { authProfessor }  from '../../services/api/professor';
 import { authFuncionario }  from '../../services/api/funcionario';
 import { authEmpresa }  from '../../services/api/empresa';
 
+// isAuths
+export async function isAuthAluno(){
+    var token = Cookies.get('token');
+    if (!token) {
+        return false;
+    } else {
+        try {
+            const response = await authAluno(token);
+            return (response.data == "Aluno autenticado com sucesso.") ? true : false
+        } catch (error) {
+            return false;
+        }    
+    }    
+}    
+
 export async function isAuthAdmin() {
     var token = Cookies.get('token-admin');
     if (!token) {
@@ -12,60 +27,27 @@ export async function isAuthAdmin() {
     } else {
         try {
             const response = await authAdmin(token);
-            if (response.data !== "Admin autenticado com sucesso.") {
-                return false;
-            } else {
-                return true;
-            }
+            return (response.data == "Admin autenticado com sucesso.") ? true : false
         } catch (error) {
             return false;
-        }
-    }
-}
-
-export async function isRegistering(){
-    return (Cookies.get('email-registro-aluno')) ? true : false;
-}
-
-export async function isRecoverigAluno(){
-    return (Cookies.get('email-recovery-aluno')) ? true : false;
-}
+        }    
+    }    
+}    
 
-export async function isAuthProfessor(){
-    var token = Cookies.get('token-professor');
+export async function isAuthEmpresa(){
+    var token = Cookies.get('token-empresa');
     if (!token) {
         return false;
     } else {
         try {
-            const response = await authProfessor(token);
-            if (response.data !== "Professor autenticado com sucesso.") {
-                console.log("aaa");
-                return false;
-            } else {
-                return true;
-            }
+            const response = await authEmpresa(token);
+            return(response.data == "Empresa autenticada com sucesso.") ? true : false;
         } catch (error) {
             return false;
         }
     }
 }
 
-export async function isInitingProfessor(){
-    return (Cookies.get('email-init-professor')) ? true : false;
-}
-
-export async function isRecoverigProfessor(){
-    return (Cookies.get('email-recovery-professor')) ? true : false;
-}
-
-export async function isInitingFuncionario(){
-    return (Cookies.get('email-init-funcionario')) ? true : false;
-}
-
-export async function isRecoverigFuncionario(){
-    return (Cookies.get('email-recovery-funcionario')) ? true : false;
-}
-
 export async function isAuthFuncionario(){
     var token = Cookies.get('token-funcionario');
     if (!token) {
@@ -73,52 +55,59 @@ export async function isAuthFuncionario(){
     } else {
         try {
             const response = await authFuncionario(token);
-            if (response.data !== "Funcionário autenticado com sucesso.") {
-                console.log(response.data);
-                return false;
-            } else {
-                return true;
-            }
+            return (response.data == "Funcionário autenticado com sucesso.") ? true : false
         } catch (error) {
             return false;
         }
     }
 }
 
-export async function isAuthEmpresa(){
-    var token = Cookies.get('token-empresa');
+export async function isAuthProfessor(){
+    var token = Cookies.get('token-professor');
     if (!token) {
         return false;
     } else {
         try {
-            const response = await authEmpresa(token);
-            if (response.data !== "Empresa autenticada com sucesso.") {
-                console.log(response.data);
-                return false;
-            } else {
-                return true;
-            }
+            const response = await authProfessor(token);
+            return (response.data == "Professor autenticado com sucesso.") ? true : false
         } catch (error) {
             return false;
         }
     }
 }
 
-export async function isAuthAluno(){
-    var token = Cookies.get('token');
-    if (!token) {
-        return false;
-    } else {
-        try {
-            const response = await authAluno(token);
-            if (response.data !== "Aluno autenticado com sucesso.") {
-                console.log(response.data);
-                return false;
-            } else {
-                return true;
-            }
-        } catch (error) {
-            return false;
-        }
-    }
+
+// isRegisterings
+export async function isRegistering(){
+    return (Cookies.get('email-registro-aluno')) ? true : false;
+}    
+
+export async function isRegisteringEmpresa(){
+    return (Cookies.get('cnpj-registro-empresa')) ? true : false;
+}
+
+// isRecoverings
+export async function isRecoveringAluno(){
+    return (Cookies.get('email-recovery-aluno')) ? true : false;
+}    
+
+export async function isRecoveringEmpresa(){
+    return (Cookies.get('email-recovery-empresa')) ? true : false;
+}
+
+export async function isRecoveringFuncionario(){
+    return (Cookies.get('email-recovery-funcionario')) ? true : false;
+}
+
+export async function isRecoveringProfessor(){
+    return (Cookies.get('email-recovery-professor')) ? true : false;
+}
+
+// isInitings
+export async function isInitingFuncionario(){
+    return (Cookies.get('email-init-funcionario')) ? true : false;
+}
+
+export async function isInitingProfessor(){
+    return (Cookies.get('email-init-professor')) ? true : false;
 }
\ No newline at end of file
diff --git a/client/src/router/routes/aluno.js b/client/src/router/routes/aluno.js
index 166be16..b10be36 100644
--- a/client/src/router/routes/aluno.js
+++ b/client/src/router/routes/aluno.js
@@ -6,7 +6,8 @@ import ValidateRecovery from '../../views/aluno/ValidateRecovery.vue';
 import HomeAluno from '../../views/aluno/Home.vue';
 
 import {
-    isRecoverigAluno,
+    isRecoveringAluno,
+    isRegistering,
     isAuthAluno
 } from '../guards/guards.js';
 
@@ -47,7 +48,7 @@ export const alunoRoutes = [
         name: 'ValidateRecovery',
         component: ValidateRecovery,
         beforeEnter: async (to, from, next) => {
-            (await isRecoverigAluno()) ? next() : next("/recovery");
+            (await isRecoveringAluno()) ? next() : next("/recovery");
         }
     }
 ];
\ No newline at end of file
diff --git a/client/src/router/routes/empresa.js b/client/src/router/routes/empresa.js
index 089deaf..02329ef 100644
--- a/client/src/router/routes/empresa.js
+++ b/client/src/router/routes/empresa.js
@@ -1,9 +1,15 @@
+import { validateRecoveryEmpresa } from '../../services/api/empresa.js';
 import Empresa from '../../views/empresa/Dashboard.vue';
 import LoginEmpresa from '../../views/empresa/Login.vue';
 import RecoveryEmpresa from '../../views/empresa/Recovery.vue';
+import RegisterEmpresa from '../../views/empresa/Register.vue';
+import ValidateEmpresa from '../../views/empresa/Validate.vue';
+import ValidateRecoveryEmpresa from '../../views/empresa/ValidateRecovery.vue';
 
 import {
-    isAuthEmpresa,
+    isRegisteringEmpresa,
+    isRecoveringEmpresa,
+    isAuthEmpresa
 } from '../guards/guards.js';
 
 
@@ -21,9 +27,30 @@ export const empresaRoutes = [
         name: "LoginEmpresa",
         component: LoginEmpresa
     },
+    {
+        path: "/empresa/register",
+        name: "RegistroEmpresa",
+        component: RegisterEmpresa
+    },
+    {
+        path: "/empresa/register/validate",
+        name: "ValidateEmpresa",
+        component: ValidateEmpresa,
+        beforeEnter: async (to, from, next) => {
+            (await isRegisteringEmpresa()) ? next() : next("/empresa/register");
+        }
+    },
     {
         path: "/empresa/recovery",
         name: "RecoveryEmpresa",
-        component: RecoveryEmpresa
+        component: RecoveryEmpresa,
+    },
+    {
+        path: "/empresa/recovery/validate",
+        name: "ValidateRecoveryEmpresa",
+        component: ValidateRecoveryEmpresa,
+        beforeEnter: async (to, from, next) => {
+            (await isRecoveringEmpresa()) ? next() : next("/empresa/recovery");
+        }
     }
 ]
\ No newline at end of file
diff --git a/client/src/router/routes/funcionario.js b/client/src/router/routes/funcionario.js
index c762c44..8f21bb3 100644
--- a/client/src/router/routes/funcionario.js
+++ b/client/src/router/routes/funcionario.js
@@ -8,7 +8,7 @@ import ValidateRecoveryFuncionario from '../../views/funcionario/ValidateRecover
 import {
     isAuthFuncionario,
     isInitingFuncionario,
-    isRecoverigFuncionario
+    isRecoveringFuncionario
 } from '../guards/guards.js';
 
 export const funcionarioRoutes = [
@@ -43,7 +43,7 @@ export const funcionarioRoutes = [
         name: 'ValidateRecoveryFuncionario',
         component: ValidateRecoveryFuncionario,
         beforeEnter: async (to, from, next) => {
-            (await isRecoverigFuncionario()) ? next() : next("/funcionario/recovery");
+            (await isRecoveringFuncionario()) ? next() : next("/funcionario/recovery");
         }
     },
     {
diff --git a/client/src/router/routes/professor.js b/client/src/router/routes/professor.js
index 989d063..2aadb07 100644
--- a/client/src/router/routes/professor.js
+++ b/client/src/router/routes/professor.js
@@ -8,7 +8,7 @@ import ValidateRecoveryProfessor from '../../views/professor/ValidateRecovery.vu
 import {
     isAuthProfessor,
     isInitingProfessor,
-    isRecoverigProfessor,
+    isRecoveringProfessor,
 } from '../guards/guards.js';
 
 export const professorRoutes = [
@@ -43,7 +43,7 @@ export const professorRoutes = [
         name: 'ValidateRecoveryProfessor',
         component: ValidateRecoveryProfessor,
         beforeEnter: async (to, from, next) => {
-            (await isRecoverigProfessor()) ? next() : next("/professor/recovery");
+            (await isRecoveringProfessor()) ? next() : next("/professor/recovery");
         }
     },
     {
diff --git a/client/src/services/api/empresa.js b/client/src/services/api/empresa.js
index abae18f..f6344dc 100644
--- a/client/src/services/api/empresa.js
+++ b/client/src/services/api/empresa.js
@@ -33,7 +33,7 @@ export const registerEmpresa = async (infoEmpresa) => {
 
 export const validateEmpresa = async (infoEmpresa) => {
     try {
-        const response = await api.post('empresa/validate/', infoEmpresa);
+        const response = await api.post('empresa/register/validate/', infoEmpresa);
         return response;
     } catch (error) {
         return error.response.data;
diff --git a/client/src/util/mixins.js b/client/src/util/mixins.js
index 8fedb55..484963f 100644
--- a/client/src/util/mixins.js
+++ b/client/src/util/mixins.js
@@ -59,7 +59,7 @@ export const validateRecoveryMixin = {
             if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
             else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
             else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
             else if (!(password.length >= 8)) this.alerts.alertLenght = true;
     
             this.alerts.alertPass = false;
@@ -81,10 +81,8 @@ export const EmpresaMixin = {
                     event.preventDefault();
                     this.empresa.cnpjExibido = this.empresa.cnpjExibido.slice(0, cursorPosition - 1) + this.empresa.cnpjExibido.slice(cursorPosition);
                     return;
-                } else{
-                    console.log(previousChar);
                 }
-                this.empresa.cnpj = this.empresa.cnpj.slice(0, cursorPosition - 1) + this.empresa.cnpj.slice(cursorPosition);
+                this.empresa.cnpj = this.empresa.cnpj.slice(0, cursorPosition - 1) + this.empresa.cnpj.slice(cursorPosition); 
             } else{
                 const cnpj = event.target.value.replace(/\D/g, '');
         
@@ -105,10 +103,11 @@ export const EmpresaMixin = {
                 event.target.value = cnpjFormatadoExibicao;
         
                 this.empresa.cnpj = cnpjFormatado;
-                console.log(cnpjFormatado);
                 this.empresa.cnpjExibido = cnpjFormatadoExibicao;
             }
-        
+            if (typeof this.cnpjValidate === 'function') {
+                this.cnpjValidate();
+            }
         }
     }
 }
diff --git a/client/src/views/admin/RegisterFuncionario.vue b/client/src/views/admin/RegisterFuncionario.vue
index e3ecc98..06ad8f2 100644
--- a/client/src/views/admin/RegisterFuncionario.vue
+++ b/client/src/views/admin/RegisterFuncionario.vue
@@ -83,7 +83,6 @@ export default {
                     this.token
                 );
 
-                console.log(response)
                 
                 if (response.status >= 200 && response.status < 300) {
                     alert("Tudo certo! 😉");
diff --git a/client/src/views/aluno/Register.vue b/client/src/views/aluno/Register.vue
index 1b55969..31de877 100644
--- a/client/src/views/aluno/Register.vue
+++ b/client/src/views/aluno/Register.vue
@@ -66,7 +66,7 @@
 
                     <div class="input-box password" :class="{ 'focused': focused.confirmFocused }">
                         <div class="d1">
-                            <label for="confirmPassword">Confirmar Senha:</label>
+                            <label for="confirmPassword">Confirmar senha</label>
                             <input :type="inputTypeConfirm" id="confirmPass" v-model="userAluno.confirmPassword"
                                 @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
                                 @input="checkConfirmPassword" required>
@@ -156,7 +156,7 @@ export default {
                 (/[A-Z]/.test(password)) &&
                 (/[a-z]/.test(password)) &&
                 (/[0-9]/.test(password)) &&
-                (/[*!@#$%&\./\\-]/.test(password)) &&
+                (/[*!@#$%&\./\\-_]/.test(password)) &&
                 (password.length >= 8) &&
                 (/@etec\.sp\.gov\.br$/.test(email)) &&
                 (password == passwordConfirm)
@@ -191,7 +191,7 @@ export default {
             if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
             else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
             else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
             else if (!(password.length >= 8)) this.alerts.alertLenght = true;
 
             this.checkConfirmPassword();
diff --git a/client/src/views/aluno/ValidateRegister.vue b/client/src/views/aluno/ValidateRegister.vue
index 16c29dc..1be3576 100644
--- a/client/src/views/aluno/ValidateRegister.vue
+++ b/client/src/views/aluno/ValidateRegister.vue
@@ -161,7 +161,6 @@ export default {
         async submitForm() {
             try {
                 const token = Object.values(this.userAluno.token).join('');
-                console.log(token);
 
                 const response = await registerAluno({
                     email: this.userAluno.email,
diff --git a/client/src/views/empresa/Login.vue b/client/src/views/empresa/Login.vue
index 7af6840..0d4abe7 100644
--- a/client/src/views/empresa/Login.vue
+++ b/client/src/views/empresa/Login.vue
@@ -35,7 +35,7 @@
                         </div>
                     </div>
                     <p><router-link to="/empresa/recovery">Esqueceu a senha?</router-link></p>
-                    <p><router-link to="/eregister">Ainda não possui conta empresarial?</router-link></p>
+                    <p><router-link to="/empresa/register">Ainda não possui conta empresarial?</router-link></p>
                     <div class="button-box">
                         <button type="submit">Entrar</button>
                     </div>
diff --git a/client/src/views/empresa/Recovery.vue b/client/src/views/empresa/Recovery.vue
index 4822972..74a89e6 100644
--- a/client/src/views/empresa/Recovery.vue
+++ b/client/src/views/empresa/Recovery.vue
@@ -77,7 +77,8 @@ export default {
                 });
 
                 if (response.status >= 200 && response.status < 300) {
-                    Cookies.set('email-recovery-empresa', `${this.empresa.email}`, { expires: 10 });
+                    Cookies.set('email-recovery-empresa', `${this.empresa.email}`, { expires: 50 });
+                    Cookies.set('cnpj-recovery-empresa', `${this.empresa.cnpj}`, { expires: 50 });
                     router.push({name: 'ValidateRecoveryEmpresa'});
                 
                     alert("Tudo certo! 😉");
diff --git a/client/src/views/empresa/Register.vue b/client/src/views/empresa/Register.vue
new file mode 100644
index 0000000..239101f
--- /dev/null
+++ b/client/src/views/empresa/Register.vue
@@ -0,0 +1,450 @@
+<template>
+    <Header />
+    <main>
+        <div class="box" id="box1">
+            <img :src="imagem" alt="Img">
+        </div>
+        <div class="box" id="box2">
+            <nav>
+                <ul>
+                    <li>
+                        <router-link to="/empresa/login">Login</router-link>
+                    </li>
+                    <li>
+                        <p>Cadastro</p>
+                    </li>
+                </ul>
+            </nav>
+            <form @submit.prevent="submitForm">
+                <div class="content">
+                    <h1>Registre-se</h1>
+                    <div class="input-box" :class="{ 'focused': focused.nameFocused }">
+                        <label for="name">Nome</label>
+
+                        <input type="text" id="name" v-model="empresa.name" @focus="focused.nameFocused = true"
+                            @blur="focused.nameFocused = false" required>
+                    </div>
+                    
+                    <div class="input-box" :class="{ 'focused': focused.emailFocused }">
+                        <label for="email">E-Mail</label>
+
+                        <input type="email" id="email" v-model="empresa.email"
+                            @focus="focused.emailFocused = true" @blur="focused.emailFocused = false" required>
+                    </div>
+
+                    <div class="input-box" :class="{ 'focused': focused.cnpjFocused }">
+                        <label for="email">CNPJ</label>
+
+                        <input type="text" id="email" v-model="empresa.cnpjExibido" @input="cnpj"
+                            @focus="focused.cnpjFocused = true" @blur="focused.cnpjFocused = false" required>
+                    
+                            <span class="alert" v-show="alerts.alertCNPJ">
+                                Insira um CNPJ válido
+                            </span>
+                    </div>
+
+                    <div class="input-box password" :class="{ 'focused': focused.passwordFocused }">
+                        <div class="d1">
+                            <label for="password">Senha</label>
+                            <input :type="inputType" id="password" v-model="empresa.password" @input="checkPassword"
+                                @focus="focused.passwordFocused = true" @blur="focused.passwordFocused = false"
+                                required>
+                            <span class="alert" v-show="alerts.alertUppercase">
+                                A senha deve conter ao menos uma letra maiúscula(A-Z)
+                            </span>
+                            <span class="alert" v-show="alerts.alertLowercase">
+                                A senha deve conter ao menos uma letra minúscula(a-z)
+                            </span>
+                            <span class="alert" v-show="alerts.alertNumber">
+                                A senha deve conter ao menos um número (0-9)
+                            </span>
+                            <span class="alert" v-show="alerts.alertSpecial">
+                                A senha deve conter ao menos um caractere especial (*, !, @, #, $, %, &, /, -, .)
+                            </span>
+                            <span class="alert" v-show="alerts.alertLenght">
+                                A senha deve conter ao menos 8 caracteres
+                            </span>
+                        </div>
+                        <div class="d2">
+                            <button type="button" @focus="focused.passwordFocused = true" @blur="focused.passwordFocused = false"
+                                @click="togglePasswordVisibility" :class="buttonClass"></button>
+                        </div>
+                    </div>
+
+                    <div class="input-box password" :class="{ 'focused': focused.confirmFocused }">
+                        <div class="d1">
+                            <label for="confirmPassword">Confirmar senha</label>
+                            <input :type="inputTypeConfirm" id="confirmPass" v-model="empresa.confirmPassword"
+                                @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
+                                @input="checkConfirmPassword" required>
+                            <span v-show="alerts.alertPass" class="alert">
+                                As senhas devem ser iguais
+                            </span>
+                        </div>
+                        <div class="d2">
+                            <button type="button" @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
+                                @click="togglePasswordConfirmVisibility" :class="buttonClassConfirm"></button>
+                        </div>
+                    </div>
+                    <div class="button-box">
+                        <button v-show="allRequirementsMet" type="submit">Registrar</button>
+                        <button v-show="!allRequirementsMet" type="button" @click="cnpjValidate">Registrar</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </main>
+    <Footer />
+</template>
+
+<script>
+
+import Header from '../../components/Header.vue';
+import Footer from '../../components/Footer.vue';
+import logo from '../../assets/imageMain.png';
+
+import Cookies from 'js-cookie';
+import router from '../../router/index.js'
+import { registerEmpresa } from '../../services/api/empresa';
+import { EmpresaMixin } from '../../util/mixins';
+
+export default {
+    name: 'Register',
+    components: {
+        Header,
+        Footer
+    },
+    data() {
+        return {
+            empresa: {
+                name: '',
+                email: '',
+                cnpj: '',
+                cnpjExibido: '',
+                password: '',
+                confirmPassword: ''
+            },
+            alerts: {
+                alertUppercase: false,
+                alertLowercase: false,
+                alertNumber: false,
+                alertSpecial: false,
+                alertLenght: false,
+                alertDominio: false,
+                alertPass: false,
+                alertCNPJ: false
+            },
+            focused: {
+                nameFocused: false,
+                emailFocused: false,
+                cnpjFocused: false,
+                passwordFocused: false,
+                confirmFocused: false
+            },
+            showPassword: false,
+            showPasswordConfirm: false,
+            imagem: logo
+        }
+    },
+    computed: {
+        inputType() {
+            return this.showPassword ? 'text' : 'password';
+        },
+        buttonClass() {
+            return this.showPassword ? 'hide' : 'show';
+        },
+        inputTypeConfirm() {
+            return this.showPasswordConfirm ? 'text' : 'password';
+        },
+        buttonClassConfirm() {
+            return this.showPasswordConfirm ? 'hide' : 'show';
+        },
+        allRequirementsMet() {
+            const email = this.empresa.email;
+            const password = this.empresa.password;
+            const passwordConfirm = this.empresa.confirmPassword;
+
+            return (
+                (/[A-Z]/.test(password)) &&
+                (/[a-z]/.test(password)) &&
+                (/[0-9]/.test(password)) &&
+                (/[*!@#$%&\./\\-_]/.test(password)) &&
+                (password.length >= 8) &&
+                (this.empresa.cnpj.length == 14) &&
+                (password == passwordConfirm)
+            );
+        }
+    },
+    methods: {
+        togglePasswordVisibility() {
+            this.showPassword = !this.showPassword;
+        },
+        togglePasswordConfirmVisibility() {
+            this.showPasswordConfirm = !this.showPasswordConfirm;
+        },
+        checkPassword() {
+            const password = this.empresa.password;
+
+            this.alerts.alertUppercase = false;
+            this.alerts.alertLowercase = false;
+            this.alerts.alertNumber = false;
+            this.alerts.alertSpecial = false;
+            this.alerts.alertLenght = false;
+
+            if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
+            else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
+            else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(password.length >= 8)) this.alerts.alertLenght = true;
+
+            this.checkConfirmPassword();
+        },
+        checkConfirmPassword() {
+            const password = this.empresa.password;
+            const passwordConfirm = this.empresa.confirmPassword;
+
+            this.alerts.alertPass = false;
+
+            if (!(password == passwordConfirm)) {
+                this.alerts.alertPass = true;
+            }
+        },
+        cnpjValidate(){
+            this.alerts.alertCNPJ = false;
+
+            if (this.empresa.cnpj.length != 14 && this.empresa.cnpjExibido.length > 0){
+                this.alerts.alertCNPJ = true;
+            }
+        },
+        async submitForm() {
+            try {
+                const response = await registerEmpresa({
+                    name: this.empresa.name,
+                    email: this.empresa.email,
+                    cnpj: this.empresa.cnpj,
+                    password: this.empresa.password
+                });
+
+                if (response.status >= 200 && response.status < 300) {
+                    Cookies.set('cnpj-registro-empresa', `${response.data.cnpj}`, { expires: 10 });
+                    router.push({ name: 'ValidateEmpresa' })
+
+                    alert("Tudo certo! 😉");
+                } else {
+                    alert("Ops.. Algo deu errado. 😕\n" + response.message);
+                }
+            } catch (error) {
+                alert("Ops.. Algo deu errado. 😕\n" + error.message);
+            }
+        }
+    },
+    mixins: [EmpresaMixin]
+}
+</script>
+
+<style lang="scss" scoped>
+main {
+    height: calc(100vh - 80px);
+    background-color: $primary-color-dark;
+    @include flex(row-reverse, center, center);
+}
+
+.alert {
+    font-size: .8rem;
+    color: rgb(158, 20, 20);
+
+    & .input-box input {
+        margin-top: 2px;
+    }
+}
+
+.box {
+    height: 65%;
+    width: 30%;
+    border-radius: 20px;
+    padding: 20px;
+    color: $font-color-dark;
+
+    nav {
+        width: 100%;
+
+        ul {
+            @include flex(row, flex-start, center);
+
+            li {
+                font-size: .9rem;
+                @include font-inter(300);
+                margin-inline: 20px;
+
+                p {
+                    @include flex(column, center, center);
+                    @include font-inter(400);
+                    width: 80px;
+                    @include line;
+
+                    &:after {
+                        width: 100%;
+                        height: 3px;
+                        margin-top: 3px;
+                        background-color: $secondary-color-orange;
+                    }
+
+                    &:hover::after {
+                        animation: none;
+                    }
+                }
+
+                a {
+                    text-decoration: none;
+                    color: $font-color-dark-2;
+                    @include flex(column, center, center);
+                    @include font-inter(400);
+                    width: 60px;
+                    @include line;
+
+                    &:after {
+                        margin-top: 3px;
+                        height: 3px;
+                        background-color: $secondary-color-orange;
+                    }
+                }
+            }
+        }
+    }
+
+    form {
+        padding: 20px;
+
+        h1 {
+            @include font-inter(300);
+            font-size: 2.5rem;
+            margin-top: 10px;
+        }
+
+        .input-box {
+            height: 65px;
+            @include flex(column, center, flex-start);
+            width: 100%;
+            padding: 10px;
+            border-radius: 5px;
+            background-color: $terciary-color-dark;
+            border-left: solid 3px $terciary-color-dark;
+            margin: 15px 0px;
+
+            &.focused {
+                border-left: solid 3px $secondary-color-orange;
+                border-radius: 0px 5px 5px 0px;
+            }
+
+            label {
+                letter-spacing: 1.5px;
+                @include font-inter(200);
+                font-size: .8rem;
+                color: $font-color-dark-2;
+            }
+
+            input {
+                background-color: transparent;
+                width: 100%;
+                margin-top: 5px;
+                outline: none;
+                color: $font-color-dark;
+                border: none;
+                @include font-inter(400);
+                font-size: 1rem;
+            }
+
+            div input:last-child {
+                font-size: 1rem;
+            }
+        }
+
+        .password {
+            @include flex(row, flex-start, center);
+
+            div {
+                @include flex(column, center, flex-start)
+            }
+
+            .d1 {
+                width: 95%;
+            }
+
+            .d2 {
+                width: 5%;
+
+                button {
+                    height: 20px;
+                    width: 20px;
+                    border: none;
+                    background-color: transparent;
+                    background-position: center;
+                    background-size: cover;
+                    background-repeat: no-repeat;
+                    filter: invert(100%);
+                    cursor: pointer;
+                }
+
+                .show {
+                    background-image: url('../../assets/icons/olho-1.png');
+                }
+
+                .hide {
+                    background-image: url('../../assets/icons/olho-2.png');
+                }
+            }
+        }
+    }
+}
+
+p {
+    width: 100%;
+    @include flex(row, flex-end, center);
+
+    a {
+        text-decoration: none;
+        color: $font-color-dark-2;
+        @include font-inter(300);
+        font-size: .8rem;
+    }
+}
+
+.button-box {
+    width: 100%;
+    margin-top: 40px;
+    @include flex(row, flex-start, center);
+
+    button {
+        height: 40px;
+        width: 140px;
+        background-color: $primary-color-orange;
+        border: none;
+        border-radius: 3px;
+        @include font-inter(400);
+        font-size: .9rem;
+        color: $secondary-color-dark;
+        border: solid 1px $primary-color-orange;
+        cursor: pointer;
+        transition: .1s linear;
+
+        &:hover {
+            background-color: $secondary-color-dark;
+            color: $primary-color-orange;
+        }
+    }
+}
+
+
+#box1 {
+    @include flex-center;
+
+    img {
+        height: 80%;
+        transform: rotatey(180deg);
+    }
+}
+
+#box2 {
+    background-color: $secondary-color-dark;
+}
+</style>
\ No newline at end of file
diff --git a/client/src/views/empresa/Validate.vue b/client/src/views/empresa/Validate.vue
index 9e83a06..45ad87e 100644
--- a/client/src/views/empresa/Validate.vue
+++ b/client/src/views/empresa/Validate.vue
@@ -1,82 +1,58 @@
-<!-- <template>
+<template>
     <Header />
     <main>
         <div class="box">
             <nav>
                 <ul>
                     <li>
-                        <router-link to="/funcionario/init">Login</router-link>
+                        <router-link to="/empresa/login">Login</router-link>
                     </li>
                     <li>
-                        <p>Validação</p>
+                        <p>Cadastro</p>
                     </li>
                 </ul>
             </nav>
             <form @submit.prevent="submitForm">
-                <h1>Valide seu cadastro</h1>
-                <p>É necessário informar a senha temporária enviada no email e criar um senha nova para logar na plataforma.</p>
-
-                <div class="input-box email">
-                    <div class="d1">
-                        <p>{{ this.funcionario.email }}</p>
-                    </div>
-                    <div class="d2">
-                        <router-link to="/funcionario/init" class="editMail"></router-link>
-                    </div>
-                </div>
-
-                <div class="input-box" :class="{ 'focused': focused.temporaryPasswordFocused }">
-                    <label>Senha Temporária enviada em seu e-mail</label>
-                    <input id="temporaryPassword" v-model="funcionario.temporaryPassword"
-                        @focus="focused.temporaryPasswordFocused = true"
-                        @blur="focused.temporaryPasswordFocused = false" required>
-                </div>
-                
-                <div class="input-box password" :class="{ 'focused': focused.passwordFocused }">
-                    <div class="d1">
-                        <label for="newPassword">Nova Senha</label>
-                        <input :type="inputType" id="newPassword" v-model="funcionario.newPassword" @input="checkPassword"
-                            @focus="focused.passwordFocused = true" @blur="focused.passwordFocused = false" required>
-                        <span class="alert" v-show="alerts.alertUppercase">
-                            A senha deve conter ao menos uma letra maiúscula(A-Z)
-                        </span>
-                        <span class="alert" v-show="alerts.alertLowercase">
-                            A senha deve conter ao menos uma letra minúscula(a-z)
-                        </span>
-                        <span class="alert" v-show="alerts.alertNumber">
-                            A senha deve conter ao menos um número (0-9)
-                        </span>
-                        <span class="alert" v-show="alerts.alertSpecial">
-                            A senha deve conter ao menos um caractere especial (*, !, @, #, $, %, &, /, -, .)
-                        </span>
-                        <span class="alert" v-show="alerts.alertLenght">
-                            A senha deve conter ao menos 8 caracteres
-                        </span>
+                <div class="content">
+                    <h1>Finalize seu registro</h1>
+                    <p>Para sua segurança te enviamos um código de verificação no email inserido anteriormente, termine seu registro inserindo-o abaixo
+                    </p>
+
+                    <div class="input-box focused">
+                        <div class="d1">
+                            <label for="">CNPJ</label>
+                            <p>{{ empresa.cnpjExibido }}</p>
+                        </div>
+                        <div class="d2">
+                            <router-link to="/empresa/register" class="editMail"></router-link>
+                        </div>
                     </div>
-                    <div class="d2">
-                        <button type="button" @click="togglePasswordVisibility" :class="buttonClass"
-                            @focus="focused.passwordFocused = true" @blur="focused.passwordFocused = false"></button>
-                    </div>
-                </div>
-
-                <div class="input-box password" :class="{ 'focused': focused.confirmFocused }">
-                    <div class="d1">
-                        <label for="confirmPassword">Confirmar Senha</label>
-                        <input :type="inputTypeConfirm" id="confirmPassword" v-model="funcionario.confirmPassword"
-                            @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
-                            @input="checkConfirmPassword" required>
-                        <span class="alert" v-show="alerts.alertPass"> As senhas devem ser iguais</span>
+                    <div class="token">
+                        <label>Token de acesso</label>
+                        <div class="box-token">
+                            <div class="box-token">
+                                <input ref="token1" type="text" pattern="[0-9]" v-model="empresa.token.token1"
+                                    maxlength="1" @keydown="handleKeyDown($event, 1)" @paste="handlePaste($event, 1)">
+                                <input ref="token2" type="text" pattern="[0-9]" v-model="empresa.token.token2"
+                                    maxlength="1" @keydown="handleKeyDown($event, 2)" @paste="handlePaste($event, 2)">
+                                <input ref="token3" type="text" pattern="[0-9]" v-model="empresa.token.token3"
+                                    maxlength="1" @keydown="handleKeyDown($event, 3)" @paste="handlePaste($event, 3)">
+                                <input ref="token4" type="text" pattern="[0-9]" v-model="empresa.token.token4"
+                                    maxlength="1" @keydown="handleKeyDown($event, 4)" @paste="handlePaste($event, 4)">
+                                <input ref="token5" type="text" pattern="[0-9]" v-model="empresa.token.token5"
+                                    maxlength="1" @keydown="handleKeyDown($event, 5)" @paste="handlePaste($event, 5)">
+                                <input ref="token6" type="text" pattern="[0-9]" v-model="empresa.token.token6"
+                                    maxlength="1" @keydown="handleKeyDown($event, 6)" @paste="handlePaste($event, 6)">
+                            </div>
+                        </div>
                     </div>
-                    <div class="d2">
-                        <button type="button" @click="togglePasswordConfirmVisibility"
-                            @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
-                            :class="buttonClassConfirm"></button>
+                    <section class="voltar">
+                        <router-link to="/empresa/register">Esse não é seu CNPJ?</router-link>
+                    </section>
+                    <div class="button-box">
+                        <button type="submit">Finalizar</button>
                     </div>
                 </div>
-                <div class="button-box">
-                    <button v-show="allRequirements" type="submit">Validar</button>
-                    <button v-show="!allRequirements" type="button">Validar</button>
-                </div>
             </form>
         </div>
     </main>
@@ -89,131 +65,125 @@ import Footer from '../../components/Footer.vue';
 
 import Cookies from 'js-cookie';
 import router from '../../router/index.js'
-import { validateFuncionario } from '../../services/api/funcionario';
+import { validateEmpresa } from '../../services/api/empresa';
 
 export default {
-    name: 'ValidateFuncionario',
+    name: 'ValidateRegisterEmpresa',
     components: {
         Header,
         Footer
     },
     data() {
         return {
-            funcionario: {
-                email: '',
-                temporaryPassword: '',
-                newPassword: ''
-            },
-            alerts: {
-                alertUppercase: false,
-                alertLowercase: false,
-                alertNumber: false,
-                alertSpecial: false,
-                alertLenght: false,
-                alertDominio: false,
-                alertPass: false
-            },
-            focused: {
-                passwordFocused: false,
-                confirmFocused: false,
-                temporaryPasswordFocused: false
-            },
-            showPassword: false,
-            showPasswordConfirm: false,
+            empresa: {
+                cnpj: '',
+                cnpjExibido: '',
+                token: {
+                    token1: '',
+                    token2: '',
+                    token3: '',
+                    token4: '',
+                    token5: '',
+                    token5: '',
+                    token6: ''
+                }
+            }
         }
     },
-    computed: {
-        allRequirements() {
-            return (
-                !this.alerts.alertUppercase &&
-                !this.alerts.alertLowercase &&
-                !this.alerts.alertNumber &&
-                !this.alerts.alertSpecial &&
-                !this.alerts.alertLenght &&
-                !this.alerts.alertPass
-            );
-        },
-        inputType() {
-            return this.showPassword ? 'text' : 'password';
-        },
-        buttonClass() {
-            return this.showPassword ? 'hide' : 'show';
-        },
-        inputTypeConfirm() {
-            return this.showPasswordConfirm ? 'text' : 'password';
-        },
-        buttonClassConfirm() {
-            return this.showPasswordConfirm ? 'hide' : 'show';
-        },
-    },
     methods: {
-        togglePasswordVisibility() {
-            this.showPassword = !this.showPassword;
-        },
-        togglePasswordConfirmVisibility() {
-            this.showPasswordConfirm = !this.showPasswordConfirm;
-        },
-        checkPassword() {
-            const password = this.funcionario.newPassword;
-
-            this.alerts.alertUppercase = false;
-            this.alerts.alertLowercase = false;
-            this.alerts.alertNumber = false;
-            this.alerts.alertSpecial = false;
-            this.alerts.alertLenght = false;
-
-            if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
-            else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
-            else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
-            else if (!(password.length >= 8)) this.alerts.alertLenght = true;
-
-            this.checkConfirmPassword();
+        handleKeyDown(event, index) {
+            const maxLength = 1;
+            const input = event.target;
+
+            if (event.key >= '0' && event.key <= '9') {
+                if (input.value.length === 0) {
+                    input.value = event.key;
+                    this.empresa.token[`token${index}`] = event.key;
+                } else if (index < 6) {
+                    const nextInput = this.$refs[`token${index + 1}`];
+                    event.preventDefault();
+                    nextInput.focus();
+                    nextInput.setSelectionRange(0, 0);
+                    nextInput.value = event.key;
+                    this.empresa.token[`token${index + 1}`] = event.key;
+                }
+            } else if (event.key === 'Backspace') {
+                if (input.value.length === 0) {
+                    const previousInput = this.$refs[`token${index - 1}`];
+                    if (previousInput) {
+                        previousInput.focus();
+                    }
+                } else {
+                    input.value = '';
+                    this.empresa.token[`token${index}`] = '';
+                }
+            } else if (event.key === 'ArrowLeft') {
+                const previousInput = this.$refs[`token${index - 1}`];
+                if (previousInput) {
+                    event.preventDefault();
+                    previousInput.focus();
+                    previousInput.setSelectionRange(maxLength, maxLength);
+                }
+            } else if (event.key === 'ArrowRight') {
+                const nextInput = this.$refs[`token${index + 1}`];
+                if (nextInput) {
+                    event.preventDefault();
+                    nextInput.focus();
+                    nextInput.setSelectionRange(0, 0);
+                }
+            }
         },
-        checkConfirmPassword() {
-            const password = this.funcionario.newPassword;
-            const passwordConfirm = this.funcionario.confirmPassword;
+        handlePaste(event, index) {
+            event.preventDefault();
 
-            this.alerts.alertPass = false;
+            const pastedText = event.clipboardData.getData('text/plain').trim();
+
+            if (pastedText.length > 6) {
+                return;
+            }
 
-            if (!(password == passwordConfirm)) {
-                this.alerts.alertPass = true;
+            if (!/^\d+$/.test(pastedText)) {
+                return;
             }
+
+            const characters = pastedText.split('');
+
+            characters.forEach((char, i) => {
+                const nextIndex = index + i;
+                if (nextIndex <= 6) {
+                    const input = this.$refs[`token${nextIndex}`];
+                    input.focus();
+                    input.setSelectionRange(0, 0);
+                    input.value = char;
+                    this.empresa.token[`token${nextIndex}`] = char;
+                }
+            });
         },
         async submitForm() {
             try {
-                const response = await validateFuncionario({
-                    email: this.funcionario.email,
-                    temporaryPassword: this.funcionario.temporaryPassword,
-                    newPassword: this.funcionario.newPassword
+                const token = Object.values(this.empresa.token).join('');
+
+                const response = await validateEmpresa({
+                    cnpj: this.empresa.cnpj,
+                    token: token
                 });
 
                 if (200 <= response.status && response.status < 300) {
-                    Cookies.remove('email-funcionario');
-                    
-                    router.push({ path: '/funcionario/login' });
-                    
+                    Cookies.remove('cnpj-registro-empresa');
+                    router.push({ name: 'LoginEmpresa' });
+
                     alert("Tudo certo! 😉");
-                } else{
+                } else {
                     alert("Ops.. Algo deu errado. 😕\n" + response.message);
                 }
-            } catch(error){
+            } catch (error) {
                 alert("Ops.. Algo deu errado. 😕\n" + error.message);
             }
-
-        },
-
-        async getEmail(){
-            if(Cookies.get('email-init-funcionario')){
-                this.funcionario.email = Cookies.get('email-init-funcionario');
-            }
-            else{
-                router.push({path: "/funcionario/init"});
-            }
         }
     },
-    async created(){
-        await this.getEmail();
+    created() {
+        this.empresa.cnpj = Cookies.get('cnpj-registro-empresa');
+        this.empresa.cnpjExibido = this.empresa.cnpj.replace(/^(\d{2})(\d{3})(\d{3})(\d{4})(\d{2})$/, '$1.$2.$3/$4-$5');
     }
 }
 </script>
@@ -226,12 +196,12 @@ main {
 }
 
 .box {
-    background-color: $secondary-color-dark;
     height: 65%;
     width: 30%;
     border-radius: 20px;
     padding: 20px;
     color: $font-color-dark;
+    background-color: $secondary-color-dark;
 
     nav {
         width: 100%;
@@ -285,47 +255,31 @@ main {
 
         h1 {
             @include font-inter(300);
-            font-size: 2rem;
+            font-size: 2.5rem;
             margin-top: 10px;
         }
 
-        >p {
-            width: 100%;
+        p {
+            @include font-inter(200);
             font-size: .8rem;
-            @include flex(row, flex-start, center);
+            margin-top: 10px;
             color: $font-color-dark-2;
-            @include font-inter(200);
-            margin-bottom: 20px;
         }
 
         .input-box {
             height: 65px;
-            @include flex(column, flex-start, center);
+            @include flex(column, center, flex-start);
             width: 100%;
             padding: 10px;
             border-radius: 5px;
             background-color: $terciary-color-dark;
-            margin: 20px 0px;
+            border-left: solid 3px $terciary-color-dark;
+            margin: 25px 0px;
+            border-left: solid 3px $secondary-color-orange;
             border-radius: 0px 5px 5px 0px;
 
-            input {
-                background-color: transparent;
-                width: 100%;
-                margin-top: 5px;
-                outline: none;
-                color: $font-color-dark;
-                border: none;
-                @include font-inter(400);
-                font-size: 1rem;
-            }
-
-            &.focused {
-                border-left: solid 3px $secondary-color-orange;
-            }
-
             label {
                 letter-spacing: 1.5px;
-                width: 100%;
                 @include font-inter(200);
                 font-size: .8rem;
                 color: $font-color-dark-2;
@@ -353,77 +307,12 @@ main {
                 background-repeat: no-repeat;
                 filter: invert(100%);
                 cursor: pointer;
-                display: inline-block;
-            }
-
-            .d1 {
-                width: 95%;
-
-                .alert {
-                    font-size: .8rem;
-                    color: rgb(158, 20, 20);
-
-                    & .input-box input {
-                        margin-top: 2px;
-                    }
-                }
-            }
-
-            .d2 {
-                width: 5%;
-
-                button {
-                    height: 20px;
-                    width: 20px;
-                    border: none;
-                    background-color: transparent;
-                    background-position: center;
-                    background-size: cover;
-                    background-repeat: no-repeat;
-                    filter: invert(100%);
-                    cursor: pointer;
-                }
-            }
-
-            .alerts {
-                @include flex(column, center, flex-start);
-                font-size: .8rem;
-                color: rgb(158, 20, 20);
-            }
-        }
-
-        .email {
-            background-color: transparent;
-            @include flex(row, flex-start, center);
-            height: 40px;
-
-            div {
-                @include flex(column, center, flex-start)
-            }
-
-            .d1 {
-                width: 95%;
             }
 
-            .d2 {
-                width: 5%;
-
-                button {
-                    height: 20px;
-                    width: 20px;
-                    border: none;
-                    background-color: transparent;
-                    background-position: center;
-                    background-size: cover;
-                    background-repeat: no-repeat;
-                    filter: invert(100%);
-                    cursor: pointer;
-                }
+            div input:last-child {
+                font-size: 1rem;
             }
 
-        }
-
-        .password{
             @include flex(row, flex-start, center);
 
             div {
@@ -448,14 +337,6 @@ main {
                     filter: invert(100%);
                     cursor: pointer;
                 }
-
-                .show {
-                    background-image: url('../../assets/icons/olho-1.png');
-                }
-
-                .hide {
-                    background-image: url('../../assets/icons/olho-2.png');
-                }
             }
         }
 
@@ -466,7 +347,7 @@ main {
             label {
                 padding-inline: 10px;
                 letter-spacing: 1.5px;
-                margin-top: 10px;
+                margin-top: 10px; 
                 @include font-inter(200);
                 font-size: .8rem;
                 color: $font-color-dark-2;
@@ -480,8 +361,8 @@ main {
                     border: none;
                     outline: none;
                     border-radius: 7px;
-                    height: 65px;
-                    width: 12%;
+                    height: 95px;
+                    width: 15%;
                     font-size: 1.8rem;
                     text-align: center;
                     @include flex-center;
@@ -493,12 +374,22 @@ main {
                     &:focus {
                         border: solid 2px $primary-color-orange;
                     }
-
-                    text-transform: uppercase
                 }
             }
         }
 
+        .voltar {
+            width: 100%;
+            @include flex(row, flex-end, center);
+
+            a {
+                text-decoration: none;
+                color: $font-color-dark-2;
+                @include font-inter(300);
+                font-size: .8rem;
+            }
+        }
+
         .button-box {
             width: 100%;
             margin-top: 10px;
@@ -524,4 +415,4 @@ main {
         }
     }
 }
-</style> -->
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/client/src/views/empresa/ValidateRecovery.vue b/client/src/views/empresa/ValidateRecovery.vue
index 32af88c..dd20dd9 100644
--- a/client/src/views/empresa/ValidateRecovery.vue
+++ b/client/src/views/empresa/ValidateRecovery.vue
@@ -1,11 +1,11 @@
-<!-- <template>
+<template>
     <Header />
     <main>
         <div class="box">
             <nav>
                 <ul>
                     <li>
-                        <router-link to="/funcionario/init">Login</router-link>
+                        <router-link to="/empresa/init">Login</router-link>
                     </li>
                     <li>
                         <p>Recuperação de senha</p>
@@ -18,16 +18,16 @@
 
                 <div class="input-box email">
                     <div class="d1">
-                        <p>{{ this.infoFuncionario.email }}</p>
+                        <p>{{ this.infoEmpresa.email }}</p>
                     </div>
                     <div class="d2">
-                        <router-link to="/funcionario/init" class="editMail"></router-link>
+                        <router-link to="/empresa/init" class="editMail"></router-link>
                     </div>
                 </div>
 
                 <div class="input-box" :class="{ 'focused': focused.temporaryPasswordFocused }">
                     <label>Senha Temporária enviada em seu e-mail</label>
-                    <input id="temporaryPassword" v-model="infoFuncionario.recoveryPass"
+                    <input id="temporaryPassword" v-model="infoEmpresa.recoveryPass"
                         @focus="focused.temporaryPasswordFocused = true"
                         @blur="focused.temporaryPasswordFocused = false" required>
                 </div>
@@ -35,7 +35,7 @@
                 <div class="input-box password" :class="{ 'focused': focused.passwordFocused }">
                     <div class="d1">
                         <label for="newPassword">Nova Senha</label>
-                        <input :type="inputType" id="newPassword" v-model="infoFuncionario.newPass" @input="checkPassword"
+                        <input :type="inputType" id="newPassword" v-model="infoEmpresa.newPass" @input="checkPassword"
                             @focus="focused.passwordFocused = true" @blur="focused.passwordFocused = false" required>
                         <span class="alert" v-show="alerts.alertUppercase">
                             A senha deve conter ao menos uma letra maiúscula(A-Z)
@@ -62,7 +62,7 @@
                 <div class="input-box password" :class="{ 'focused': focused.confirmFocused }">
                     <div class="d1">
                         <label for="confirmPassword">Confirmar Senha</label>
-                        <input :type="inputTypeConfirm" id="confirmPassword" v-model="infoFuncionario.confirmNewPass"
+                        <input :type="inputTypeConfirm" id="confirmPassword" v-model="infoEmpresa.confirmNewPass"
                             @focus="focused.confirmFocused = true" @blur="focused.confirmFocused = false"
                             @input="checkConfirmPassword" required>
                         <span class="alert" v-show="alerts.alertPass"> As senhas devem ser iguais</span>
@@ -89,17 +89,17 @@ import Footer from '../../components/Footer.vue';
 
 import Cookies from 'js-cookie';
 import router from '../../router/index.js'
-import { validateRecovery } from '../../services/api/funcionario';
+import { validateRecoveryEmpresa } from '../../services/api/empresa';
 
 export default {
-    name: 'ValidateRecoveryFuncionario',
+    name: 'ValidateRecoveryEmpresa',
     components: {
         Header,
         Footer
     },
     data() {
         return {
-            infoFuncionario: {
+            infoEmpresa: {
                 email: '',
                 recoveryPass: '',
                 newPass: '',
@@ -155,7 +155,7 @@ export default {
             this.showPasswordConfirm = !this.showPasswordConfirm;
         },
         checkPassword() {
-            const password = this.infoFuncionario.newPass;
+            const password = this.infoEmpresa.newPass;
 
             this.alerts.alertUppercase = false;
             this.alerts.alertLowercase = false;
@@ -166,14 +166,14 @@ export default {
             if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
             else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
             else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
             else if (!(password.length >= 8)) this.alerts.alertLenght = true;
 
             this.checkConfirmPassword();
         },
         checkConfirmPassword() {
-            const password = this.infoFuncionario.newPass;
-            const passwordConfirm = this.infoFuncionario.confirmNewPass;
+            const password = this.infoEmpresa.newPass;
+            const passwordConfirm = this.infoEmpresa.confirmNewPass;
 
             this.alerts.alertPass = false;
 
@@ -183,14 +183,14 @@ export default {
         },
         async submitForm() {
             try {
-                const response = await validateRecovery({
-                    email: this.infoFuncionario.email,
-                    recoveryPass: this.infoFuncionario.recoveryPass,
-                    newPass: this.infoFuncionario.newPass
+                const response = await validateRecoveryEmpresa({
+                    cnpj: this.infoEmpresa.cnpj,
+                    tempPass: this.infoEmpresa.recoveryPass,
+                    newPass: this.infoEmpresa.newPass
                 });
 
                 if (200 <= response.status && response.status < 300) {
-                    router.push({ name: 'LoginFuncionario' });
+                    router.push({ name: 'LoginEmpresa' });
 
                     alert("Tudo certo! 😉");
                 } else{
@@ -202,7 +202,8 @@ export default {
         }
     },
     created(){
-        this.infoFuncionario.email = Cookies.get('email-recovery-funcionario');
+        this.infoEmpresa.email = Cookies.get('email-recovery-empresa');
+        this.infoEmpresa.cnpj = Cookies.get('cnpj-recovery-empresa');
     }
 }
 </script>
@@ -518,4 +519,4 @@ main {
         }
     }
 }
-</style> -->
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/client/src/views/funcionario/Validate.vue b/client/src/views/funcionario/Validate.vue
index fb04c5d..3014b69 100644
--- a/client/src/views/funcionario/Validate.vue
+++ b/client/src/views/funcionario/Validate.vue
@@ -165,7 +165,7 @@ export default {
             if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
             else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
             else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
             else if (!(password.length >= 8)) this.alerts.alertLenght = true;
 
             this.checkConfirmPassword();
diff --git a/client/src/views/professor/Validate.vue b/client/src/views/professor/Validate.vue
index ef296ef..0414aa5 100644
--- a/client/src/views/professor/Validate.vue
+++ b/client/src/views/professor/Validate.vue
@@ -162,7 +162,7 @@ export default {
             if (!(/[A-Z]/.test(password))) this.alerts.alertUppercase = true;
             else if (!(/[a-z]/.test(password))) this.alerts.alertLowercase = true;
             else if (!(/[0-9]/.test(password))) this.alerts.alertNumber = true;
-            else if (!(/[*!@#$%&\./\\-]/.test(password))) this.alerts.alertSpecial = true;
+            else if (!(/[*!@#$%&\./\\-_]/.test(password))) this.alerts.alertSpecial = true;
             else if (!(password.length >= 8)) this.alerts.alertLenght = true;
 
             this.checkConfirmPassword();
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 6c4ac0d..5a7071f 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -138,7 +138,7 @@ model Professor {
     professorImagem     String?
     validated           Boolean       @default(false)
     coordenador         Coordenador[]
-    atide               Atividade[]
+    ativide               Atividade[]
     tentativasRestantes Int           @default(5)
     createdAt           DateTime      @default(now())
     updatedAt           DateTime      @updatedAt
diff --git a/server/src/modules/controllers/empresaControllers.ts b/server/src/modules/controllers/empresaControllers.ts
index 138dd70..b5b3ca0 100644
--- a/server/src/modules/controllers/empresaControllers.ts
+++ b/server/src/modules/controllers/empresaControllers.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from "express";
-import { RegisterEmpresaUseCase } from '../services/empresa/RegisterEmpresaUseCase';
+import { RegisterEmpresaUseCase } from '../services/empresa/RegisterEmpresaUsecase';
 import { LoginEmpresaUseCase } from '../services/empresa/LoginEmpresaUseCase'
 import { ValidateEmpresaUseCase } from '../services/empresa/ValidateEmpresaUseCase'
 import { RecoveryEmpresaUseCase } from '../services/empresa/RecoveryEmpresaUseCase'
@@ -55,11 +55,11 @@ export class RecoveryEmpresaController {
 
 export class ValidateRecoveryEmpresaController {
     async handle(req: Request, res: Response) {
-        const { cnpj, token, newPass } = req.body;
+        const { cnpj, tempPass, newPass } = req.body;
 
         const validateRecoveryEmpresaController = new ValidateRecoveryEmpresaUseCase();
 
-        const result = await validateRecoveryEmpresaController.execute({ cnpj, token, newPass });
+        const result = await validateRecoveryEmpresaController.execute({ cnpj, tempPass, newPass });
 
         return res.status(201).json(result);
     }
diff --git a/server/src/modules/interfaces/empresaDTOs.ts b/server/src/modules/interfaces/empresaDTOs.ts
index ec03baa..d20f9f0 100644
--- a/server/src/modules/interfaces/empresaDTOs.ts
+++ b/server/src/modules/interfaces/empresaDTOs.ts
@@ -20,7 +20,7 @@ export interface RecoveryEmpresaDTO {
 
 export interface ValidateRecoveryEmpresaDTO {
     cnpj: string,
-    token: string,
+    tempPass: string,
     newPass: string
 }
 
diff --git a/server/src/modules/services/empresa/RecoveryEmpresaUseCase.ts b/server/src/modules/services/empresa/RecoveryEmpresaUseCase.ts
index 1e274ad..fed38f8 100644
--- a/server/src/modules/services/empresa/RecoveryEmpresaUseCase.ts
+++ b/server/src/modules/services/empresa/RecoveryEmpresaUseCase.ts
@@ -27,7 +27,7 @@ export class RecoveryEmpresaUseCase {
 
         else {
             const salt = bcrypt.genSaltSync(10);
-            const token = Array.from({ length: 6 }, () => Math.floor(Math.random() * 10)).join('');
+            const token: string = Array(8).fill(0).map(() => Math.random().toString(36).charAt(2)).join('').toUpperCase();
             const hash = bcrypt.hashSync(token, salt);
 
             await prisma.empresa.update({
diff --git a/server/src/modules/services/empresa/ValidateRecoveryEmpresa.ts b/server/src/modules/services/empresa/ValidateRecoveryEmpresa.ts
index 8aa928e..f59bdba 100644
--- a/server/src/modules/services/empresa/ValidateRecoveryEmpresa.ts
+++ b/server/src/modules/services/empresa/ValidateRecoveryEmpresa.ts
@@ -7,9 +7,9 @@ import { generateAccessTokenEmpresa } from "../../../jwt/jwtServices";
 const bcrypt = require('bcrypt');
 
 export class ValidateRecoveryEmpresaUseCase {
-    async execute({ cnpj, token, newPass }: ValidateRecoveryEmpresaDTO): Promise<{ token: string, empresa: Pick<Empresa, 'cnpj' | 'email'> }> {
+    async execute({ cnpj, tempPass, newPass }: ValidateRecoveryEmpresaDTO): Promise<{ token: string, empresa: Pick<Empresa, 'cnpj' | 'email'> }> {
         
-        if( !cnpj || !token || !newPass ){
+        if( !cnpj || !tempPass || !newPass ){
             throw new AppError("Parâmetros insuficientes ou inválidos.");
         }
         
@@ -22,7 +22,7 @@ export class ValidateRecoveryEmpresaUseCase {
         if (!empresa) {
             throw new AppError("CNPJ ou senha de recuperação inválidos.");
         } else {
-            const isTokenValid = bcrypt.compareSync(token, empresa.token);
+            const isTokenValid = bcrypt.compareSync(tempPass, empresa.token);
 
             if (!isTokenValid) {
                 throw new AppError("Token de recuperação inválido.");
diff --git a/server/src/modules/services/empresa/registerEmpresaUseCase.ts b/server/src/modules/services/empresa/registerEmpresaUseCase.ts
index fcdfd0c..6e3b828 100644
--- a/server/src/modules/services/empresa/registerEmpresaUseCase.ts
+++ b/server/src/modules/services/empresa/registerEmpresaUseCase.ts
@@ -43,14 +43,14 @@ export class RegisterEmpresaUseCase {
 
                 const nome = name.split(' ').shift()?.toString() ?? 'empresa';
 
-                const token = Array.from({ length: 6 }, () => Math.floor(Math.random() * 10)).join('');
-                const tokenHash = bcrypt.hashSync(token, salt);
+                const tokenGen = Array.from({ length: 6 }, () => Math.floor(Math.random() * 10)).join('');
+                const tokenHash = bcrypt.hashSync(tokenGen, salt);
 
                 const mailOptions = {
                     from: process.env.EMAIL,
                     to: email,
                     subject: 'Boot - Código de verificação',
-                    html: generateRegisterEmpresaEmail(nome, cnpjFormated, token)
+                    html: generateRegisterEmpresaEmail(nome, cnpjFormated, tokenGen)
                 };
 
                 var emailEnviado = false;
@@ -64,8 +64,6 @@ export class RegisterEmpresaUseCase {
                     }
                 });
 
-                console.log(name, email, cnpj, hash, tokenHash);
-
                 const empresaRegister = await prisma.empresa.create({
                     data: {
                         name,
diff --git a/server/src/router/routes/empresa.routes.ts b/server/src/router/routes/empresa.routes.ts
index 5aacf44..dfbb6df 100644
--- a/server/src/router/routes/empresa.routes.ts
+++ b/server/src/router/routes/empresa.routes.ts
@@ -6,22 +6,19 @@ import {
     LoginEmpresaController,
     RecoveryEmpresaController,
     ValidateRecoveryEmpresaController
-    // InitEmpresaController
 } from "../../modules/controllers/empresaControllers";
 
 
-
 const registerEmpresaController = new RegisterEmpresaController();
 const validateEmpresaController = new ValidateEmpresaController();
 const loginEmpresaController = new LoginEmpresaController();
 const recoveryEmpresaController = new RecoveryEmpresaController();
 const validateRecoveryEmpresaController= new ValidateRecoveryEmpresaController();
-// const initEmpresaController = new InitEmpresaController();
 
 const empresaRoutes = Router();
 
 empresaRoutes.post("/register", registerEmpresaController.handle);
-empresaRoutes.post("/validate", validateEmpresaController.handle);
+empresaRoutes.post("/register/validate", validateEmpresaController.handle);
 empresaRoutes.post("/login", loginEmpresaController.handle);
 empresaRoutes.post("/recovery", recoveryEmpresaController.handle);
 empresaRoutes.post("/recovery/validate", validateRecoveryEmpresaController.handle);
@@ -30,6 +27,4 @@ empresaRoutes.get("/auth", empresaAuthMiddleware, (req, res) => {
     res.status(200).send("Empresa autenticada com sucesso.");
 });
 
-// empresaRoutes.get("/init", initEmpresaController.handle);
-
 export { empresaRoutes };
\ No newline at end of file