fixity fix fix

dan-divy · Apr 29, 2019 · 27e3eb9 · 27e3eb9
1 parent 1f09b0f
commit 27e3eb9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,4 @@ typings/
 .next
 
 #testing images
+.vscode/sftp.json
diff --git a/views/main.ejs b/views/main.ejs
@@ -63,7 +63,7 @@
     </div>
 
     <div class="gram-card-footer">
-      <button <% if(people[i].posts[z].likes.includes(people[i].posts[z].author)) { %> disabled <% } %>onclick="this.innerHTML =  '<i class=\'glyphicon glyphicon-thumbs-up\'></i> ' + (parseInt(<%= people[i].posts[z].likes.length %>) + 1); this.disabled = true;" class="footer-action-icons likes btn btn-link non-hoverable like-button-box" author="<%= people[i].posts[z].author %>" id="<%= people[i].posts[z]._id %>-like">
+      <button data="people[i].posts[z].likes" <% if(people[i].posts[z].likes.includes(user.username)) { %> disabled <% } %>onclick="this.innerHTML =  '<i class=\'glyphicon glyphicon-thumbs-up\'></i> ' + (parseInt(<%= people[i].posts[z].likes.length %>) + 1); this.disabled = true;" class="footer-action-icons likes btn btn-link non-hoverable like-button-box" author="<%= people[i].posts[z].author %>" id="<%= people[i].posts[z]._id %>-like">
         <i class="glyphicon glyphicon-thumbs-up"></i> <%= people[i].posts[z].likes.length %></button>
 
       <input id="<%= people[i].posts[z]._id %>" class="comments-input comment-input-box" author="<%= people[i].posts[z].author %>" type="text" id="comment" placeholder="Click enter to comment here..."/>

diff --git a/views/me/index.ejs b/views/me/index.ejs
@@ -3,19 +3,7 @@
   <%- include('../head') -%>
   <link rel="stylesheet" type="text/css" href="/stylesheets/moment.css">
   <body>
-    <div class="container-fluid top-navbar box-shadow">
-      <a href="/" class="float-left">
-      <h2>
-        <img src="/images/logo/logo.png" class="logo">
-        leaflet
-      </h2>
-      </a>
-      <div class="float-right margin-top-20">
-        <button type="button" class="btn btn-link" id="sidebarToggle">
-          <i class="fa fa-lg fa-paper-plane pills"></i>
-        </button>
-      </div>
-    </div>
+  <%- include('../navbar')	-%>
     <br>
     <div class="container">
       <img src="<%= user.profile_pic %>" class="logo">
@@ -47,6 +35,7 @@
     <div id="notify_message" class="notify_message-success">
     	<center>Follow @<%= user.username %>!</center>
     </div>
+    <%- include('../tabs') %>
     <%- include('../footer') -%>
   </body>
   <script type="text/javascript">