From e2882c99de74815d50c9602907cea2c53544d3cb Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Wed, 13 Feb 2019 10:37:38 +0100 Subject: [PATCH 1/4] Added some necessary depndencies --- package.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package.json b/package.json index ff9b52a..d9d7fce 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,8 @@ "name": "github-trading", "version": "0.0.0", "scripts": { + "android": "tns run android --bundle", + "ios": "tns run ios --bundle", "ng": "ng", "start": "ng serve", "build": "ng build", @@ -11,6 +13,10 @@ }, "private": true, "dependencies": { + "nativescript-angular": "~7.1.0", + "nativescript-theme-core": "~1.0.4", + "reflect-metadata": "~0.1.8", + "tns-core-modules": "~5.1.1", "@angular/animations": "^6.1.10", "@angular/common": "^6.1.10", "@angular/compiler": "^6.1.10", @@ -21,19 +27,24 @@ "@angular/platform-browser-dynamic": "^6.1.10", "@angular/router": "^6.1.10", "@fortawesome/fontawesome-free": "^5.4.0", + "@nativescript/schematics": "^0.5.0", "@ng-bootstrap/ng-bootstrap": "^3.3.1", "@types/bootbox": "^4.4.36", "@types/jquery": "^3.3.14", + "angular-cli-ghpages": "^0.5.3", "bootbox": "^4.4.0", "bootstrap": "^4.1.3", "core-js": "^2.5.4", "jquery": "^3.3.1", "ng6-toastr": "^6.0.0", "ngx-toastr": "^9.1.0", + "popper.js": "^1.14.6", "rxjs": "^6.3.3", "zone.js": "^0.8.26" }, "devDependencies": { + "nativescript-dev-webpack": "^0.18.0", + "@nativescript/schematics": "~0.4.0", "@angular-devkit/build-angular": "~0.6.6", "@angular/cli": "^6.2.4", "@angular/compiler-cli": "^6.1.10", @@ -53,5 +64,8 @@ "ts-node": "~5.0.1", "tslint": "~5.9.1", "typescript": "^2.9.2" + }, + "nativescript": { + "id": "org.nativescript.ngsample" } } From 6a78a1c25b2137092192eca37f37df7d8688a8d0 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Mon, 18 Feb 2019 13:13:10 +0100 Subject: [PATCH 2/4] Revert "Added some necessary depndencies" This reverts commit e2882c99de74815d50c9602907cea2c53544d3cb. --- package.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package.json b/package.json index d9d7fce..ff9b52a 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,6 @@ "name": "github-trading", "version": "0.0.0", "scripts": { - "android": "tns run android --bundle", - "ios": "tns run ios --bundle", "ng": "ng", "start": "ng serve", "build": "ng build", @@ -13,10 +11,6 @@ }, "private": true, "dependencies": { - "nativescript-angular": "~7.1.0", - "nativescript-theme-core": "~1.0.4", - "reflect-metadata": "~0.1.8", - "tns-core-modules": "~5.1.1", "@angular/animations": "^6.1.10", "@angular/common": "^6.1.10", "@angular/compiler": "^6.1.10", @@ -27,24 +21,19 @@ "@angular/platform-browser-dynamic": "^6.1.10", "@angular/router": "^6.1.10", "@fortawesome/fontawesome-free": "^5.4.0", - "@nativescript/schematics": "^0.5.0", "@ng-bootstrap/ng-bootstrap": "^3.3.1", "@types/bootbox": "^4.4.36", "@types/jquery": "^3.3.14", - "angular-cli-ghpages": "^0.5.3", "bootbox": "^4.4.0", "bootstrap": "^4.1.3", "core-js": "^2.5.4", "jquery": "^3.3.1", "ng6-toastr": "^6.0.0", "ngx-toastr": "^9.1.0", - "popper.js": "^1.14.6", "rxjs": "^6.3.3", "zone.js": "^0.8.26" }, "devDependencies": { - "nativescript-dev-webpack": "^0.18.0", - "@nativescript/schematics": "~0.4.0", "@angular-devkit/build-angular": "~0.6.6", "@angular/cli": "^6.2.4", "@angular/compiler-cli": "^6.1.10", @@ -64,8 +53,5 @@ "ts-node": "~5.0.1", "tslint": "~5.9.1", "typescript": "^2.9.2" - }, - "nativescript": { - "id": "org.nativescript.ngsample" } } From 7ecfc9a759337f35a162b596eeee4a2aafe8c6f5 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Mon, 18 Feb 2019 14:08:31 +0100 Subject: [PATCH 3/4] Revert "Added a check on the email availability from github api" This reverts commit 5c15c457a0e99074bf43e06411b6ad2ec43dd3a4. --- src/main.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main.ts b/src/main.ts index e2dc518..ad8aaaf 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,9 +8,6 @@ import { environmentLoader as environmentLoaderPromise } from './environments/en environmentLoaderPromise.then(env => { if (env.production) { enableProdMode(); - if (window) { - window.console.log = function () { }; - } } environment.production = env.production; From 2e91fb3870c276ac7281af9411a696b5b6926e98 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Mon, 6 May 2019 22:31:25 +0200 Subject: [PATCH 4/4] Added user attribute to contribution interface to test with DB --- src/app/interfaces/contribution.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/interfaces/contribution.ts b/src/app/interfaces/contribution.ts index 9fcd278..0cf1664 100644 --- a/src/app/interfaces/contribution.ts +++ b/src/app/interfaces/contribution.ts @@ -1,5 +1,6 @@ import { GitProject } from "./git-project"; import { Transaction } from "./transaction"; +import { User } from "./user" export interface Contribution { id?: number, @@ -7,5 +8,6 @@ export interface Contribution { calculation_utc_datetime: Date, commit_id: string, git_project: GitProject, - transaction: Transaction + transaction: Transaction, + user: User };