Merge remote-tracking branch 'origin/master'

Mentor-Medier · Oct 16, 2017 · 4518464 · 4518464
2 parents a233609 + 409f19d
commit 4518464
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 14 deletions.
diff --git a/src/main/java/com/newsstories/story/Story.java b/src/main/java/com/newsstories/story/Story.java
@@ -8,8 +8,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Date;

diff --git a/src/main/resources/static/js/app.js b/src/main/resources/static/js/app.js
diff --git a/src/main/resources/static/js/manifest.js b/src/main/resources/static/js/manifest.js
diff --git a/vueapp/src/App.vue b/vueapp/src/App.vue
@@ -10,7 +10,7 @@
           </q-toolbar-title>
         </q-toolbar>
         <router-view></router-view>
-        <q-fixed-position corner="bottom-right" :offset="[560, 16]">
+        <q-fixed-position corner="bottom-right" :offset="[16, 16]">
           <q-fab
             ref="createstory"
             color="primary"

diff --git a/vueapp/src/components/Feeds.vue b/vueapp/src/components/Feeds.vue
@@ -12,6 +12,7 @@
           </q-card-main>
           <q-card-separator />
           <q-card-actions>
+            <q-btn flat @click="edit( story.id )">Edit</q-btn>
             <q-btn flat @click="getStory( story.id )">HTML</q-btn>
             <q-btn flat @click="getStoryJson( story.id )">JSON</q-btn>
             <q-btn flat @click="getStoryXml( story.id )">XML</q-btn>
@@ -72,6 +73,10 @@ export default {
 
     getStoryXml (storyId) {
       this.$router.push({name: 'news_detail_xml', params: {id: storyId}})
+    },
+
+    edit (storyId) {
+      this.$router.push({name: 'edit_news', params: {id: storyId}})
     }
   }
 }

diff --git a/vueapp/src/components/NewsDetail.vue b/vueapp/src/components/NewsDetail.vue
@@ -10,6 +10,7 @@
       </q-card-main>
       <q-card-separator />
       <q-card-actions>
+        <q-btn flat @click="edit( story.id )">Edit</q-btn>
         <q-btn flat @click="back()">Back</q-btn>
       </q-card-actions>
     </q-card>

diff --git a/vueapp/src/components/NewsForm.vue b/vueapp/src/components/NewsForm.vue
@@ -2,26 +2,26 @@
   <div class="layout-padding docs-input row justify-center">
     <div style="width: 500px; max-width: 90vw; text-align: left">
       <q-card>
-        <q-card-title>
-          Create News Story
-        </q-card-title>
+        <q-card-title v-if="this.$route.params.id">Edit News Story</q-card-title>
+        <q-card-title v-else>Create News Story</q-card-title>
         <q-card-main>
           <q-field>
-            <q-input v-model="story.title" float-label="Title" :value="story.title" />
+            <q-input v-model="story.title" float-label="Title" />
           </q-field>
           <q-field>
-            <q-input v-model="story.author.fullName" float-label="Author" :value="story.author.fullName" />
+            <q-input v-model="story.author.fullName" float-label="Author" />
           </q-field>
           <q-field>
-            <q-datetime v-model="story.publishedDate" format="ddd, DD-MMM-YYYY hh:mm:ss A" type="datetime" />
+            <q-datetime v-model="story.publishedDate" format="ddd, DD-MMM-YYYY hh:mm:ss A" type="datetime" float-label="Publish Date" />
           </q-field>
           <q-field>
-            <q-input type="textarea" v-model="story.body" float-label="Details" :value="story.body" />
+            <q-input type="textarea" v-model="story.body" float-label="Details" :min-rows="4" />
           </q-field>
         </q-card-main>
         <q-card-separator />
         <q-card-actions>
           <q-btn flat color="secondary" @click="submit()">Submit</q-btn>
+          <q-btn flat @click="cancel()">Cancel</q-btn>
         </q-card-actions>
       </q-card>
     </div>
@@ -68,12 +68,23 @@ export default {
   },
 
   data () {
-    return {
+    let data = {
       story: {
+        title: '',
+        body: '',
         publishedDate: new Date(),
-        author: {}
+        author: {
+          fullName: ''
+        }
       }
     }
+    if (this.$route.params.id) {
+      this.$http.get('/stories/' + this.$route.params.id)
+        .then(resp => {
+          data.story = resp.data
+        })
+    }
+    return data
   },
 
   methods: {
@@ -84,6 +95,14 @@ export default {
         .then(resp => {
           this.$router.push({name: 'feeds'})
         })
+    },
+
+    edit (storyId) {
+      this.$router.push({name: 'edit_news', params: {id: storyId}})
+    },
+
+    cancel () {
+      this.$router.go(-1)
     }
   }
 }