Nex il y a 9 ans
Parent
commit
4c23b85237

+ 1 - 1
app/client/scripts/helpers.js

@@ -180,7 +180,7 @@ Template.profile.helpers({
         return Session.get("username")
     },
     "first_joined": function () {
-        return moment(Session.get("first_joined")).format("DD/MM/YYYY HH:mm:ss");
+        return moment(Session.get("first_joined")).format("DD/MM/YYYY");
     },
     "rank": function () {
         return Session.get("rank");

+ 4 - 4
app/client/scripts/routes.js

@@ -100,10 +100,10 @@ Router.route("/feedback", {
     name: "feedback"
 })
 
-Router.route("/team", {
-    template: "team",
-    name: "team"
-})
+//Router.route("/team", {
+//    template: "team",
+//    name: "team"
+//})
 
 Router.route("/news", {
     template: "news",

+ 2 - 2
app/client/templates/header.html

@@ -8,7 +8,7 @@
         </ul>
         <ul id="aboutDrop" class="dropdown-content">
             <li><a href="/project" class="grey-text text-darken-4">The Project</a></li>
-            <li><a href="/team" class="grey-text text-darken-4">The Team</a></li>
+            <!--<li><a href="/team" class="grey-text text-darken-4">The Team</a></li>-->
         </ul>
         <ul id="accountDrop" class="dropdown-content">
             {{#if currentUser}}
@@ -66,7 +66,7 @@
                             </div>
                             <div class="collapsible-body black-text">
                                 <a href="/project">The Project</a>
-                                <a href="/team">The Team</a>
+                                <!--<a href="/team">The Team</a>-->
                             </div>
                         </li>
                         <li>

+ 36 - 40
app/client/templates/profile.html

@@ -1,47 +1,43 @@
 <template name="profile">
     {{> header}}
-        <!--{{> avatar userId=profileUserId shape="circle" class="profile-img" initials=initials}}-->
-        <h1 id="profile-name" class="center-align black-text thin">{{username}}</h1>
-        <div class="row hack-container">
-            <div class="col s12 m4 l4">
-                <div class="card blue-grey darken-1 profile-card">
-                    <div class="card-content white-text">
-                        <span class="card-title">User Info</span>
-                        <!--<p>Name: {{real_name}}</p>-->
-                        <p>Username: {{username}}</p>
-                        <p>First Joined: {{first_joined}}</p>
-                        <p>Rank: {{rank}}</p>
-                        <p>Requested Songs: {{songs_requested}}</p>
-                    </div>
-                </div>
-            </div>
-            <div class="col s12 m4 l4">
-                <div class="card teal accent-3 profile-card">
-                    <div class="card-content white-text">
-                        <span class="card-title">Liked Songs</span>
-                        <ul>
-                           {{#each likedSongs}}
-                               <li>
-                                   <h5>{{title}}</h5>
-                                   <h6>{{artist}}</h6>
-                               </li>
-                           {{/each}}
-                       </ul>
-                    </div>
-                </div>
+    <div class="row">
+      <div class="col s12 m12 l10 push-l1 pull-l1">
+        <div class="card">
+            <div class="row" style="margin-top: 40px;">
+              <div class="col s12 m8 push-m2 pull-m2 l2 push-l5 pull-l5">
+                <img src="/notes.png" style="width: 100%;background-color: rgb(245, 245, 245);margin-top: 40px;" class="circle center-align" />
+                <h1 id="profile-name" class="center-align black-text thin">{{username}}</h1>
+              </div>
             </div>
-            <div class="col s12 m4 l4">
-                <div class="card red darken-2 profile-card">
-                    <div class="card-content white-text">
-                        <span class="card-title">Disliked Songs</span>
-                        {{#each dislikedSongs}}
-                            <li>
-                                <h4>{{title}}</h4>
-                                <h5>{{artist}}</h5>
-                            </li>
-                        {{/each}}
-                    </div>
+                <div class="container row center" style="list-style-type: none;">
+                  <div class="col s12 m12 l4">
+                    <h4>User Info</h4>
+                    <!--<p>Name: {{real_name}}</p>-->
+                    <p>Username: {{username}}</p>
+                    <p>First Joined: {{first_joined}}</p>
+                    <p>Rank: {{rank}}</p>
+                    <p>Requested Songs: {{songs_requested}}</p>
+                  </div>
+                  <div class="col s12 m12 l4">
+                    <h4>Liked songs</h4>
+                    {{#each likedSongs}}
+                        <li>
+                            <h5>{{title}}</h5>
+                            <h6>{{artist}}</h6>
+                        </li>
+                    {{/each}}
+                  </div>
+                  <div class="col s12 m12 l4">
+                    <h4>Disliked songs</h4>
+                    {{#each dislikedSongs}}
+                        <li>
+                            <h5>{{title}}</h5>
+                            <h6>{{artist}}</h6>
+                        </li>
+                    {{/each}}
+                  </div>
                 </div>
             </div>
+          </div>
         </div>
 </template>

+ 1 - 23
app/client/templates/team.html

@@ -15,31 +15,9 @@
                         <i class="material-icons">email</i> <span>contact@nexuscreates.com</span>
                     </div>
                 </li>
-                <li class="collection-item avatar">
-                    <img src="https://avatars2.githubusercontent.com/u/9784561?v=3&s=460" alt="Kris' Profile Picture" class="circle">
-                    <span class="title">Kristian Vos</span>
-                    <p>Founder & Lead Developer</p>
-                    <div class="contact-details">
-                        <i class="material-icons">my_location</i> <span>Haarlem, The Netherlands</span>
-                    </div>
-                    <div class="contact-details">
-                        <i class="material-icons">email</i> <span>krisvos130@gmail.com</span>
-                    </div>
-                </li>
-                <li class="collection-item avatar">
-                    <img src="https://avatars2.githubusercontent.com/u/6952369?v=3&s=460" alt="Johand's Profile Picture" class="circle">
-                    <span class="title">Johannes Andersen</span>
-                    <p>Founder & Developer</p>
-                    <div class="contact-details">
-                        <i class="material-icons">my_location</i> <span>Fredrikstad, Norway</span>
-                    </div>
-                    <div class="contact-details">
-                        <i class="material-icons">email</i> <span>johanan@ostfoldfk.no</span>
-                    </div>
-                </li>
                 <li class="collection-item">
                     <p><u>Old members</u></p>
-                    <p>Akira Laine - Founder<br>Wesley McCaan - Developer</p>
+                    <p>Akira Laine - Founder<br>Wesley McCaan - Developer<br>Kristian Vos - Founder<br>Johannes Andersen - Developer</p>
                 </li>
             </ul>
         </div>