-
+
@@ -102,7 +102,7 @@
HUBERT
@@ -102,7 +102,7 @@
-
+
@@ -117,7 +117,7 @@
FRANSOLET
@@ -117,7 +117,7 @@
-
+
diff --git a/src/app/control-panel/profile/config/config.component.html b/src/app/control-panel/profile/config/config.component.html
deleted file mode 100644
index 8c4851e..0000000
--- a/src/app/control-panel/profile/config/config.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ConfigurationComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ConfigurationComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/control-panel/profile/configuration/configuration.component.ts b/src/app/control-panel/profile/configuration/configuration.component.ts
new file mode 100644
index 0000000..7faef93
--- /dev/null
+++ b/src/app/control-panel/profile/configuration/configuration.component.ts
@@ -0,0 +1,39 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import { ConfirmationService } from 'primeng/api';
+import { NotificationsService } from '../../../_services/notifications.service';
+import { UserInfo } from '../../../_api/models';
+
+@Component({
+ selector: 'app-configuration',
+ templateUrl: './configuration.component.html',
+ styleUrls: ['./configuration.component.css']
+})
+export class ConfigurationComponent implements OnInit {
+
+ public ConnectedUser: UserInfo;
+
+ public SelectedConfig = 'hkgskjhdskj15';
+
+ constructor(
+ private _notifications: NotificationsService,
+ private _confirmationService: ConfirmationService,
+ private _route: ActivatedRoute,
+ private _router: Router
+ ) { }
+
+ ngOnInit() {
+ this.Test();
+ }
+
+ Test() {
+ this._route.paramMap.subscribe(params => {
+ console.log(params.get('configId'));
+ });
+ }
+
+ public OpenSelectedConfig() {
+ this._router.navigate([this._router.url, this.SelectedConfig]);
+ }
+
+}
diff --git a/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.css b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.html b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.html
new file mode 100644
index 0000000..51879f3
--- /dev/null
+++ b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.html
@@ -0,0 +1,9 @@
+
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ EditConfigurationComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(EditConfigurationComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.ts b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.ts
new file mode 100644
index 0000000..08ce096
--- /dev/null
+++ b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import { ConfirmationService } from 'primeng/api';
+import { NotificationsService } from '../../../../_services/notifications.service';
+
+@Component({
+ selector: 'app-edit-configuration',
+ templateUrl: './edit-configuration.component.html',
+ styleUrls: ['./edit-configuration.component.css']
+})
+export class EditConfigurationComponent implements OnInit {
+
+ constructor(
+ private _notifications: NotificationsService,
+ private _confirmationService: ConfirmationService,
+ private _route: ActivatedRoute,
+ private _router: Router
+ ) { }
+
+ ngOnInit() {
+
+ this.Test();
+ }
+
+ Test() {
+ this._route.paramMap.subscribe(params => {
+ console.log(params.get('configId'));
+ });
+ }
+
+}
diff --git a/src/app/control-panel/profile/devices/devices.component.css b/src/app/control-panel/profile/devices/devices.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/control-panel/profile/devices/devices.component.html b/src/app/control-panel/profile/devices/devices.component.html
new file mode 100644
index 0000000..5be1387
--- /dev/null
+++ b/src/app/control-panel/profile/devices/devices.component.html
@@ -0,0 +1,21 @@
+
+;
+describe('DevicesComponent', () => {
+ let component: DevicesComponent;
+ let fixture: ComponentFixture;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ConfigComponent ]
+ declarations: [ DevicesComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ConfigComponent);
+ fixture = TestBed.createComponent(DevicesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/control-panel/profile/devices/devices.component.ts b/src/app/control-panel/profile/devices/devices.component.ts
new file mode 100644
index 0000000..33148d4
--- /dev/null
+++ b/src/app/control-panel/profile/devices/devices.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-devices',
+ templateUrl: './devices.component.html',
+ styleUrls: ['./devices.component.css']
+})
+export class DevicesComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/control-panel/profile/edit-profile/edit-profile.component.html b/src/app/control-panel/profile/edit-profile/edit-profile.component.html
index c7e35ff..edf2c53 100644
--- a/src/app/control-panel/profile/edit-profile/edit-profile.component.html
+++ b/src/app/control-panel/profile/edit-profile/edit-profile.component.html
@@ -78,10 +78,29 @@
-
MICHEL
diff --git a/src/app/control-panel/profile/config/config.component.html b/src/app/control-panel/profile/config/config.component.html
deleted file mode 100644
index 8c4851e..0000000
--- a/src/app/control-panel/profile/config/config.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-- This is the config page. => Existing one. -
diff --git a/src/app/control-panel/profile/config/config.component.ts b/src/app/control-panel/profile/config/config.component.ts deleted file mode 100644 index 5813d4e..0000000 --- a/src/app/control-panel/profile/config/config.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-config', - templateUrl: './config.component.html', - styleUrls: ['./config.component.css'] -}) -export class ConfigComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/control-panel/profile/config/config.component.css b/src/app/control-panel/profile/configuration/configuration.component.css similarity index 100% rename from src/app/control-panel/profile/config/config.component.css rename to src/app/control-panel/profile/configuration/configuration.component.css diff --git a/src/app/control-panel/profile/configuration/configuration.component.html b/src/app/control-panel/profile/configuration/configuration.component.html new file mode 100644 index 0000000..09678b5 --- /dev/null +++ b/src/app/control-panel/profile/configuration/configuration.component.html @@ -0,0 +1,15 @@ + +
+
+
+
+
+
++
+
+
+ This is the config page. => You will find list of all configuration and link to create new one. +
+ + + \ No newline at end of file diff --git a/src/app/control-panel/profile/configuration/configuration.component.spec.ts b/src/app/control-panel/profile/configuration/configuration.component.spec.ts new file mode 100644 index 0000000..cbc856a --- /dev/null +++ b/src/app/control-panel/profile/configuration/configuration.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ConfigurationComponent } from './configuration.component'; + +describe('ConfigurationComponent', () => { + let component: ConfigurationComponent; + let fixture: ComponentFixture
+
+
+
+
++
+
+
+ This is the edit config page. => (Existing one from MyMirror 1.0) => You will have the chance to personnalize your screen configuration +
diff --git a/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.spec.ts b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.spec.ts new file mode 100644 index 0000000..fc7d6a6 --- /dev/null +++ b/src/app/control-panel/profile/configuration/edit-configuration/edit-configuration.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditConfigurationComponent } from './edit-configuration.component'; + +describe('EditConfigurationComponent', () => { + let component: EditConfigurationComponent; + let fixture: ComponentFixture
+
+
+
+
++
+
+
+ This is the devices page. => You will have the possibility to change parameters for all your screen devices => +
+ +Actions
++ - Changer parametres + - Changer position + - Changer Nom + - Changer les owners + - Supprimer du profil + - Voir l'état de connexion + - Assigner une configuration (?) +
+ \ No newline at end of file diff --git a/src/app/control-panel/profile/config/config.component.spec.ts b/src/app/control-panel/profile/devices/devices.component.spec.ts similarity index 56% rename from src/app/control-panel/profile/config/config.component.spec.ts rename to src/app/control-panel/profile/devices/devices.component.spec.ts index ec5d3be..12f4c0d 100644 --- a/src/app/control-panel/profile/config/config.component.spec.ts +++ b/src/app/control-panel/profile/devices/devices.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ConfigComponent } from './config.component'; +import { DevicesComponent } from './devices.component'; -describe('ConfigComponent', () => { - let component: ConfigComponent; - let fixture: ComponentFixture
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+ {{language.label}}
+
+
+
+
+
+
+