Browse Source

worked on team page

Akira Laine 9 years ago
parent
commit
0f65d75d47

+ 8 - 28
app/client/app.css

@@ -817,39 +817,14 @@ nav form input[type="image"]{
     background-color: white;
 }
 
-.contact-name {
-    float: left;
+.contact-details{
+    margin-bottom: 5px;
 }
 
-.contact-img {
+.contact-details .material-icons{
     float: left;
-    margin-bottom: 20px;
-    margin-right: 20px;
-}
-
-.contact-ul {
-    clear: left;
-}
-
-.contact-option {
-    font-size: 22px;
 }
 
-#contact-container {
-    margin-top: 30px;
-    margin-bottom: 200px;
-}
-
-.contact-icon {
-    margin-right: 10px;
-    width: 28px;
-    height: 28px;
-    font-size: 28px !important;
-}
-.contact-pos {
-    padding-top: -10px;
-    margin-top: 70px;
-}
 .settings-label {
     color: #50a3a2;
     line-height: 18px;
@@ -1082,3 +1057,8 @@ input[type="checkbox"]:checked + #two-label:after {
     text-align: center;
 }
 
+.avatar{
+    width: auto;
+    height: auto;
+}
+

+ 10 - 1
app/client/scripts/routes.js

@@ -74,6 +74,15 @@ Router.route("/about", {
     template: "about"
 });
 
+Router.route("/feedback", {
+    template: "feedback"
+})
+
+Router.route("/team", {
+    template: "team"
+})
+
+
 Router.route("/admin", {
     waitOn: function() {
         return [Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId())];
@@ -147,4 +156,4 @@ Router.route("/:type", {
 
 Router.route("/u/:user", function() {
     this.render("profile");
-});
+});

+ 0 - 4
app/client/templates/contact.html

@@ -1,8 +1,6 @@
 <template name="contact">
     {{> alerts}}
-    <div class="landing">
         {{> header}}
-        <div class="row" id="contact-container">
             <div class="about col-md-8 col-md-offset-2 contact-box" itemscope itemtype="https://schema.org/Person">
                 <!-- Akira -->
                 <img height="100px" width="100px" class="img-circle contact-img" src="https://avatars0.githubusercontent.com/u/11958359?v=3&s=460" itemprop="image"/>
@@ -48,6 +46,4 @@
                     <li class="contact-option place-contact"><i class="fa fa-2x fa-map-marker contact-icon"></i> <span itemprop="address">USA</span></li>
                 </ul>
             </div>
-        </div>
-    </div>
 </template>

+ 3 - 0
app/client/templates/feedback.html

@@ -0,0 +1,3 @@
+<template name="feedback">
+
+</template>

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

@@ -26,7 +26,7 @@
                 <a href="/" class="brand-logo">Musare</a>
                 <a href="#" data-activates="mobile-navi" class="button-collapse"><i class="material-icons">menu</i></a>
                 <ul class="right hide-on-med-and-down scroll-fix">
-                    <li><a href="feedback.html">Feedback</a></li>
+                    <li><a href="/feedback">Feedback</a></li>
                     <li><a class="dropdown-button" href="#!" data-activates="contributeDrop">Contribute<i
                             class="material-icons right">arrow_drop_down</i></a></li>
                     <li><a class="dropdown-button" href="#!" data-activates="aboutDrop">About<i

+ 23 - 21
app/client/templates/home.html

@@ -1,33 +1,35 @@
 <template name="home">
     {{> header}}
     <main>
-    <div class="col s12 m10 l8">
-        <div class="row">
-            {{#each rooms}}
-                <div class="col s12 m5 l2">
-                    <div class="card">
-                        <div class="card-image waves-effect waves-block waves-light">
-                            <img src={{currentSong.song.img}}>
-                            <figcaption>
-                                <h5>{{currentSong.song.title}}</h5>
-                                <h5>{{currentSong.song.artist}}</h5>
-                                <a href=/{{type}} class="waves-effect waves-light btn">Join Room</a>
-                            </figcaption>
-                        </div>
-                        <div class="card-content">
+        <div class="col s12 m10 l8">
+            <div class="row">
+                {{#each rooms}}
+                    <div class="col s12 m5 l2">
+                        <div class="card">
+                            <div class="card-image waves-effect waves-block waves-light">
+                                <img src={{currentSong.song.img}}>
+                                <figcaption>
+                                    <h5>{{currentSong.song.title}}</h5>
+                                    <h5>{{currentSong.song.artist}}</h5>
+                                    <a href=/{{type}} class="waves-effect waves-light btn">Join Room</a>
+                                </figcaption>
+                            </div>
+                            <div class="card-content">
                             <span class="card-title activator grey-text text-darken-4">{{display}}<i
                                     class="material-icons right">more_vert</i></span>
 
-                            <p><span class="user-num">{{userNum}}</span> <i class="material-icons">perm_identity</i></p>
-                        </div>
-                        <div class="card-reveal">
-                            <span class="card-title grey-text text-darken-4">{{display}}<i class="material-icons right">close</i></span>
+                                <p><span class="user-num">{{userNum}}</span> <i class="material-icons">perm_identity</i>
+                                </p>
+                            </div>
+                            <div class="card-reveal">
+                                <span class="card-title grey-text text-darken-4">{{display}}<i
+                                        class="material-icons right">close</i></span>
+                            </div>
                         </div>
                     </div>
-                </div>
-            {{/each}}
+                {{/each}}
+            </div>
         </div>
-    </div>
     </main>
     {{> footer}}
 </template>

+ 45 - 0
app/client/templates/team.html

@@ -0,0 +1,45 @@
+<template name="team">
+    {{> header}}
+    <main>
+        <h3 class="black-text thin">The Team</h3>
+        <ul class="collection">
+            <li class="collection-item avatar">
+                <img src="https://avatars0.githubusercontent.com/u/11958359?v=3&s=460" alt="Akira's Profile Picture"
+                     class="circle">
+                <span class="title">Akira Laine</span>
+                <p>Co Founder, Lead Developer & Whovian</p>
+                <div class="contact-details">
+                    <i class="material-icons">my_location</i> <span>Noumea, New Caledonia</span>
+                </div>
+                <div class="contact-details">
+                    <i class="material-icons">email</i> <span>akira_laine@outlook.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">Kris Vos</span>
+                <p>Co Founder, Lead Developer & Fox</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://avatars0.githubusercontent.com/u/1158013?v=3&s=460" alt="Wesley's Profile Picture"
+                     class="circle">
+                <span class="title">Wesley McCaan</span>
+                <p>Core Developer</p>
+                <div class="contact-details">
+                    <i class="material-icons">my_location</i> <span>Colorado Springs, CA</span>
+                </div>
+                <!--<div class="contact-details">-->
+                    <!--<i class="material-icons">email</i> <span></span>-->
+                <!--</div>-->
+            </li>
+        </ul>
+    </main>
+    {{> footer}}
+</template>