From dd0f823a6d0e269dcae022caf911b235ce621ab1 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 31 Jan 2021 08:49:44 +0200 Subject: Moved language and technology class out of user model --- .../profile-settings/profile-settings.component.ts | 4 +++- src/DevHive.Angular/src/app/services/language.service.ts | 2 +- src/DevHive.Angular/src/app/services/technology.service.ts | 2 +- src/DevHive.Angular/src/models/identity/user.ts | 12 ++---------- src/DevHive.Angular/src/models/language.ts | 6 ++++++ src/DevHive.Angular/src/models/technology.ts | 6 ++++++ 6 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 src/DevHive.Angular/src/models/language.ts create mode 100644 src/DevHive.Angular/src/models/technology.ts (limited to 'src/DevHive.Angular') diff --git a/src/DevHive.Angular/src/app/components/profile-settings/profile-settings.component.ts b/src/DevHive.Angular/src/app/components/profile-settings/profile-settings.component.ts index e348b8b..1989a4d 100644 --- a/src/DevHive.Angular/src/app/components/profile-settings/profile-settings.component.ts +++ b/src/DevHive.Angular/src/app/components/profile-settings/profile-settings.component.ts @@ -7,9 +7,11 @@ import {AppConstants} from 'src/app/app-constants.module'; import {LanguageService} from 'src/app/services/language.service'; import {UserService} from 'src/app/services/user.service'; import {TechnologyService} from 'src/app/services/technology.service'; -import {Language, Technology, User} from 'src/models/identity/user'; +import {User} from 'src/models/identity/user'; import {ErrorBarComponent} from '../error-bar/error-bar.component'; import {SuccessBarComponent} from '../success-bar/success-bar.component'; +import {Language} from 'src/models/language'; +import {Technology} from 'src/models/technology'; @Component({ selector: 'app-profile-settings', diff --git a/src/DevHive.Angular/src/app/services/language.service.ts b/src/DevHive.Angular/src/app/services/language.service.ts index d85f178..65012e9 100644 --- a/src/DevHive.Angular/src/app/services/language.service.ts +++ b/src/DevHive.Angular/src/app/services/language.service.ts @@ -2,7 +2,7 @@ import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http'; import {Injectable} from '@angular/core'; import {Guid} from 'guid-typescript'; import {Observable} from 'rxjs'; -import {Language} from 'src/models/identity/user'; +import {Language} from 'src/models/language'; import {AppConstants} from '../app-constants.module'; @Injectable({ diff --git a/src/DevHive.Angular/src/app/services/technology.service.ts b/src/DevHive.Angular/src/app/services/technology.service.ts index 207303f..90f90d6 100644 --- a/src/DevHive.Angular/src/app/services/technology.service.ts +++ b/src/DevHive.Angular/src/app/services/technology.service.ts @@ -2,7 +2,7 @@ import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http'; import {Injectable} from '@angular/core'; import {Guid} from 'guid-typescript'; import {Observable} from 'rxjs'; -import {Technology} from 'src/models/identity/user'; +import {Technology} from 'src/models/technology'; import {AppConstants} from '../app-constants.module'; @Injectable({ diff --git a/src/DevHive.Angular/src/models/identity/user.ts b/src/DevHive.Angular/src/models/identity/user.ts index c92ed26..045d1d9 100644 --- a/src/DevHive.Angular/src/models/identity/user.ts +++ b/src/DevHive.Angular/src/models/identity/user.ts @@ -1,14 +1,6 @@ import { Guid } from 'guid-typescript'; - -export class Language { - public id: Guid; - public name: string; -} - -export class Technology { - public id: Guid; - public name: string; -} +import {Language} from '../language'; +import {Technology} from '../technology'; export class User { private _id : Guid; diff --git a/src/DevHive.Angular/src/models/language.ts b/src/DevHive.Angular/src/models/language.ts new file mode 100644 index 0000000..9ae6814 --- /dev/null +++ b/src/DevHive.Angular/src/models/language.ts @@ -0,0 +1,6 @@ +import {Guid} from 'guid-typescript'; + +export class Language { + public id: Guid; + public name: string; +} diff --git a/src/DevHive.Angular/src/models/technology.ts b/src/DevHive.Angular/src/models/technology.ts new file mode 100644 index 0000000..4235a86 --- /dev/null +++ b/src/DevHive.Angular/src/models/technology.ts @@ -0,0 +1,6 @@ +import {Guid} from 'guid-typescript'; + +export class Technology { + public id: Guid; + public name: string; +} -- cgit v1.2.3