From aeac6ed1ae9814f001cb4bdbed6ed1a102b64663 Mon Sep 17 00:00:00 2001
From: Andrew Yates <andrewmacu@me.com>
Date: Sun, 8 Apr 2018 21:33:54 -0700
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 index.js                  |  16 ++--
 src/components/Thread.vue | 154 ++++++++++++++++++++------------------
 2 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/index.js b/index.js
index 975312a..5454988 100644
--- a/index.js
+++ b/index.js
@@ -63,12 +63,12 @@ app.use(function (err, req, res, next) {
     res.json({ error: err.message });
 });
 
-//let options = {
-//    key: fs.readFileSync('privateKey.key'),
-//    cert: fs.readFileSync('certificate.crt')
-//};
-//https.createServer(options, app).listen(3001);
+// let options = {
+//     key: fs.readFileSync('privateKey.key'),
+//     cert: fs.readFileSync('certificate.crt')
+// };
+// https.createServer(options, app).listen(3001);
 
- app.listen(3001, ()=>{
-     console.log('API listening on port 3001');
- });
+app.listen(3001, ()=>{
+    console.log('API listening on port 3001');
+});
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index 5ce2031..18a73d2 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -4,8 +4,8 @@
         <div id="topNav" class="boardNav">
             <span class="boardList">
                 [ <span v-html="boardList"></span> ]
-            </span> <span class="actionList"> [ <a
-                href="#bottom">Bottom</a> / <a href="/" target="_top">Home</a> ] </span></div>
+            </span> <span class="actionList"> [ <a href="#bottom">Bottom</a> / <a href="/"
+                                                                                  target="_top">Home</a> ] </span></div>
         <div class="boardBanner">
             <div class="boardTitle">/{{ $route.params.board }}/ {{ board.name }}</div>
         </div>
@@ -17,22 +17,25 @@
                 <div class="postContainer opContainer">
                     <div v-bind:id="thread._id" class="post op">
                         <div v-if="thread.attachment_path" class="file">
-                            <div class="fileText"> File: <a :href="'/' + thread.attachment_path">{{ thread.attachment_name }}</a></div>
-                            <a class="fileThumb" :href="'/' + thread.attachment_path" target="_blank" v-if="new Array('gif', 'jpg', 'jpeg', 'png').includes(thread.attachment_name.split('.').pop())">
-			       	<img :src="'/' + thread.attachment_path">
-                            </a>
-			    <video class="fileThumb" v-if="new Array('webm').includes(thread.attachment_name.split('.').pop())" controls="">
-			    	<source :src="'/' + thread.attachment_path"></source>
-			    </video>
-			    </div>
-                        <div class="postInfo"><span class="subject">{{ thread.title }}</span> <span class="nameBlock"> <span
-                                class="name">{{ thread.name }}</span> </span> <span class="dateTime"
-                                                                              >{{ new Date(thread.timeStamp) }}</span>
-                            <span class="postNum"> <a :href="'#' + thread._id" title="Link to this post">No.</a> <a
-                                    href="#" v-on:click="appendUserIdToReplyContent(thread._id + '\n')"
-                                    title="Reply to this post">{{ thread._id }}</a> </span> <span v-if="isMod"><button v-on:click="ban(thread)">Ban</button></span></div>
-                        <blockquote class="postMessage" v-html="thread.content">
-                        </blockquote>
+                            <div class="fileText"> File: <a
+                                    :href="'/' + thread.attachment_path">{{ thread.attachment_name }}</a></div>
+                            <a class="fileThumb" :href="'/' + thread.attachment_path" target="_blank"
+                               v-if="new Array('gif', 'jpg', 'jpeg', 'png').includes(thread.attachment_name.split('.').pop())">
+                                <img :src="'/' + thread.attachment_path"> </a>
+                            <video class="fileThumb"
+                                   v-if="new Array('webm').includes(thread.attachment_name.split('.').pop())"
+                                   controls="">
+                                <source :src="'/' + thread.attachment_path"></source>
+                            </video>
+                        </div>
+                        <div class="postInfo"><span class="subject">{{ thread.title }}</span> <span
+                                class="nameBlock"> <span class="name">{{ thread.name }}</span> </span> <span
+                                class="dateTime">{{ new Date(thread.timeStamp) }}</span> <span class="postNum"> <a
+                                :href="'#' + thread._id" title="Link to this post">No.</a> <a href="#"
+                                                                                              v-on:click="appendUserIdToReplyContent(thread._id + '\n')"
+                                                                                              title="Reply to this post">{{ thread._id }}</a> </span>
+                            <span v-if="isMod"><button v-on:click="ban(thread)">Ban</button></span></div>
+                        <blockquote class="postMessage" v-html="thread.content"></blockquote>
                     </div>
                 </div>
 
@@ -41,58 +44,67 @@
                     <div class="sideArrows">>></div>
                     <div class="post reply" v-bind:id="reply._id">
                         <div v-if="reply.attachment_path" class="file">
-                            <div class="fileText"> File: <a :href="'/' + reply.attachment_path">{{ reply.attachment_name }}</a></div>
-                            <a class="fileThumb" :href="'/' + reply.attachment_path" target="_blank" v-if="new Array('gif', 'jpg', 'jpeg', 'png').includes(reply.attachment_name.split('.').pop())">
-			        <img :src="'/' + reply.attachment_path">
-			    </a>
-			    <video class="fileThumb" v-if="new Array('webm').includes(reply.attachment_name.split('.').pop())" controls="">
+                            <div class="fileText"> File: <a
+                                    :href="'/' + reply.attachment_path">{{ reply.attachment_name }}</a></div>
+                            <a class="fileThumb" :href="'/' + reply.attachment_path" target="_blank"
+                               v-if="new Array('gif', 'jpg', 'jpeg', 'png').includes(reply.attachment_name.split('.').pop())">
+                                <img :src="'/' + reply.attachment_path"> </a>
+                            <video class="fileThumb"
+                                   v-if="new Array('webm').includes(reply.attachment_name.split('.').pop())"
+                                   controls="">
                                 <source :src="'/' + reply.attachment_path"></source>
-			    </video>
+                            </video>
                         </div>
-                        <div class="postInfo"><span class="nameBlock"> <span class="name">{{ reply.name }}</span> </span> <span
-                                class="dateTime">{{ new Date(reply.time) }}</span> <span
-                                class="postNum"> <a :href="'#' + reply._id" title="Link to this post">No.</a> <a
-                                href="#" v-on:click="appendUserIdToReplyContent(reply._id + '\n')" title="Reply to this post">{{ reply._id }}</a> </span> <span v-if="isMod"><button v-on:click="ban(reply)">Ban</button> <button v-on:click="deleteReply(reply)">Delete</button></span>
+                        <div class="postInfo"><span class="nameBlock"> <span
+                                class="name">{{ reply.name }}</span> </span> <span
+                                class="dateTime">{{ new Date(reply.time) }}</span> <span class="postNum"> <a
+                                :href="'#' + reply._id" title="Link to this post">No.</a> <a href="#"
+                                                                                             v-on:click="appendUserIdToReplyContent(reply._id + '\n')"
+                                                                                             title="Reply to this post">{{ reply._id }}</a> </span>
+                            <span v-if="isMod"><button v-on:click="ban(reply)">Ban</button> <button
+                                    v-on:click="deleteReply(reply)">Delete</button></span>
                         </div>
-                        <blockquote class="postMessage" v-html="reply.content">
-                        </blockquote>
+                        <blockquote class="postMessage" v-html="reply.content"></blockquote>
                     </div>
                 </div>
                 <div id="bottom">
                     <hr>
-                    <div id="bottomNav" class="boardNav"><span class="boardList"> [ <span v-html="boardList"></span> ] </span> <span class="actionList"> [ <a
-                            href="catalog.php#top">Top</a> / <a href="/" target="_top">Home</a> ] </span></div>
+                    <div id="bottomNav" class="boardNav"><span class="boardList"> [ <span v-html="boardList"></span> ] </span>
+                        <span class="actionList"> [ <a href="catalog.php#top">Top</a> / <a href="/"
+                                                                                           target="_top">Home</a> ] </span>
+                    </div>
                     <br>
                 </div>
-                </div>
             </div>
+        </div>
 
-            <div class="replyBox" v-if="replyBoxShown">
-                <tr>Post Reply</tr>
-                <form name="post" action="/create/reply" method="post" enctype="multipart/form-data">
-                    <tbody>
-                    <tr style="display: none;" data-type="Thread">
-                        <td>Thread</td>
-                        <td><input id="thread" name="threadId" type="text" v-model="thread._id"></td>
-                    </tr>
-		    <tr data-type="Name">
-		        <td>Name</td>
-			<td><input id="name" name="name" type="text" value="Anonymous"></td>
-		    </tr>
-                    <tr data-type="Content">
-                        <td>Content</td>
-                        <td><textarea v-model="replyContent" name="content" cols="48" rows="4" wrap="soft" tabindex="4"></textarea></td>
-                    </tr>
-                    <tr data-type="File">
-                        <td>File</td>
-                        <td><input id="postFile" name="attachment" type="file" tabindex="7">
-                        </td>
-                    </tr>
-		    </tbody>
-                    <button type="submit">Post</button>
-                </form>
-            </div>
+        <div class="replyBox" v-if="replyBoxShown">
+            <tr>Post Reply</tr>
+            <form name="post" action="/create/reply" method="post" enctype="multipart/form-data">
+                <tbody>
+                <tr style="display: none;" data-type="Thread">
+                    <td>Thread</td>
+                    <td><input id="thread" name="threadId" type="text" v-model="thread._id"></td>
+                </tr>
+                <tr data-type="Name">
+                    <td>Name</td>
+                    <td><input id="name" name="name" type="text" value="Anonymous"></td>
+                </tr>
+                <tr data-type="Content">
+                    <td>Content</td>
+                    <td><textarea v-model="replyContent" name="content" cols="48" rows="4" wrap="soft"
+                                  tabindex="4"></textarea></td>
+                </tr>
+                <tr data-type="File">
+                    <td>File</td>
+                    <td><input id="postFile" name="attachment" type="file" tabindex="7">
+                    </td>
+                </tr>
+                </tbody>
+                <button type="submit">Post</button>
+            </form>
         </div>
+    </div>
 </template>
 
 <style scoped>
@@ -238,11 +250,11 @@
     }
 
     #postLinkText:hover {
-	color: #d00;
+        color: #d00;
     }
 
     .replyBox {
-    	background-color: #EEF2FF;
+        background-color: #EEF2FF;
     }
 
     .thread {
@@ -311,17 +323,17 @@
                     }
                 });
             },
-	    deleteThread(id) {
-		let vm = this;
-		_api.deleteThread(id, function(err, res) {
-		    if (err) {
-			console.log(err);
-		    }
-		    else if (res.result) {
-			vm.$router.push('/' + board.letter + '/catalog');
-		    }
-		});
-	    },
+            deleteThread(id) {
+                let vm = this;
+                _api.deleteThread(id, function (err, res) {
+                    if (err) {
+                        console.log(err);
+                    }
+                    else if (res.result) {
+                        vm.$router.push('/' + board.letter + '/catalog');
+                    }
+                });
+            },
             updateThread(id) {
                 let vm = this;
                 _api.thread(id, function (err, res) {