2
0
unknown 9 жил өмнө
parent
commit
12b4374f3e
7 өөрчлөгдсөн 27 нэмэгдсэн , 59 устгасан
  1. 0 26
      README.md
  2. 1 1
      app/.meteor/.id
  3. 1 1
      app/.meteor/release
  4. 10 10
      app/.meteor/versions
  5. 6 7
      app/app.css
  6. 3 6
      app/app.html
  7. 6 8
      app/app.js

+ 0 - 26
README.md

@@ -1,26 +0,0 @@
-##Get started with development!
-
-First download Meteor: https://www.meteor.com/
-
-Then download Git (CLI): https://git-scm.com/
-
-Once that is done, get the repository on your local machine and open your command line.
-
-Navigate to "../app" and run "meteor". Go to localhost:3000 and you're set!
-
-##How to use Git!
-
-(This will only work if you are a contributor)
-
-Run the following commands if you are doing this for the first time.
-`git remote add origin https://github.com/AkiraLaine/music-app.git`
-
-After you executing the command above, you will have to do these command each time you start developing.
-
-`git pull origin master` to get the latest code.
-
-`git add FILES` to add all the files you have changed.
-
-`git commit -m "MESSAGE"` to commit the changes you have made.
-
-`git push origin master` to push your updated code to GitHub. Note: it is recommended to first run `git pull origin master` before you do this command to make sure you have the latest code.

+ 1 - 1
app/.meteor/.id

@@ -4,4 +4,4 @@
 #   - ensuring you don't accidentally deploy one app on top of another
 #   - providing package authors with aggregated statistics
 
-9nee5czgahhs18mbx0x
+texisip2xmab1efmm3c

+ 1 - 1
app/.meteor/release

@@ -1 +1 @@
-METEOR@1.2.0.1
+METEOR@1.2.0.2

+ 10 - 10
app/.meteor/versions

@@ -14,7 +14,7 @@ blaze-html-templates@1.0.1
 blaze-tools@1.0.4
 boilerplate-generator@1.0.4
 caching-compiler@1.0.0
-caching-html-compiler@1.0.1
+caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.0.6
 ddp@1.2.2
@@ -24,7 +24,7 @@ ddp-rate-limiter@1.0.0
 ddp-server@1.2.1
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.4
+ecmascript@0.1.5
 ecmascript-collections@0.1.6
 ejson@1.0.7
 email@1.0.7
@@ -53,14 +53,14 @@ launch-screen@1.0.4
 livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
-meteor@1.1.7
+meteor@1.1.9
 meteor-base@1.0.1
 meteorhacks:async@1.0.0
 minifiers@1.1.7
-minimongo@1.0.9
+minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-mongo@1.1.1
+mongo@1.1.2
 mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
@@ -68,10 +68,10 @@ oauth@1.1.6
 oauth2@1.1.5
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.4.8
+promise@0.5.0
 random@1.0.4
 rate-limit@1.0.0
-reactive-dict@1.1.1
+reactive-dict@1.1.2
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
@@ -82,10 +82,10 @@ sha@1.0.4
 spacebars@1.0.7
 spacebars-compiler@1.0.7
 srp@1.0.4
-standard-minifiers@1.0.0
-templating@1.1.3
+standard-minifiers@1.0.1
+templating@1.1.4
 templating-tools@1.0.0
-tracker@1.0.8
+tracker@1.0.9
 twbs:bootstrap@3.3.5
 ui@1.0.8
 underscore@1.0.4

+ 6 - 7
app/app.css

@@ -370,12 +370,6 @@ footer a:hover{
   margin-left: 35px;
   background-color: rgba(102,205,170,1);
 }
-@media (max-width: 992px) {
-    .station {
-        background-color: red;
-    }
-}
-
 .privacy {
   margin: 0 auto;
   padding: 100px 0;
@@ -387,4 +381,9 @@ footer a:hover{
   padding: 100px 0;
   height: 900px;
   text-align: center;
-}
+}
+@media (max-width: 992px) {
+    .station {
+        background-color: red;
+    }
+}

+ 3 - 6
app/app.html

@@ -168,9 +168,7 @@
 
 <template name="privacy">
     <div class="privacy">
-        <h2>
-  Privacy Policy
-</h2>
+        <h2>Privacy Policy</h2>
 
         <p>
             Your privacy is very important to us. Accordingly, we have developed this Policy in order for you to understand how we collect, use, communicate, disclose and make use of personal information. The following outlines our privacy policy.
@@ -198,8 +196,7 @@
             <li>
                 We will make readily available to customers information about our policies and practices relating to the management of personal information.
             </li>
-        </ul>
-
+        </ul
         <p>
             We are committed to conducting our business in accordance with these principles in order to ensure that the confidentiality of personal information is protected and maintained.
         </p>
@@ -285,4 +282,4 @@
         </ol>
         <hr>
     </div>
-</template>
+</template>

+ 6 - 8
app/app.js

@@ -6,7 +6,7 @@ if (Meteor.isClient) {
             publickey: '6LcVxg0TAAAAAE18vBiH00UAyaJggsmLm890SjZl'
         });
     });
-    
+
     var hpSound = undefined;
     Template.register.events({
         "submit form": function(e){
@@ -17,7 +17,7 @@ if (Meteor.isClient) {
             var captchaData = grecaptcha.getResponse();
             Meteor.call("createUserMethod", {username: username, email: email, password: password}, captchaData, function(err, res) {
                 grecaptcha.reset();
-                
+
                 if (err) {
                     console.log(err);
                 } else {
@@ -174,11 +174,11 @@ if (Meteor.isServer) {
             privatekey: '6LcVxg0TAAAAAI2fgIEEWHFxwNXeVIs8mzq5cfRM'
         });
     });
-    
+
     Meteor.users.deny({update: function () { return true; }});
     Meteor.users.deny({insert: function () { return true; }});
     Meteor.users.deny({remove: function () { return true; }});
-    
+
     var startedAt = Date.now();
     var songs = [{id: 216112412, title: "How Deep Is Your Love", artist: "Calvin Harris", duration: 193}];
     var currentSong = 0;
@@ -228,7 +228,7 @@ if (Meteor.isServer) {
     Meteor.publish("history", function() {
         return History.find({type: "edm"})
     });
-    
+
     Meteor.methods({
         createUserMethod: function(formData, captchaData) {
             var verifyCaptchaResponse = reCAPTCHA.verifyCaptcha(this.connection.clientAddress, captchaData);
@@ -243,8 +243,6 @@ if (Meteor.isServer) {
                     password: formData.password
                 });
             }
-            //do stuff with your formData
-
             return true;
         }
     });
@@ -256,4 +254,4 @@ Router.route("/", {
 
 Router.route("/:type", {
     template: "room"
-});
+});