- {{ rememberMe }}
diff --git a/assets/src/app/app.component.ts b/assets/src/app/app.component.ts
index 763d4c3..5ac9619 100644
--- a/assets/src/app/app.component.ts
+++ b/assets/src/app/app.component.ts
@@ -1,8 +1,9 @@
-import { Component, HostListener, OnInit, OnDestroy} from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { AuthService} from './commons/services/auth/auth.service';
import { FormControl, FormBuilder, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { Location } from '@angular/common';
+import { Title } from '@angular/platform-browser';
@Component({
selector: 'app-root',
@@ -10,9 +11,7 @@ import { Location } from '@angular/common';
styleUrls: ['./app.component.css'],
providers: [AuthService]
})
-
-export class AppComponent implements OnInit{
- title = 'angular';
+export class AppComponent implements OnInit {
usersForm;
errors;
rememberMe:boolean = false;
@@ -21,7 +20,8 @@ export class AppComponent implements OnInit{
private authService: AuthService,
private fb: FormBuilder,
private router: Router,
- private location: Location
+ private location: Location,
+ private title: Title,
){ }
ngOnInit(){
@@ -29,12 +29,7 @@ export class AppComponent implements OnInit{
email : new FormControl('', [Validators.required, Validators.email]),
password : new FormControl('', Validators.required)
});
- }
-
- ngOnDestroy(){
- if(this.rememberMe == false){
- this.authService.removeToken();
- }
+
}
get username(){
diff --git a/assets/src/app/app.module.ts b/assets/src/app/app.module.ts
index 4992a8a..a7827e1 100644
--- a/assets/src/app/app.module.ts
+++ b/assets/src/app/app.module.ts
@@ -1,9 +1,14 @@
import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { HttpClientModule,HTTP_INTERCEPTORS } from '@angular/common/http';
import { RouterModule, Routes } from "@angular/router";
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AppRoutingModule } from './app-routing.module';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { polyfill } from 'keyboardevent-key-polyfill';
+import { TextInputAutocompleteModule } from 'angular-text-input-autocomplete';
+import { NgbPaginationModule, NgbAlertModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
//Service
import { TokenService } from './commons/services/interceptors/token.service';
@@ -18,15 +23,20 @@ import { CartComponent } from './components/cart/cart.component';
import { DetailsComponent } from './components/details/details.component';
import { AccountComponent } from './components/account/account.component';
+//Pipes
+import { CategoryPipe } from './commons/pipes/category/category.pipe';
+
//Routes
const routes: Routes = [
{ path: '', component: HomeComponent },
- { path: 'details', component: DetailsComponent },
- { path: 'cart', component: CartComponent },
+ { path: 'details/:id', component: DetailsComponent },
+ { path: 'cart/:id', component: CartComponent },
{ path: 'account', component: AccountComponent }
]
+polyfill();
+
@NgModule({
declarations: [
AppComponent,
@@ -34,6 +44,7 @@ const routes: Routes = [
CartComponent,
DetailsComponent,
AccountComponent,
+ CategoryPipe,
],
imports: [
@@ -43,6 +54,10 @@ const routes: Routes = [
HttpClientModule,
FormsModule,
ReactiveFormsModule,
+ TextInputAutocompleteModule,
+ NgbPaginationModule,
+ NgbAlertModule,
+ NgbModule,
RouterModule.forRoot(routes, {onSameUrlNavigation: 'reload'}),
],
providers: [
@@ -52,7 +67,8 @@ const routes: Routes = [
multi: true
}
],
- bootstrap: [AppComponent]
+ bootstrap: [AppComponent],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class AppModule { }
diff --git a/assets/src/app/commons/pipes/category.pipe.ts b/assets/src/app/commons/pipes/category.pipe.ts
new file mode 100644
index 0000000..6472dd0
--- /dev/null
+++ b/assets/src/app/commons/pipes/category.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'category'
+})
+export class CategoryPipe implements PipeTransform {
+
+ transform(category:any, args?: any): any {
+ if(args === undefined) return category;
+
+ return category.filter(
+ cat => {
+ console.log(cat.category__category.toLowerCase());
+ return cat.category__category.toLowerCase().includes(args.toLowerCase());
+ }
+ )
+ }
+
+}
diff --git a/assets/src/app/commons/pipes/category/category.pipe.spec.ts b/assets/src/app/commons/pipes/category/category.pipe.spec.ts
new file mode 100644
index 0000000..45b4d74
--- /dev/null
+++ b/assets/src/app/commons/pipes/category/category.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { CategoryPipe } from './category.pipe';
+
+describe('CategoryPipe', () => {
+ it('create an instance', () => {
+ const pipe = new CategoryPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/assets/src/app/commons/pipes/category/category.pipe.ts b/assets/src/app/commons/pipes/category/category.pipe.ts
new file mode 100644
index 0000000..10ce382
--- /dev/null
+++ b/assets/src/app/commons/pipes/category/category.pipe.ts
@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'category'
+})
+export class CategoryPipe implements PipeTransform {
+
+ transform(category:any, args?: any): any {
+ if(args === undefined) return category;
+
+ return category.filter(
+ cat => {
+ return cat.category__category.toLowerCase().includes(args.toLowerCase());
+ }
+ )
+ }
+
+}
diff --git a/assets/src/app/commons/services/auth/auth.service.ts b/assets/src/app/commons/services/auth/auth.service.ts
index ce5ce18..792ca97 100644
--- a/assets/src/app/commons/services/auth/auth.service.ts
+++ b/assets/src/app/commons/services/auth/auth.service.ts
@@ -77,7 +77,8 @@ export class AuthService {
}
getSessionToken(){
- if(sessionStorage['token'] == null){
+ if(sessionStorage['token'] == null ||
+ sessionStorage['token'] == undefined){
return JSON.parse(null);
}
this.token = this.refreshToken(this.user);
diff --git a/assets/src/app/commons/services/cart/cart.service.spec.ts b/assets/src/app/commons/services/cart/cart.service.spec.ts
new file mode 100644
index 0000000..a686b44
--- /dev/null
+++ b/assets/src/app/commons/services/cart/cart.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { CartService } from './cart.service';
+
+describe('CartService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: CartService = TestBed.get(CartService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/assets/src/app/commons/services/cart/cart.service.ts b/assets/src/app/commons/services/cart/cart.service.ts
new file mode 100644
index 0000000..f202955
--- /dev/null
+++ b/assets/src/app/commons/services/cart/cart.service.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class CartService {
+
+ httpHeaders = new HttpHeaders({'Content-type':'application/json'});
+ constructor(
+ private http: HttpClient) { }
+
+ getThemeCart(id){
+ return this.http.get
('http://localhost:8000/home/theme/cart/'+id+'/', {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+}
diff --git a/assets/src/app/commons/services/details/details.service.spec.ts b/assets/src/app/commons/services/details/details.service.spec.ts
new file mode 100644
index 0000000..9587d83
--- /dev/null
+++ b/assets/src/app/commons/services/details/details.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DetailsService } from './details.service';
+
+describe('DetailsService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: DetailsService = TestBed.get(DetailsService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/assets/src/app/commons/services/details/details.service.ts b/assets/src/app/commons/services/details/details.service.ts
new file mode 100644
index 0000000..7762845
--- /dev/null
+++ b/assets/src/app/commons/services/details/details.service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class DetailsService {
+
+ httpHeaders = new HttpHeaders({'Content-type': 'application/json'});
+ constructor(
+ private http: HttpClient) { }
+
+ getThemeDetailsService(id){
+ return this.http.get('http://localhost:8000/home/theme/details/'+id+'/', {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response =>{
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ );
+ }
+
+ createReviewService(comment){
+ return this.http.post("http://localhost:8000/details/createReview/",comment)
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ );
+ }
+}
diff --git a/assets/src/app/commons/services/home/home.service.spec.ts b/assets/src/app/commons/services/home/home.service.spec.ts
new file mode 100644
index 0000000..2d073b4
--- /dev/null
+++ b/assets/src/app/commons/services/home/home.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HomeService } from './home.service';
+
+describe('HomeService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: HomeService = TestBed.get(HomeService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/assets/src/app/commons/services/home/home.service.ts b/assets/src/app/commons/services/home/home.service.ts
new file mode 100644
index 0000000..d9b62c2
--- /dev/null
+++ b/assets/src/app/commons/services/home/home.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class HomeService {
+
+ httpHeaders = new HttpHeaders({'Content-type': 'application/json'});
+ public categories;
+ constructor(private http: HttpClient) {
+ this.categories = this.getCategory();
+ }
+
+ getThemes(){
+ return this.http.get("http://localhost:8000/home/theme/", {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+ getCategory(){
+ return this.http.get("http://localhost:8000/home/theme/category/", {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+
+}
diff --git a/assets/src/app/components/account/account.component.html b/assets/src/app/components/account/account.component.html
index 2980bf2..2ad48c1 100644
--- a/assets/src/app/components/account/account.component.html
+++ b/assets/src/app/components/account/account.component.html
@@ -16,7 +16,9 @@
- Field required!
+
+ Field required!
+
@@ -25,7 +27,9 @@ 
+ 
+
+ 
+ 
+ 
+ {{ comments.comment }} +
+