9 years ago · f1a23c4a03
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -81,7 +81,7 @@ script
 
				 	until mountpoint -q /musare; do sleep 1; done
			
 
				 	echo \$\$ > /var/run/musare.pid
			
 
				 	cd /musare
			
 
				-	exec node app.js
			
 
				+	exec gulp
			
 
				 end script
			
 
				 
			
 
				 pre-start script
			
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -0,0 +1,22 @@
 
				+'use strict';
			
 
				+
			
 
				+const gulp = require('gulp');
			
 
				+const sass = require('gulp-sass');
			
 
				+const nodemon = require('gulp-nodemon');
			
 
				+
			
 
				+gulp.task('sass', () => {
			
 
				+  return gulp.src('./src/sass/**/*.scss')
			
 
				+    .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
			
 
				+    .pipe(gulp.dest('./public/css'));
			
 
				+});
			
 
				+
			
 
				+gulp.task('start', () => {
			
 
				+  nodemon({
			
 
				+    script: 'src/app.js',
			
 
				+		ext: 'js'
			
 
				+  });
			
 
				+});
			
 
				+
			
 
				+gulp.task('default', ['start'], () => {
			
 
				+  gulp.watch('./src/sass/**/*.scss', ['sass']);
			
 
				+});
			
--- a/package.json
+++ b/package.json
@@ -1,17 +1,22 @@
 
				 {
			
 
				-	"name": "musare",
			
 
				-	"version": "0.0.0",
			
 
				-	"description": "",
			
 
				-	"main": "app.js",
			
 
				-	"repository": "",
			
 
				-	"dependencies": {
			
 
				-		"async": "2.0.1",
			
 
				-		"body-parser": "^1.15.2",
			
 
				-		"config": "^1.21.0",
			
 
				-		"express": "^4.14.0",
			
 
				-		"express-session": "^1.14.0",
			
 
				-		"request": "^2.74.0",
			
 
				-		"socket.io": "^1.4.8",
			
 
				-		"rethinkdb": "^2.3.2"
			
 
				-	}
			
 
				+  "name": "musare",
			
 
				+  "version": "0.0.0",
			
 
				+  "description": "",
			
 
				+  "main": "src/app.js",
			
 
				+  "repository": "",
			
 
				+  "dependencies": {
			
 
				+    "async": "2.0.1",
			
 
				+    "body-parser": "^1.15.2",
			
 
				+    "config": "^1.21.0",
			
 
				+    "express": "^4.14.0",
			
 
				+    "express-session": "^1.14.0",
			
 
				+    "request": "^2.74.0",
			
 
				+    "socket.io": "^1.4.8",
			
 
				+    "rethinkdb": "^2.3.2"
			
 
				+  },
			
 
				+  "devDependencies": {
			
 
				+    "gulp": "^3.9.1",
			
 
				+    "gulp-nodemon": "^2.1.0",
			
 
				+    "gulp-sass": "^2.3.2"
			
 
				+  }
			
 
				 }
			
--- a/public/css/main.css
+++ b/public/css/main.css
--- a/public/index.html
+++ b/public/index.html
@@ -9,8 +9,8 @@
 
				 		<script src='https://www.google.com/recaptcha/api.js'></script>
			
 
				 		<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
			
 
				 		<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css">
			
 
				-		<link type="text/css" rel="stylesheet" href="css/app.css" />
			
 
				-		<script src="js/app.js"></script>
			
 
				+		<link type="text/css" rel="stylesheet" href="css/main.css" />
			
 
				+		<script src="js/main.js"></script>
			
 
				 	</head>
			
 
				 	<body>
			
 
				 		<div id="app">
			
--- a/public/js/main.js
+++ b/public/js/main.js
--- a/src/app.js
+++ b/src/app.js
--- a/src/logic/coreHandler.js
+++ b/src/logic/coreHandler.js
--- a/src/logic/expressHandler.js
+++ b/src/logic/expressHandler.js
--- a/src/logic/global.js
+++ b/src/logic/global.js
--- a/src/logic/socketHandler.js
+++ b/src/logic/socketHandler.js
--- a/src/logic/stations.js
+++ b/src/logic/stations.js
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -24,8 +24,6 @@ html, body { margin: 0; padding: 0; width: 100%; height: 100%; }
 
				 .header-room-linkRight { float: right; width: 64px; color: white; text-decoration: none; font-weight: 300; font-size: 28px; }
			
 
				 .header-room-linkLeft:hover, .header-room-linkRight:hover { cursor: pointer; background-color: #0083d3; }
			
 
				 
			
 
				-.body {}
			
 
				-
			
 
				 .body-home { width: 100%; height: auto; }
			
 
				 .body-home-group { width: 100%; height: 448px; margin: 64px 0 64px 0; }
			
 
				 .body-home-group-title { float: left; clear: none; width: 100%; height: 64px; line-height: 48px; text-align: center; font-size: 48px; }
			
@@ -73,20 +71,6 @@ html, body { margin: 0; padding: 0; width: 100%; height: 100%; }
 
				 
			
 
				 .body-home-group-rooms-room-image { width: 100%; height: 256px; }
			
 
				 
			
 
				-.body-room {}
			
 
				-
			
 
				-.body-room-player {}
			
 
				-
			
 
				-.body-room-playlist {}
			
 
				-.body-room-playlist-song {}
			
 
				-
			
 
				-.body-room-chat {}
			
 
				-.body-room-chat-message {}
			
 
				-.body-room-chat-input {}
			
 
				-.body-room-chat-send {}
			
 
				-
			
 
				-.body-room-users {}
			
 
				-
			
 
				 .body-overlay {
			
 
				 	position: fixed;
			
 
				 	top: 0;