Merge pull request #19 from Pear-Trading/Release-v0.0.5

Release v0.0.5

.gitignore

@@ -34,3 +34,7 @@ Thumbs.db
 UserInterfaceState.xcuserstate
 
 config/config-dev.json
+
+\.sourcemaps/main\.css\.map
+
+\.sourcemaps/main\.js\.map

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.peartrade.localloop" version="0.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.peartrade.localloop" version="0.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>LocalLoop</name>
     <description>Tracking Local Money for Local People.</description>
     <author email="[email protected]" href="http://github.com/pear-trading">Pear Trading Development Team</author>

config/config-dev.json.example

@@ -1,3 +1,4 @@
 {
-  "api_url": "http://dev.peartrade.org/api"
+  "api_url": "https://dev.peartrade.org/api",
+  "api_key": "CHANGEME"
 }

src/app/app.module.ts

@@ -20,7 +20,6 @@ import { TruncateModule } from 'ng2-truncate';
 import { MyApp } from './app.component';
 import { LoginPage } from '../pages/login/login';
 import { FeedbackPage } from '../pages/feedback/feedback';
-import { TokenPage } from '../pages/token/token';
 import { SignupPage } from '../pages/signup/signup';
 import { AboutPage } from '../pages/about/about';
 import { ReceiptPage } from '../pages/receipt/receipt';
@@ -39,7 +38,6 @@ import { IntroPage } from '../pages/intro/intro';
     MyApp,
     LoginPage,
     FeedbackPage,
-    TokenPage,
     SignupPage,
     AboutPage,
     ReceiptPage,
@@ -65,7 +63,6 @@ import { IntroPage } from '../pages/intro/intro';
     MyApp,
     LoginPage,
     FeedbackPage,
-    TokenPage,
     SignupPage,
     AboutPage,
     ReceiptPage,

src/pages/about/about.ts

@@ -1,6 +1,5 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams } from 'ionic-angular';
-import { PeopleService } from '../../providers/people-service';
 import { UserData } from '../../providers/user-data';
 import 'rxjs/add/operator/timeout';
 
@@ -17,7 +16,6 @@ export class AboutPage {
   constructor(
     public navCtrl: NavController,
     public navParams: NavParams,
-    private peopleService: PeopleService,
     private userData: UserData,
   ) {
     this.userData.hasLoggedIn().subscribe(

src/pages/intro/intro.html

@@ -21,10 +21,10 @@ <h2>Please Register or Login with your account!<br>You will need a token to regi
 			</ion-col>
 			<button ion-button (click)="goToLogin()"  class="button-submit" color="secondary" block>Login</button>
 			<button ion-button (click)="goToSignup()"  class="button-submit" color="secondary" block>Create an account</button>
-
-			<img class="icon-intro" src="assets/img/icon1.png">
 		</ion-row>
+
 		<ion-row align-items-end>
+			<img class="icon-intro" src="assets/img/icon1.png">
 		</ion-row>
 
 	</ion-grid>

src/pages/intro/intro.scss

@@ -17,12 +17,14 @@ page-intro {
 		scroll-content {
       display: flex;
       flex-direction: column;
+
     }
 
     ion-grid {
-			margin-top: 20px;
+			margin-top: 10px;
       padding: 0;
       height: 100%;
+			overflow: 0;
     }
 
     ion-row {
@@ -32,9 +34,8 @@ page-intro {
 	}
 
 	.icon-intro {
-		height: 100%;
-		// width: 25%;
-		margin: 50px auto;
-		display: block;
+		width: 25vw;
+  	margin: auto;
+  	display: block;
 	}
 }

src/pages/intro/intro.ts

@@ -2,21 +2,18 @@ import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { LoginPage } from '../login/login';
 import { SignupPage } from '../signup/signup';
-import { UserData } from '../../providers/user-data';
 
 
 /* interface of home page*/
 @Component({
   selector: 'page-intro',
-  templateUrl: 'intro.html',
-  providers: [ UserData ]
+  templateUrl: 'intro.html'
 })
 
 export class IntroPage {
 
   constructor(
     private navCtrl: NavController,
-    private userData: UserData,
   ) {}
 
   goToLogin() {

src/pages/receipt/receipt.html

@@ -18,7 +18,7 @@
 
     <!-- Enter storename and search -->
     <ion-item>
-      <ion-label stacked><span class="labelreceipt">Enterb the store name:</span></ion-label>
+      <ion-label stacked><span class="labelreceipt">Enter the store name:</span></ion-label>
       <ion-input [(ngModel)]="submitOrg.name" (input)="organisationSearch($event)" (ngModelChange)="step1Validate()" placeholder="Name of Company"></ion-input>
     </ion-item>
 

src/pages/receipt/receipt.ts

@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component } from '@angular/core';
 import {
   NavController,
   NavParams,
@@ -12,7 +12,6 @@ import {
 import { convertDataToISO } from 'ionic-angular/util/datetime-util';
 import { Camera, CameraOptions } from '@ionic-native/camera';
 import { FilePath } from '@ionic-native/file-path';
-import { Transfer } from '@ionic-native/transfer';
 import { File } from '@ionic-native/file';
 import { Keyboard } from '@ionic-native/keyboard';
 import { PeopleService } from '../../providers/people-service';
@@ -74,7 +73,6 @@ export class ReceiptPage {
     private keyboard: Keyboard,
     private camera: Camera,
     private filePath: FilePath,
-    private transfer: Transfer,
     private file: File,
     public alertCtrl: AlertController
   ) {
@@ -179,7 +177,8 @@ export class ReceiptPage {
   }
 
   step1Validate() {
-    if( this.submitOrg.name.length == 0 ) {
+    if( this.submitOrg.name.length == 0 ||
+        this.submitOrg.town.length == 0 ) {
           this.step1Invalid = true;
         }else{
           this.step1Invalid = false;

src/pages/user/user.ts

@@ -2,7 +2,6 @@ import { Component,ViewChild } from '@angular/core';
 import {
   NavController,
   NavParams,
-  App,
   Slides,
   ToastController,
   AlertController,
@@ -68,7 +67,6 @@ export class UserPage {
   };
 
   constructor(
-    private  app : App,
     public navCtrl: NavController,
     public navParams: NavParams,
     public peopleService: PeopleService,

src/providers/people-service.ts

@@ -183,24 +183,6 @@ export class PeopleService {
       ).map( response => response.json() );
   }
 
-  /* Links to server, these should be stored in config.js */
-  foodloop_root_url = "http://app.peartrade.org/";
-  foodloop_root_url_edit = this.foodloop_root_url + "edit";
-  foodloop_root_url_token = this.foodloop_root_url + "token";
-  foodloop_root_url_approve = this.foodloop_root_url + "admin-approve";
-
-  edit(data){
-    return this.http.post(this.foodloop_root_url_edit,data);
-  }
-
-  verifyToken(data){
-    return this.http.post(this.foodloop_root_url_token,data);
-  }
-
-  approve(data){
-    return this.http.post(this.foodloop_root_url_approve,data);
-  }
-
 
 /*********************** --  Data representation part -- **************************/
   /* including get request to server to retrieve user data */

src/providers/user-data.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Events } from 'ionic-angular';
 import { Storage } from '@ionic/storage';
 import { Observable } from 'rxjs/Rx';
 import 'rxjs/add/operator/map';
@@ -13,8 +12,7 @@ import 'rxjs/add/operator/map';
 export class UserData {
 
   constructor(
-    private storage: Storage,
-    private events: Events
+    private storage: Storage
   ) {
     this.loadTestingData();
   }
@@ -206,24 +204,6 @@ export class UserData {
        return   {token:"d","ref":username,"username": fullname,"previousPos":1,"currentPos":1,"pearPoint":620.57,"retailerSpent":20,"receiptSubmitted":161,"firstStart":"20-Jun-15"};
   }
 
-  // /* Login and log out events ****/
-  // login(username: string ){
-  //   this.storage.set(this.HAS_LOGGED_IN,true);
-  //   this.setUsername(username);
-  //   this.events.publish('user:login')
-  // }
-  // signup(username: string) {
-  //   this.storage.set(this.HAS_LOGGED_IN, true);
-  //   this.setUsername(username);
-  //   this.events.publish('user:signup');
-  // };
-  // logout() {
-  //   this.storage.remove(this.HAS_LOGGED_IN);
-  //   this.storage.remove('username');
-  //   this.events.publish('user:logout');
-  // };
-  /* Login and log out events end ****/
-
   /* Storage management and data access method */
   getRankingData(){
     return this.testingData.ranking;