From 470b1e7f0e0e7a4ae7155d7b88c322e770e21f26 Mon Sep 17 00:00:00 2001 From: "peter.maquiran" Date: Tue, 3 Jun 2025 09:42:08 +0100 Subject: [PATCH] fix --- src/app/app.module.ts | 4 ++-- .../monitoring}/interceptors/metter.interceptor.ts | 2 +- .../monitoring}/interceptors/token.interceptors.ts | 8 ++++---- version/git-version.ts | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) rename src/app/{ => infra/monitoring}/interceptors/metter.interceptor.ts (93%) rename src/app/{ => infra/monitoring}/interceptors/token.interceptors.ts (94%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 348018603..6d89de9da 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -86,14 +86,14 @@ import { CreateProcessPage } from './modals/create-process/create-process.page'; import { LoggingInterceptorService } from './services/logging-interceptor.service'; import { PopupQuestionPipe } from './modals/popup-question.pipe'; import '@teamhive/capacitor-video-recorder'; -import { tokenInterceptor } from './interceptors/token.interceptors'; +import { tokenInterceptor } from './infra/monitoring/interceptors/token.interceptors'; import { InputFilterDirective } from './services/directives/input-filter.directive'; import { VisibilityDirective } from './services/directives/visibility.directive'; import { DeplomaOptionsPageModule } from './shared/popover/deploma-options/deploma-options.module'; import { DiplomaOptionsPage } from './shared/popover/deploma-options/deploma-options.page'; import { ImageCropperModule } from 'ngx-image-cropper'; -import { metricsInterceptor } from './interceptors/metter.interceptor'; +import { metricsInterceptor } from './infra/monitoring/interceptors/metter.interceptor'; import {MatMenuModule} from '@angular/material/menu'; import {MatIconModule} from '@angular/material/icon'; diff --git a/src/app/interceptors/metter.interceptor.ts b/src/app/infra/monitoring/interceptors/metter.interceptor.ts similarity index 93% rename from src/app/interceptors/metter.interceptor.ts rename to src/app/infra/monitoring/interceptors/metter.interceptor.ts index c5e951afe..d5ac9e305 100644 --- a/src/app/interceptors/metter.interceptor.ts +++ b/src/app/infra/monitoring/interceptors/metter.interceptor.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { HTTP_INTERCEPTORS, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { meter, RequestCounter } from '../services/monitoring/opentelemetry/matrix'; +import { meter, RequestCounter } from '../../../services/monitoring/opentelemetry/matrix'; @Injectable() diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/infra/monitoring/interceptors/token.interceptors.ts similarity index 94% rename from src/app/interceptors/token.interceptors.ts rename to src/app/infra/monitoring/interceptors/token.interceptors.ts index 18b0f15f3..4c91bc67e 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/infra/monitoring/interceptors/token.interceptors.ts @@ -10,14 +10,14 @@ import { } from "@angular/common/http"; import { Observable, throwError, BehaviorSubject, of } from "rxjs"; import { catchError, filter, take, switchMap, tap } from "rxjs/operators"; -import { SessionStore } from '../store/session.service'; +import { SessionStore } from '../../../store/session.service'; import { environment } from "src/environments/environment"; import { Router } from "@angular/router"; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { Platform } from '@ionic/angular'; -import { UserLoginOutputResponse } from "../core/user/repository/user-remote-repository"; -import { UserLoginMapper } from "../core/user/mapper/user-login"; -import { UserSession } from "../models/user.model"; +import { UserLoginOutputResponse } from "../../../core/user/repository/user-remote-repository"; +import { UserLoginMapper } from "../../../core/user/mapper/user-login"; +import { UserSession } from "../../../models/user.model"; @Injectable() export class TokenInterceptor implements HttpInterceptor { diff --git a/version/git-version.ts b/version/git-version.ts index fff9419c4..d0314701f 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "715615a44", - "SHA": "715615a44534c697041ad4a03d37de020b5482ea", + "shortSHA": "9e7fff83a", + "SHA": "9e7fff83a05f456031c46b36cb535744fcf4b82f", "branch": "feature/login-v2", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 15 11:49:57 2025 +0100'", - "lastCommitMessage": "add despacho ppresidencial", - "lastCommitNumber": "6139", - "changeStatus": "On branch feature/login-v2\nYour branch is ahead of 'origin/feature/login-v2' by 4 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: doc/architecture.md\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html", + "lastCommitTime": "'Sat Mar 8 16:32:19 2025 +0100'", + "lastCommitMessage": "add", + "lastCommitNumber": "6140", + "changeStatus": "On branch feature/login-v2\nYour branch is ahead of 'origin/feature/login-v2' by 5 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app.module.ts\n\trenamed: src/app/interceptors/metter.interceptor.ts -> src/app/infra/monitoring/interceptors/metter.interceptor.ts\n\trenamed: src/app/interceptors/token.interceptors.ts -> src/app/infra/monitoring/interceptors/token.interceptors.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file