From f5fc71b81bbb07a396fe5d7042895c9981d6a9aa Mon Sep 17 00:00:00 2001 From: Luis Nunez Date: Tue, 28 Feb 2017 14:33:49 -0300 Subject: [PATCH] re styling login --- src/app/app.html | 3 +- src/app/app.scss | 33 +++--- src/app/app.settings.ts | 3 +- src/assets/images/ces_logo.png | Bin 0 -> 19947 bytes src/components/fieldBuilder/fieldBuilder.html | 9 ++ src/components/fieldBuilder/fieldBuilder.ts | 9 ++ src/pages/login/login.html | 71 ++++++++----- src/pages/login/login.scss | 97 +++++++++++++++++- src/pages/login/login.ts | 27 +++-- src/services/AlertService.ts | 4 - src/services/AuthService.ts | 9 +- src/services/CategoriesService.ts | 2 - src/services/ConfigService.ts | 2 - src/services/FieldTypesService.ts | 2 - src/services/HttpBasicAuth.ts | 18 +++- src/services/MemberService.ts | 12 +-- src/services/OfferService.ts | 13 +-- src/services/TransactionService.ts | 10 +- src/services/WantService.ts | 13 +-- 19 files changed, 218 insertions(+), 119 deletions(-) create mode 100644 src/assets/images/ces_logo.png diff --git a/src/app/app.html b/src/app/app.html index 3650c33..af1d830 100644 --- a/src/app/app.html +++ b/src/app/app.html @@ -16,5 +16,4 @@

Menu

- - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/app.scss b/src/app/app.scss index 57c2734..c4f4bdf 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -18,41 +18,47 @@ html { font-size: 1em; } - ion-header { text-align: center; + + ion-navbar.toolbar { + min-height: 35px; + height: 35px; + } .toolbar-background { - background-color: #21BA45; + background-color: rgba(0, 0, 0, 0.2); } - .ui.header, - button[menutoggle], - button[ion-button] span, - button[ion-button] ion-icon { + .toolbar-title { + color: white; + font-size: 20px; + } +} +ion-content.content { + background: #00b5ad; +} +ion-header { + .ui.header, button[menutoggle], button[ion-button] span, button[ion-button] ion-icon { color: white; } } - ion-menu { .ui.header { color: white; } } - .ui.card { width: 100%; - &>.content{ + + &>.content { .author { text-align: right; padding-top: 10px; } } } - -.ui.form, -.ui.button { +.ui.form, .ui.button { font-size: 100%; } - .ui.button.add-new { background-color: #21BA45; color: white; @@ -62,7 +68,6 @@ ion-menu { right: 15px; bottom: 15px; } - .ui.dropdown.button { text-align: center; } \ No newline at end of file diff --git a/src/app/app.settings.ts b/src/app/app.settings.ts index fee9aca..a807d4f 100644 --- a/src/app/app.settings.ts +++ b/src/app/app.settings.ts @@ -3,8 +3,7 @@ import { Injectable } from '@angular/core'; @Injectable() export class AppSettings { public get SERVER_URL(): any { - // return 'http://hamlets.communityforge.net/commex'; - return 'http://northwind.servicestack.net/customers.json'; + return 'http://hamlets.communityforge.net/commex'; } public get URL(): any { diff --git a/src/assets/images/ces_logo.png b/src/assets/images/ces_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2759831e81e3708011acb75d20546603f420d124 GIT binary patch literal 19947 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 V@*k_M4PDR>5ab_rq?s0<^M6er(J24` literal 0 HcmV?d00001 diff --git a/src/components/fieldBuilder/fieldBuilder.html b/src/components/fieldBuilder/fieldBuilder.html index bded1b0..144d566 100644 --- a/src/components/fieldBuilder/fieldBuilder.html +++ b/src/components/fieldBuilder/fieldBuilder.html @@ -19,6 +19,15 @@ +
+ + +
{{ field.placeholder || '' }}
+
+
{{ option }}
+
+
+
diff --git a/src/components/fieldBuilder/fieldBuilder.ts b/src/components/fieldBuilder/fieldBuilder.ts index 4a6f3f4..caeb4c6 100644 --- a/src/components/fieldBuilder/fieldBuilder.ts +++ b/src/components/fieldBuilder/fieldBuilder.ts @@ -117,6 +117,15 @@ export class FieldBuilderComponent implements OnInit, AfterViewInit { } }); break; + case 'select': + $field.parents('.ui.dropdown').dropdown({ + onChange: (value) => { + let fieldValue = {}; + fieldValue[this.field.name] = value; + this.fieldForm.setValue(fieldValue); + } + }); + break; case 'member': this.autocompleteService = this.fieldTypes[this.field.type].autocomplete; this.autocompleteSearch(); diff --git a/src/pages/login/login.html b/src/pages/login/login.html index 17aa851..40dbd84 100644 --- a/src/pages/login/login.html +++ b/src/pages/login/login.html @@ -1,30 +1,53 @@ -

{{sitename}}

+ Welcome - - -
-
- - -
- {{ formErrors.username }} -
-
-
- - -
- {{ formErrors.password }} -
-
-
- -
-
- -
+ + + +
+
+ logo +

Community

+

Exchange

+
+
+ + + + + + + + + + + +
+ {{ formErrors.username }} +
+ + + + + + + + +
+ {{ formErrors.password }} +
+ + + Remember me + + + + +

This is the mobile site

+

+ Go to full site +

\ No newline at end of file diff --git a/src/pages/login/login.scss b/src/pages/login/login.scss index a79c67f..6b67546 100644 --- a/src/pages/login/login.scss +++ b/src/pages/login/login.scss @@ -1,3 +1,98 @@ page-login { - + height: calc(100%); + ion-slides { + height: 40%; + + .image-wrapper { + height: 50%; + display: table; + width: 100%; + + .image { + display: table-cell; + vertical-align: middle; + + img { + max-height: 120px; + } + } + } + .logo-title { + margin: 0; + text-transform: uppercase; + color: #ffffff; + font-family: sans-serif; + font-size: 40px; + } + .logo-title:last-child { + color: #2185d0; + } + } + form { + height: 60%; + background: #ffffff; + padding: 20px 30px 0; + + ion-list.list { + margin-bottom: 0; + + ion-item.item.item-input { + padding: 0; + margin-bottom: 20px; + background: #fff; + color: rgba(0, 0, 0, .87); + border-radius: 5px; + font-size: 18px; + min-height: 55px; + height: 55px; + border: 1px solid rgba(34, 36, 38, .15) !important; + box-shadow: none !important; + + ion-label.label { + margin: 0 10px 0 0; + padding: 13px 20px; + background: #F0F0F0; + border-right: 1px solid rgba(34, 36, 38, 0.15); + + ion-icon.icon { + width: 15px; + } + } + } + ion-item.item.item-checkbox { + padding: 0; + margin: 0 auto; + margin-bottom: 20px; + background: #fff; + color: rgba(0, 0, 0, .87); + font-size: 15px; + min-height: 25px; + height: 25px; + text-align: center; + width: 150px; + border: none !important; + + ion-checkbox.checkbox { + margin: 0; + } + } + } + button.button.button-full { + border-radius: 5px; + background: #2185d0; + height: 50px; + font-size: 20px; + margin-bottom: 20px; + } + p, a { + color: rgba(0, 0, 0, .87); + } + p { + width: 100%; + text-align: center; + font-size: 15px; + line-height: 20px; + margin: 0; + } + } } \ No newline at end of file diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index 4c82870..f125347 100644 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -1,8 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { NavController, MenuController } from 'ionic-angular'; +import { NavController } from 'ionic-angular'; import { AuthService } from '../../services/AuthService'; -import { ConfigService } from '../../services/ConfigService'; import { AlertService } from '../../services/AlertService'; import { HomePage } from '../home/home'; @@ -12,34 +11,31 @@ import { HomePage } from '../home/home'; }) export class LoginPage implements OnInit { loginForm: FormGroup; - private sitename: string; private username: string; private password: string; + private rememberMe: boolean; constructor(private navCtrl: NavController, - private menuCtrl: MenuController, private formBuilder: FormBuilder, private authService: AuthService, - private configService: ConfigService, private alertService: AlertService) { - this.menuCtrl.enable(false, 'app-menu'); - this.configService.appConfig.subscribe( - config => { - this.sitename = config.sitename; - }); } - login() { + doLogin() { this.username = this.loginForm.value.username; this.password = this.loginForm.value.password; - this.buildForm(); - this.authService.login(this.username, this.password) + this.rememberMe = this.loginForm.value.rememberMe; + this.authService.login(this.username, this.password, this.rememberMe) .subscribe( response => this.navCtrl.setRoot(HomePage), error => this.alertService.showError('Error with credentials. Please try again.') ); } + goToFullSite() { + window.open('http://hamlets.communityforge.net', '_system', 'location=yes'); + } + ngOnInit(): void { this.buildForm(); } @@ -47,7 +43,8 @@ export class LoginPage implements OnInit { buildForm(): void { this.loginForm = this.formBuilder.group({ 'username': [this.username, Validators.required], - 'password': [this.password, Validators.required] + 'password': [this.password, Validators.required], + 'rememberMe': [this.rememberMe], }); this.loginForm.valueChanges .subscribe(data => this.onValueChanged(data)); @@ -77,7 +74,7 @@ export class LoginPage implements OnInit { validationMessages = { 'username': { - 'required': 'Username is required.' + 'required': 'Email is required.' }, 'password': { 'required': 'Password is required.' diff --git a/src/services/AlertService.ts b/src/services/AlertService.ts index 72794c5..b44f806 100644 --- a/src/services/AlertService.ts +++ b/src/services/AlertService.ts @@ -14,9 +14,5 @@ export class AlertService { subTitle: message, buttons: ['OK'] }).present(); - // return this.toastCtrl.create({ - // message: message, - // duration: 3000 - // }).present(); } } \ No newline at end of file diff --git a/src/services/AuthService.ts b/src/services/AuthService.ts index 1ea8928..a1240df 100644 --- a/src/services/AuthService.ts +++ b/src/services/AuthService.ts @@ -4,7 +4,6 @@ import { ReplaySubject } from 'rxjs/ReplaySubject'; import { AppSettings } from '../app/app.settings'; import { HttpBasicAuth } from './HttpBasicAuth'; import { Member } from '../domain/Member'; -import { MEMBERS } from '../test/mock-members'; @Injectable() export class AuthService { @@ -45,11 +44,9 @@ export class AuthService { } private requestUserInfo(username): Observable { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth - // .getWithAuth(`${this.settings.URL.members}?fragment=${username}&depth=1`) + return this.httpBasicAuth + .getWithAuth(`${this.settings.URL.members}?fragment=${username}&depth=1`) .map(response => { - response = MEMBERS; for (let id in response) { this.storeToken(response[id]); break; @@ -58,7 +55,7 @@ export class AuthService { }); } - login(username, password): Observable { + login(username, password, rememberMe): Observable { this.httpBasicAuth.setAuthorizationToken(username, password); return this.requestUserInfo(username); } diff --git a/src/services/CategoriesService.ts b/src/services/CategoriesService.ts index 944ec26..0cf87bb 100644 --- a/src/services/CategoriesService.ts +++ b/src/services/CategoriesService.ts @@ -6,8 +6,6 @@ import { Category } from '../domain/Category'; export class CategoriesService { categories = new ReplaySubject>(1); - constructor() { } - setCategories(categories) { this.categories.next(categories); } diff --git a/src/services/ConfigService.ts b/src/services/ConfigService.ts index ab37126..8bf82eb 100644 --- a/src/services/ConfigService.ts +++ b/src/services/ConfigService.ts @@ -9,7 +9,6 @@ import { CategoriesService } from './CategoriesService'; import { FieldTypesService } from './FieldTypesService'; import { Config } from '../domain/Config'; import { Category } from '../domain/Category'; -import { CONFIG } from '../test/mock-config'; @Injectable() export class ConfigService { @@ -28,7 +27,6 @@ export class ConfigService { requestAppConfig(): Observable { return this.httpBasicAuth.get(this.settings.URL.config) .map((response: Config) => { - response = CONFIG; this.categoriesService.setCategories( lodash.map(response.categories, (category: Category, id: string) => { category.id = id; diff --git a/src/services/FieldTypesService.ts b/src/services/FieldTypesService.ts index 03106cc..77a411d 100644 --- a/src/services/FieldTypesService.ts +++ b/src/services/FieldTypesService.ts @@ -5,8 +5,6 @@ import { ReplaySubject } from 'rxjs/ReplaySubject'; export class FieldTypesService { fieldTypes = new ReplaySubject(1); - constructor() { } - setFieldTypes(fieldTypes) { this.fieldTypes.next(fieldTypes); } diff --git a/src/services/HttpBasicAuth.ts b/src/services/HttpBasicAuth.ts index 82bb0cb..64d0a40 100644 --- a/src/services/HttpBasicAuth.ts +++ b/src/services/HttpBasicAuth.ts @@ -42,14 +42,17 @@ export class HttpBasicAuth { headers.append('Authorization', this.authorizationToken); } + private createAcceptHeader(headers: Headers) { + headers.append('Accept', 'application/json'); + } + private extractData(response: Response) { let body = response.json(); return body || {}; } private extractError(error): any { - console.log('error', error); - throw JSON.stringify(error.json()); + throw error._body; } getWithAuth(url) { @@ -58,7 +61,8 @@ export class HttpBasicAuth { return this.get(url, headers); } - get(url, headers?) { + get(url, headers: any = new Headers()) { + this.createAcceptHeader(headers); return this.http.get(url, { headers: headers }).map(this.extractData) @@ -77,7 +81,8 @@ export class HttpBasicAuth { return this.post(url, data, headers); } - post(url, data, headers?) { + post(url, data, headers: any = new Headers()) { + this.createAcceptHeader(headers); return this.http.post(url, data, { headers: headers }).map(this.extractData) @@ -90,7 +95,8 @@ export class HttpBasicAuth { return this.patch(url, data, headers); } - patch(url, data, headers?) { + patch(url, data, headers: any = new Headers()) { + this.createAcceptHeader(headers); return this.http.patch(url, data, { headers: headers }).map(this.extractData) @@ -99,6 +105,8 @@ export class HttpBasicAuth { options(url) { let headers = new Headers(); + this.createAuthorizationHeader(headers); + this.createAcceptHeader(headers); return this.http.options(url, { headers: headers }).map(this.extractData) diff --git a/src/services/MemberService.ts b/src/services/MemberService.ts index f05ce52..33ca571 100644 --- a/src/services/MemberService.ts +++ b/src/services/MemberService.ts @@ -3,7 +3,6 @@ import { Observable } from 'rxjs/Observable'; import { AppSettings } from '../app/app.settings'; import { HttpBasicAuth } from './HttpBasicAuth'; import { Member } from '../domain/Member'; -import { MEMBERS } from '../test/mock-members'; import * as lodash from 'lodash'; @Injectable() @@ -13,10 +12,8 @@ export class MemberService { private httpBasicAuth: HttpBasicAuth) { } list(): Observable> { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.getWithAuth(this.settings.URL.members) + return this.httpBasicAuth.getWithAuth(this.settings.URL.members) .map((response: Array) => { - response = MEMBERS; response = lodash.map(response, (member: Member, key: any) => { if (!member.id) { member.id = key; @@ -28,12 +25,7 @@ export class MemberService { } get(id): Observable { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.getWithAuth(`${this.settings.URL.members}/${id}?depth=1`); - .map(response => { - response = MEMBERS[id]; - return response; - }); + return this.httpBasicAuth.getWithAuth(`${this.settings.URL.members}/${id}?depth=1`); } post(member: Member): Observable { diff --git a/src/services/OfferService.ts b/src/services/OfferService.ts index 054caf8..d0fb475 100644 --- a/src/services/OfferService.ts +++ b/src/services/OfferService.ts @@ -3,8 +3,6 @@ import { Observable } from 'rxjs/Observable'; import { AppSettings } from '../app/app.settings'; import { HttpBasicAuth } from './HttpBasicAuth'; import { Offer } from '../domain/Offer'; -import { OPTIONS_OFFER } from '../test/mock-options-offer'; -import { OFFERS } from '../test/mock-offers'; import * as lodash from 'lodash'; @Injectable() @@ -14,10 +12,8 @@ export class OfferService { private httpBasicAuth: HttpBasicAuth) { } list(): Observable> { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.getWithAuth(`${this.settings.URL.offers}?depth=1`) + return this.httpBasicAuth.getWithAuth(`${this.settings.URL.offers}?depth=1`) .map((response: Array) => { - response = OFFERS; response = lodash.map(response, (offer: Offer, key: any) => { if (!offer.id) { offer.id = key; @@ -37,11 +33,6 @@ export class OfferService { } describe(): Observable { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.options(this.settings.URL.offers) - .map(response => { - response = OPTIONS_OFFER; - return response; - }); + return this.httpBasicAuth.options(this.settings.URL.offers); } } \ No newline at end of file diff --git a/src/services/TransactionService.ts b/src/services/TransactionService.ts index ddcde59..b45fa74 100644 --- a/src/services/TransactionService.ts +++ b/src/services/TransactionService.ts @@ -3,8 +3,6 @@ import { Observable } from 'rxjs/Observable'; import { AppSettings } from '../app/app.settings'; import { HttpBasicAuth } from './HttpBasicAuth'; import { Transaction } from '../domain/Transaction'; -import { TRANSACTIONS } from '../test/mock-transactions'; -import { OPTIONS_TRANSACTION } from '../test/mock-options-transaction'; import * as lodash from 'lodash'; @Injectable() @@ -14,10 +12,8 @@ export class TransactionService { private httpBasicAuth: HttpBasicAuth) { } list(): Observable> { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.getWithAuth(`${this.settings.URL.transactions}?depth=1`) + return this.httpBasicAuth.getWithAuth(`${this.settings.URL.transactions}?depth=1`) .map((response: Array) => { - response = TRANSACTIONS; response = lodash.map(response, (transaction: Transaction, key: any) => { if (!transaction.id) { transaction.id = key; @@ -37,10 +33,8 @@ export class TransactionService { } describe(): Observable { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.options(this.settings.URL.transactions) + return this.httpBasicAuth.options(this.settings.URL.transactions) .map(response => { - response = OPTIONS_TRANSACTION; return response; }); } diff --git a/src/services/WantService.ts b/src/services/WantService.ts index b596fad..4fca2fd 100644 --- a/src/services/WantService.ts +++ b/src/services/WantService.ts @@ -3,8 +3,6 @@ import { Observable } from 'rxjs/Observable'; import { AppSettings } from '../app/app.settings'; import { HttpBasicAuth } from './HttpBasicAuth'; import { Want } from '../domain/Want'; -import { OPTIONS_OFFER } from '../test/mock-options-offer'; -import { OFFERS } from '../test/mock-offers'; import * as lodash from 'lodash'; @Injectable() @@ -14,10 +12,8 @@ export class WantService { private httpBasicAuth: HttpBasicAuth) { } list(): Observable> { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.getWithAuth(`${this.settings.URL.wants}?depth=1`) + return this.httpBasicAuth.getWithAuth(`${this.settings.URL.wants}?depth=1`) .map((response: Array) => { - response = OFFERS; response = lodash.map(response, (want: Want, key: any) => { if (!want.id) { want.id = key; @@ -37,11 +33,6 @@ export class WantService { } describe(): Observable { - return this.httpBasicAuth.get(this.settings.URL.config) - // return this.httpBasicAuth.options(this.settings.URL.wants) - .map(response => { - response = OPTIONS_OFFER; - return response; - }); + return this.httpBasicAuth.options(this.settings.URL.wants); } } \ No newline at end of file