From f848e204926eebf46a31318df4f23b177c1b7bd9 Mon Sep 17 00:00:00 2001
From: Matheus Albino Brunhara <matheusalb3213@gmail.com>
Date: Mon, 2 May 2022 19:49:47 -0500
Subject: [PATCH] =?UTF-8?q?Mais=20altera=C3=A7=C3=B5es=20de=20merge=20e=20?=
 =?UTF-8?q?padroniza=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/api.config.ts | 14 +-------------
 src/pages/Login.tsx      |  5 +++--
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/config/api.config.ts b/src/config/api.config.ts
index f25dba8..172c67e 100644
--- a/src/config/api.config.ts
+++ b/src/config/api.config.ts
@@ -1,24 +1,12 @@
-<<<<<<< HEAD
-import environment from "../constants/environment";
+import environment from "../environments/environment";
 
 const getBaseUrl = (): string => {
   // const { hostname } = window.location;
-  
-=======
-import environment from "../environments/environment";
-
-function getBaseUrl() {
-  const { hostname } = window.location;
->>>>>>> 561e8597e0534b18b8dfbf5b454030b6d9a0cdbc
   const { url } = environment;
 
   let apiUrl = null;
   
-<<<<<<< HEAD
-  // if (hostname === 'projeto-integrado-f-web.herokuapp.com') {
-=======
   // if (hostname === '') {
->>>>>>> 561e8597e0534b18b8dfbf5b454030b6d9a0cdbc
   //   apiUrl = url.prod;
   // } else {
     apiUrl = url.local;
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 12f1d86..cd14fb7 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -20,6 +20,7 @@ import {
 
 import * as sessionRoutes from '../services/session';
 import LocalStorage from '../LocalStorage';
+import { Action } from "../components/Action";
 
 const Page: React.FC = () => {
   const [showToast, setShowToast] = useState(false);
@@ -165,14 +166,14 @@ const Page: React.FC = () => {
           <IonRow>
             <IonCol>
               <p style={{ fontSize: "small" }}>
-                Clicando no botão de "LOGIN", você concorda com a nossa{" "}
+                Clicando no botão de "Login", você concorda com a nossa{" "}
                 <a href="#">política de termos e serviços</a>
               </p>
               <IonButton expand="block" onClick={handleLogin}>
                 Login
               </IonButton>
               <p style={{ fontSize: "medium" }}>
-                Ainda não possui uma conta? <a href="#">Cadastre-se aqui!</a>
+                <Action message="Ainda não possui uma conta?" text="Cadastre-se aqui!" link="/cadastro" />
               </p>
             </IonCol>
           </IonRow>