peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-05 12:18:21 +01:00
parent 572ab6db7b c8bdcfce8e
commit 56c1733945
9 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.module.ts
+19 -19
View File
@@ -69,35 +69,35 @@ import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
// The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.
/////123//// import * as SentrySibling from '@sentry/angular';
/////123////import * as Sentry from '@sentry/capacitor';
import * as SentrySibling from '@sentry/angular';
import * as Sentry from '@sentry/capacitor';
// The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.
// For automatic instrumentation (highly recommended)
/////123////import { Integration } from '@sentry/types';
/////123////import { BrowserTracing } from '@sentry/tracing';
import { Integration } from '@sentry/types';
import { BrowserTracing } from '@sentry/tracing';
/* import { FCM } from '@ionic-native/fcm/ngx';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
/////123//// Sentry.init(
/////123//// {
/////123//// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
Sentry.init(
{
dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
// To set your release and dist versions
/////123//// release: 'gabinetedigital@1.0.0',
/////123//// dist: '1',
release: 'gabinetedigital@1.0.0',
dist: '1',
// Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
// We recommend adjusting this value in production.
/////123//// tracesSampleRate: 1.0,
/////123//// integrations: [
/////123//// new BrowserTracing({
/////123//// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
/////123//// }) as Integration,
/////123//// ]
/////123//// },
tracesSampleRate: 1.0,
integrations: [
new BrowserTracing({
tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
}) as Integration,
]
},
// Forward the init method to the sibling Framework.
/////123//// SentrySibling.init
/////123////);
SentrySibling.init
);
@NgModule({
declarations: [AppComponent],
entryComponents: [],
@@ -145,7 +145,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
{
provide: ErrorHandler,
// Attach the Sentry ErrorHandler
/////123////useValue: SentrySibling.createErrorHandler(),
useValue: SentrySibling.createErrorHandler(),
},
StatusBar,
//SplashScreen,
src/app/modals/profile/profile.page.html
+1 -2
View File
@@ -51,8 +51,7 @@
</ion-buttons>
</div>
<div class="line"></div>
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationdata.length}} novas notificações</ion-label>
<ion-label (click)="asyncNotification()" *ngIf="!notificationdata">0 novas notificações</ion-label>
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
</div>
</ion-header>
src/app/modals/profile/profile.page.ts
+1
View File
@@ -32,6 +32,7 @@ export class ProfilePage implements OnInit {
isProfileOpen = false
hideImage = false
logoutOut = false
notificationStatus = '';
constructor(private modalController: ModalController,
private authService: AuthService,
src/app/pages/login/login.page.ts
+1 -1
View File
@@ -164,7 +164,7 @@ export class LoginPage implements OnInit {
this.ChatSystemService.loadChat();
}
// this.getToken();
this.getToken();
if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) {
if(this.sessionStore.hasPin) {
src/app/services/notifications.service.ts
-9
View File
@@ -51,15 +51,6 @@ export class NotificationsService {
/* private eventTriger: Events, */
/* private fcm: FCM */) {
this.storageService.get("Notifications").then((value) => {
}).catch((error)=>{
console.error('storage getnotification',error)
}).catch(() => {
this.storageService.store("Notifications", [])
})
}
registerCallback(type: IdObject, funx: Function, object: any = {}) {
src/app/shared/header/header.page.ts
+6 -2
View File
@@ -80,9 +80,13 @@ export class HeaderPage implements OnInit {
/* var data = JSON.parse(value); */
this.notificationLength = value.length;
}).catch((error) => {
if(!error) {
this.notificationLength = 0;
} else {
console.error('header storage get notification', error)
}
})
}
hideSearch() {
src/environments/environment.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { versionData } from '../../version/git-version'
export const environment = {
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
// 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: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
@@ -8,8 +8,8 @@ export const environment = {
// apiWsChatUrl: 'wss://192.168.0.29:3000/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://gdchat-dev.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', */
production: true,
domain: 'paulo.pinto@gabinetedigital.local',
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto@gabinetedigital.local
src/main.ts
+17 -17
View File
@@ -8,35 +8,35 @@ import { defineCustomElements } from '@ionic/pwa-elements/loader';
import "hammerjs"; // HAMMER TIME
/////123////import * as Sentry from '@sentry/capacitor';
/* import * as Sentry from '@sentry/capacitor';
// The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.
/////123////import * as SentrySibling from '@sentry/angular';
import * as SentrySibling from '@sentry/angular';
// For automatic instrumentation (highly recommended)
/////123//// import { Integration } from '@sentry/types';
/////123//// import { BrowserTracing } from '@sentry/tracing';
import { Integration } from '@sentry/types';
import { BrowserTracing } from '@sentry/tracing'; */
if (environment.production) {
enableProdMode();
}
/////123//// Sentry.init(
/////123//// {
/////123//// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
/* Sentry.init(
{
dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
// To set your release and dist versions
/////123//// release: 'gabinetedigital@1.0.0',
/////123//// dist: '1',
release: 'gabinetedigital@1.0.0',
dist: '1',
// Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
// We recommend adjusting this value in production.
/////123//// integrations: [
/////123//// new BrowserTracing({
/////123//// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
/////123//// }) as Integration,
/////123//// ]
/////123//// },
integrations: [
new BrowserTracing({
tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
}) as Integration,
]
},
// Forward the init method to the sibling Framework.
/////123//// SentrySibling.init
/////123////);
SentrySibling.init
); */
platformBrowserDynamic().bootstrapModule(AppModule)
version/git-version.ts
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "0d485672d",
"SHA": "0d485672d85fe521eb51dcdeec7f77e70579246b",
"shortSHA": "572ab6db7",
"SHA": "572ab6db7b8cc05e5b32362f48dbad03cc948d52",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Jan 4 14:45:17 2023 +0100'",
"lastCommitTime": "'Thu Jan 5 12:11:50 2023 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4612",
"lastCommitNumber": "4613",
"change": "",
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/index/index-routing.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tnew file: src/app/services/chat/viewed-message.service.spec.ts\n\tnew file: src/app/services/chat/viewed-message.service.ts\n\tmodified: src/app/services/storage.service.ts\n\tmodified: src/app/store/localstore.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
"changeStatus": "On branch develop_bitOut-fix\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/main.ts",
"changeAuthor": "peter.maquiran"
}