From 7357908004cddfbb8a7c78db1a031235fbff0b9e Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Thu, 2 Jul 2020 23:24:31 +0300 Subject: [PATCH 1/2] Added sample components --- .../ClientApp/src/app/app.component.html | 10 +++----- .../ClientApp/src/app/app.module.ts | 6 ++++- .../ClientApp/src/app/app.server.module.ts | 11 -------- .../src/app/chat/chat.component.html | 8 +++--- .../src/app/home/home.component.html | 9 ++++--- .../src/app/my-day/my-day.component.css | 4 +++ .../src/app/my-day/my-day.component.html | 1 + .../src/app/my-day/my-day.component.spec.ts | 25 +++++++++++++++++++ .../src/app/my-day/my-day.component.ts | 16 ++++++++++++ .../src/app/my-demo/my-demo.component.css | 0 .../src/app/my-demo/my-demo.component.html | 4 +++ .../src/app/my-demo/my-demo.component.spec.ts | 25 +++++++++++++++++++ .../src/app/my-demo/my-demo.component.ts | 20 +++++++++++++++ .../src/app/nav-menu/nav-menu.component.html | 5 ++-- .../app/raspisanie/raspisanie.component.html | 11 +++++--- 15 files changed, 123 insertions(+), 32 deletions(-) delete mode 100644 studentOrganizer/ClientApp/src/app/app.server.module.ts create mode 100644 studentOrganizer/ClientApp/src/app/my-day/my-day.component.css create mode 100644 studentOrganizer/ClientApp/src/app/my-day/my-day.component.html create mode 100644 studentOrganizer/ClientApp/src/app/my-day/my-day.component.spec.ts create mode 100644 studentOrganizer/ClientApp/src/app/my-day/my-day.component.ts create mode 100644 studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.css create mode 100644 studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.html create mode 100644 studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.spec.ts create mode 100644 studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts diff --git a/studentOrganizer/ClientApp/src/app/app.component.html b/studentOrganizer/ClientApp/src/app/app.component.html index 7173845..5549aa2 100644 --- a/studentOrganizer/ClientApp/src/app/app.component.html +++ b/studentOrganizer/ClientApp/src/app/app.component.html @@ -1,6 +1,4 @@ - - -
- -
- + +
+ +
diff --git a/studentOrganizer/ClientApp/src/app/app.module.ts b/studentOrganizer/ClientApp/src/app/app.module.ts index 79ae813..3b3ef03 100644 --- a/studentOrganizer/ClientApp/src/app/app.module.ts +++ b/studentOrganizer/ClientApp/src/app/app.module.ts @@ -9,6 +9,8 @@ import { NavMenuComponent } from './nav-menu/nav-menu.component'; import { HomeComponent } from './home/home.component'; import { chatComponent } from './chat/chat.component'; import { raspisanieComponent } from './raspisanie/raspisanie.component'; +import { MyDemoComponent } from './my-demo/my-demo.component'; +import { MyDayComponent } from './my-day/my-day.component'; @NgModule({ declarations: [ @@ -16,7 +18,9 @@ import { raspisanieComponent } from './raspisanie/raspisanie.component'; NavMenuComponent, HomeComponent, chatComponent, - raspisanieComponent + raspisanieComponent, + MyDemoComponent, + MyDayComponent ], imports: [ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), diff --git a/studentOrganizer/ClientApp/src/app/app.server.module.ts b/studentOrganizer/ClientApp/src/app/app.server.module.ts deleted file mode 100644 index cfb0e02..0000000 --- a/studentOrganizer/ClientApp/src/app/app.server.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { ServerModule } from '@angular/platform-server'; -import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader'; -import { AppComponent } from './app.component'; -import { AppModule } from './app.module'; - -@NgModule({ - imports: [AppModule, ServerModule, ModuleMapLoaderModule], - bootstrap: [AppComponent] -}) -export class AppServerModule { } diff --git a/studentOrganizer/ClientApp/src/app/chat/chat.component.html b/studentOrganizer/ClientApp/src/app/chat/chat.component.html index 1c56642..1391967 100644 --- a/studentOrganizer/ClientApp/src/app/chat/chat.component.html +++ b/studentOrganizer/ClientApp/src/app/chat/chat.component.html @@ -1,4 +1,4 @@ -
+

- + \ No newline at end of file diff --git a/studentOrganizer/ClientApp/src/app/home/home.component.html b/studentOrganizer/ClientApp/src/app/home/home.component.html index 5d42ab6..6408370 100644 --- a/studentOrganizer/ClientApp/src/app/home/home.component.html +++ b/studentOrganizer/ClientApp/src/app/home/home.component.html @@ -1,9 +1,10 @@ -
+ -
+ + diff --git a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.css b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.css new file mode 100644 index 0000000..959198a --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.css @@ -0,0 +1,4 @@ +.myComponent { + background-color: red; + width: 200px; +} \ No newline at end of file diff --git a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html new file mode 100644 index 0000000..8e1f804 --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html @@ -0,0 +1 @@ +
day name: {{day.name}}
diff --git a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.spec.ts b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.spec.ts new file mode 100644 index 0000000..ae280c5 --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyDayComponent } from './my-day.component'; + +describe('MyDayComponent', () => { + let component: MyDayComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MyDayComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MyDayComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.ts b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.ts new file mode 100644 index 0000000..182d60d --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-my-day', + templateUrl: './my-day.component.html', + styleUrls: ['./my-day.component.css'] +}) +export class MyDayComponent implements OnInit { + @Input() day: string; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.css b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.css new file mode 100644 index 0000000..e69de29 diff --git a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.html b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.html new file mode 100644 index 0000000..24a3351 --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.html @@ -0,0 +1,4 @@ +

my-demo works! value:

+
+ +
diff --git a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.spec.ts b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.spec.ts new file mode 100644 index 0000000..efbb4ec --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyDemoComponent } from './my-demo.component'; + +describe('MyDemoComponent', () => { + let component: MyDemoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MyDemoComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MyDemoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts new file mode 100644 index 0000000..549d796 --- /dev/null +++ b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-demo', + templateUrl: './my-demo.component.html', + styleUrls: ['./my-demo.component.css'] +}) +export class MyDemoComponent implements OnInit { + + days = [ + {name: 'sun', color: 'red'}, + {name: 'mon', color: 'blue' }, + {name: 'tue', color: 'yellow'}]; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/studentOrganizer/ClientApp/src/app/nav-menu/nav-menu.component.html b/studentOrganizer/ClientApp/src/app/nav-menu/nav-menu.component.html index 72f80e5..ff3cc93 100644 --- a/studentOrganizer/ClientApp/src/app/nav-menu/nav-menu.component.html +++ b/studentOrganizer/ClientApp/src/app/nav-menu/nav-menu.component.html @@ -1,4 +1,5 @@ -
+

Navigation

+ \ No newline at end of file diff --git a/studentOrganizer/ClientApp/src/app/raspisanie/raspisanie.component.html b/studentOrganizer/ClientApp/src/app/raspisanie/raspisanie.component.html index d5add05..bf26893 100644 --- a/studentOrganizer/ClientApp/src/app/raspisanie/raspisanie.component.html +++ b/studentOrganizer/ClientApp/src/app/raspisanie/raspisanie.component.html @@ -1,4 +1,4 @@ -
+ + + +

- + \ No newline at end of file From a1e17db7196bce4c9c322be066a545338774dd7a Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Thu, 2 Jul 2020 23:58:12 +0300 Subject: [PATCH 2/2] changed to components approach --- .../src/app/home/home.component.html | 47 ++++--------------- .../ClientApp/src/app/home/home.component.ts | 9 ++++ .../src/app/my-day/my-day.component.html | 12 ++++- .../src/app/my-demo/my-demo.component.ts | 8 ++-- 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/studentOrganizer/ClientApp/src/app/home/home.component.html b/studentOrganizer/ClientApp/src/app/home/home.component.html index 6408370..fc17c45 100644 --- a/studentOrganizer/ClientApp/src/app/home/home.component.html +++ b/studentOrganizer/ClientApp/src/app/home/home.component.html @@ -3,43 +3,12 @@ window.dataLayer = window.dataLayer || []; function gtat() { dataLAyer.push(arguments); } gtag('js', new Date()); gtag('config',UA-6483399-23); --> - - - + +
diff --git a/studentOrganizer/ClientApp/src/app/home/home.component.ts b/studentOrganizer/ClientApp/src/app/home/home.component.ts index 1f23999..3b28a5a 100644 --- a/studentOrganizer/ClientApp/src/app/home/home.component.ts +++ b/studentOrganizer/ClientApp/src/app/home/home.component.ts @@ -5,4 +5,13 @@ import { Component } from '@angular/core'; styleUrls: ['./style.css'] }) export class HomeComponent { + + currentDate: Date; + + constructor() { + this.currentDate = new Date(); + } + + ngOnInit() { + } } diff --git a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html index 8e1f804..d49877b 100644 --- a/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html +++ b/studentOrganizer/ClientApp/src/app/my-day/my-day.component.html @@ -1 +1,11 @@ -
day name: {{day.name}}
+
День недели: {{day.name}}
+ +
{{day.name}}
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts index 549d796..65b161a 100644 --- a/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts +++ b/studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts @@ -8,9 +8,11 @@ import { Component, OnInit } from '@angular/core'; export class MyDemoComponent implements OnInit { days = [ - {name: 'sun', color: 'red'}, - {name: 'mon', color: 'blue' }, - {name: 'tue', color: 'yellow'}]; + {name: 'Понедельник', color: 'red'}, + {name: 'Вторник', color: 'blue' }, + {name: 'tue', color: 'yellow'}, + {name: 'wed', color: 'green'} + ]; constructor() { }