diff --git a/package.json b/package.json index ff82a121..b5ab1552 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "stripe-angular": "0.5.0", "swagger-ui": "2.2.10", "tslib": "1.10.0", + "yarn": "^1.19.1", "zone.js": "0.9.1" }, "devDependencies": { diff --git a/src/main/webapp/app/home/email/email.component.html b/src/main/webapp/app/home/email/email.component.html index 8e33ded7..9269515b 100644 --- a/src/main/webapp/app/home/email/email.component.html +++ b/src/main/webapp/app/home/email/email.component.html @@ -50,7 +50,7 @@

Drop Us a Message

-
+
diff --git a/src/main/webapp/app/home/email/email.component.ts b/src/main/webapp/app/home/email/email.component.ts index 6ec2c21d..76d70a3e 100644 --- a/src/main/webapp/app/home/email/email.component.ts +++ b/src/main/webapp/app/home/email/email.component.ts @@ -7,68 +7,68 @@ import { MatSnackBar } from '@angular/material'; import { JhiAlertService } from 'ng-jhipster'; @Component({ - selector: 'jhi-email', - templateUrl: './email.component.html', - styleUrls: ['./email.scss'] + selector: 'jhi-email', + templateUrl: './email.component.html', + styleUrls: ['./email.component.scss'] }) export class EmailComponent implements OnInit { - contactForm = this.fb.group({ - contactName: ['', Validators.required], - contactEmail: ['', [Validators.required, Validators.email]], - contactPhone: [''], - contactMsg: ['', Validators.required] - }); - - get contactName() { - return this.contactForm.get('contactName'); - } + contactForm = this.fb.group({ + contactName: ['', Validators.required], + contactEmail: ['', [Validators.required, Validators.email]], + contactPhone: [''], + contactMsg: ['', Validators.required] + }); - get contactEmail() { - return this.contactForm.get('contactEmail'); - } + get contactName() { + return this.contactForm.get('contactName'); + } - get contactPhone() { - return this.contactForm.get('contactPhone'); - } + get contactEmail() { + return this.contactForm.get('contactEmail'); + } - get contactMsg() { - return this.contactForm.get('contactMsg'); - } + get contactPhone() { + return this.contactForm.get('contactPhone'); + } - onSubmit() { - this.sendRequest().subscribe( - () => { - this._snackBar.open('Thanks for writing to us! We will get back to you soon!', null, { - duration: 5000, - panelClass: ['contact-form-snack-bar'] - }); - this.contactForm.reset(); - }, - err => { - this.onError(err.message); - } - ); - } + get contactMsg() { + return this.contactForm.get('contactMsg'); + } - sendRequest(): Observable { - return this.http.post('https://usebasin.com/f/b5ed73d03aa5', this.contactForm.value, { - headers: new HttpHeaders({ - Accept: 'application/json' - }), - observe: 'response' + onSubmit() { + this.sendRequest().subscribe( + () => { + this._snackBar.open('Thanks for writing to us! We will get back to you soon!', null, { + duration: 5000, + panelClass: ['contact-form-snack-bar'] }); - } + this.contactForm.reset(); + }, + err => { + this.onError(err.message); + } + ); + } + + sendRequest(): Observable { + return this.http.post('https://usebasin.com/f/b5ed73d03aa5', this.contactForm.value, { + headers: new HttpHeaders({ + Accept: 'application/json' + }), + observe: 'response' + }); + } - constructor( - private fb: FormBuilder, - private http: HttpClient, - private _snackBar: MatSnackBar, - private jhiAlertService: JhiAlertService - ) {} + constructor( + private fb: FormBuilder, + private http: HttpClient, + private _snackBar: MatSnackBar, + private jhiAlertService: JhiAlertService + ) {} - ngOnInit() {} + ngOnInit() {} - private onError(errorMessage: string) { - this.jhiAlertService.error(errorMessage, null, null); - } + private onError(errorMessage: string) { + this.jhiAlertService.error(errorMessage, null, null); + } } diff --git a/src/main/webapp/app/home/email/email.scss b/src/main/webapp/app/home/email/email.scss deleted file mode 100644 index 9357851f..00000000 --- a/src/main/webapp/app/home/email/email.scss +++ /dev/null @@ -1,45 +0,0 @@ -/** - Contact Us Section: Start - */ - -body { - background: -webkit-linear-gradient(left, #0072ff, #00c6ff); -} - -.contact-form { - background: #fff; - margin-top: 10%; - margin-bottom: 10%; - width: 70%; -} - -.contact-form .form-control { - border-radius: 1rem; -} - -.contact-image { - text-align: center; -} - -.contact-image img { - margin-top: -3%; -} - -.contact-form form { - padding: 14%; -} - -.contact-form h3 { - margin-bottom: 8%; - margin-top: -10%; - text-align: center; - color: #0062cc; -} - -.sendEmail { - color: #0062cc; -} - -/* - Contact Us section: END - */ diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 2c744718..ef3dd295 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -21,7 +21,7 @@

Welcome to Python-Sinhala!

Affordable
-

Accessible without Bounds...

+

Accessible without Bounds...

We want to make education accessible to everyone; and commit to make our courses accessible to everyone in all parts of Sri-Lanka now and always.

@@ -31,7 +31,7 @@

Accessible without Bounds...

Non-Profit
-

Not For Profit...

+

Not For Profit...

We are a non-profit organizaiton incorporated in British Columbia and only sell our courses for the minimum amount of money needed to cover bandwidth and operational costs.

@@ -41,7 +41,7 @@

Not For Profit...

Expand
-

Think Big, Strive for More...

+

Think Big, Strive for More...

We aspire to cover all subjects related to the standardized examination curriculum in Sri-Lanka and strive to make partnerships more tutors and educational institutions that share our goal.

@@ -50,7 +50,7 @@

Think Big, Strive for More...

-
+
books
diff --git a/src/main/webapp/app/home/home.scss b/src/main/webapp/app/home/home.component.scss similarity index 57% rename from src/main/webapp/app/home/home.scss rename to src/main/webapp/app/home/home.component.scss index 8d28d51b..fd1615f4 100644 --- a/src/main/webapp/app/home/home.scss +++ b/src/main/webapp/app/home/home.component.scss @@ -30,19 +30,19 @@ Main page styles margin-top: 15%; } -#mission { - background-color: white; - padding: 1rem 0 1rem 0; -} +// #mission { +// background-color: white; +// padding: 1rem 0 1rem 0; +// } -#ourTeam { - background-color: white; - padding: 1rem 0 1rem 0; -} +// #ourTeam { +// background-color: white; +// padding: 1rem 0 1rem 0; +// } -#commitment { - padding: 1rem 0 1rem 0; -} +// #commitment { +// padding: 1rem 0 1rem 0; +// } .kenburns-bottom { -webkit-animation: kenburns-bottom 5s ease-out infinite alternate-reverse both; @@ -50,15 +50,15 @@ Main page styles } /* ---------------------------------------------- - * Generated by Animista on 2019-6-5 12:35:15 - * w: http://animista.net, t: @cssanimista - * ---------------------------------------------- */ + * Generated by Animista on 2019-6-5 12:35:15 + * w: http://animista.net, t: @cssanimista + * ---------------------------------------------- */ /** - * ---------------------------------------- - * animation kenburns-bottom - * ---------------------------------------- - */ + * ---------------------------------------- + * animation kenburns-bottom + * ---------------------------------------- + */ @-webkit-keyframes kenburns-bottom { 0% { -webkit-transform: scale(1) translateY(0); @@ -66,6 +66,7 @@ Main page styles -webkit-transform-origin: 50% 84%; transform-origin: 50% 84%; } + 100% { -webkit-transform: scale(1.25) translateY(15px); transform: scale(1.25) translateY(15px); @@ -73,6 +74,7 @@ Main page styles transform-origin: bottom; } } + @keyframes kenburns-bottom { 0% { -webkit-transform: scale(1) translateY(0); @@ -80,6 +82,7 @@ Main page styles -webkit-transform-origin: 50% 84%; transform-origin: 50% 84%; } + 100% { -webkit-transform: scale(1.25) translateY(15px); transform: scale(1.25) translateY(15px); @@ -94,6 +97,7 @@ Main page styles width: 100%; height: 100%; z-index: -1; + top: 0; } .background_outer_div { @@ -110,3 +114,97 @@ Main page styles max-width: 100%; height: auto; } + +#mission, +#ourTeam { + background-color: #ffffff; +} + +section { + padding: 3rem 0; + h1 { + text-align: center; + } + p { + padding: 3rem 0; + font-size: 22px; + } +} + +#ourTeam p { + padding: 0; +} + +p { + font-weight: 100; + font-size: 16px; +} + +#mission { + ul > li { + padding: 2rem 0; + } + .img-fluid { + padding: 0 0 2rem 0; + } +} + +.jh-card { + .card-title, + .card-text { + text-align: center; + } +} + +@media screen and (max-width: 575px) { + .jumbotron { + .container { + min-height: 100vh; + h1 { + font-size: 2em; + margin: 2rem 0; + text-align: center; + } + } + } + + section { + padding: 1rem 0; + h1 { + font-size: 2em; + } + p { + padding: 0 0 1rem 0; + font-size: 16px; + margin: 0; + } + } + + #mission { + ul > li { + padding: 2rem 0; + } + .img-fluid { + padding: 0 0 2rem 0; + } + } + + .jh-card { + margin-top: 15px; + } + + .asanka-img { + height: 150px; + display: block; + margin: auto; + margin-top: 15px; + margin-bottom: 30px; + } + + .contact-form { + margin-top: 0; + margin-bottom: 0; + width: 100%; + padding-top: 3rem; + } +} diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 533fb301..5204b067 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -8,7 +8,7 @@ import { LoginModalService, AccountService, Account } from 'app/core'; @Component({ selector: 'jhi-home', templateUrl: './home.component.html', - styleUrls: ['home.scss'] + styleUrls: ['home.component.scss'] }) export class HomeComponent implements OnInit { account: Account; diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index 68d1c5e3..0fef752e 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -1,6 +1,6 @@