Home Explore Help
Sign In
archive
/
MusareMeteor
mirror of https://github.com/Musare/MusareMeteor
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

minor dashboard updates

unknown 9 years ago
parent
30147aab15
commit
41de9fd691
5 changed files with 91 additions and 55 deletions
Split View Show Diff Stats
  1. 1 1
      app/.meteor/release
  2. 16 16
      app/.meteor/versions
  3. 37 2
      app/app.css
  4. 27 35
      app/app.html
  5. 10 1
      app/app.js

+ 1 - 1
app/.meteor/release
View File 

@@ -1 +1 @@
 
-METEOR@1.2
 
+METEOR@1.2.0.1

+ 16 - 16
app/.meteor/versions
View File 

@@ -1,11 +1,11 @@
 
 accounts-base@1.2.1
 
-accounts-facebook@1.0.5
 
-accounts-github@1.0.5
 
-accounts-oauth@1.1.6
 
-accounts-password@1.1.2
 
+accounts-facebook@1.0.6
 
+accounts-github@1.0.6
 
+accounts-oauth@1.1.7
 
+accounts-password@1.1.3
 
 autopublish@1.0.4
 
 autoupdate@1.2.3
 
-babel-compiler@5.8.24
 
+babel-compiler@5.8.24_1
 
 babel-runtime@0.1.4
 
 base64@1.0.4
 
 binary-heap@1.0.4
 
@@ -17,14 +17,14 @@ caching-compiler@1.0.0
 
 caching-html-compiler@1.0.1
 
 callback-hook@1.0.4
 
 check@1.0.6
 
-ddp@1.2.1
 
+ddp@1.2.2
 
 ddp-client@1.2.1
 
 ddp-common@1.2.1
 
 ddp-rate-limiter@1.0.0
 
 ddp-server@1.2.1
 
-deps@1.0.8
 
+deps@1.0.9
 
 diff-sequence@1.0.1
 
-ecmascript@0.1.3
 
+ecmascript@0.1.4
 
 ecmascript-collections@0.1.6
 
 ejson@1.0.7
 
 email@1.0.7
 
@@ -40,13 +40,13 @@ http@1.1.1
 
 id-map@1.0.4
 
 insecure@1.0.4
 
 jquery@1.11.4
 
-launch-screen@1.0.3
 
-livedata@1.0.14
 
-localstorage@1.0.4
 
+launch-screen@1.0.4
 
+livedata@1.0.15
 
+localstorage@1.0.5
 
 logging@1.0.8
 
 meteor@1.1.7
 
 meteor-base@1.0.1
 
-minifiers@1.1.6
 
+minifiers@1.1.7
 
 minimongo@1.0.9
 
 mobile-experience@1.0.1
 
 mobile-status-bar@1.0.6
 
@@ -55,7 +55,7 @@ mongo-id@1.0.1
 
 npm-bcrypt@0.7.8_2
 
 npm-mongo@1.4.39_1
 
 oauth@1.1.6
 
-oauth2@1.1.4
 
+oauth2@1.1.5
 
 observe-sequence@1.0.7
 
 ordered-dict@1.0.4
 
 promise@0.4.8
 
@@ -73,12 +73,12 @@ spacebars@1.0.7
 
 spacebars-compiler@1.0.7
 
 srp@1.0.4
 
 standard-minifiers@1.0.0
 
-templating@1.1.2
 
+templating@1.1.3
 
 templating-tools@1.0.0
 
 tracker@1.0.8
 
 twbs:bootstrap@3.3.5
 
-ui@1.0.7
 
+ui@1.0.8
 
 underscore@1.0.4
 
 url@1.0.5
 
 webapp@1.2.2
 
-webapp-hashing@1.0.4
 
+webapp-hashing@1.0.5

+ 37 - 2
app/app.css
View File 

@@ -289,6 +289,41 @@ footer a:hover{
 
 .button:hover {
 
   background-color: #f5f7f9;
 
 }
 
-#dashboard{
 
-  color: black;
 
+#dashboard #name-container{
 
+  background-color: rgba(255,255,255,0.5);
 
+  width: 300px;
 
+  height: 60px;
 
+}
 
+#dashboard h1{
 
+  margin-left: 20px;
 
+  line-height: 60px;
 
+  color: white;
 
+  font-weight: 600;
 
+}
 
+#dashboard .station{
 
+  width: 150px;
 
+  height: 150px;
 
+  background-color: rgba(255,255,255,0.7);
 
+  border-radius: 100px;
 
+  margin-top: 100px;
 
+  margin-left: 300px;
 
+  cursor: pointer;
 
+}
 
+#dashboard .station h3{
 
+  text-align: center;
 
+  color: white;
 
+  font-weight: 600;
 
+  font-size: 3.5em;
 
+  line-height: 150px;
 
+}
 
+#dashboard .station .song-info{
 
+  color: darkcyan;
 
+  margin-left: 70px;
 
+}
 
+#dashboard .station .song-title{
 
+  font-size: 2em;
 
+  font-weight: 900;
 
+}
 
+#dashboard .station .song-artist{
 
+  font-size: 1.5em;
 
 }

+ 27 - 35
app/app.html
View File 

@@ -22,7 +22,9 @@
 
 
 <body onload="init()">
 
   {{#if currentUser}}
 
-    {{> dashboard}}
 
+    <div id="dashboard">
 
+      {{> dashboard}}
 
+    </div>
 
   {{else}}
 
     <div class="landing">
 
       <div id="login-view">
 
@@ -31,6 +33,18 @@
 
       <div id="register-view" style="display:none">
 
         {{> register}}
 
       </div>
 
+      <ul class="bg-bubbles">
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+        <li></li>
 
+      </ul>
 
       {{> footer}}
 
     </div>
 
   {{/if}}
 
@@ -39,61 +53,39 @@
 
 <template name="register">
 
   <div class="container">
 
     <button class="button" id="login">Login</button>
 
-    <h1>Register</h1>
 
+    <h1>Sign Up</h1>
 
     <form class="form">
 
       <input type="text" name="registerUsername" placeholder="Enter a username" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter a username'" required/>
 
       <input type="email" name="registerEmail" placeholder="Enter your email" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter your email'" required>
 
       <input type="password" name="registerPassword" placeholder="Enter a password" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter a password'" required/>
 
-      <button type="submit">Register</button>
 
+      <button type="submit">Sign Up</button>
 
     </form>
 
-    <button class="btn-social" id="facebook-login"><i class="fa fa-facebook pull-left"></i>Login with Facebook</button><p></p>
 
-    <button class="btn-social" id="github-login"><i class="fa fa-github pull-left"></i>Login with Github</button>
 
+    <button class="btn-social" id="facebook-login"><i class="fa fa-facebook pull-left"></i>Signup with Facebook</button><p></p>
 
+    <button class="btn-social" id="github-login"><i class="fa fa-github pull-left"></i>Signup with Github</button>
 
   </div>
 
-
 
-  <ul class="bg-bubbles">
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-    <li></li>
 
-  </ul>
 
 </template>
 
 
 <template name="login">
 
   <div class="container">
 
-    <button class="button" id="register">Register</button>
 
+    <button class="button" id="register">Sign Up</button>
 
   	<h1>Login</h1>
 
     <form class="form">
 
     	<input type="text" name="loginUsername" placeholder="Enter your username" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter your username'" required/>
 
-    	<input type="password" name="loginPassword" placeholder="Enter your password" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter a password'" required/>
 
+    	<input type="password" name="loginPassword" placeholder="Enter your password" onfocus="this.placeholder = ''" onblur="this.placeholder='Enter your password'" required/>
 
     	<button type="submit">Login</button>
 
     </form>
 
     <button class="btn-social" id="facebook-login"><i class="fa fa-facebook pull-left"></i>Login with Facebook</button><p></p>
 
     <button class="btn-social" id="github-login"><i class="fa fa-github pull-left"></i>Login with Github</button>
 
   </div>
 
-
 
-  <ul class="bg-bubbles">
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  	<li></li>
 
-  </ul>
 
 </template>
 
 
-<template name="dashboard" id="dashboard">
 
+<template name="dashboard">
 
   <div class="landing">
 
-    <h1>Hello {{currentUser.services.facebook.first_name}}</h1>
 
+    <div id="name-container"> <h1>{{currentUser.username}}{{currentUser.services.facebook.first_name}} {{currentUser.services.facebook.last_name}}{{currentUser.services.github.username}}</h1></div>
 
+    <div class="station">
 
+      <h3>EDM</h3>
 
+      <div class="song-info"></div>
 
+    </div>
 
     <a href="#" class="logout">Logout</a>
 
 
     <ul class="bg-bubbles">

+ 10 - 1
app/app.js
View File 

@@ -33,7 +33,7 @@ if (Meteor.isClient) {
 
         var password = e.target.loginPassword.value;
 
         Meteor.loginWithPassword(username, password);
 
         Accounts.onLoginFailure(function(){
 
-           $("input").css("background-color","indianred");
 
+           $("input").css("background-color","indianred").addClass("animated shake");
 
            $("input").on("click",function(){
 
              $("input").css({
 
                "background-color": "transparent",
 
@@ -61,6 +61,15 @@ if (Meteor.isClient) {
 
     "click .logout": function(e){
 
         e.preventDefault();
 
         Meteor.logout();
 
+    },
 
+
 
+    "click .station": function() {
 
+      $(".station").css({
 
+        "width": "250px",
 
+        "height": "250px",
 
+        "border-radius": "150px",
 
+      })
 
+      $(".station .song-info").html("<h6 class='song-title'>Immortals</h6><p class='song-artist'>Fall Out Boy</p>")
 
     }
 
   })
 
 }