Changeset 738b31a

Timestamp:

02/05/23 19:06:46 (21 months ago)

Author:

Filip Chorbeski <86695898+FilipChorbeski@…>

Branches:

main

Children:

6479fe1

Parents:

b1b571b

Message:

resolve merge conflict

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/service/PostService.java (added)
• java/finki/paw5/service/implementation/PostServiceImpl.java (added)
• java/finki/paw5/web/controllers/CreatePostController.java (deleted)
• java/finki/paw5/web/controllers/PostController.java (added)
• resources/templates/CreatePost.html (modified) (4 diffs)
• resources/templates/createpost.html (added)

Prototype Application/Paw5/src/main/resources/templates/CreatePost.html

@@ -17 +17 @@
     <div id="AddNewPet">
         <label for="newpet">Add new pet:</label>
-            <input id="newpet" type="checkbox">
+            <input id="newpet" name="newpet" placeholder="newpet" type="checkbox">
     </div>
 
     <div id="PetName">
-        Name:<input type="text">
+        Name:<input id="name" name="name" placeholder="name" type="text">
     </div>
 
     <div id="Genders">
         <label for="gender">Gender:</label>
-        <select id="gender">
-            <option>male</option>
-            <option>female</option>
+        <select id="gender" name="gender">
+            <option value = "MALE">male</option>
+            <option value = "FEMALE">female</option>
         </select>
     </div>
@@ -34 +34 @@
     <div id="AgeGroup">
         <label for="age">Age Group:</label>
-        <select id="age">
-            <option>young</option>
-            <option>adult</option>
-            <option>elder</option>
+        <select id="age" name="size">
+            <option value = "YOUNG">young</option>
+            <option value = "ADULT">adult</option>
+            <option value = "ELDER">elder</option>
         </select>
     </div>
@@ -43 +43 @@
     <div id="Sizes">
         <label for="size">Size:</label>
-        <select id="size">
-            <option>extra small</option>
-            <option>small</option>
-            <option>medium</option>
-            <option>large</option>
-            <option>extra large</option>
+        <select id="size" name="size">
+            <option value = "XSMALL">extra small</option>
+            <option value = "SMALL">small</option>
+            <option value = "MEDIUM">medium</option>
+            <option value = "LARGE">large</option>
+            <option value = "XLARGE">extra large</option>
         </select>
     </div>
@@ -54 +54 @@
     <div id="Species">
         <label for="specie">Species:</label>
-        <select id="specie">
-            <option>cat</option>
-            <option>dog</option>
-            <option>bird</option>
+        <select id="specie" name="specie">
+            <option value = "CAT">cat</option>
+            <option value = "DOG">dog</option>
+            <option value = "BIRD">bird</option>
         </select>
     </div>
 
-    <div id="Breed">
-        Breed:<input type="text">
+    <div id="Breeds">
+        Breed:<input id="breed" name="breed" placeholder="breed" type="text">
     </div>
 
-    <div id="UploadImage">
-        URL of Image:<input type="text">
+    <div id="UploadImages">
+        URL of Image:<input id="image" name="image" placeholder="image" type="text">
        <!-- <label for="upload">Image:</label>
         <input id="upload" type="file" accept="image/*">