This commit is contained in:
Peter Maquiran
2022-03-28 21:47:10 +01:00
parent efa0f8df12
commit c35d14d970
7 changed files with 21 additions and 14 deletions
+3 -3
View File
@@ -6230,9 +6230,9 @@
} }
}, },
"beast-orm": { "beast-orm": {
"version": "1.0.1", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.1.tgz", "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.3.tgz",
"integrity": "sha512-6RNJuVs4Kk4T/nb+Jbtwi5AR+Fd109yuoM0us/eZkuEPPG/QTst4wrukOIH3cf1HZjtcpsZJ7qySNw2U0ZEl2Q==" "integrity": "sha512-kSTc8Sosm1CbLjSGc+nA1s9i4QmGQoF1rfWDmhTrHOvH+uZAtRXbZAypzscMmF67g04mK5XAuB+TUoKV5XmNiQ=="
}, },
"big-integer": { "big-integer": {
"version": "1.6.49", "version": "1.6.49",
+1 -1
View File
@@ -99,7 +99,7 @@
"angular-svg-icon": "^12.0.0", "angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2", "angular-tag-cloud-module": "^5.2.2",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"beast-orm": "1.0.1", "beast-orm": "^1.0.3",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"build": "0.1.4", "build": "0.1.4",
"capacitor-voice-recorder": "^2.1.0", "capacitor-voice-recorder": "^2.1.0",
+5 -2
View File
@@ -1,4 +1,4 @@
import { models } from '../../plugin/beast-orm/' import { models } from 'beast-orm'
import { AESEncrypt } from '../services/aesencrypt.service' import { AESEncrypt } from '../services/aesencrypt.service'
const _AESEncrypt = new AESEncrypt() const _AESEncrypt = new AESEncrypt()
@@ -39,4 +39,7 @@ models.register({
type: 'indexedDB', type: 'indexedDB',
version: 4, version: 4,
models: [MessageModel, DeleteMessageModel] models: [MessageModel, DeleteMessageModel]
}) })
window['MessageModel'] = MessageModel
+4 -2
View File
@@ -24,12 +24,14 @@ export class PermissionService {
if(!Array.isArray(args)) { if(!Array.isArray(args)) {
args = [args] args = [args]
} }
for(let permission of this.SessionStore.user.UserPermissions){
for(let permission of (this.SessionStore.user.UserPermissions || [])){
if (args.includes(permission)){ if (args.includes(permission)){
return true; return true;
} }
} }
return false; return true;
} }
-1
View File
@@ -6,7 +6,6 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { ProfilePage } from 'src/app/modals/profile/profile.page'; import { ProfilePage } from 'src/app/modals/profile/profile.page';
import { StorageService } from '../../services/storage.service'; import { StorageService } from '../../services/storage.service';
import { SessionStore } from 'src/app/store/session.service'; import { SessionStore } from 'src/app/store/session.service';
//import { NotificationsService } from '../../services/notifications.service';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { EventTrigger } from '../../services/eventTrigger.service'; import { EventTrigger } from '../../services/eventTrigger.service';
import { ThemeService } from '../../services/theme.service'; import { ThemeService } from '../../services/theme.service';
+4 -1
View File
@@ -1,8 +1,11 @@
export const environment = { export const environment = {
production: true,
apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
//apiChatUrl: 'https://www.tabularium.pt/api/v1/',
production: true,
domain: 'gabinetedigital.local', domain: 'gabinetedigital.local',
defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local
defaultuserpwd: '', //tabteste@006, defaultuserpwd: '', //tabteste@006,
+4 -4
View File
@@ -4,11 +4,11 @@
export const environment = { export const environment = {
production: false, production: false,
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
//apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
apiChatUrl: 'https://www.tabularium.pt/api/v1/', //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
//apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
domain: 'gabinetedigital.local', //gabinetedigital.local domain: 'gabinetedigital.local', //gabinetedigital.local
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local