summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob <gatelyjm@clarkson.edu>2019-12-09 07:37:40 -0500
committerJacob <gatelyjm@clarkson.edu>2019-12-09 07:37:40 -0500
commit1b23ba09800009f484b9ab6a49a5626b0baaf504 (patch)
treead59b70ef89202b71181382a3d40a468705b535c
parentc6afa531481b664950406df6cea17794942d8028 (diff)
Initial commit for main page work in progress. Trying to figure out
infinite scroll
-rw-r--r--recipeBuddy/src/app/app-routing.module.ts6
-rw-r--r--recipeBuddy/src/app/app.component.css10
-rw-r--r--recipeBuddy/src/app/app.component.html20
-rw-r--r--recipeBuddy/src/app/app.module.ts10
-rw-r--r--recipeBuddy/src/app/recipe-card/recipe-card.component.css18
-rw-r--r--recipeBuddy/src/app/recipe-card/recipe-card.component.html134
-rw-r--r--recipeBuddy/src/app/recipe-card/recipe-card.component.ts171
-rw-r--r--recipeBuddy/src/styles.css1
8 files changed, 123 insertions, 247 deletions
diff --git a/recipeBuddy/src/app/app-routing.module.ts b/recipeBuddy/src/app/app-routing.module.ts
index a6e4399..a6b69bd 100644
--- a/recipeBuddy/src/app/app-routing.module.ts
+++ b/recipeBuddy/src/app/app-routing.module.ts
@@ -2,10 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { CookPageComponent } from './cook-page/cook-page.component';
+import { RecipeCardComponent } from './recipe-card/recipe-card.component';
const routes: Routes = [
- { path: '', redirectTo: '/cook', pathMatch: 'full' },
- { path: 'cook', component: CookPageComponent }
+ { path: '', redirectTo: '/main', pathMatch: 'full' },
+ { path: 'cook', component: CookPageComponent },
+ { path: 'main', component: RecipeCardComponent }
];
@NgModule({
diff --git a/recipeBuddy/src/app/app.component.css b/recipeBuddy/src/app/app.component.css
index c62f266..fa69a91 100644
--- a/recipeBuddy/src/app/app.component.css
+++ b/recipeBuddy/src/app/app.component.css
@@ -2,6 +2,7 @@
h1 {
font-size: 1.2em;
margin-bottom: 0;
+ text-align: center;
}
h2 {
font-size: 2em;
@@ -26,3 +27,12 @@ nav a:hover {
nav a.active {
color: #039be5;
}
+#left{
+ float:left;width:100px;
+ }
+#right{
+ float:right;width:175px;
+ }
+#center{
+ margin:0 auto;width:100px;
+ } \ No newline at end of file
diff --git a/recipeBuddy/src/app/app.component.html b/recipeBuddy/src/app/app.component.html
index 014c6b0..18b63ba 100644
--- a/recipeBuddy/src/app/app.component.html
+++ b/recipeBuddy/src/app/app.component.html
@@ -1,2 +1,20 @@
-<h1>{{title}}</h1>
+<h1>
+ Recipe Buddy
+</h1>
+<div id="container">
+ <div id="left">
+ <div id="add">
+ <input (click)="addPage()" type="image" src="https://image.flaticon.com/icons/png/512/61/61183.png"
+ alt="add" width="60" height="60">
+ </div>
+ </div>
+ <div id="right">Search: <input type = "text">
+ <input (click)="submitSearch()" type = "submit"></div>
+ <div id="center">
+ <div id="cart">
+ <input (click)="shoppingCart()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="60" height ="60">
+ </div>
+ </div>
+</div>
+<hr>
<router-outlet></router-outlet>
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index 55678a8..680b8fd 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -10,7 +10,11 @@ import { StepCardComponent } from './cook-page/step-card/step-card.component';
import { AppRoutingModule } from './app-routing.module';
-import {HttpClientModule } from '@angular/common/http'
+import {HttpClientModule } from '@angular/common/http';
+
+import {ScrollingModule} from '@angular/cdk/scrolling';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {ScrollDispatchModule} from '@angular/cdk/scrolling';
@NgModule({
declarations: [
@@ -23,7 +27,9 @@ import {HttpClientModule } from '@angular/common/http'
BrowserModule,
AppRoutingModule,
MatCardModule,
- HttpClientModule
+ HttpClientModule,
+ ScrollingModule,
+ ScrollDispatchModule
],
providers: [],
bootstrap: [AppComponent]
diff --git a/recipeBuddy/src/app/recipe-card/recipe-card.component.css b/recipeBuddy/src/app/recipe-card/recipe-card.component.css
index d52f971..8cf412a 100644
--- a/recipeBuddy/src/app/recipe-card/recipe-card.component.css
+++ b/recipeBuddy/src/app/recipe-card/recipe-card.component.css
@@ -1,3 +1,21 @@
+ .example-viewport{
+ height: 250px;
+ width: 80%;
+ margin-left: 50px;
+ border: 1px solid saddlebrown;
+ display: flex;
+ }
+ .list{
+ height: 50px;
+ justify-content: center;
+ align-items: center;
+ }
+ h2{
+ margin-left: 40px;
+ }
+ .container{
+ margin-bottom: 40px;
+ }
p {
font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
}
diff --git a/recipeBuddy/src/app/recipe-card/recipe-card.component.html b/recipeBuddy/src/app/recipe-card/recipe-card.component.html
index 53573db..4584d6f 100644
--- a/recipeBuddy/src/app/recipe-card/recipe-card.component.html
+++ b/recipeBuddy/src/app/recipe-card/recipe-card.component.html
@@ -1,131 +1,33 @@
-<h1>
- Recipe Buddy
-</h1>
-<div id="container">
- <div id="left">
- <div id="add">
- <input (click)="addPage()" type="image" src="https://image.flaticon.com/icons/png/512/61/61183.png"
- alt="add" width="60" height="60">
- </div>
- </div>
- <div id="right">Search: <input type = "text">
- <input (click)="submitSearch()" type = "submit"></div>
- <div id="center">
- <div id="cart">
- <input (click)="shoppingCart()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="60" height ="60">
- </div>
- </div>
-</div>
-<hr>
-<div id="previous">
- <input (click)="previous()" type="image" src="https://www.pngfind.com/pngs/m/9-95287_double-left-chevron-svg-png-icon-free-download.png"
- alt="previous" width="45" height="45">
+<div *ngFor="let recipe of recipes">
+<p>{{recipe}}</p>
</div>
-
-
-<div id="cardContainer">
+<ul class="list">
+<cdk-virtual-scroll-viewport [itemSize]="100" class="example-viewport" style="height:300px; minBufferPx:50;">
+<ng-container *cdkVirtualFor="let recipe of recipes" class="example-viewport">
+<h1>Hello</h1>
+<!--<div id="cardContainer">
<mat-card class="example-card">
<mat-card-header>
<div id="card-title">
- <mat-card-title (click)="cookPage1()">{{recipeName1}}</mat-card-title>
+ <mat-card-title (click)="cookPage(i)">{{recipes[i].name}}</mat-card-title>
</div>
<div id="edit">
- <input (click)="edit1()" type="image" src="https://image.freepik.com/free-icon/scissors_318-9061.jpg"
+ <input (click)="edit(i)" type="image" src="https://image.freepik.com/free-icon/scissors_318-9061.jpg"
alt="edit" width="24" height="32">
</div>
<div id="cart">
- <input (click)="shoppingCart1()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="24" height ="32">
+ <input (click)="shoppingCart()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="24" height ="32">
</div>
<div id="delete">
- <input (click)="delete1()" type="image" src="https://image.flaticon.com/icons/svg/61/61391.svg" alt="delete" width="24" height="32">
+ <input (click)="delete(i)" type="image" src="https://image.flaticon.com/icons/svg/61/61391.svg" alt="delete" width="24" height="32">
</div>
</mat-card-header>
- <img mat-card-image src={{recipeImage1}} alt="Photo of recipe" width="150" height="220">
- <img src={{likeRatingImg1}} alt="like rating" width="50" height="50">
- <mat-card-content>
- </mat-card-content>
- <mat-card-actions>
- <!--
- <div id="like-rating">
- <img src="https://as1.ftcdn.net/jpg/02/36/32/68/500_F_236326831_AMTN6cLvvhi1ImGYYOGFAaJBcuvWwHyx.jpg" alt="Like rating">
- </div>
- <div id="rating">
- <img src="https://www.judsonsmartliving.org/wp-content/uploads/5-stars.png" alt="5 star rating">
- </div>
- -->
- </mat-card-actions>
- </mat-card>
- <mat-card class="example-card">
- <mat-card-header>
- <div id="card-title">
- <mat-card-title (click)="cookPage2()">{{recipeName2}}</mat-card-title>
- </div>
- <div id="edit">
- <input (click)="edit2()" type="image" src="https://image.freepik.com/free-icon/scissors_318-9061.jpg"
- alt="edit" width="24" height="32">
- </div>
- <div id="cart">
- <input (click)="shopoingCart2()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="24" height ="32">
- </div>
- <div id="delete">
- <input (click)="delete2()" type="image" src="https://image.flaticon.com/icons/svg/61/61391.svg" alt="delete" width="24" height="32">
- </div>
- </mat-card-header>
- <img mat-card-image src={{recipeImage2}} alt="Photo of recipe" width="150" height="220">
- <img src={{likeRatingImg2}} alt="like rating" width="50" height="50">
- <mat-card-content>
- </mat-card-content>
- <mat-card-actions>
- <!--
- <div id="like-rating">
- <img src="https://as1.ftcdn.net/jpg/02/36/32/68/500_F_236326831_AMTN6cLvvhi1ImGYYOGFAaJBcuvWwHyx.jpg" alt="Like rating">
- </div>
- <div id="rating">
- <img src="https://www.judsonsmartliving.org/wp-content/uploads/5-stars.png" alt="5 star rating">
- </div>
- -->
- </mat-card-actions>
+ <img mat-card-image src={{recipes[i].photos[0]}} alt="Photo of recipe" width="150" height="220">
+ <p>Rating: {{recipes[i].rating}}</p>
</mat-card>
- <mat-card class="example-card">
- <mat-card-header>
- <div id="card-title">
- <mat-card-title (click)="clickPage3()">{{recipeName3}}</mat-card-title>
- </div>
- <div id="edit">
- <input (click)="edit3()" type="image" src="https://image.freepik.com/free-icon/scissors_318-9061.jpg"
- alt="edit" width="24" height="32">
- </div>
- <div id="cart">
- <input (click)="shoppingCart3()" type="image" src="https://image.flaticon.com/icons/png/512/126/126083.png" alt="cart" width="24" height ="32">
- </div>
- <div id="delete">
- <input (click)="delete3()" type="image" src="https://image.flaticon.com/icons/svg/61/61391.svg" alt="delete" width="24" height="32">
- </div>
- </mat-card-header>
- <img mat-card-image src={{recipeImage3}} alt="Photo of recipe" width="150" height="220">
- <img src={{likeRatingImg3}} alt="like rating" width="50" height="50">
- <mat-card-content>
- </mat-card-content>
- <mat-card-actions>
- <!--
- <div id="like-rating">
- <img src="https://as1.ftcdn.net/jpg/02/36/32/68/500_F_236326831_AMTN6cLvvhi1ImGYYOGFAaJBcuvWwHyx.jpg" alt="Like rating">
- </div>
- <div id="rating">
- <img src="https://www.judsonsmartliving.org/wp-content/uploads/5-stars.png" alt="5 star rating">
- </div>
- -->
- </mat-card-actions>
- </mat-card>
-</div>
-<div id="next">
- <input (click)="next()" type="image" src="data:image/png;base64,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"
- alt="next" width="45" height="45">
-</div>
-
-<!-- Copyright 2019 Google LLC. All Rights Reserved.
- Use of this source code is governed by an MIT-style license that
- can be found in the LICENSE file at http://angular.io/license -->
-
-
+ </div>
+ -->
+ </ng-container>
+</cdk-virtual-scroll-viewport>
+</ul>
<!--No image found web address: https://www.azfinesthomes.com/assets/images/image-not-available.jpg --> \ No newline at end of file
diff --git a/recipeBuddy/src/app/recipe-card/recipe-card.component.ts b/recipeBuddy/src/app/recipe-card/recipe-card.component.ts
index e5e3a03..bd44316 100644
--- a/recipeBuddy/src/app/recipe-card/recipe-card.component.ts
+++ b/recipeBuddy/src/app/recipe-card/recipe-card.component.ts
@@ -1,142 +1,61 @@
import {Component,OnInit} from '@angular/core';
+import{BackendService} from '../REST_service/backend.service';
/**
* @title Card with multiple sections
*/
@Component({
- selector: 'card-fancy-example',
- templateUrl: 'card-fancy-example.html',
- styleUrls: ['card-fancy-example.css'],
+ selector: 'RecipeCardComponent',
+ templateUrl: 'recipe-card.component.html',
+ styleUrls: ['recipe-card.component.css']
})
-export class CardFancyExample implements OnInit {
- recipeNumber: number;
- totalRecipeNum: number;
- recipeNames: string[] = ["Pizza", "Pancakes", "Pasta", "Chicken", "Eggs", "Sandwich", "Meatballs"];
- recipeName1: string;
- recipeName2: string;
- recipeName3: string;
- recipeImgs: string[] = ["https://images.unsplash.com/photo-1534308983496-4fabb1a015ee?ixlib=rb-1.2.1&w=1000&q=80",
- "https://www.mamaknowsglutenfree.com/wp-content/uploads/2019/01/gluten-free-pancakes-rc.jpg",
- "https://feedmephoebe.com/wp-content/uploads/2017/10/Homemade-Gluten-Free-Pasta-Recipe-Tuscan-Pici-Spaghetti-Noodles-19.jpg", "https://images.all-free-download.com/images/graphicthumb/chicken_picture_3_167117.jpg", "https://www.photos-public-domain.com/wp-content/uploads/2011/11/fried-eggs.jpg", "https://image.freepik.com/free-photo/sandwich_1339-1108.jpg", "https://www.glutenfreepalate.com/wp-content/uploads/2019/05/Gluten-Free-Meatballs-3.2-720x720.jpg"];
- faceImgs: string[] = ["https://making-the-web.com/sites/default/files/clipart/174377/sad-face-pictures-free-174377-9562118.png","https://cdn.shopify.com/s/files/1/1061/1924/products/Neutral_Face_Emoji_large.png?v=1571606037","https://img.clipartlook.com/smiley-face-clipart-free-happy-face-clip-art-free-250_250.png" ]
- likeRatings: number[] = [2,2,0,1,2,0,1]
- likeRatingImg1: string;
- likeRatingImg2: string;
- likeRatingImg3: string;
- recipeImage1: string;
- recipeImage2: string;
- recipeImage3: string;
+export class RecipeCardComponent implements OnInit {
+
+ constructor(private restService: BackendService) {}
+
+ recipes = []; //array of recipe objects
+ mynumbers = [];
ngOnInit() {
- this.recipeNumber = 0;
- this.totalRecipeNum = this.recipeNames.length;
- this.recipeName1 = this.recipeNames[this.recipeNumber];
- this.recipeName2 = this.recipeNames[this.recipeNumber + 1];
- this.recipeName3 = this.recipeNames[this.recipeNumber + 2];
- this.recipeImage1 = this.recipeImgs[this.recipeNumber];
- this.recipeImage2 = this.recipeImgs[this.recipeNumber + 1];
- this.recipeImage3 = this.recipeImgs[this.recipeNumber + 2];
- this.likeRatingImg1 = this.faceImgs[this.likeRatings[this.recipeNumber]];
- this.likeRatingImg2 = this.faceImgs[this.likeRatings[this.recipeNumber + 1]];
- this.likeRatingImg3 = this.faceImgs[this.likeRatings[this.recipeNumber + 2]];
- }
-
- addPage() {
- /**Code here to open add page */
- }
- submitSearch() {
- /**Code here to submit search */
- }
- shoppingCart() {
- /**Code here to open shopping cart with no ingredients */
- }
-
- previous() {
- if(this.recipeNumber > 2)
- {
- this.recipeNumber = this.recipeNumber - 3;
- this.recipeName1 = this.recipeNames[this.recipeNumber];
- this.recipeName2 = this.recipeNames[this.recipeNumber + 1];
- this.recipeName3 = this.recipeNames[this.recipeNumber + 2];
- this.recipeImage1 = this.recipeImgs[this.recipeNumber];
- this.recipeImage2 = this.recipeImgs[this.recipeNumber + 1];
- this.recipeImage3 = this.recipeImgs[this.recipeNumber + 2];
- this.likeRatingImg1 = this.faceImgs[this.likeRatings[this.recipeNumber]];
- this.likeRatingImg2 = this.faceImgs[this.likeRatings[this.recipeNumber + 1]];
- this.likeRatingImg3 = this.faceImgs[this.likeRatings[this.recipeNumber + 2]];
- } else
- {
- this.recipeNumber = 0;
- this.recipeName1 = this.recipeNames[this.recipeNumber];
- this.recipeName2 = this.recipeNames[this.recipeNumber + 1];
- this.recipeName3 = this.recipeNames[this.recipeNumber + 2];
- this.recipeImage1 = this.recipeImgs[this.recipeNumber];
- this.recipeImage2 = this.recipeImgs[this.recipeNumber + 1];
- this.recipeImage3 = this.recipeImgs[this.recipeNumber + 2];
- this.likeRatingImg1 = this.faceImgs[this.likeRatings[this.recipeNumber]];
- this.likeRatingImg2 = this.faceImgs[this.likeRatings[this.recipeNumber + 1]];
- this.likeRatingImg3 = this.faceImgs[this.likeRatings[this.recipeNumber + 2]];
- }
- }
- next() {
- this.recipeNumber = this.recipeNumber + 3;
- if(this.recipeNumber + 3 > this.totalRecipeNum)
- {
- this.recipeNumber = this.totalRecipeNum - 3;
+ this.restService.getRecipes().subscribe(
+ res => {
+ var i: number;
+ for(i = 0; i < res.length; i++) {
+ this.restService.getRecipe(res[i]).subscribe(
+ res2 => {
+ this.recipes.push(res2)
+ }, err => {/*Deal with error*/}, () => {/*Code for complete observable*/}
+ );
}
- this.recipeName1 = this.recipeNames[this.recipeNumber];
- this.recipeName2 = this.recipeNames[this.recipeNumber + 1];
- this.recipeName3 = this.recipeNames[this.recipeNumber + 2];
- this.recipeImage1 = this.recipeImgs[this.recipeNumber];
- this.recipeImage2 = this.recipeImgs[this.recipeNumber + 1];
- this.recipeImage3 = this.recipeImgs[this.recipeNumber + 2];
- this.likeRatingImg1 = this.faceImgs[this.likeRatings[this.recipeNumber]];
- this.likeRatingImg2 = this.faceImgs[this.likeRatings[this.recipeNumber + 1]];
- this.likeRatingImg3 = this.faceImgs[this.likeRatings[this.recipeNumber + 2]];
- }
-
- cookPage1(){
- /**Code here to go to cook page for recipe in position 1 */
- }
- edit1() {
- /**Code here to edit recipe in position 1 */
- }
- shoppingCart1() {
- /**Code here to open shopping cart with ingredients from the recipe in position 1 */
- }
- delete1() {
- /**Code here to delete recipe in position 1 */
- }
-
- cookPage2(){
- /**Code here to go to cook page for recipe in position 2 */
- }
- edit2() {
- /**Code here to edit recipe in position 2 */
+ },
+ err => {
+//Deal with error
+ },
+ () => {
+//Complete observable
+ }
+);
+ for(var i = 0; i <10; ++i)
+ {
+ mynumbers.push(i);
+ }
+ }
+
+ shoppingCart() {
+ /**Code here to open shopping cart */
}
- shoppingCart2() {
- /**Code here to open shopping cart with ingredients from the recipe in position 2 */
+
+ cookPage(id){
+ /**Code here to go to cook page for recipe with id */
+ //this.recipes[id];
}
- delete2() {
- /**Code here to delete recipe in position 2 */
+
+ edit(id) {
+ /**Code here to edit recipe with id */
}
- cookPage3(){
- /**Code here to go to cook page for recipe in position 3 */
+ delete(id) {
+ /**Code here to delete recipe with id */
}
- edit3() {
- /**Code here to edit recipe in position 3 */
- }
- shoppingCart3() {
- /**Code here to open shopping cart with ingredients from the recipe in position 3 */
- }
- delete3() {
- /**Code here to delete recipe in position 3 */
- }
-
}
-
-
-/** Copyright 2019 Google LLC. All Rights Reserved.
- Use of this source code is governed by an MIT-style license that
- can be found in the LICENSE file at http://angular.io/license */ \ No newline at end of file
+ \ No newline at end of file
diff --git a/recipeBuddy/src/styles.css b/recipeBuddy/src/styles.css
index 90d4ee0..3063ec3 100644
--- a/recipeBuddy/src/styles.css
+++ b/recipeBuddy/src/styles.css
@@ -1 +1,2 @@
/* You can add global styles to this file, and also import other style files */
+@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';