Browse Source

Added Nebulous to Project page.

KrisVos130 9 năm trước cách đây
mục cha
commit
53318e89c6

+ 1 - 0
app/.meteor/.finished-upgraders

@@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2
 1.2.0-meteor-platform-split
 1.2.0-cordova-changes
 1.2.0-breaking-changes
+1.3.0-split-minifiers-package

+ 2 - 1
app/.meteor/packages

@@ -11,7 +11,6 @@ blaze-html-templates    # Compile .html files into Meteor Blaze views
 session                 # Client-side reactive dictionary for your app
 tracker                 # Meteor's client-side reactive programming library
 
-standard-minifiers      # JS/CSS minifiers run for production mode
 es5-shim                # ECMAScript 5 compatibility for older browsers.
 ecmascript              # Enable ECMAScript2015+ syntax in app code
 
@@ -37,3 +36,5 @@ meteorhacks:npm
 
 
 npm-container
+standard-minifier-css
+standard-minifier-js

+ 1 - 1
app/.meteor/release

@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.3

+ 96 - 87
app/.meteor/versions

@@ -1,48 +1,52 @@
-accounts-base@1.2.2
-accounts-facebook@1.0.6
-accounts-github@1.0.6
-accounts-oauth@1.1.8
-accounts-password@1.1.4
-aldeed:collection2@2.7.0
-aldeed:simple-schema@1.3.3
-altapp:recaptcha@2.0.0
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
-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.2
-callback-hook@1.0.4
-check@1.1.0
-coffeescript@1.0.11
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-rate-limiter@1.0.0
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
+accounts-base@1.2.4
+accounts-facebook@1.0.7
+accounts-github@1.0.7
+accounts-oauth@1.1.10
+accounts-password@1.1.6
+aldeed:collection2@2.9.1
+aldeed:collection2-core@1.1.1
+aldeed:schema-deny@1.0.1
+aldeed:schema-index@1.0.1
+aldeed:simple-schema@1.5.3
+allow-deny@1.0.2
+altapp:recaptcha@2.0.1
+autoupdate@1.2.6
+babel-compiler@6.5.2
+babel-runtime@0.1.6
+base64@1.0.6
+binary-heap@1.0.6
+blaze@2.1.5
+blaze-html-templates@1.0.2
+blaze-tools@1.0.6
+boilerplate-generator@1.0.6
+caching-compiler@1.0.2
+caching-html-compiler@1.0.4
+callback-hook@1.0.6
+check@1.1.2
+coffeescript@1.0.15
+ddp@1.2.3
+ddp-client@1.2.3
+ddp-common@1.2.3
+ddp-rate-limiter@1.0.2
+ddp-server@1.2.4
+deps@1.0.10
+diff-sequence@1.0.3
+ecmascript@0.4.1
+ecmascript-runtime@0.2.8
+ejson@1.0.9
+email@1.0.10
 emojione:emojione@1.5.2
-es5-shim@4.1.14
-facebook@1.2.2
-fastclick@1.0.7
-geojson-utils@1.0.4
-github@1.1.4
-handlebars@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
+es5-shim@4.5.8
+facebook@1.2.4
+fastclick@1.0.9
+geojson-utils@1.0.6
+github@1.1.6
+handlebars@1.0.5
+hot-code-push@1.0.2
+html-tools@1.0.7
+htmljs@1.0.7
+http@1.1.3
+id-map@1.0.5
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -55,56 +59,61 @@ joncursi:socket-io-client@0.1.4
 jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
 jparker:gravatar@0.3.1
-jquery@1.11.4
-launch-screen@1.0.4
-livedata@1.0.15
-localstorage@1.0.5
-logging@1.0.8
+jquery@1.11.6
+launch-screen@1.0.8
+livedata@1.0.16
+localstorage@1.0.7
+logging@1.0.10
 matb33:collection-hooks@0.8.1
 materialize:materialize@0.97.5
-meteor@1.1.10
-meteor-base@1.0.1
+mdg:validation-error@0.2.0
+meteor@1.1.12
+meteor-base@1.0.2
 meteorhacks:async@1.0.0
-meteorhacks:inject-initial@1.0.3
+meteorhacks:inject-initial@1.0.4
 meteorhacks:npm@1.5.0
-minifiers@1.1.7
-minimongo@1.0.10
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-momentjs:moment@2.10.6
-mongo@1.1.3
-mongo-id@1.0.1
+minifier-css@1.1.9
+minifier-js@1.1.9
+minimongo@1.0.12
+mobile-experience@1.0.2
+mobile-status-bar@1.0.10
+modules@0.5.1
+modules-runtime@0.6.1
+momentjs:moment@2.12.0
+mongo@1.1.5
+mongo-id@1.0.2
 npm-bcrypt@0.7.8_2
 npm-container@1.2.0
-npm-mongo@1.4.39_1
-oauth@1.1.6
-oauth2@1.1.5
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.1
+npm-mongo@1.4.41
+oauth@1.1.8
+oauth2@1.1.7
+observe-sequence@1.0.9
+ordered-dict@1.0.5
+promise@0.6.5
 raix:eventemitter@0.1.3
-random@1.0.5
-rate-limit@1.0.0
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-service-configuration@1.0.5
-session@1.1.1
-sha@1.0.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
-srp@1.0.4
-standard-minifiers@1.0.2
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
-ui@1.0.8
-underscore@1.0.4
-url@1.0.5
+random@1.0.7
+rate-limit@1.0.2
+reactive-dict@1.1.5
+reactive-var@1.0.7
+reload@1.1.6
+retry@1.0.5
+routepolicy@1.0.8
+service-configuration@1.0.7
+session@1.1.3
+sha@1.0.5
+spacebars@1.0.9
+spacebars-compiler@1.0.9
+srp@1.0.6
+standard-minifier-css@1.0.4
+standard-minifier-js@1.0.4
+templating@1.1.7
+templating-tools@1.0.2
+tracker@1.0.11
+ui@1.0.9
+underscore@1.0.6
+url@1.0.7
 utilities:avatar@0.9.2
-webapp@1.2.3
-webapp-hashing@1.0.5
+webapp@1.2.6
+webapp-hashing@1.0.7
 zimme:active-route@2.3.2
 zimme:iron-router-active@2.0.1

+ 9 - 0
app/client/templates/project.html

@@ -22,6 +22,15 @@
                     </p>
                 </div>
             </div>
+            <div class="card white">
+                <div class="card-content black-text">
+                    <span class="card-title">What is Nebulous?</span>
+                    <p>
+                        Nebulous is a Minecraft network that started in February 2016. In March 2016 Musare started working together with Nebulous so we could have expand more with more resources.
+                        Due to the 'merge' with Nebulous, we can now add the much requested private rooms. You can check out Nebulous <a href="https://nebulousmc.com">here</a>.
+                    </p>
+                </div>
+            </div>
             <div class="card white">
                 <div class="card-content black-text">
                     <span class="card-title">How can I help?</span>

+ 9 - 2
app/server/server.js

@@ -159,18 +159,25 @@ function Station(type) {
     if (Playlists.findOne({type: type}).songs.length === 0) {
         Playlists.update({type: type}, {$push: {songs: default_song.mid}});
     }
+    var usersObj = {};
     Meteor.publish(type, function () {
         var user = Meteor.users.findOne(this.userId);
         if (this.userId !== undefined && user !== undefined && user.profile !== undefined && user.profile.username !== undefined) {
             var username = user.profile.username;
+            if (usersObj[username] === undefined) {
+                usersObj[username] = 1;
+            }
             Rooms.update({type: type}, {$push: {userList: username}});
             this.onStop(function() {
+                usersObj[username]--;
                 var list = Rooms.findOne({type: type}).userList;
                 var index = list.indexOf(username);
                 if (index >= 0) {
-                    list.splice( index, 1 );
+                    var t = {};
+                    t["userList" + index] = 1;
+                    Rooms.update({type: type}, {$unset : t});
+                    Rooms.update({type: type}, {$pull : {"userList": null}});
                 }
-                Rooms.update({type: type}, {$set: {userList: list}});
             });
         }
         return undefined;