diff --git a/.gitignore b/.gitignore index 20c4212dd..79d9b37ce 100644 --- a/.gitignore +++ b/.gitignore @@ -81,4 +81,5 @@ src/plugin/src/ _node_modules/ migrat/ -cypress/videos \ No newline at end of file +cypress/videos +*.rar \ No newline at end of file diff --git a/package.json b/package.json index 5e6cf4d7f..ad6c161be 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "ionic-build": "ionic cap run android --prod", "prepare": "husky install", "cypress:open": "cypress open", - "cypress:run": "cypress run" + "cypress:run": "cypress run", + "docker:build": "docker build -t gabinetedigital:0.0.0.1 .", + "docker:publish": "docker run -p gabinetedigital:0.0.0.1" }, "private": true, "dependencies": { diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts index b70957006..9a7e6d742 100644 --- a/src/environments/suport/dev.ts +++ b/src/environments/suport/dev.ts @@ -3,7 +3,7 @@ import { Environment } from './../../app/models/envarioment' export const DevProd: Environment = { id:'3', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gdapi-dev.dyndns.info/api/', apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', production: true, @@ -24,9 +24,10 @@ export const DevProd: Environment = { dispatchPR: 'Despachos Titular', }; + export const DevDev: Environment = { id:'3', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gdapi-dev.dyndns.info/api/', apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', production: true, diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts index bb4752ed4..87d423f0f 100644 --- a/src/environments/suport/doneIt.ts +++ b/src/environments/suport/doneIt.ts @@ -23,6 +23,7 @@ export const doneITProd: Environment = { VP: '', dispatchPR: 'Despachos Titular', }; + export const doneITDev: Environment = { id:'1', apiURL: 'https://API.DONEIT.CO.AO/api/', @@ -30,8 +31,8 @@ export const doneITDev: Environment = { apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', production: true, domain: 'equilibrium.co.ao', - defaultuser: 'evandre.dasilva@equilibrium.co.ao', - defaultuserpwd: 'Luand@1114', + defaultuser: 'peter.maquiran@equilibrium.co.ao', + defaultuserpwd: 'codcodccx', chatOffline: true, presidential: false, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index f1cde97f2..ec63dcd58 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "80392ddb4", - "SHA": "80392ddb4f103e315b2730b26676418879ccd463", + "shortSHA": "588745c05", + "SHA": "588745c055073c227b8a6830f077133b57f5b09a", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jun 5 11:11:24 2023 +0100'", + "lastCommitTime": "'Mon Jun 5 15:44:51 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "4951", + "lastCommitNumber": "4952", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tnew file: cypress.config.js\n\tnew file: cypress/.gitignore\n\tnew file: cypress/fixtures/example.json\n\tnew file: cypress/support/commands.js\n\tnew file: cypress/support/e2e.js\n\tmodified: jest.config.js\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/toast.service.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: package.json\n\tmodified: src/environments/suport/dev.ts\n\tmodified: src/environments/suport/doneIt.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file