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 0000000..2759831 Binary files /dev/null and b/src/assets/images/ces_logo.png differ 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