fix conflicts and rework routes

src/ui/RequestedWineCard.vue

@@ -56,13 +56,13 @@ export default {
         },
         method: "post"
       }
-      fetch("http://localhost:30030/api/request", options)
+      fetch("http://localhost:30030/api/request/new-wine", options)
         .then(res => res.json())
     },
     async deleteWine(wine) {
       if (window.confirm("Er du sikker på at du vil slette vinen?")) {
         let response = await deleteRequestedWine(wine);
-        if (response) {
+        if (response['success'] == true) {
           this.$emit('wineDeleted', wine);
         } else {
           alert("Klarte ikke slette vinen");

src/ui/Wine.vue

@@ -22,6 +22,7 @@
           :href="wine.vivinoLink"
           class="wine-link"
         >Les mer på {{ hostname(wine.vivinoLink) }}</a>
+
         <button
           v-if="winner"
           @click="choseWine(wine.name)"
@@ -174,4 +175,8 @@ a:visited {
     color: $red;
   }
 }
+
+.vin-button {
+  margin-top: 1rem;
+}
 </style>

src/ui/Winners.vue

@@ -34,8 +34,10 @@ h2 {
 
 .winners {
   display: flex;
+  flex-flow: wrap;
   justify-content: space-around;
   align-items: center;
+  flex-wrap: wrap;
 }
 
 .ballot-element {