Browse Source

Edited nav links, new icons and added Discord link.

Nex 9 years ago
parent
commit
e0a914c4cf

+ 4 - 3
app/client/templates/footer.html

@@ -4,8 +4,9 @@
             <div class="col l3 s12 offset-l1 left">
             <div class="col l3 s12 offset-l1 left">
                 <h5 class="grey-text text-darken-2">Stay Connected</h5>
                 <h5 class="grey-text text-darken-2">Stay Connected</h5>
                 <p class="grey-text text-darken-1">Follow us on social media or send us an email!</p>
                 <p class="grey-text text-darken-1">Follow us on social media or send us an email!</p>
-                <a href="https://www.facebook.com/MusareMusic" target="_blank"><img src="\facebook.png" height="32dp" width="32dp" /></a>
-                <a href="https://twitter.com/musareapp" target="_blank"><img src="\twitter.png" height="32dp" width="32dp" /></a>
+                <a href="https://www.facebook.com/MusareMusic" target="_blank"><img src="/facebook.png" height="32dp" width="32dp" /></a>
+                <a href="https://twitter.com/musareapp" target="_blank"><img src="/twitter.png" height="32dp" width="32dp" /></a>
+                <a href="https://discordapp.com/invite/0rQRiaFwLwffsKJu" target="_blank"><img src="/discord.svg" height="32dp" width="32dp" /></a>
             </div>
             </div>
             <div class="col l6 hide-on-med-and-down">
             <div class="col l6 hide-on-med-and-down">
               <h5 class="grey-text text-darken-2">Contact Us</h5>
               <h5 class="grey-text text-darken-2">Contact Us</h5>
@@ -44,7 +45,7 @@
         </div>
         </div>
         <div class="footer-copyright">
         <div class="footer-copyright">
             <div class="container grey-text text-darken-1">
             <div class="container grey-text text-darken-1">
-               Copyright &copy; 2016 Musare
+               &copy; Copyright CosmosNode 2015-2016
             </div>
             </div>
         </div>
         </div>
     </footer>
     </footer>

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

@@ -3,7 +3,7 @@
         <!-- Dropdown Structure -->
         <!-- Dropdown Structure -->
         <ul id="contributeDrop" class="dropdown-content">
         <ul id="contributeDrop" class="dropdown-content">
             <li><a href="https://www.github.com/Musare/Musare" target="_blank" class="grey-text text-darken-4">Github</a></li>
             <li><a href="https://www.github.com/Musare/Musare" target="_blank" class="grey-text text-darken-4">Github</a></li>
-            <li><a href="/donate" class="grey-text text-darken-4">Donate</a></li>
+            <li><a href="https://paypal.me/CNDonate" class="grey-text text-darken-4">Donate</a></li>
             <li><a href="/feedback" class="grey-text text-darken-4">Feedback</a></li>
             <li><a href="/feedback" class="grey-text text-darken-4">Feedback</a></li>
         </ul>
         </ul>
         <ul id="aboutDrop" class="dropdown-content">
         <ul id="aboutDrop" class="dropdown-content">
@@ -56,7 +56,7 @@
                             </div>
                             </div>
                             <div class="collapsible-body black-text">
                             <div class="collapsible-body black-text">
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
-                                <a href="/donate">Donate</a>
+                                <a href="https://paypal.me/CNDonate">Donate</a>
                                 <a href="/feedback">Feedback</a>
                                 <a href="/feedback">Feedback</a>
                             </div>
                             </div>
                         </li>
                         </li>

+ 8 - 4
app/client/templates/home.html

@@ -2,6 +2,8 @@
     {{> header}}
     {{> header}}
     <main>
     <main>
         {{> alerts}}
         {{> alerts}}
+            <div class="row">
+            <div class="col m10 offset-m1">
             <h3 class="center-align">Official Rooms</h3>
             <h3 class="center-align">Official Rooms</h3>
             <hr class="center-block" style="width: 99%">
             <hr class="center-block" style="width: 99%">
             <div class="row">
             <div class="row">
@@ -12,7 +14,7 @@
                                 <div class="card hoverable">
                                 <div class="card hoverable">
                                     <div class="card-image waves-effect waves-block waves-light">
                                     <div class="card-image waves-effect waves-block waves-light">
                                         <a href=/{{type}}>
                                         <a href=/{{type}}>
-                                        <img onerror="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'" src={{currentSong.song.img}}>
+                                        <img onerror="this.src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'" src={{currentSong.song.img}}>
                                         <figcaption class="caption center-align">
                                         <figcaption class="caption center-align">
                                             <h5>{{currentSong.song.title}}</h5>
                                             <h5>{{currentSong.song.title}}</h5>
                                             <h5>{{currentSong.song.artist}}</h5>
                                             <h5>{{currentSong.song.artist}}</h5>
@@ -34,7 +36,7 @@
                             <div class="card hoverable">
                             <div class="card hoverable">
                                 <div class="card-image waves-effect waves-block waves-light">
                                 <div class="card-image waves-effect waves-block waves-light">
                                     <a href=/{{type}}>
                                     <a href=/{{type}}>
-                                    <img onerror="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'" src={{currentSong.song.img}}>
+                                    <img onerror="this.src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'" src={{currentSong.song.img}}>
                                     <figcaption class="caption center-align">
                                     <figcaption class="caption center-align">
                                         <h5>{{currentSong.song.title}}</h5>
                                         <h5>{{currentSong.song.title}}</h5>
                                         <h5>{{currentSong.song.artist}}</h5>
                                         <h5>{{currentSong.song.artist}}</h5>
@@ -63,7 +65,7 @@
                                 <div class="card hoverable">
                                 <div class="card hoverable">
                                     <div class="card-image waves-effect waves-block waves-light">
                                     <div class="card-image waves-effect waves-block waves-light">
                                         <a href=/private/{{name}}>
                                         <a href=/private/{{name}}>
-                                        <img src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'>
+                                        <img src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'>
                                         <figcaption class="caption center-align">
                                         <figcaption class="caption center-align">
                                             <h5>{{currentPrivateSong.song.title}}</h5>
                                             <h5>{{currentPrivateSong.song.title}}</h5>
                                         </figcaption>
                                         </figcaption>
@@ -84,7 +86,7 @@
                             <div class="card hoverable">
                             <div class="card hoverable">
                                 <div class="card-image waves-effect waves-block waves-light">
                                 <div class="card-image waves-effect waves-block waves-light">
                                     <a href=/private/{{name}}>
                                     <a href=/private/{{name}}>
-                                        <img src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'>
+                                        <img src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'>
                                         <figcaption class="caption center-align">
                                         <figcaption class="caption center-align">
                                             <h5>{{currentPrivateSong.song.title}}</h5>
                                             <h5>{{currentPrivateSong.song.title}}</h5>
                                         </figcaption>
                                         </figcaption>
@@ -102,6 +104,8 @@
                     {{/if}}
                     {{/if}}
                 {{/each}}
                 {{/each}}
             </div>
             </div>
+            </div>
+            </div>
     </main>
     </main>
     {{> footer}}
     {{> footer}}
 
 

+ 4 - 3
app/client/templates/room.html

@@ -53,13 +53,14 @@
                             </div>
                             </div>
                         </div>
                         </div>
                         <img alt="Not loading" class="responsive-img song-img col s12 m12 l4"
                         <img alt="Not loading" class="responsive-img song-img col s12 m12 l4"
-                             onError="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'"
+                             onError="this.src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'"
                              id="song-img" style="margin-top: 10px !important"/>
                              id="song-img" style="margin-top: 10px !important"/>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
     </main>
     </main>
+    {{> footer}}
     <!--Chat slideout-->
     <!--Chat slideout-->
     <div id="chat-slide-out" class="side-nav room-slideout">
     <div id="chat-slide-out" class="side-nav room-slideout">
         <h5>Chat</h5>
         <h5>Chat</h5>
@@ -182,7 +183,7 @@
                                                 {{#each result in singleVideoResults}}
                                                 {{#each result in singleVideoResults}}
                                                     <li class="collection-item avatar youtube-search-result-li">
                                                     <li class="collection-item avatar youtube-search-result-li">
                                                         <img src="{{result.image}}"
                                                         <img src="{{result.image}}"
-                                                             onerror="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'"
+                                                             onerror="this.src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'"
                                                              alt="" class="video-import-thumbnail">
                                                              alt="" class="video-import-thumbnail">
                                                         <span class="title video-import-text">{{result.title}}</span>
                                                         <span class="title video-import-text">{{result.title}}</span>
                                                         <p class="video-import-text">{{result.artist}} <br>
                                                         <p class="video-import-text">{{result.artist}} <br>
@@ -238,7 +239,7 @@
                                         {{#each result in importPlaylistVideos}}
                                         {{#each result in importPlaylistVideos}}
                                             <li class="collection-item avatar youtube-search-result-li">
                                             <li class="collection-item avatar youtube-search-result-li">
                                                 <img src="{{result.image}}"
                                                 <img src="{{result.image}}"
-                                                     onerror="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'"
+                                                     onerror="this.src='https://pixabay.com/static/uploads/photo/2015/12/09/22/09/music-1085655_960_720.png'"
                                                      alt="" class="video-import-thumbnail">
                                                      alt="" class="video-import-thumbnail">
                                                 <span class="title video-import-text">{{result.title}}</span>
                                                 <span class="title video-import-text">{{result.title}}</span>
                                                 <p class="video-import-text">{{result.artist}} <br>
                                                 <p class="video-import-text">{{result.artist}} <br>

+ 5 - 5
app/packages/npm-container/.npm/package/npm-shrinkwrap.json

@@ -3,29 +3,29 @@
     "ytdl-core": {
     "ytdl-core": {
       "version": "0.7.9",
       "version": "0.7.9",
       "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.7.9.tgz",
       "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.7.9.tgz",
-      "from": "ytdl-core@0.7.9",
+      "from": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.7.9.tgz",
       "dependencies": {
       "dependencies": {
         "html-entities": {
         "html-entities": {
           "version": "1.2.0",
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.0.tgz",
           "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.0.tgz",
-          "from": "html-entities@1.2.0"
+          "from": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.0.tgz"
         },
         },
         "jstream": {
         "jstream": {
           "version": "0.2.8",
           "version": "0.2.8",
           "resolved": "https://registry.npmjs.org/jstream/-/jstream-0.2.8.tgz",
           "resolved": "https://registry.npmjs.org/jstream/-/jstream-0.2.8.tgz",
-          "from": "jstream@0.2.8",
+          "from": "https://registry.npmjs.org/jstream/-/jstream-0.2.8.tgz",
           "dependencies": {
           "dependencies": {
             "clarinet": {
             "clarinet": {
               "version": "0.11.0",
               "version": "0.11.0",
               "resolved": "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz",
               "resolved": "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz",
-              "from": "clarinet@0.11.0"
+              "from": "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"
             }
             }
           }
           }
         },
         },
         "sax": {
         "sax": {
           "version": "1.1.4",
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-          "from": "sax@1.1.4"
+          "from": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"
         }
         }
       }
       }
     }
     }

+ 1 - 0
app/public/discord.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/></svg>