Browse Source

Started to work on news page

PC crashed. So this is what I managed to save
Johand 9 years ago
parent
commit
dd94b68ec5

+ 7 - 3
app/client/app.css

@@ -1008,8 +1008,12 @@ nav form input[type="image"]{
 }
 
 .avatar{
-    width: auto;
-    height: auto;
+  width: auto;
+  height: auto;
+}
+.news-box{
+  width: auto;
+  height: auto;
 }
 
 .lowercase{
@@ -1023,4 +1027,4 @@ nav form input[type="image"]{
 .content-box{
     margin-left: 30px;
     margin-right: 30px;
-}
+}

+ 1 - 1
app/client/head.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 	  <meta name="keywords" content="music, musare, lisen, app, meteor, edm, rooms, party, good, mus, are, pop">
     <meta name="description" content="Musare is a website where you can enjoy genre specific playlists with lots of songs! The same song plays for everyone at the same time in the same station, so you can also listen to it with friends!">
-	  <meta name="copyright" content="Copyright © 2015 All Right Reserved">
+	  <meta name="copyright" content="Copyright © 2015-2016 All Right Reserved">
     <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
     <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">

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

@@ -82,6 +82,10 @@ Router.route("/team", {
     template: "team"
 })
 
+Router.route("/news", {
+    template: "news"
+})
+
 Router.route("/project", {
     template: "project"
 })
@@ -159,4 +163,4 @@ Router.route("/:type", {
             this.redirect("/");
         }
     }
-});
+});

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

@@ -4,6 +4,7 @@
         <ul id="contributeDrop" class="dropdown-content">
             <li><a href="https://www.github.com/Musare/Musare" target="_blank">Github</a></li>
             <li><a href="donate.html">Donate</a></li>
+            <li><a href="/feedback">Feedback</a></li>
         </ul>
         <ul id="aboutDrop" class="dropdown-content">
             <li><a href="/project">The Project</a></li>
@@ -25,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">Feedback</a></li>
+                    <li><a href="/news">News</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
@@ -41,7 +42,7 @@
                 <ul class="side-nav" id="mobile-navi" style="width: 240px;">
                     <ul class="collapsible" data-collapsible="accordion">
                         <li>
-                            <a href="/feedback">Feedback</a>
+                            <a href="/feedback">News</a>
                         </li>
                         <li>
                             <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
@@ -50,6 +51,7 @@
                             <div class="collapsible-body black-text">
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
                                 <a href="donate.html">Donate</a>
+                                <a href="/feedback">Feedback</a>
                             </div>
                         </li>
                         <li>

+ 10 - 0
app/client/templates/news.html

@@ -0,0 +1,10 @@
+<template name="news">
+    {{> header}}
+    <main class="content-box">
+        <h3 class="black-text thin">News, Updates & Announcements</h3>
+        <ul class="collection">
+        <!-- {{> newsCol}} -->
+        </ul>
+    </main>
+    {{> footer}}
+</template>

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

@@ -27,6 +27,18 @@
                     <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="Kris' Profile Picture"
+                     class="circle">
+                <span class="title">Johannes Andersen</span>
+                <p>Co Founder, <span title="Chief business officer">CBO</span> & 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>Johand@Johand.me</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">
@@ -42,4 +54,4 @@
         </ul>
     </main>
     {{> footer}}
-</template>
+</template>

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

@@ -3,7 +3,7 @@
     {{> header}}
     <div style="margin:10px;">
         <h3>Terms of Service</h3>
-        <small>Last updated: Septemeber 29, 2015</small>
+        <small>Last updated: January 4, 2016</small>
         <hr>
         <p class="flow-text">
             By using the musare.com web site ("Service"), or any services of Musare ("Musare"), you are agreeing to be
@@ -101,7 +101,7 @@
                 may not settle any claim, demand, suit or proceeding unless the settlement unconditionally releases
                 Musare of all liability); and (c) provides to You all reasonable assistance, at Your expense.
             </li>
-            <li>The look and feel of the Service is copyright © 2015 Musare. All rights reserved. You may not duplicate,
+            <li>The look and feel of the Service is copyright © 2015-2016 Musare. All rights reserved. You may not duplicate,
                 copy, or reuse any portion of the HTML/CSS, Javascript, or visual design elements or concepts without
                 express written permission from Musare.
             </li>