Home Explore Help
Sign In
kris
/
Musare
mirror of https://github.com/Musare/Musare.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Added socket.io client side, fixed some ES5 - ES6 issues, added friends array to user schema.

theflametrooper 8 years ago
parent
ffc03718c4
commit
6612eec1e3
4 changed files with 5 additions and 4 deletions
Unified View Show Diff Stats
  1. 2 1
      backend/schemas/user.js
  2. 1 0
      frontend/build/index.html
  3. 1 1
      frontend/components/App.vue
  4. 1 2
      frontend/components/HomeBody.vue

+ 2 - 1
backend/schemas/user.js
View File 

@@ -36,7 +36,8 @@ module.exports = mongoose => {
 
             songsRequested: { type: Number, default: 0 },
 
             songsRequested: { type: Number, default: 0 },
 
             songsAccepted: { type: Number, default: 0 }
 
             songsAccepted: { type: Number, default: 0 }
 
         },
 
         },
 
-        createdAt: { type: Date, default: Date.now() }
 
+        createdAt: { type: Date, default: Date.now() },
 
+		friends: []
 
     });
 
     });
 
 
 
     return mongoose.model('user', userSchema);
 
     return mongoose.model('user', userSchema);

+ 1 - 0
frontend/build/index.html
View File 

@@ -12,6 +12,7 @@
 
 	<link rel="stylesheet" href="./vendor/bootstrap.min.css">
 
 	<link rel="stylesheet" href="./vendor/bootstrap.min.css">
 
 	<script src="./vendor/jquery.min.js"></script>
 
 	<script src="./vendor/jquery.min.js"></script>
 
 	<script src="./vendor/bootstrap.min.js"></script>
 
 	<script src="./vendor/bootstrap.min.js"></script>
 
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.8/socket.io.min.js"></script>
 
 	<script src='https://www.google.com/recaptcha/api.js'></script>
 
 	<script src='https://www.google.com/recaptcha/api.js'></script>
 
 </head>
 
 </head>
 
 <body>
 
 <body>

+ 1 - 1
frontend/components/App.vue
View File 

@@ -34,7 +34,7 @@
 
 		},
 
 		},
 
 		components: { MainHeader, HomeBody, StationBody, MainFooter },
 
 		components: { MainHeader, HomeBody, StationBody, MainFooter },
 
 		events: {
 
 		events: {
 
-			'switchView': function(hide, show) {
 
+			'switchView': (hide, show) => {
 
 				this[hide].visible = false;
 
 				this[hide].visible = false;
 
 				this[show].visible = true;
 
 				this[show].visible = true;
 
 			}
 
 			}

+ 1 - 2
frontend/components/HomeBody.vue
View File 

@@ -18,7 +18,6 @@
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
-	<!-- Will be deleted soon ^^ -->
 
 	<div class="group" v-for="group in groups">
 
 	<div class="group" v-for="group in groups">
 
 		<div class="group-title">{{group.name}}</div>
 
 		<div class="group-title">{{group.name}}</div>
 
 		<div class="group-rooms">
 
 		<div class="group-rooms">
 
@@ -67,7 +66,7 @@
 
 			}
 
 			}
 
 		},
 
 		},
 
 		methods: {
 
 		methods: {
 
-			log: function(thing) {
 
+			log: thing => {
 
 				console.log(thing);
 
 				console.log(thing);
 
 			}
 
 			}
 
 		}
 
 		}