2
0
Эх сурвалжийг харах

made base ladning page, fixed #! bug and navbar bug

Akira Laine 9 жил өмнө
parent
commit
935654b123

+ 4 - 0
app/client/scripts/main.js

@@ -63,6 +63,10 @@ Handlebars.registerHelper('active', function(path) {
     return curPath() == path ? 'active' : '';
 });
 
+Handlebars.registerHelper('isLoggedIn', function(path) {
+    return Meteor.userId();
+});
+
 UI.registerHelper("formatTime", function(seconds) {
     var d = moment.duration(parseInt(seconds), 'seconds');
     return d.minutes() + ":" + ("0" + d.seconds()).slice(-2);

+ 1 - 0
app/client/scripts/onCreated.js

@@ -9,6 +9,7 @@ Template.alertsDashboard.onCreated(function() {
 });
 
 Template.landing.onCreated(function(){
+    $("body").css("overflow", "hidden");
     function pageScroll() {
         window.scrollBy(0,1);
         if($(window).scrollTop() + $(window).height() == $(document).height()) {

+ 13 - 1
app/client/stylesheets/app.css

@@ -238,9 +238,21 @@ textarea{
     margin-left: 225px !important;
 }
 
+.layer-content{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.8);
+    text-align: center;
+    color: white;
+}
+
+.layer-content a{
+    background-color: #616161;
+}
+
 .album-art-row img{
     width: 10%;
     float: left;
     height: 10%;
-    opacity: 0.7;
 }

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

@@ -90,7 +90,7 @@
             </div>
         </nav>
         <script>
-            $(function () {
+            (function () {
                 $(".dropdown-button").dropdown({
                     inDuration: 300,
                     outDuration: 225,
@@ -101,7 +101,7 @@
                 $('.collapsible').collapsible({
                     accordion: false // A setting that changes the collapsible behavior to expandable instead of the default accordion style
                 });
-            });
+            })();
         </script>
     </header>
 </template>

+ 107 - 3
app/client/templates/landing.html

@@ -1,7 +1,111 @@
 <template name="landing">
+    <div class="layer-content">
+        <h1 class="center-align">Musare</h1>
+        <p class="flow-text">Musare is a modern, open-source music app that allows you to collaboratively listen to music in out genre specific stations.</p>
+        <a href="/login" class="waves-effect waves-light btn">Login to Musare</a>
+        <p>or</p>
+        <a href="/" class="waves-effect waves-light btn">Continue without logging in</a>
+    </div>
     <div class="album-art-row">
-        {{#each songs}}
-            <img src={{img}} />
-        {{/each}}
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
+        <img src="http://c.directlyrics.com/img/upload/fall-out-boy-sixth-album-cover.jpg"/>
     </div>
 </template>

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

@@ -127,7 +127,7 @@
                                             <p class="video-import-text">{{result.artist}} <br>
                                                 <a href="https://youtube.com/watch?v={{result.id}}" target="_blank">View Video In YouTube</a>
                                             </p>
-                                            <a href="#!" class="secondary-content" id="addSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">add</i></a>
+                                            <a href="#" class="secondary-content" id="addSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">add</i></a>
                                         </li>
                                         {{/each}}
                                     </ul>
@@ -185,7 +185,7 @@
 
                 <div class="divider"></div>
                 <div class="modal-footer">
-                    <a href="#!" class="modal-action modal-close waves-effect btn">Close</a>
+                    <a href="#" class="modal-action modal-close waves-effect btn">Close</a>
                 </div>
             </div>
         </main>