Merge pull request #139 from SCCapstone/120-Ingredient-Forms

Ingredient Changes and Login Tests
SCCapstone · Jan 30, 2022 · a597847 · a597847
2 parents dc7951d + 77386f0
commit a597847
Show file tree

Hide file tree

Showing 14 changed files with 308 additions and 1,287 deletions.
diff --git a/backend/src/main/java/recipes/fridger/backend/dto/CreateIngredientDTO.java b/backend/src/main/java/recipes/fridger/backend/dto/CreateIngredientDTO.java
@@ -38,6 +38,6 @@ public class CreateIngredientDTO {
     @DecimalMax(value = "10000.0")
     private Double cost;
 
-    @Size(min = 0, max = 500)
+    @Size(min = 0, max = 1000)
     private String imgSrc;
 }
diff --git a/backend/src/main/java/recipes/fridger/backend/model/Ingredient.java b/backend/src/main/java/recipes/fridger/backend/model/Ingredient.java
@@ -57,7 +57,7 @@ public class Ingredient {
     @Column(name = "cost", nullable = true)
     private Double cost;
 
-    @Size(min = 0, max = 500)
+    @Size(min = 0, max = 1000)
     @Column(name = "imgSrc", nullable = true)
     private String imgSrc;
 }
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,80 +1,80 @@
-{
-  "name": "fridger",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "@capacitor/app": "1.0.3",
-    "@capacitor/core": "3.2.4",
-    "@capacitor/haptics": "1.1.0",
-    "@capacitor/keyboard": "1.1.0",
-    "@capacitor/status-bar": "1.0.3",
-    "@hookform/error-message": "^2.0.0",
-    "@ionic/react": "^5.5.0",
-    "@ionic/react-router": "^5.5.0",
-    "@testing-library/jest-dom": "^5.11.9",
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.6.3",
-    "@types/jest": "^26.0.20",
-    "@types/react": "^16.14.3",
-    "@types/react-dom": "^16.9.10",
-    "@types/react-router": "^5.1.11",
-    "@types/react-router-dom": "^5.1.7",
-    "axios": "^0.25.0",
-    "ionicons": "^5.5.4",
-    "lodash": "^4.17.21",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-google-charts": "^3.0.15",
-    "react-hook-form": "^7.25.1",
-    "react-icons": "^4.3.1",
-    "react-ionicons": "^4.2.0",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.3.0",
-    "typescript": "^4.5.4",
-    "web-vitals": "^0.2.4",
-    "workbox-background-sync": "^5.1.4",
-    "workbox-broadcast-update": "^5.1.4",
-    "workbox-cacheable-response": "^5.1.4",
-    "workbox-core": "^5.1.4",
-    "workbox-expiration": "^5.1.4",
-    "workbox-google-analytics": "^5.1.4",
-    "workbox-navigation-preload": "^5.1.4",
-    "workbox-precaching": "^5.1.4",
-    "workbox-range-requests": "^5.1.4",
-    "workbox-routing": "^5.1.4",
-    "workbox-strategies": "^5.1.4",
-    "workbox-streams": "^5.1.4",
-    "yup": "^0.32.11"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@capacitor/cli": "3.2.4",
-    "@types/lodash": "^4.14.178",
-    "@types/node": "^12.20.42",
-    "react-scripts": "4.0.2"
-  },
-  "description": "fridger.recipes"
-}
+{
+  "name": "fridger",
+  "version": "0.0.1",
+  "private": true,
+  "dependencies": {
+    "@capacitor/app": "1.0.3",
+    "@capacitor/core": "3.2.4",
+    "@capacitor/haptics": "1.1.0",
+    "@capacitor/keyboard": "1.1.0",
+    "@capacitor/status-bar": "1.0.3",
+    "@hookform/error-message": "^2.0.0",
+    "@ionic/react": "^5.5.0",
+    "@ionic/react-router": "^5.5.0",
+    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^12.6.3",
+    "@types/jest": "^26.0.20",
+    "@types/react": "^16.14.3",
+    "@types/react-dom": "^16.9.10",
+    "@types/react-router": "^5.1.11",
+    "@types/react-router-dom": "^5.1.7",
+    "axios": "^0.25.0",
+    "ionicons": "^5.5.4",
+    "lodash": "^4.17.21",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-google-charts": "^3.0.15",
+    "react-hook-form": "^7.25.1",
+    "react-icons": "^4.3.1",
+    "react-ionicons": "^4.2.0",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.3.0",
+    "typescript": "^4.5.4",
+    "web-vitals": "^0.2.4",
+    "workbox-background-sync": "^5.1.4",
+    "workbox-broadcast-update": "^5.1.4",
+    "workbox-cacheable-response": "^5.1.4",
+    "workbox-core": "^5.1.4",
+    "workbox-expiration": "^5.1.4",
+    "workbox-google-analytics": "^5.1.4",
+    "workbox-navigation-preload": "^5.1.4",
+    "workbox-precaching": "^5.1.4",
+    "workbox-range-requests": "^5.1.4",
+    "workbox-routing": "^5.1.4",
+    "workbox-strategies": "^5.1.4",
+    "workbox-streams": "^5.1.4",
+    "yup": "^0.32.11"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "devDependencies": {
+    "@capacitor/cli": "3.2.4",
+    "@types/lodash": "^4.14.178",
+    "@types/node": "^12.20.42",
+    "react-scripts": "4.0.2"
+  },
+  "description": "fridger.recipes"
+}
diff --git a/frontend/src/components/AddIngredient.css b/frontend/src/components/AddIngredient.css
diff --git a/frontend/src/components/AddIngredient.tsx b/frontend/src/components/AddIngredient.tsx
diff --git a/frontend/src/components/LoginForm.tsx b/frontend/src/components/LoginForm.tsx
@@ -8,6 +8,7 @@ import Context from './Context';
 import History from '../History';
 
 import axios from "axios";
+import React from "react";
 
 export const LoginForm: React.FC = () => {
     const context = useContext(Context);
@@ -68,14 +69,16 @@ export const LoginForm: React.FC = () => {
                 <IonLabel position="floating">Email</IonLabel>
                 <IonInput
                     value={email}
+                    placeholder="Email"
                     onIonChange={(e) => setEmail(e.detail.value!)}
                     type="email"
                 />
             </IonItem>
             <IonItem>
                 <IonLabel position="floating">Password</IonLabel>
                 <IonInput
-                    value={password}
+                    value=""
+                    placeholder="Password"
                     onIonChange={(e) => setPassword(e.detail.value!)}
                     type="password"
                 />