diff --git a/src/app/styles/account-menu.css b/src/app/account-menu.component.css similarity index 100% rename from src/app/styles/account-menu.css rename to src/app/account-menu.component.css diff --git a/src/app/components/account-menu.ts b/src/app/account-menu.component.ts similarity index 94% rename from src/app/components/account-menu.ts rename to src/app/account-menu.component.ts index 544b8e0..647fa26 100644 --- a/src/app/components/account-menu.ts +++ b/src/app/account-menu.component.ts @@ -2,7 +2,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; @Component({ selector: 'account-menu', - styleUrls: ['../styles/account-menu.css'], + styleUrls: ['./account-menu.component.css'], template: `
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7b45cfa..0c37394 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoursesComponent } from './components/courses'; -import { RegisterComponent } from './components/sign-in'; -import { SignInComponent } from './components/sign-in'; +import { catalogComponent } from './catalog/catalog.component'; +import { RegisterComponent } from './users/register.component'; +import { SignInComponent } from './users/sign-in.component'; const routes: Routes = [ - { path: 'catalog', component: CoursesComponent, }, + { path: 'catalog', component: catalogComponent, }, { path: 'users/register', component: RegisterComponent, }, { path: 'users/sign-in', component: SignInComponent, }, { path: '', redirectTo: '/catalog', pathMatch: 'full' }, diff --git a/src/app/components/app.ts b/src/app/app.component.ts similarity index 100% rename from src/app/components/app.ts rename to src/app/app.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1b8df5a..223f99e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,20 +3,20 @@ import { BrowserModule } from '@angular/platform-browser'; import { ReactiveFormsModule, FormsModule } from '@angular/forms' import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './components/app'; -import { NavBarComponent } from './components/nav-bar'; -import { CoursesComponent } from "./components/courses"; -import { RegisterComponent } from "./components/sign-in"; -import { SignInComponent } from "./components/sign-in"; -import { LoadingComponent } from "./components/loading-spinner"; -import { DataRepositoryService } from "./services/data-repository" -import { AccountMenuComponent } from "./components/account-menu"; +import { AppComponent } from './app.component'; +import { NavBarComponent } from './nav-bar.component'; +import { catalogComponent } from "./catalog/catalog.component"; +import { RegisterComponent } from "./users/register.component"; +import { SignInComponent } from "./users/sign-in.component"; +import { LoadingComponent } from "./components/loading-spinner.component"; +import { DataRepositoryService } from "./services/data-repository.service" +import { AccountMenuComponent } from "./account-menu.component"; @NgModule({ declarations: [ AppComponent, NavBarComponent, - CoursesComponent, + catalogComponent, RegisterComponent, SignInComponent, LoadingComponent, diff --git a/src/app/styles/catalog.css b/src/app/catalog/catalog.component.css similarity index 100% rename from src/app/styles/catalog.css rename to src/app/catalog/catalog.component.css diff --git a/src/app/templates/catalog.html b/src/app/catalog/catalog.component.html similarity index 95% rename from src/app/templates/catalog.html rename to src/app/catalog/catalog.component.html index 2853828..360b3f1 100644 --- a/src/app/templates/catalog.html +++ b/src/app/catalog/catalog.component.html @@ -1,3 +1,7 @@ +
@@ -35,4 +39,4 @@ -
\ No newline at end of file +
diff --git a/src/app/components/courses.ts b/src/app/catalog/catalog.component.ts similarity index 89% rename from src/app/components/courses.ts rename to src/app/catalog/catalog.component.ts index 330c923..4d29b6c 100644 --- a/src/app/components/courses.ts +++ b/src/app/catalog/catalog.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; -import { DataRepositoryService } from "../services/data-repository" -import { IClass } from '../services/class.model'; +import { DataRepositoryService } from "../services/data-repository.service" +import { IClass } from './class.model'; @Component({ - styleUrls: ['../styles/catalog.css'], - templateUrl: '../templates/catalog.html' + styleUrls: ['./catalog.component.css'], + templateUrl: './catalog.component.html' }) -export class CoursesComponent { +export class catalogComponent { classes: IClass[] = []; visibleClasses: IClass[] = []; diff --git a/src/app/services/class.model.ts b/src/app/catalog/class.model.ts similarity index 100% rename from src/app/services/class.model.ts rename to src/app/catalog/class.model.ts diff --git a/src/app/components/loading-spinner.ts b/src/app/components/loading-spinner.component.ts similarity index 100% rename from src/app/components/loading-spinner.ts rename to src/app/components/loading-spinner.component.ts diff --git a/src/app/styles/nav-bar.css b/src/app/nav-bar.component.css similarity index 100% rename from src/app/styles/nav-bar.css rename to src/app/nav-bar.component.css diff --git a/src/app/components/nav-bar.ts b/src/app/nav-bar.component.ts similarity index 83% rename from src/app/components/nav-bar.ts rename to src/app/nav-bar.component.ts index 3d146a8..aa81a89 100644 --- a/src/app/components/nav-bar.ts +++ b/src/app/nav-bar.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; -import { DataRepositoryService } from "../services/data-repository"; +import { DataRepositoryService } from "../app/services/data-repository.service"; @Component({ selector: 'nav-bar', - styleUrls: [`../styles/nav-bar.css`], + styleUrls: [`./nav-bar.component.css`], template: `
diff --git a/src/app/services/data-repository.ts b/src/app/services/data-repository.service.ts similarity index 98% rename from src/app/services/data-repository.ts rename to src/app/services/data-repository.service.ts index c586294..d2607a2 100644 --- a/src/app/services/data-repository.ts +++ b/src/app/services/data-repository.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { Observable, Subject, EMPTY, throwError, timer } from 'rxjs'; -import { IUser } from '../services/user.model'; -import { IClass, ICourse } from '../services/class.model'; +import { IUser } from '../users/user.model'; +import { IClass, ICourse } from '../catalog/class.model'; @Injectable() export class DataRepositoryService { diff --git a/src/app/styles/register.css b/src/app/users/register.component.css similarity index 100% rename from src/app/styles/register.css rename to src/app/users/register.component.css diff --git a/src/app/templates/register.html b/src/app/users/register.component.html similarity index 100% rename from src/app/templates/register.html rename to src/app/users/register.component.html diff --git a/src/app/users/register.component.ts b/src/app/users/register.component.ts new file mode 100644 index 0000000..c1dd537 --- /dev/null +++ b/src/app/users/register.component.ts @@ -0,0 +1,50 @@ +import { Component } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router' + +import { DataRepositoryService } from '../services/data-repository.service' +import { IUser } from './user.model'; + + + +@Component({ + styleUrls: ['./register.component.css'], + templateUrl: './register.component.html' +}) + +export class RegisterComponent { + registerForm: FormGroup; + firstName: FormControl; + lastName: FormControl; + email: FormControl; + password: FormControl; + saving: boolean = false; + + constructor(private router: Router, private dataRepository: DataRepositoryService) { + this.firstName = new FormControl('', Validators.required); + this.lastName = new FormControl('', Validators.required); + this.email = new FormControl('', Validators.required); + this.password = new FormControl('', Validators.required); + + this.registerForm = new FormGroup({ + firstName: this.firstName, + lastName: this.lastName, + email: this.email, + password: this.password + }); + } + + + registerUser(user: IUser) { + this.saving = true; + this.dataRepository.saveUser(user) + .subscribe({ + error: () => this.saving = false, + complete: () => this.router.navigate(['/catalog']) + }); + } + + cancel() { + this.router.navigate(['/']); + } +} diff --git a/src/app/components/sign-in.ts b/src/app/users/sign-in.component.ts similarity index 69% rename from src/app/components/sign-in.ts rename to src/app/users/sign-in.component.ts index 262197e..58364cd 100644 --- a/src/app/components/sign-in.ts +++ b/src/app/users/sign-in.component.ts @@ -1,9 +1,7 @@ import { Component } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router' +import { DataRepositoryService } from '../services/data-repository.service' -import { DataRepositoryService } from '../services/data-repository' -import { IUser } from '../services/user.model'; @Component({ styles: [` @@ -93,44 +91,3 @@ export class SignInComponent { } } -@Component({ - styleUrls: ['../styles/register.css'], - templateUrl: '../templates/register.html' -}) - -export class RegisterComponent { - registerForm: FormGroup; - firstName: FormControl; - lastName: FormControl; - email: FormControl; - password: FormControl; - saving: boolean = false; - - constructor(private router: Router, private dataRepository: DataRepositoryService) { - this.firstName = new FormControl('', Validators.required); - this.lastName = new FormControl('', Validators.required); - this.email = new FormControl('', Validators.required); - this.password = new FormControl('', Validators.required); - - this.registerForm = new FormGroup({ - firstName: this.firstName, - lastName: this.lastName, - email: this.email, - password: this.password - }); - } - - - registerUser(user: IUser) { - this.saving = true; - this.dataRepository.saveUser(user) - .subscribe({ - error: () => this.saving = false, - complete: () => this.router.navigate(['/catalog']) - }); - } - - cancel() { - this.router.navigate(['/']); - } -} diff --git a/src/app/services/user.model.ts b/src/app/users/user.model.ts similarity index 100% rename from src/app/services/user.model.ts rename to src/app/users/user.model.ts