diff --git a/angular.json b/angular.json index b6dede3..72a6897 100644 --- a/angular.json +++ b/angular.json @@ -22,15 +22,10 @@ "src/browserconfig.xml", "src/favicon-16x16.png", "src/favicon-32x32.png", + "src/favicon-96x96.png", "src/favicon.ico", "src/assets", "src/manifest.json", - "src/mstile-70x70.png", - "src/mstile-144x144.png", - "src/mstile-150x150.png", - "src/mstile-310x150.png", - "src/mstile-310x310.png", - "src/safari-pinned-tab.svg" ], "styles": [ "src/styles.css", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3b20d8d..0b18b9f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -18,7 +18,11 @@ export class AppComponent { constructor( @Inject(TWIGS_SERVICE) private twigsService: TwigsService, private location: Location, - ) { } + ) { + this.twigsService.getProfile().subscribe(user => { + this.user = user; + }); + } getUsername(): String { return this.user.username; diff --git a/src/app/shared/twigs.http.service.ts b/src/app/shared/twigs.http.service.ts index 5fe6161..abc5ba3 100644 --- a/src/app/shared/twigs.http.service.ts +++ b/src/app/shared/twigs.http.service.ts @@ -156,6 +156,10 @@ export class TwigsHttpService implements TwigsService { } // Users + getProfile(): Observable { + return this.http.get(`${this.apiUrl}/users/me`, this.options); + } + getUsersByUsername(username: string): Observable { return Observable.create(subscriber => { subscriber.error("Not yet implemented") diff --git a/src/app/shared/twigs.local.service.ts b/src/app/shared/twigs.local.service.ts index a9336a9..84b68e5 100644 --- a/src/app/shared/twigs.local.service.ts +++ b/src/app/shared/twigs.local.service.ts @@ -301,6 +301,12 @@ export class TwigsLocalService implements TwigsService { } // Users + getProfile(): Observable { + return Observable.create(subscriber => { + subscriber.error("Not yet implemented") + }); + } + getUsersByUsername(username: string): Observable { return Observable.create(subscriber => { subscriber.next(this.users.filter(user => user.username.indexOf(username) > -1 )); diff --git a/src/app/shared/twigs.service.ts b/src/app/shared/twigs.service.ts index 1cb5eb1..c37a09d 100644 --- a/src/app/shared/twigs.service.ts +++ b/src/app/shared/twigs.service.ts @@ -44,6 +44,7 @@ export interface TwigsService { updateTransaction(budgetId: number, id: number, changes: object): Observable; deleteTransaction(budgetId: number, id: number): Observable; + getProfile(): Observable; getUsersByUsername(username: string): Observable; } diff --git a/src/assets/icons/icon-114x114.png b/src/assets/icons/icon-114x114.png new file mode 100644 index 0000000..3dfb488 Binary files /dev/null and b/src/assets/icons/icon-114x114.png differ diff --git a/src/assets/icons/icon-120x120.png b/src/assets/icons/icon-120x120.png new file mode 100644 index 0000000..43bfb12 Binary files /dev/null and b/src/assets/icons/icon-120x120.png differ diff --git a/src/assets/icons/icon-144x144.png b/src/assets/icons/icon-144x144.png index ab9621d..c100140 100644 Binary files a/src/assets/icons/icon-144x144.png and b/src/assets/icons/icon-144x144.png differ diff --git a/src/assets/icons/icon-150x150.png b/src/assets/icons/icon-150x150.png new file mode 100644 index 0000000..e56d845 Binary files /dev/null and b/src/assets/icons/icon-150x150.png differ diff --git a/src/assets/icons/icon-152x152.png b/src/assets/icons/icon-152x152.png index 5dae1e2..0d6e277 100644 Binary files a/src/assets/icons/icon-152x152.png and b/src/assets/icons/icon-152x152.png differ diff --git a/src/assets/icons/icon-180x180.png b/src/assets/icons/icon-180x180.png new file mode 100644 index 0000000..9b7d8e0 Binary files /dev/null and b/src/assets/icons/icon-180x180.png differ diff --git a/src/assets/icons/icon-192x192.png b/src/assets/icons/icon-192x192.png index 497aaeb..f94745b 100644 Binary files a/src/assets/icons/icon-192x192.png and b/src/assets/icons/icon-192x192.png differ diff --git a/src/assets/icons/icon-310x310.png b/src/assets/icons/icon-310x310.png new file mode 100644 index 0000000..9ac1b98 Binary files /dev/null and b/src/assets/icons/icon-310x310.png differ diff --git a/src/assets/icons/icon-36x36.png b/src/assets/icons/icon-36x36.png new file mode 100644 index 0000000..d6e3edb Binary files /dev/null and b/src/assets/icons/icon-36x36.png differ diff --git a/src/assets/icons/icon-48x48.png b/src/assets/icons/icon-48x48.png new file mode 100644 index 0000000..78d7c36 Binary files /dev/null and b/src/assets/icons/icon-48x48.png differ diff --git a/src/assets/icons/icon-57x57.png b/src/assets/icons/icon-57x57.png new file mode 100644 index 0000000..ce79597 Binary files /dev/null and b/src/assets/icons/icon-57x57.png differ diff --git a/src/assets/icons/icon-60x60.png b/src/assets/icons/icon-60x60.png new file mode 100644 index 0000000..f4ea2e5 Binary files /dev/null and b/src/assets/icons/icon-60x60.png differ diff --git a/src/assets/icons/icon-70x70.png b/src/assets/icons/icon-70x70.png new file mode 100644 index 0000000..1b371bf Binary files /dev/null and b/src/assets/icons/icon-70x70.png differ diff --git a/src/assets/icons/icon-72x72.png b/src/assets/icons/icon-72x72.png index 09dbe2e..7f35f3c 100644 Binary files a/src/assets/icons/icon-72x72.png and b/src/assets/icons/icon-72x72.png differ diff --git a/src/assets/icons/icon-76x76.png b/src/assets/icons/icon-76x76.png new file mode 100644 index 0000000..9ffcd10 Binary files /dev/null and b/src/assets/icons/icon-76x76.png differ diff --git a/src/assets/icons/icon-96x96.png b/src/assets/icons/icon-96x96.png index 2dcc04a..fc39b10 100644 Binary files a/src/assets/icons/icon-96x96.png and b/src/assets/icons/icon-96x96.png differ diff --git a/src/assets/icons/icon-precomposed.png b/src/assets/icons/icon-precomposed.png new file mode 100644 index 0000000..c20e026 Binary files /dev/null and b/src/assets/icons/icon-precomposed.png differ diff --git a/src/assets/icons/icon.png b/src/assets/icons/icon.png new file mode 100644 index 0000000..c20e026 Binary files /dev/null and b/src/assets/icons/icon.png differ diff --git a/src/assets/icons/apple-touch-icon.png b/src/assets/icons/touch-icon.png similarity index 100% rename from src/assets/icons/apple-touch-icon.png rename to src/assets/icons/touch-icon.png diff --git a/src/browserconfig.xml b/src/browserconfig.xml index 52cd4b6..2c192c7 100644 --- a/src/browserconfig.xml +++ b/src/browserconfig.xml @@ -1,8 +1,11 @@ - + - #81c784 + + + + #ffffff - + \ No newline at end of file diff --git a/src/favicon-16x16.png b/src/favicon-16x16.png index fd017d5..214242c 100644 Binary files a/src/favicon-16x16.png and b/src/favicon-16x16.png differ diff --git a/src/favicon-32x32.png b/src/favicon-32x32.png index 78ff1c9..01569e6 100644 Binary files a/src/favicon-32x32.png and b/src/favicon-32x32.png differ diff --git a/src/favicon-96x96.png b/src/favicon-96x96.png new file mode 100644 index 0000000..fc39b10 Binary files /dev/null and b/src/favicon-96x96.png differ diff --git a/src/favicon.ico b/src/favicon.ico index 2680342..c08c5f9 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ diff --git a/src/index.html b/src/index.html index 2cbaaca..6df95c1 100644 --- a/src/index.html +++ b/src/index.html @@ -6,10 +6,10 @@ Twigs - + + - diff --git a/src/mstile-144x144.png b/src/mstile-144x144.png deleted file mode 100644 index c204b67..0000000 Binary files a/src/mstile-144x144.png and /dev/null differ diff --git a/src/mstile-150x150.png b/src/mstile-150x150.png deleted file mode 100644 index 56da257..0000000 Binary files a/src/mstile-150x150.png and /dev/null differ diff --git a/src/mstile-310x150.png b/src/mstile-310x150.png deleted file mode 100644 index 16bfdf8..0000000 Binary files a/src/mstile-310x150.png and /dev/null differ diff --git a/src/mstile-310x310.png b/src/mstile-310x310.png deleted file mode 100644 index 4d45c5d..0000000 Binary files a/src/mstile-310x310.png and /dev/null differ diff --git a/src/mstile-70x70.png b/src/mstile-70x70.png deleted file mode 100644 index a62dcaa..0000000 Binary files a/src/mstile-70x70.png and /dev/null differ diff --git a/src/safari-pinned-tab.svg b/src/safari-pinned-tab.svg deleted file mode 100644 index bc4c62f..0000000 --- a/src/safari-pinned-tab.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - -