diff --git a/src/app/commons/api/service/api.service.spec.ts b/src/app/commons/api/service/api.service.spec.ts new file mode 100644 index 0000000..eabfdd4 --- /dev/null +++ b/src/app/commons/api/service/api.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { APIService } from './api.service'; + +describe('APIService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [APIService] + }); + }); + + it('should be created', inject([APIService], (service: APIService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/app/commons/api/service/api.service.ts b/src/app/commons/api/service/api.service.ts new file mode 100644 index 0000000..09dbaab --- /dev/null +++ b/src/app/commons/api/service/api.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { Observer } from 'rxjs/Observer'; +import { Subject } from 'rxjs/Subject'; +import { Subscription } from 'rxjs/Subscription'; +import { WebSocketSubject } from 'rxjs/observable/dom/WebSocketSubject'; + +@Injectable() +export class APIService { + private socketSubject: WebSocketSubject; + private socket: Subscription; + private apiURL: string; + + constructor() { } + + public connect(): void { + this.socketSubject = WebSocketSubject.create(this.apiURL); + this.socketSubject.subscribe({ + next: (data: MessageEvent) => { + + } + }); + } + +} diff --git a/src/app/packages/discovery/components/setting/setting.component.html b/src/app/packages/discovery/component/setting/setting.component.html similarity index 100% rename from src/app/packages/discovery/components/setting/setting.component.html rename to src/app/packages/discovery/component/setting/setting.component.html diff --git a/src/app/packages/discovery/components/setting/setting.component.scss b/src/app/packages/discovery/component/setting/setting.component.scss similarity index 100% rename from src/app/packages/discovery/components/setting/setting.component.scss rename to src/app/packages/discovery/component/setting/setting.component.scss diff --git a/src/app/packages/discovery/components/setting/setting.component.spec.ts b/src/app/packages/discovery/component/setting/setting.component.spec.ts similarity index 100% rename from src/app/packages/discovery/components/setting/setting.component.spec.ts rename to src/app/packages/discovery/component/setting/setting.component.spec.ts diff --git a/src/app/packages/discovery/components/setting/setting.component.ts b/src/app/packages/discovery/component/setting/setting.component.ts similarity index 100% rename from src/app/packages/discovery/components/setting/setting.component.ts rename to src/app/packages/discovery/component/setting/setting.component.ts diff --git a/src/app/packages/discovery/discovery.module.ts b/src/app/packages/discovery/discovery.module.ts index f712783..ee6a259 100644 --- a/src/app/packages/discovery/discovery.module.ts +++ b/src/app/packages/discovery/discovery.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SettingComponent } from './components/setting/setting.component'; +import { SettingComponent } from './component/setting/setting.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; @NgModule({ diff --git a/src/app/packages/infra/components/map/map.component.html b/src/app/packages/infra/component/map/map.component.html similarity index 100% rename from src/app/packages/infra/components/map/map.component.html rename to src/app/packages/infra/component/map/map.component.html diff --git a/src/app/packages/infra/components/map/map.component.scss b/src/app/packages/infra/component/map/map.component.scss similarity index 100% rename from src/app/packages/infra/components/map/map.component.scss rename to src/app/packages/infra/component/map/map.component.scss diff --git a/src/app/packages/infra/components/map/map.component.spec.ts b/src/app/packages/infra/component/map/map.component.spec.ts similarity index 100% rename from src/app/packages/infra/components/map/map.component.spec.ts rename to src/app/packages/infra/component/map/map.component.spec.ts diff --git a/src/app/packages/infra/components/map/map.component.ts b/src/app/packages/infra/component/map/map.component.ts similarity index 100% rename from src/app/packages/infra/components/map/map.component.ts rename to src/app/packages/infra/component/map/map.component.ts diff --git a/src/app/packages/infra/infra.module.ts b/src/app/packages/infra/infra.module.ts index 1a13b8c..b14010b 100644 --- a/src/app/packages/infra/infra.module.ts +++ b/src/app/packages/infra/infra.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MapComponent } from './components/map/map.component'; +import { MapComponent } from './component/map/map.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; @NgModule({ diff --git a/src/app/packages/member/components/modify/modify-reducer.module.ts b/src/app/packages/member/component/modify/modify-reducer.module.ts similarity index 100% rename from src/app/packages/member/components/modify/modify-reducer.module.ts rename to src/app/packages/member/component/modify/modify-reducer.module.ts diff --git a/src/app/packages/member/components/modify/modify.component.html b/src/app/packages/member/component/modify/modify.component.html similarity index 100% rename from src/app/packages/member/components/modify/modify.component.html rename to src/app/packages/member/component/modify/modify.component.html diff --git a/src/app/packages/member/components/modify/modify.component.scss b/src/app/packages/member/component/modify/modify.component.scss similarity index 100% rename from src/app/packages/member/components/modify/modify.component.scss rename to src/app/packages/member/component/modify/modify.component.scss diff --git a/src/app/packages/member/components/modify/modify.component.spec.ts b/src/app/packages/member/component/modify/modify.component.spec.ts similarity index 100% rename from src/app/packages/member/components/modify/modify.component.spec.ts rename to src/app/packages/member/component/modify/modify.component.spec.ts diff --git a/src/app/packages/member/components/modify/modify.component.ts b/src/app/packages/member/component/modify/modify.component.ts similarity index 100% rename from src/app/packages/member/components/modify/modify.component.ts rename to src/app/packages/member/component/modify/modify.component.ts diff --git a/src/app/packages/member/components/modify/modify.module.ts b/src/app/packages/member/component/modify/modify.module.ts similarity index 100% rename from src/app/packages/member/components/modify/modify.module.ts rename to src/app/packages/member/component/modify/modify.module.ts diff --git a/src/app/packages/member/components/reset-password/reset-password.component.html b/src/app/packages/member/component/reset-password/reset-password.component.html similarity index 100% rename from src/app/packages/member/components/reset-password/reset-password.component.html rename to src/app/packages/member/component/reset-password/reset-password.component.html diff --git a/src/app/packages/member/components/reset-password/reset-password.component.scss b/src/app/packages/member/component/reset-password/reset-password.component.scss similarity index 100% rename from src/app/packages/member/components/reset-password/reset-password.component.scss rename to src/app/packages/member/component/reset-password/reset-password.component.scss diff --git a/src/app/packages/member/components/reset-password/reset-password.component.spec.ts b/src/app/packages/member/component/reset-password/reset-password.component.spec.ts similarity index 100% rename from src/app/packages/member/components/reset-password/reset-password.component.spec.ts rename to src/app/packages/member/component/reset-password/reset-password.component.spec.ts diff --git a/src/app/packages/member/components/reset-password/reset-password.component.ts b/src/app/packages/member/component/reset-password/reset-password.component.ts similarity index 100% rename from src/app/packages/member/components/reset-password/reset-password.component.ts rename to src/app/packages/member/component/reset-password/reset-password.component.ts diff --git a/src/app/packages/member/components/reset-password/reset-password.module.ts b/src/app/packages/member/component/reset-password/reset-password.module.ts similarity index 100% rename from src/app/packages/member/components/reset-password/reset-password.module.ts rename to src/app/packages/member/component/reset-password/reset-password.module.ts diff --git a/src/app/packages/member/components/signin/signin.component.html b/src/app/packages/member/component/signin/signin.component.html similarity index 100% rename from src/app/packages/member/components/signin/signin.component.html rename to src/app/packages/member/component/signin/signin.component.html diff --git a/src/app/packages/member/components/signin/signin.component.scss b/src/app/packages/member/component/signin/signin.component.scss similarity index 100% rename from src/app/packages/member/components/signin/signin.component.scss rename to src/app/packages/member/component/signin/signin.component.scss diff --git a/src/app/packages/member/components/signin/signin.component.spec.ts b/src/app/packages/member/component/signin/signin.component.spec.ts similarity index 100% rename from src/app/packages/member/components/signin/signin.component.spec.ts rename to src/app/packages/member/component/signin/signin.component.spec.ts diff --git a/src/app/packages/member/components/signin/signin.component.ts b/src/app/packages/member/component/signin/signin.component.ts similarity index 100% rename from src/app/packages/member/components/signin/signin.component.ts rename to src/app/packages/member/component/signin/signin.component.ts diff --git a/src/app/packages/member/components/signin/signin.module.ts b/src/app/packages/member/component/signin/signin.module.ts similarity index 100% rename from src/app/packages/member/components/signin/signin.module.ts rename to src/app/packages/member/component/signin/signin.module.ts diff --git a/src/app/packages/member/components/signup/signup.component.html b/src/app/packages/member/component/signup/signup.component.html similarity index 100% rename from src/app/packages/member/components/signup/signup.component.html rename to src/app/packages/member/component/signup/signup.component.html diff --git a/src/app/packages/member/components/signup/signup.component.scss b/src/app/packages/member/component/signup/signup.component.scss similarity index 100% rename from src/app/packages/member/components/signup/signup.component.scss rename to src/app/packages/member/component/signup/signup.component.scss diff --git a/src/app/packages/member/components/signup/signup.component.spec.ts b/src/app/packages/member/component/signup/signup.component.spec.ts similarity index 100% rename from src/app/packages/member/components/signup/signup.component.spec.ts rename to src/app/packages/member/component/signup/signup.component.spec.ts diff --git a/src/app/packages/member/components/signup/signup.component.ts b/src/app/packages/member/component/signup/signup.component.ts similarity index 100% rename from src/app/packages/member/components/signup/signup.component.ts rename to src/app/packages/member/component/signup/signup.component.ts diff --git a/src/app/packages/member/components/signup/signup.module.ts b/src/app/packages/member/component/signup/signup.module.ts similarity index 100% rename from src/app/packages/member/components/signup/signup.module.ts rename to src/app/packages/member/component/signup/signup.module.ts diff --git a/src/app/packages/member/member.module.ts b/src/app/packages/member/member.module.ts index 66c9187..1873d54 100644 --- a/src/app/packages/member/member.module.ts +++ b/src/app/packages/member/member.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModifyModule } from 'app/packages/member/components/modify/modify.module'; -import { SigninModule } from 'app/packages/member/components/signin/signin.module'; -import { SignupModule } from 'app/packages/member/components/signup/signup.module'; -import { ResetPasswordModule } from 'app/packages/member/components/reset-password/reset-password.module'; -import { MemberService } from 'app/packages/member/services/member.service'; +import { ModifyModule } from 'app/packages/member/component/modify/modify.module'; +import { SigninModule } from 'app/packages/member/component/signin/signin.module'; +import { SignupModule } from 'app/packages/member/component/signup/signup.module'; +import { ResetPasswordModule } from 'app/packages/member/component/reset-password/reset-password.module'; +import { MemberService } from 'app/packages/member/service/member.service'; @NgModule({ imports: [ diff --git a/src/app/packages/member/model/member.ts b/src/app/packages/member/model/member.ts new file mode 100644 index 0000000..8fca9b9 --- /dev/null +++ b/src/app/packages/member/model/member.ts @@ -0,0 +1,10 @@ +export class Member { + id: number; + email: string; + password: string; + name: string; + phone: string; + companyName: string; + createDate: Date; + status: string; +} diff --git a/src/app/packages/member/services/member.service.spec.ts b/src/app/packages/member/service/member.service.spec.ts similarity index 100% rename from src/app/packages/member/services/member.service.spec.ts rename to src/app/packages/member/service/member.service.spec.ts diff --git a/src/app/packages/member/services/member.service.ts b/src/app/packages/member/service/member.service.ts similarity index 69% rename from src/app/packages/member/services/member.service.ts rename to src/app/packages/member/service/member.service.ts index 02bcfb3..85c1ee1 100644 --- a/src/app/packages/member/services/member.service.ts +++ b/src/app/packages/member/service/member.service.ts @@ -5,4 +5,7 @@ export class MemberService { constructor() { } + signin(email: string, password: string) { + + } } diff --git a/src/app/packages/noauth/components/list/list.component.html b/src/app/packages/noauth/component/list/list.component.html similarity index 100% rename from src/app/packages/noauth/components/list/list.component.html rename to src/app/packages/noauth/component/list/list.component.html diff --git a/src/app/packages/noauth/components/list/list.component.scss b/src/app/packages/noauth/component/list/list.component.scss similarity index 100% rename from src/app/packages/noauth/components/list/list.component.scss rename to src/app/packages/noauth/component/list/list.component.scss diff --git a/src/app/packages/noauth/components/list/list.component.spec.ts b/src/app/packages/noauth/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/noauth/components/list/list.component.spec.ts rename to src/app/packages/noauth/component/list/list.component.spec.ts diff --git a/src/app/packages/noauth/components/list/list.component.ts b/src/app/packages/noauth/component/list/list.component.ts similarity index 100% rename from src/app/packages/noauth/components/list/list.component.ts rename to src/app/packages/noauth/component/list/list.component.ts diff --git a/src/app/packages/noauth/noauth.module.ts b/src/app/packages/noauth/noauth.module.ts index 8ef8e3b..58a0e20 100644 --- a/src/app/packages/noauth/noauth.module.ts +++ b/src/app/packages/noauth/noauth.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ListComponent } from 'app/packages/noauth/components/list/list.component'; +import { ListComponent } from 'app/packages/noauth/component/list/list.component'; @NgModule({ imports: [ diff --git a/src/app/packages/probe/components/download/download.component.html b/src/app/packages/probe/component/download/download.component.html similarity index 100% rename from src/app/packages/probe/components/download/download.component.html rename to src/app/packages/probe/component/download/download.component.html diff --git a/src/app/packages/probe/components/download/download.component.scss b/src/app/packages/probe/component/download/download.component.scss similarity index 100% rename from src/app/packages/probe/components/download/download.component.scss rename to src/app/packages/probe/component/download/download.component.scss diff --git a/src/app/packages/probe/components/download/download.component.spec.ts b/src/app/packages/probe/component/download/download.component.spec.ts similarity index 100% rename from src/app/packages/probe/components/download/download.component.spec.ts rename to src/app/packages/probe/component/download/download.component.spec.ts diff --git a/src/app/packages/probe/components/download/download.component.ts b/src/app/packages/probe/component/download/download.component.ts similarity index 100% rename from src/app/packages/probe/components/download/download.component.ts rename to src/app/packages/probe/component/download/download.component.ts diff --git a/src/app/packages/probe/components/list/list.component.html b/src/app/packages/probe/component/list/list.component.html similarity index 100% rename from src/app/packages/probe/components/list/list.component.html rename to src/app/packages/probe/component/list/list.component.html diff --git a/src/app/packages/probe/components/list/list.component.scss b/src/app/packages/probe/component/list/list.component.scss similarity index 100% rename from src/app/packages/probe/components/list/list.component.scss rename to src/app/packages/probe/component/list/list.component.scss diff --git a/src/app/packages/probe/components/list/list.component.spec.ts b/src/app/packages/probe/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/probe/components/list/list.component.spec.ts rename to src/app/packages/probe/component/list/list.component.spec.ts diff --git a/src/app/packages/probe/components/list/list.component.ts b/src/app/packages/probe/component/list/list.component.ts similarity index 100% rename from src/app/packages/probe/components/list/list.component.ts rename to src/app/packages/probe/component/list/list.component.ts diff --git a/src/app/packages/probe/probe.module.ts b/src/app/packages/probe/probe.module.ts index 4c57c6b..33a5ced 100644 --- a/src/app/packages/probe/probe.module.ts +++ b/src/app/packages/probe/probe.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ListComponent } from 'app/packages/probe/components/list/list.component'; -import { DownloadComponent } from 'app/packages/probe/components/download/download.component'; +import { ListComponent } from 'app/packages/probe/component/list/list.component'; +import { DownloadComponent } from 'app/packages/probe/component/download/download.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; @NgModule({ diff --git a/src/app/pages/auth/signin/signin-page.module.ts b/src/app/pages/auth/signin/signin-page.module.ts index c203c45..05f4495 100644 --- a/src/app/pages/auth/signin/signin-page.module.ts +++ b/src/app/pages/auth/signin/signin-page.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SigninPageRoutingModule } from './signin-page-routing.module'; import { SigninPageComponent } from './signin-page.component'; -import { SigninModule } from 'app/packages/member/components/signin/signin.module'; +import { SigninModule } from 'app/packages/member/component/signin/signin.module'; import { FlexLayoutModule } from '@angular/flex-layout'; @NgModule({ diff --git a/src/app/pages/probes/probes-page-routing.module.ts b/src/app/pages/probes/probes-page-routing.module.ts index 60dbc45..02fc95f 100644 --- a/src/app/pages/probes/probes-page-routing.module.ts +++ b/src/app/pages/probes/probes-page-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ProbesPageComponent } from './probes-page.component'; -import { ListComponent as ProbeListComponent } from 'app/packages/probe/components/list/list.component'; -import { ListComponent as NoauthListComponent } from 'app/packages/noauth/components/list/list.component'; -import { DownloadComponent } from 'app/packages/probe/components/download/download.component'; +import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component'; +import { ListComponent as NoauthListComponent } from 'app/packages/noauth/component/list/list.component'; +import { DownloadComponent } from 'app/packages/probe/component/download/download.component'; const routes: Routes = [ {