Skip to content

Commit

Permalink
Added two components and chartJS for later implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
iAlbertTran committed Feb 9, 2019
1 parent 7557082 commit 889fe4a
Show file tree
Hide file tree
Showing 12 changed files with 103 additions and 6 deletions.
12 changes: 9 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"animate.css": "^3.7.0",
"boostrap": "^2.0.0",
"bootstrap": "^4.1.3",
"chart.js": "^2.5.0",
"chart.js": "^2.7.3",
"core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"hammerjs": "^2.0.8",
Expand All @@ -43,6 +43,7 @@
"@angular/cli": "^7.2.0",
"@angular/compiler-cli": "~7.0.0",
"@angular/language-service": "~7.0.0",
"@types/chart.js": "^2.7.42",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/jquery": "^3.3.22",
Expand Down
4 changes: 4 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import { DefaultUrlSerializer, UrlTree } from '@angular/router';
import { CountdownTimerModule } from 'ngx-countdown-timer';

import { MDBBootstrapModule } from 'angular-bootstrap-md';
import { CollectionComponent } from './collection/collection.component';
import { WishlistComponent } from './wishlist/wishlist.component';

export class LowerCaseUrlSerializer extends DefaultUrlSerializer {
parse(url: string): UrlTree {
Expand Down Expand Up @@ -66,6 +68,8 @@ const appRoutes: Routes = [
ResetPasswordComponent,
DashboardComponent,
FunkopopComponent,
CollectionComponent,
WishlistComponent,
],
imports: [
MDBBootstrapModule.forRoot(),
Expand Down
3 changes: 3 additions & 0 deletions src/app/collection/collection.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<p>
collection works!
</p>
Empty file.
25 changes: 25 additions & 0 deletions src/app/collection/collection.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { CollectionComponent } from './collection.component';

describe('CollectionComponent', () => {
let component: CollectionComponent;
let fixture: ComponentFixture<CollectionComponent>;

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

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

it('should create', () => {
expect(component).toBeTruthy();
});
});
15 changes: 15 additions & 0 deletions src/app/collection/collection.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-collection',
templateUrl: './collection.component.html',
styleUrls: ['./collection.component.scss']
})
export class CollectionComponent implements OnInit {

constructor() { }

ngOnInit() {
}

}
4 changes: 2 additions & 2 deletions src/app/services/funkollection-api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import { LoginModel } from '../models/loginModel';
@Injectable()
export class FunkollectionApiService {

//baseURL = 'http://localhost:8000/api';
baseURL = 'https://funkollection-api.herokuapp.com/api';
baseURL = 'http://localhost:8000/api';
//baseURL = 'https://funkollection-api.herokuapp.com/api';


funkopopURL = this.baseURL + '/funkopop';
Expand Down
3 changes: 3 additions & 0 deletions src/app/wishlist/wishlist.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<p>
wishlist works!
</p>
Empty file.
25 changes: 25 additions & 0 deletions src/app/wishlist/wishlist.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { WishlistComponent } from './wishlist.component';

describe('WishlistComponent', () => {
let component: WishlistComponent;
let fixture: ComponentFixture<WishlistComponent>;

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

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

it('should create', () => {
expect(component).toBeTruthy();
});
});
15 changes: 15 additions & 0 deletions src/app/wishlist/wishlist.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-wishlist',
templateUrl: './wishlist.component.html',
styleUrls: ['./wishlist.component.scss']
})
export class WishlistComponent implements OnInit {

constructor() { }

ngOnInit() {
}

}

0 comments on commit 889fe4a

Please sign in to comment.