compare skills & main platforms to one with skills

Author: Awakich

projects/core/src/lib/providers/api-url.provide.ts

@@ -2,3 +2,4 @@
 import { InjectionToken } from "@angular/core";
 
 export const API_URL = new InjectionToken<string>("API_URL");
+export const SKILLS_API_URL = new InjectionToken<string>("SKILLS_API_URL");

projects/core/src/lib/services/index.ts

@@ -1,6 +1,7 @@
 /** @format */
 
 export * from "./api.service";
+export * from "./skillsApi.service";
 export * from "./subscription-plans.service";
 export * from "./token.service";
 export * from "./yt-extract.service";

projects/core/src/lib/services/skillsApi.service.ts

@@ -0,0 +1,13 @@
+/** @format */
+
+import { Inject, Injectable } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import { ApiService } from "./api.service";
+import { SKILLS_API_URL } from "@corelib";
+
+@Injectable({ providedIn: "root" })
+export class SkillsApiService extends ApiService {
+  constructor(http: HttpClient, @Inject(SKILLS_API_URL) apiUrl: string) {
+    super(http, apiUrl);
+  }
+}

projects/skills/src/app/app.config.ts

@@ -4,7 +4,13 @@ import { ApplicationConfig } from "@angular/core";
 import { provideRouter } from "@angular/router";
 import { routes } from "./app.routes";
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
-import { API_URL, BearerTokenInterceptor, CamelcaseInterceptor, PRODUCTION } from "@corelib";
+import {
+  API_URL,
+  BearerTokenInterceptor,
+  CamelcaseInterceptor,
+  PRODUCTION,
+  SKILLS_API_URL,
+} from "@corelib";
 import { environment } from "../environments/environment";
 
 export const appConfig: ApplicationConfig = {
@@ -13,6 +19,7 @@ export const appConfig: ApplicationConfig = {
     { provide: HTTP_INTERCEPTORS, multi: true, useClass: BearerTokenInterceptor },
     { provide: HTTP_INTERCEPTORS, multi: true, useClass: CamelcaseInterceptor },
     { provide: API_URL, useValue: environment.apiUrl },
+    { provide: SKILLS_API_URL, useValue: environment.skillsApiUrl },
     { provide: PRODUCTION, useValue: environment.production },
     provideHttpClient(withInterceptorsFromDi()),
   ],

projects/skills/src/app/profile/services/profile.service.ts

@@ -1,14 +1,14 @@
 /** @format */
 
 import { inject, Injectable } from "@angular/core";
-import { ApiService, SubscriptionData } from "@corelib";
+import { SkillsApiService, SubscriptionData } from "@corelib";
 import { Profile, UserData } from "../../../models/profile.model";
 
 @Injectable({
   providedIn: "root",
 })
 export class ProfileService {
-  apiService = inject(ApiService);
+  apiService = inject(SkillsApiService);
 
   getProfile() {
     return this.apiService.get<Profile>("/progress/profile/");

projects/skills/src/app/rating/services/rating.service.ts

@@ -1,7 +1,7 @@
 /** @format */
 
 import { inject, Injectable } from "@angular/core";
-import { ApiService } from "@corelib";
+import { SkillsApiService } from "@corelib";
 import { GeneralRating } from "../../../models/rating.model";
 import { map } from "rxjs";
 import { ApiPagination } from "../../../models/api-pagination.model";
@@ -10,7 +10,7 @@ import { ApiPagination } from "../../../models/api-pagination.model";
   providedIn: "root",
 })
 export class RatingService {
-  apiService = inject(ApiService);
+  apiService = inject(SkillsApiService);
 
   getGeneralRating(
     ratingParam: "last_year" | "last_month" | "last_day" | "last_week" = "last_month"

projects/skills/src/app/skills/services/skill.service.ts

@@ -1,7 +1,7 @@
 /** @format */
 
 import { inject, Injectable } from "@angular/core";
-import { ApiService } from "@corelib";
+import { SkillsApiService } from "@corelib";
 import { ApiPagination } from "../../../models/api-pagination.model";
 import { Skill, TasksResponse } from "../../../models/skill.model";
 import { HttpParams } from "@angular/common/http";
@@ -10,7 +10,7 @@ import { HttpParams } from "@angular/common/http";
   providedIn: "root",
 })
 export class SkillService {
-  apiService = inject(ApiService);
+  apiService = inject(SkillsApiService);
   private skillId: number | null = null;
   private storageKey = "skillId";
 

projects/skills/src/app/subscription/service/subscription.service.ts

@@ -1,13 +1,13 @@
 /** @format */
 
 import { Injectable, inject } from "@angular/core";
-import { ApiService, SubscriptionPlan } from "@corelib";
+import { SkillsApiService, SubscriptionPlan } from "@corelib";
 
 @Injectable({
   providedIn: "root",
 })
 export class SubscriptionService {
-  apiService = inject(ApiService);
+  apiService = inject(SkillsApiService);
 
   getSubscriptions() {
     return this.apiService.get<SubscriptionPlan[]>("/subscription/");

projects/skills/src/app/task/services/task.service.ts

@@ -1,7 +1,7 @@
 /** @format */
 
 import { inject, Injectable, signal } from "@angular/core";
-import { ApiService } from "@corelib";
+import { SkillsApiService } from "@corelib";
 import { TaskResults, TaskStep, TaskStepsResponse } from "../../../models/skill.model";
 import { Observable, tap } from "rxjs";
 import { StepType } from "../../../models/step.model";
@@ -10,7 +10,7 @@ import { StepType } from "../../../models/step.model";
   providedIn: "root",
 })
 export class TaskService {
-  private apiService = inject(ApiService);
+  private apiService = inject(SkillsApiService);
 
   currentSteps = signal<TaskStepsResponse["stepData"]>([]);
   currentTaskDone = signal(false);

projects/skills/src/app/trajectories/trajectories.service.ts

@@ -2,21 +2,15 @@
 
 import { HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
-import { ApiService } from "@corelib";
-import { plainToInstance } from "class-transformer";
-import { BehaviorSubject, catchError, map, Observable, of } from "rxjs";
-import {
-  Student,
-  Trajectory,
-  TrajectorySkills,
-  UserTrajectory,
-} from "../../models/trajectory.model";
+import { SkillsApiService } from "@corelib";
+import { catchError, map, of } from "rxjs";
+import { Student, Trajectory, UserTrajectory } from "../../models/trajectory.model";
 
 @Injectable({
   providedIn: "root",
 })
 export class TrajectoriesService {
-  constructor(private readonly apiService: ApiService) {}
+  constructor(private readonly apiService: SkillsApiService) {}
 
   getTrajectories(limit: number, offset: number) {
     const params = new HttpParams();