From 054dc5afce277b4f9851a718bdbb306270969ba8 Mon Sep 17 00:00:00 2001 From: Darko Luketic <2694548+dalu@users.noreply.github.com> Date: Thu, 29 Mar 2018 23:40:08 +0200 Subject: [PATCH] primeng + font-awesome + bootstrap --- angular/.angular-cli.json | 5 ++++- angular/package.json | 5 ++++- angular/src/app/app.component.html | 20 -------------------- angular/src/app/services/data.service.ts | 4 ---- angular/src/styles.scss | 2 +- angular/yarn.lock | 14 +++++++++++++- 6 files changed, 22 insertions(+), 28 deletions(-) diff --git a/angular/.angular-cli.json b/angular/.angular-cli.json index 1d168dc..497ac5b 100644 --- a/angular/.angular-cli.json +++ b/angular/.angular-cli.json @@ -19,7 +19,10 @@ "testTsconfig": "tsconfig.spec.json", "prefix": "icod", "styles": [ - "styles.scss" + "styles.scss", + "../node_modules/font-awesome/css/font-awesome.min.css", + "../node_modules/primeng/resources/themes/omega/theme.css", + "../node_modules/primeng/resources/primeng.min.css" ], "scripts": [], "environmentSource": "environments/environment.ts", diff --git a/angular/package.json b/angular/package.json index 8936f83..1a7626d 100644 --- a/angular/package.json +++ b/angular/package.json @@ -12,7 +12,7 @@ }, "private": true, "dependencies": { - "@angular/animations": "^5.2.0", + "@angular/animations": "^5.2.9", "@angular/common": "^5.2.0", "@angular/compiler": "^5.2.0", "@angular/core": "^5.2.0", @@ -22,7 +22,10 @@ "@angular/platform-browser-dynamic": "^5.2.0", "@angular/router": "^5.2.0", "@angular/service-worker": "^5.2.0", + "bootstrap": "^4.0.0", "core-js": "^2.4.1", + "font-awesome": "^4.7.0", + "primeng": "^5.2.4", "rxjs": "^5.5.6", "zone.js": "^0.8.19" }, diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html index 1094e7e..0680b43 100644 --- a/angular/src/app/app.component.html +++ b/angular/src/app/app.component.html @@ -1,21 +1 @@ - -
-

- Welcome to {{ title }}! -

- Angular Logo -
-

Here are some links to help you start:

- - diff --git a/angular/src/app/services/data.service.ts b/angular/src/app/services/data.service.ts index 438ad0f..daf9e68 100644 --- a/angular/src/app/services/data.service.ts +++ b/angular/src/app/services/data.service.ts @@ -4,7 +4,6 @@ import {Observable} from 'rxjs/Observable'; @Injectable() export class DataService { - private rootURL = '/api/v1/data/'; constructor(private http: HttpClient) { @@ -12,7 +11,6 @@ export class DataService { public list(p: DataParams): Observable { let params = new HttpParams(); - params = params.append('response_type', 'list'); if (p.start !== undefined) { @@ -167,7 +165,6 @@ export class DataService { } } - return this.http.get(this.rootURL, {params: params}); } @@ -182,7 +179,6 @@ export class DataService { public removeId(id: string) { return this.http.delete(this.rootURL + id); } - } export class DataParams { diff --git a/angular/src/styles.scss b/angular/src/styles.scss index 90d4ee0..19b0ca9 100644 --- a/angular/src/styles.scss +++ b/angular/src/styles.scss @@ -1 +1 @@ -/* You can add global styles to this file, and also import other style files */ +@import "~bootstrap/scss/bootstrap"; diff --git a/angular/yarn.lock b/angular/yarn.lock index 1312acc..20d5215 100644 --- a/angular/yarn.lock +++ b/angular/yarn.lock @@ -27,7 +27,7 @@ "@ngtools/json-schema" "^1.1.0" rxjs "^5.5.6" -"@angular/animations@^5.2.0": +"@angular/animations@^5.2.9": version "5.2.9" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.9.tgz#220db9fb5a52a193db0023d721b23ddd25a75770" dependencies: @@ -805,6 +805,10 @@ boom@5.x.x: dependencies: hoek "4.x.x" +bootstrap@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -2474,6 +2478,10 @@ follow-redirects@1.0.0: dependencies: debug "^2.2.0" +font-awesome@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" + for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" @@ -4965,6 +4973,10 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" +primeng@^5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/primeng/-/primeng-5.2.4.tgz#79d9b030ea37fdeb23284dcbbca3b89dddc3e91e" + process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"