Merge pull request #10 from CenaFood/develop

Version 0.0.4

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="review.cenafood.app" version="0.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="review.cenafood.app" version="0.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>cena</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="[email protected]" href="http://cenafood.review/">Cena Team</author>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Cena Swiper",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "author": "Cena Team",
   "homepage": "https://github.com/CenaFood/ionic-cena",
   "private": true,

src/pages/about/about.html

@@ -17,7 +17,7 @@ <h3>Logged in as {{ auth.user }}</h3>
         <p>Cena aims to develop an automated and fake review proof food evaluation system.</p>
         <p>
 
-          The alogrithm works local and persionalized. We therefore analyse your location and personal preferences.
+          The algorithm works local and personalized. We therefore analyse your location and personal preferences.
         </p>
       </div>
     </ion-col>
@@ -26,7 +26,7 @@ <h3>Logged in as {{ auth.user }}</h3>
     <ion-col>
 
       <div>
-        <h3>Thirdparty licences</h3>
+        <h3>Thirdparty licenses</h3>
         <ion-list>
           <a ion-item href="https://github.com/apache/cordova-android.git ">cordova-android
             <p item-end>Apache-2.0</p>

src/pages/discover/discover.ts

@@ -24,7 +24,7 @@ export class DiscoverPage {
   stackConfig: StackConfig;
   refreshTimer;
 
-  constructor(private api: ApiProvider, private annotatations: AnnotationProvider) {
+  constructor(private api: ApiProvider, private annotations: AnnotationProvider) {
     this.stackConfig = {
       // Default setting only allows UP, LEFT and RIGHT so you can override this as below
       allowedDirections: [
@@ -69,7 +69,7 @@ export class DiscoverPage {
     this.swingStack.dragend.subscribe((event: DragEvent) => this.resetOverlay(event.target));
 
     //Add cards when providers are ready
-    Promise.all([this.api.authReady()]) //TODO: , this.annotatations.ready()
+    Promise.all([this.api.authReady()]) 
       .then(
         () => this.addNewCards()
       );
@@ -116,7 +116,7 @@ export class DiscoverPage {
         result = "Yes";
         break;
     }
-    this.annotatations.postAnnotation(challenge.id, result)
+    this.annotations.postAnnotation(challenge.id, result)
       .then(() => console.log("Made annotation"))
       .catch(() => console.log("Annotation failed"));
   }

src/pages/rewards/rewards.html

@@ -21,7 +21,7 @@
     <ion-card-content>
       <circle-progress [percent]='percentPersonal' [subtitleFormat]='formatSubtitle'></circle-progress>
       <h1>{{quote}}</h1>
-      <p>We are Cenafood and we need <b>your</b> help. The Cena Swiper helps us to label food pictures. Our final goal is to create an artificial intelligence that can learn your taste and help us find the best plates served around you. Help us reach our ultimate goal by swiping some images. </p>
+      <p>We are Cena and we need <b>your</b> help. The Cena Swiper helps us to label food pictures. Our final goal is to create an artificial intelligence that can learn your taste and help us find the best plates served around you. Help us reach our ultimate goal by swiping some images. </p>
     </ion-card-content>
   </ion-card>
   <ion-card>

src/pages/rewards/rewards.ts

@@ -49,11 +49,11 @@ export class RewardsPage {
 
   formatSubtitle = (percent: number): string => {
     if (percent >= 150) {
-      return "Masterlabler"
+      return "Master labeler"
     } else if (percent >= 100) {
       return "Puh, Got it!"
     } else if (percent >= 75) {
-      return "Allmost there"
+      return "Almost there"
     } else if (percent > 0) {
       return "Keep going!"
     } else {
@@ -63,7 +63,7 @@ export class RewardsPage {
 
   getQuote(percent: number): string {
     if (percent >= 150) {
-      return "You are an Official Masterlabler"
+      return "You are an Official Master labeler"
     } else if (percent >= 100) {
       return "Puh, Got it!"
     } else if (percent >= 80) {

src/pages/welcome/welcome.html

@@ -20,7 +20,7 @@
         <ion-col>
           <img src="assets/imgs/CenaAI.png">
           <h2>Welcome to Cena Family</h2>
-          <p>We are Cenafood and we need <b>your</b> help. The Cena Swiper helps us to label food pictures. Our final goal is to create an artificial intelligence that can learn your taste and help us find the best plates served around you. Help us reach our ultimate goal by swiping some images. </p>
+          <p>We are Cena and we need <b>your</b> help. The Cena Swiper helps us to label food pictures. Our final goal is to create an artificial intelligence that can learn your taste and help us find the best plates served around you. Help us reach our ultimate goal by swiping some images. </p>
         </ion-col>
       </ion-row>
       <ion-row>
@@ -35,7 +35,7 @@ <h2>Welcome to Cena Family</h2>
         <ion-col>
           <img src="assets/imgs/IllustrationLike.png" />
           <h1>Mhmm</h1>
-          <p>If you like what you see and it is acually food. Swipe <b>Right.</b></p>
+          <p>If you like what you see and it is actually food. Swipe <b>Right.</b></p>
         </ion-col>
       </ion-row>
       <ion-row>
@@ -50,7 +50,7 @@ <h1>Mhmm</h1>
         <ion-col>
           <img src="assets/imgs/IllustrationDislike.png" />
           <h1>Yuk!</h1>
-          <p>If you dislike what you see but it's sill food. Swipe <b>Left</b>.</p>
+          <p>If you dislike what you see but it's still food. Swipe <b>Left</b>.</p>
         </ion-col>
       </ion-row>
       <ion-row>
@@ -65,7 +65,7 @@ <h1>Yuk!</h1>
         <ion-col>
           <img src="assets/imgs/IllustrationNoFood.png" />
           <h1>What?</h1>
-          <p>If you see something that is not food, something unidentifyable swipe <b>up</b> or <b>down.</b></p>
+          <p>If you see something that is not food, something unidentifiable swipe <b>up</b> or <b>down.</b></p>
         </ion-col>
       </ion-row>
       <ion-row>