Browse Source

removed all the www stuff

Kr Younger 6 years ago
parent
commit
84e87ee8e5

+ 2
- 1
.gitignore View File

@@ -24,4 +24,5 @@ dist/
24 24
 nbdist/
25 25
 .nb-gradle/
26 26
 
27
-frontend/SimpleMonday/node_modules
27
+frontend/SimpleMonday/node_modules
28
+frontend/SimpleMonday/www

+ 2
- 2
frontend/SimpleMonday/src/app/app.module.ts View File

@@ -11,7 +11,7 @@ import { TabsPage } from '../pages/tabs/tabs';
11 11
 
12 12
 import { StatusBar } from '@ionic-native/status-bar';
13 13
 import { SplashScreen } from '@ionic-native/splash-screen';
14
-import { PeopleSupplyProvider } from '../providers/people-supply/people-supply';
14
+//import { PeopleSupplyProvider } from '../providers/people-supply/people-supply';
15 15
 
16 16
 @NgModule({
17 17
   declarations: [
@@ -38,7 +38,7 @@ import { PeopleSupplyProvider } from '../providers/people-supply/people-supply';
38 38
     StatusBar,
39 39
     SplashScreen,
40 40
     {provide: ErrorHandler, useClass: IonicErrorHandler},
41
-    PeopleSupplyProvider
41
+    //PeopleSupplyProvider
42 42
   ]
43 43
 })
44 44
 export class AppModule {}

BIN
frontend/SimpleMonday/src/assets/imgs/monday.jpg View File


+ 24
- 23
frontend/SimpleMonday/src/pages/about/about.html View File

@@ -7,34 +7,35 @@
7 7
 </ion-header>
8 8
 
9 9
 <ion-content padding>
10
-  <h2>Monday Monday, -- The Mommas and Papas</h2>
11
-<p>Bah-da bah-da-da-da
12
-  Bah-da bah-da-da-da
10
+  <h2>Monday Monday, -- The Mamas and Papas</h2>
11
+  <p><img src='assets/imgs/monday.jpg'/></p>
12
+<p>Bah-da bah-da-da-da<br/>
13
+  Bah-da bah-da-da-da<br/>
13 14
   Bah-da bah-da-da-da</p><p>
14
-  Monday, Monday, so good to me
15
-  Monday mornin´, it was all I hoped it would be
16
-  Oh Monday mornin´, Monday mornin´ couldn´t guarantee
15
+  Monday, Monday, so good to me<br/>
16
+  Monday mornin´, it was all I hoped it would be<br/>
17
+  Oh Monday mornin´, Monday mornin´ couldn´t guarantee<br/>
17 18
   That Monday evenin´ you would still be here with me</p><p>
18
-  Monday, Monday, can´t trust that day
19
-  Monday, Monday, sometimes it just turns out that way
20
-  Oh Monday mornin´ you gave me no warnin´ of what was to be
19
+  Monday, Monday, can´t trust that day<br/>
20
+  Monday, Monday, sometimes it just turns out that way<br/>
21
+  Oh Monday mornin´ you gave me no warnin´ of what was to be<br/>
21 22
   Oh Monday, Monday, how could you leave and not take me</p><p>
22
-  Every other day, every other day
23
-  Every other day of the week is fine, yeah
24
-  But whenever Monday comes, but whenever Monday comes
23
+  Every other day, every other day<br/>
24
+  Every other day of the week is fine, yeah<br/>
25
+  But whenever Monday comes, but whenever Monday comes<br/>
25 26
   A-you can find me cryin´ all of the time</p><p>
26
-  Monday, Monday, so good to me
27
-  Monday mornin´, it was all I hoped it would be
28
-  But Monday mornin´, Monday mornin´ couldn´t guarantee
27
+  Monday, Monday, so good to me<br/>
28
+  Monday mornin´, it was all I hoped it would be<br/>
29
+  But Monday mornin´, Monday mornin´ couldn´t guarantee<br/>
29 30
   That Monday evenin´ you would still be here with me</p><p>
30
-  Every other day, every other day
31
-  Every other day of the week is fine, yeah
32
-  But whenever Monday comes, but whenever Monday comes
31
+  Every other day, every other day<br/>
32
+  Every other day of the week is fine, yeah<br/>
33
+  But whenever Monday comes, but whenever Monday comes<br/>
33 34
   A-you can find me cryin´ all of the time</p><p>
34
-  Monday, Monday, can´t trust that day
35
-  Monday, Monday, it just turns out that way
36
-  Oh Monday, Monday, won´t go away
37
-  Monday, Monday, it´s here to stay
38
-  Oh Monday, Monday
35
+  Monday, Monday, can´t trust that day<br/>
36
+  Monday, Monday, it just turns out that way<br/>
37
+  Oh Monday, Monday, won´t go away<br/>
38
+  Monday, Monday, it´s here to stay<br/>
39
+  Oh Monday, Monday<br/>
39 40
   Oh Monday, Monday</p>
40 41
 </ion-content>

+ 6
- 1
frontend/SimpleMonday/src/pages/contact/contact.ts View File

@@ -14,9 +14,14 @@ export class ContactPage {
14 14
   people: any;
15 15
 
16 16
   constructor(public navCtrl: NavController, public http: Http) {
17
+    // one could, and might, make this a provider, and inject it vi changes to this constructor.
17 18
     this.http.get('http://localhost:8080/persons').map(res => res.json()).subscribe(data => {
18 19
         //console.log(data);
19
-        this.people = data._embedded.persons;
20
+        if (data.status == 200) {
21
+          this.people = data._embedded.persons;
22
+        } else {
23
+          this.people = [{name: 'Unable to Find Any People!', age: 0}];
24
+        }
20 25
     });
21 26
 
22 27
   }