diff --git a/.gitignore b/.gitignore index 3ce21822b..ddffe41bb 100644 --- a/.gitignore +++ b/.gitignore @@ -67,4 +67,8 @@ android/app/src/main/** !android/app/src/main/AndroidManifest.xml android/app/src/main/res/** !android/app/src/main/res/drawable*** -!android/app/src/main/res/mip*** \ No newline at end of file +!android/app/src/main/res/mip*** + +___android/ +_android/ +_www/ \ No newline at end of file diff --git a/package.json b/package.json index 14f586326..08d46998f 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,7 @@ "dev:share": "lite-server --baseDir=share", "install:chromium": "node node_modules/puppeteer/install.js", "build:version": "node ./version/git-version.js", - "ionic-build": "ionic cap run android --prod", - "prepare": "husky install && cp -R -u -p .env.example .env" + "ionic-build": "ionic cap run android --prod" }, "private": true, "dependencies": { diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 4d6b1b510..85c863049 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,21 +1,21 @@ import { versionData } from '../../version/git-version' export const environment = { // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - //apiURL: 'https://gd-api.oapr.gov.ao/api/', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gd-api.oapr.gov.ao/api/', + //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', - //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', - //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', - apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', + // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', production: true, domain: 'gabinetedigital.local', - defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local - defaultuserpwd: 'M@p2022', //tabteste@006, + defaultuser: '',//paulo.pinto@gabinetedigital.local + defaultuserpwd: '', //tabteste@006, chatOffline: true, presidencia: false, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index b7c33791b..a64c46fed 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a73dde467", - "SHA": "a73dde467c5ab0fa375fb618b7d6f2d0d4cedc94", - "branch": "develop_bitOut-fix", + "shortSHA": "13b58e6aa", + "SHA": "13b58e6aacf9e088f9eb80e833d20995bc051063", + "branch": "consoleCle2", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 9 10:49:58 2023 +0100'", - "lastCommitMessage": "improve chat", - "lastCommitNumber": "4618", - "change": "", - "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Mon Jan 9 10:57:09 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4619", + "change": "diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 4d6b1b510..85c863049 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,21 +1,21 @@\n import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n- //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n- apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n- apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n+ apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n production: true,\n domain: 'gabinetedigital.local',\n- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n- defaultuserpwd: 'M@p2022', //tabteste@006,\n+ defaultuser: '',//paulo.pinto@gabinetedigital.local\n+ defaultuserpwd: '', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n version: versionData,", + "changeStatus": "On branch consoleCle2\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: package.json\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/environments/environment.prod.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file