added checkbox

ionic-beer/package.json

@@ -55,4 +55,4 @@
       "android"
     ]
   }
-}
+}

ionic-beer/src/pages/about/about.html

@@ -7,5 +7,6 @@
 </ion-header>
 
 <ion-content padding>
+  <p><img src="assets/imgs/WilderBeer.png"></p>
 
 </ion-content>

ionic-beer/src/pages/beer/beer.html

@@ -1,6 +1,11 @@
 <ion-header>
   <ion-navbar>
-    <ion-title>Good Beers</ion-title>
+    <ion-title>Kristofer's Nasty Beers</ion-title>
+    <ion-item>
+      <ion-label>Show Good Beers</ion-label>
+    <ion-checkbox [(ngModel)]="goodbeers" (click)="changeList()"></ion-checkbox>
+    </ion-item>
+
     <ion-buttons end>
       <button ion-button icon-only (click)="openModal()" color="primary">
         <ion-icon name="add-circle"></ion-icon>

ionic-beer/src/pages/beer/beer.ts

@@ -11,14 +11,14 @@ import { BeerModalPage } from './beer-modal';
 })
 export class BeerPage {
   private beers: Array<any>;
-
+  public goodbeers: boolean;
   constructor(public navCtrl: NavController, public navParams: NavParams,
               public beerService: BeerService, public giphyService: GiphyService,
               public modalCtrl: ModalController, public toastCtrl: ToastController) {
   }
 
   ionViewDidLoad() {
-    this.beerService.getGoodBeers().subscribe(beers => {
+    this.beerService.getBeers().subscribe(beers => {
       this.beers = beers;
       for (const beer of this.beers) {
         this.giphyService.get(beer.name).subscribe(url => {
@@ -27,7 +27,10 @@ export class BeerPage {
       }
     })
   }
-
+  changeList(event) {
+    this.beerService.good = this.goodbeers.valueOf();
+    this.ionViewDidLoad();
+  }
   openModal(beerId) {
     let modal = this.modalCtrl.create(BeerModalPage, beerId);
     modal.present();

ionic-beer/src/pages/contact/contact.html

@@ -11,7 +11,7 @@
     <ion-list-header>Follow us on Twitter</ion-list-header>
     <ion-item>
       <ion-icon name="ionic" item-start></ion-icon>
-      @ionicframework
+      Don't call me, I'll call you! 
     </ion-item>
   </ion-list>
 </ion-content>

ionic-beer/src/pages/home/home.html

@@ -5,13 +5,13 @@
 </ion-header>
 
 <ion-content padding>
-  <h2>Welcome to Ionic!</h2>
+  <h2>Welcome to Kristofer's Beers!</h2>
   <p>
-    This starter project comes with simple tabs-based layout for apps
-    that are going to primarily use a Tabbed UI.
+    Tabs, Beers, and nothing else.
   </p>
+  <h3><strong>“I would give all my fame for a pot of ale and safety”</strong></h3>
   <p>
-    Take a look at the <code>src/pages/</code> directory to add or change tabs,
-    update any existing page or create new pages.
+<em>Henry V: Act 3, Scene 2.</em>
   </p>
+  <p><img src="assets/imgs/BardBeer.png"></p>
 </ion-content>

ionic-beer/src/pages/tabs/tabs.ts

@@ -11,8 +11,8 @@ import { BeerPage } from '../beer/beer';
 export class TabsPage {
   tab1Root = HomePage;
   tab2Root = BeerPage;
-  tab3Root = AboutPage;
-  tab4Root = ContactPage;
+  tab3Root = ContactPage;
+  tab4Root = AboutPage;
 
   constructor() {
 

ionic-beer/src/providers/beer-service.ts

@@ -4,16 +4,28 @@ import { HttpClient } from '@angular/common/http';
 
 @Injectable()
 export class BeerService {
-  public API = 'http://192.168.1.48:8080';
+  public API = 'http://localhost:8080';
   public BEER_API = this.API + '/beers';
-
+  public good: boolean;
   constructor(public http: HttpClient) {
+    this.good = false;
   }
 
   getGoodBeers(): Observable<any> {
     return this.http.get(this.API + '/good-beers');
   }
 
+  getAllBeers(): Observable<any> {
+    return this.http.get(this.API + '/all-beers');
+  }
+
+  getBeers(): Observable<any> {
+    if (this.good) {
+      return this.http.get(this.API + '/good-beers');
+    }
+    return this.http.get(this.API + '/all-beers');
+  }
+
   get(id: string) {
     return this.http.get(this.BEER_API + '/' + id);
   }

server/src/main/java/com/example/demo/beer/BeerCommandLineRunner.java

@@ -17,8 +17,8 @@ public class BeerCommandLineRunner implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
         // Top beers from https://www.beeradvocate.com/lists/top/
-        Stream.of("Kentucky Brunch Brand Stout", "Good Morning", "Very Hazy", "King Julius",
-                "Budweiser", "Coors Light", "PBR").forEach(name ->
+        Stream.of("Kentucky Quail Egg Stout", "Good Morning, Breakfast Weiss", "Very Hazy", "King Henry's Favorite Fried Chicken Porter",
+                "Budweiser", "Coors Light", "PBR", "Goat Spit Ale", "Diabetic Pony", "Funky T-shirt").forEach(name ->
                 repository.save(new Beer(name))
         );
         repository.findAll().forEach(System.out::println);

server/src/main/java/com/example/demo/beer/BeerController.java

@@ -29,4 +29,12 @@ public class BeerController {
                 !beer.getName().equals("Coors Light") &&
                 !beer.getName().equals("PBR");
     }
+    @GetMapping("/all-beers")
+    @CrossOrigin(origins = {"http://localhost:8100","http://localhost:8080"})
+    public Collection<Beer> allBeers() {
+
+        return repository.findAll().stream()
+                .collect(Collectors.toList());
+    }
+
 }