diff --git a/mock/db.json b/mock/db.json deleted file mode 100644 index 6b1251a..0000000 --- a/mock/db.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cadastro-van": [ - { - "id": 1, - "placa": "DBE2356", - "marca": "Fiat", - "modelo": "Ducatto", - "numPassageiros": 14, - "alugado": false - } - ] -} \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8ba23dd..1bcdc31 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,6 +1,6 @@ export default { url: { prod: 'https://projeto-integrado-f.herokuapp.com', - local: 'http://localhost:3000' + local: 'http://localhost:3333' }, } \ No newline at end of file diff --git a/src/pages/Cadastro/Cadastro.tsx b/src/pages/Cadastro/Cadastro.tsx index 35913d6..5c91087 100644 --- a/src/pages/Cadastro/Cadastro.tsx +++ b/src/pages/Cadastro/Cadastro.tsx @@ -8,7 +8,7 @@ import ModalExample from '../../components/Email'; import * as UsersService from '../../services/api/users' import LocalStorage from '../../LocalStorage'; import { UserContext } from '../../App'; -import { Color } from '@ionic/react/node_modules/@ionic/core'; +import { Color } from '@ionic/core'; const Cadastro: React.FC = () => { const history = useHistory(); diff --git a/src/pages/CadastroCompletar/CadastroCompletar.tsx b/src/pages/CadastroCompletar/CadastroCompletar.tsx index de2c677..9489c79 100644 --- a/src/pages/CadastroCompletar/CadastroCompletar.tsx +++ b/src/pages/CadastroCompletar/CadastroCompletar.tsx @@ -20,7 +20,7 @@ import { useHistory, useLocation } from "react-router"; import { callOutline, documentTextOutline } from "ionicons/icons"; import '../Cadastro/Cadastro.css' -import { Color } from "@ionic/react/node_modules/@ionic/core"; +import { Color } from "@ionic/core"; interface cardItem { icon: string; diff --git a/src/pages/CadastroCompletar/CompletarTelefone.tsx b/src/pages/CadastroCompletar/CompletarTelefone.tsx index f739146..31e4b29 100644 --- a/src/pages/CadastroCompletar/CompletarTelefone.tsx +++ b/src/pages/CadastroCompletar/CompletarTelefone.tsx @@ -24,7 +24,7 @@ import { import { saveOutline } from "ionicons/icons"; import * as usersRoutes from '../../services/api/users'; -import { Color } from "@ionic/react/node_modules/@ionic/core"; +import { Color } from "@ionic/core"; interface documentTypesInterface { label: string; diff --git a/src/pages/CadastroVan.tsx b/src/pages/CadastroVan.tsx index 7091ce7..b03c5c2 100644 --- a/src/pages/CadastroVan.tsx +++ b/src/pages/CadastroVan.tsx @@ -28,7 +28,7 @@ import carsService from '../services/functions/carsService' import * as vansRoutes from '../services/api/vans'; import "./CadastroVan.css"; -import { Color } from "@ionic/react/node_modules/@ionic/core"; +import { Color } from "@ionic/core"; const CadastroVan: React.FC = () => { const history = useHistory(); diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 1306fd4..465ab13 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,5 +1,5 @@ import { IonContent, IonPage, IonToast } from '@ionic/react'; -import { Color } from '@ionic/react/node_modules/@ionic/core'; +import { Color } from '@ionic/core'; import { useContext, useEffect, useState } from 'react'; import { useLocation } from 'react-router'; diff --git a/src/pages/MinhasVans.tsx b/src/pages/MinhasVans.tsx index 904478c..d9129c5 100644 --- a/src/pages/MinhasVans.tsx +++ b/src/pages/MinhasVans.tsx @@ -1,5 +1,5 @@ import { IonBackButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonTitle, IonToast, IonToolbar } from '@ionic/react'; -import { Color } from '@ionic/react/node_modules/@ionic/core'; +import { Color } from '@ionic/core'; import { carOutline } from 'ionicons/icons'; import { useContext, useEffect, useState } from 'react'; import { useHistory, useLocation } from 'react-router'; diff --git a/src/pages/Perfil.tsx b/src/pages/Perfil.tsx index 3661c11..dd71854 100644 --- a/src/pages/Perfil.tsx +++ b/src/pages/Perfil.tsx @@ -29,7 +29,7 @@ import LocalStorage from "../LocalStorage"; import sessionsService from '../services/functions/sessionsService' import usersService from '../services/functions/usersService' import { UserContext } from "../App"; -import { Color } from "@ionic/react/node_modules/@ionic/core"; +import { Color } from "@ionic/core"; interface ScanNewProps { match: { diff --git a/src/pages/PerfilEditar.tsx b/src/pages/PerfilEditar.tsx index d3fa677..a6f5063 100644 --- a/src/pages/PerfilEditar.tsx +++ b/src/pages/PerfilEditar.tsx @@ -28,7 +28,7 @@ import isEqual from 'lodash.isequal'; import * as usersRoutes from '../services/api/users'; import './Cadastro/Cadastro.css' -import { Color } from "@ionic/react/node_modules/@ionic/core"; +import { Color } from "@ionic/core"; interface userData { name: string; diff --git a/yarn.lock b/yarn.lock index a2d40ad..0c89af5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,6 +31,11 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d" integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ== +"@babel/compat-data@^7.18.8": + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d" + integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ== + "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59" @@ -1692,10 +1697,10 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== dependencies: "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10"