From a0698b6f1c1e254867b58ba0a70d71bec611726b Mon Sep 17 00:00:00 2001 From: OussEmaDevCode Date: Fri, 22 Nov 2019 20:07:53 +0100 Subject: [PATCH 1/2] Fixed angular version issues --- README.md | 2 +- src/app/core/login/login.component.html | 2 +- src/app/core/login/login.component.ts | 2 ++ src/app/core/signup/signup.component.html | 6 +++--- src/app/core/signup/signup.component.ts | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d2ff320..0b3ece0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Certificate Generator aims to automatically generate certificates based on the d ## Development Stack * HTML * CSS -* Angular 6 for Front-End +* Angular 7 for Front-End ## Work Flow for Developers * _**For Certificate Issuers:**_ diff --git a/src/app/core/login/login.component.html b/src/app/core/login/login.component.html index 53bd776..1add16e 100644 --- a/src/app/core/login/login.component.html +++ b/src/app/core/login/login.component.html @@ -11,7 +11,7 @@
Development Stack
- Angular 6 for Front-End
+ Angular {{angularVersion}} for Front-End
Django for Back-End
diff --git a/src/app/core/login/login.component.ts b/src/app/core/login/login.component.ts index 6fbecff..748db8a 100644 --- a/src/app/core/login/login.component.ts +++ b/src/app/core/login/login.component.ts @@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AuthenticationService } from '../../services/authentication.service'; import { Router } from '@angular/router'; import { User } from '../../services/user.service'; +import {VERSION} from '@angular/core'; @Component({ selector: 'app-login', @@ -11,6 +12,7 @@ import { User } from '../../services/user.service'; }) export class LoginComponent implements OnInit { + angularVersion = VERSION.major; signinForm: FormGroup; submitted = false; user: User; diff --git a/src/app/core/signup/signup.component.html b/src/app/core/signup/signup.component.html index 7db0601..5e47204 100644 --- a/src/app/core/signup/signup.component.html +++ b/src/app/core/signup/signup.component.html @@ -11,7 +11,7 @@
Development Stack
- Angular 6 for Front-End
+ Angular {{angularVersion}} for Front-End
Django for Back-End
@@ -26,8 +26,8 @@

Certificate Generator

{{ error }}
- - + +
Name is required
diff --git a/src/app/core/signup/signup.component.ts b/src/app/core/signup/signup.component.ts index 71449d5..015ee34 100644 --- a/src/app/core/signup/signup.component.ts +++ b/src/app/core/signup/signup.component.ts @@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AuthenticationService } from '../../services/authentication.service'; import { Router } from '@angular/router'; import { UserSignup } from '../../services/user.service'; +import {VERSION} from '@angular/core'; @Component({ selector: 'app-signup', @@ -11,6 +12,7 @@ import { UserSignup } from '../../services/user.service'; }) export class SignupComponent implements OnInit { + angularVersion = VERSION.major; signupForm: FormGroup; submitted = false; userSignup: UserSignup; From 3319c31fa31ec9f7e74c214f7584d3a572c893e2 Mon Sep 17 00:00:00 2001 From: "Oussema.exe" Date: Mon, 25 Nov 2019 16:19:56 +0100 Subject: [PATCH 2/2] Update .travis.yml attempt to fix build issues --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 962436c..fb38400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ node_js: sudo: required +services: + - xvfb + notifications: email: on_failure: change @@ -18,7 +21,6 @@ before_script: - npm install -g @angular/cli - export CHROME_BIN=chromium-browser - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start script: - echo "Namaste! Travis this side"