Skip to content

Added sample components #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jskonst wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added sample components #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7357908
Added sample components
Jul 2, 2020
a1e17db
changed to components approach
Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions studentOrganizer/ClientApp/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<body>
<app-nav-menu></app-nav-menu>
<div class="container">
<router-outlet></router-outlet>
</div>
</body>
<app-nav-menu></app-nav-menu>
<div class="container">
<router-outlet></router-outlet>
</div>
6 changes: 5 additions & 1 deletion studentOrganizer/ClientApp/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ 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: [
AppComponent,
NavMenuComponent,
HomeComponent,
chatComponent,
raspisanieComponent
raspisanieComponent,
MyDemoComponent,
MyDayComponent
],
imports: [
BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }),
Expand Down
11 changes: 0 additions & 11 deletions studentOrganizer/ClientApp/src/app/app.server.module.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions studentOrganizer/ClientApp/src/app/chat/chat.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<header>
<!-- <header>
<div class="container">
<div class="chat">
<h1>Чат</h1>
Expand All @@ -10,15 +10,15 @@ <h1>Чат</h1>
<title>Кнопка</title>
</head>

<body>
<body> -->
<div id="messages"></div>
<input [(ngModel)]="name" #ctrl="ngModel" required />
<p><button (click)="sendMessage()">
<img src="http://cdn.onlinewebfonts.com/svg/img_518618.png" width="80" height="60"
alt="картинка" style="vertical-align:middle">
Отправить сообщение
</button></p>
</body>
<!-- </body>
</div>
</div>
</header>
</header> -->
50 changes: 10 additions & 40 deletions studentOrganizer/ClientApp/src/app/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,14 @@
<header>
<!-- <header>
<script>
window.dataLayer = window.dataLayer || []; function gtat() { dataLAyer.push(arguments); } gtag('js', new Date()); gtag('config',UA-6483399-23);
</script>
</script> -->

<div class="container">
<div class="overwiev">
<div class="ovdays">Пары в ближайшие дни</div>
<div class="date1b"></div>
<div class="date2b"></div>
<div class="date3b"></div>
<div class="card1">
<div class="oval">
<img src="assets/ova1.png">
</div>
<div class="group">
<div class="hline"></div>
</div>
<div class="container">
<div class="overwiev">
<div class="ovdays">Пары в ближайшие дни</div>
<div class="date1b">{{currentDate | date:"dd"}}</div>
<div class="date2b">{{currentDate | date:"MM"}}</div>
<div class="date3b">{{currentDate | date: "yyyy"}}</div>
</div>
<div class="namecard1">Первый день</div>
<div class="card2">
<div class="oval">
<img src="assets/ova2.png">
</div>
<div class="group">
<div class="hline"></div>
</div>
</div>
<div class="namecard2">Второй день</div>
<div class="card3">
<div class="oval">
<img src="assets/ova3.png">
</div>
<div class="group">
<div class="hline"></div>
</div>
</div>
<div class="namecard3">Третий день</div>
</div>
<div class="alluser">
</div>
</div>
</header>

<app-my-demo></app-my-demo>
</div>
9 changes: 9 additions & 0 deletions studentOrganizer/ClientApp/src/app/home/home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,13 @@ import { Component } from '@angular/core';
styleUrls: ['./style.css']
})
export class HomeComponent {

currentDate: Date;

constructor() {
this.currentDate = new Date();
}

ngOnInit() {
}
}
4 changes: 4 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-day/my-day.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.myComponent {
background-color: red;
width: 200px;
}
11 changes: 11 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-day/my-day.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="myComponent" [ngStyle]="{'background-color': day.color}">День недели: {{day.name}}</div>

<div class="namecard1">{{day.name}}</div>
<div class="card2">
<div class="oval">
<img src=" assets/ova2.png">
</div>
<div class="group">
<div class="hline"></div>
</div>
</div>
25 changes: 25 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-day/my-day.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<MyDayComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MyDayComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(MyDayComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
16 changes: 16 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-day/my-day.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
}

}
Empty file added studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.css
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<p>my-demo works! value:</p>
<div *ngFor="let el of days">
<app-my-day [day]="el"></app-my-day>
</div>
25 changes: 25 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<MyDemoComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MyDemoComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(MyDemoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
22 changes: 22 additions & 0 deletions studentOrganizer/ClientApp/src/app/my-demo/my-demo.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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: 'Понедельник', color: 'red'},
{name: 'Вторник', color: 'blue' },
{name: 'tue', color: 'yellow'},
{name: 'wed', color: 'green'}
];

constructor() { }

ngOnInit() {
}

}
5 changes: 3 additions & 2 deletions studentOrganizer/ClientApp/src/app/nav-menu/nav-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<header>
<p>Navigation</p>
<!-- <header>
<nav
class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"
>
Expand Down Expand Up @@ -76,4 +77,4 @@
</div>
</div>
</nav>
</header>
</header> -->
11 changes: 7 additions & 4 deletions studentOrganizer/ClientApp/src/app/raspisanie/raspisanie.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<header>
<!-- <header>
<div class="container">
<div class="raspisanie">
<h1 id="tableLabel">Расписание</h1>
Expand All @@ -9,15 +9,18 @@ <h1 id="tableLabel">Расписание</h1>
<meta charset="utf-8">
<title>Кнопка</title>
</head>
<body>
<body> -->



<div id="messages"></div>
<!-- <input [(ngModel)]="gr" #ctrl="ngModel" required /> -->
<p><button (click)="rasp()">
<img src="http://cdn.onlinewebfonts.com/svg/img_405194.png" width="80" height="60"
alt="картинка" style="vertical-align:middle">
Отправить сообщение
</button></p>
</body>
<!-- </body>
</div>
</div>
</header>
</header> -->