Home Explore Help
Sign In
kris
/
MusareFork
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Added gulp, sass compiling, nodemon and new folder structure

Jonathan 8 years ago
parent
3ce45ff3ff
commit
f1a23c4a03
13 changed files with 45 additions and 34 deletions
Unified View Show Diff Stats
  1. 1 1
      bootstrap.sh
  2. 22 0
      gulpfile.js
  3. 20 15
      package.json
  4. 0 0
      public/css/main.css
  5. 2 2
      public/index.html
  6. 0 0
      public/js/main.js
  7. 0 0
      src/app.js
  8. 0 0
      src/logic/coreHandler.js
  9. 0 0
      src/logic/expressHandler.js
  10. 0 0
      src/logic/global.js
  11. 0 0
      src/logic/socketHandler.js
  12. 0 0
      src/logic/stations.js
  13. 0 16
      src/sass/main.scss

+ 1 - 1
bootstrap.sh
View File 

@@ -81,7 +81,7 @@ script
 
 	until mountpoint -q /musare; do sleep 1; done
 
 	until mountpoint -q /musare; do sleep 1; done
 
 	echo \$\$ > /var/run/musare.pid
 
 	echo \$\$ > /var/run/musare.pid
 
 	cd /musare
 
 	cd /musare
 
-	exec node app.js
 
+	exec gulp
 
 end script
 
 end script
 
 
 
 pre-start script
 
 pre-start script

+ 22 - 0
gulpfile.js
View File 

@@ -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']);
 
+});

+ 20 - 15
package.json
View File 

@@ -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"
 
+  }
 
 }
 
 }

File diff suppressed because it is too large
+ 0 - 0
public/css/main.css


+ 2 - 2
public/index.html
View File 

@@ -9,8 +9,8 @@
 
 		<script src='https://www.google.com/recaptcha/api.js'></script>
 
 		<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://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 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>
 
 	</head>
 
 	<body>
 
 	<body>
 
 		<div id="app">
 
 		<div id="app">

+ 0 - 0
public/js/app.js → public/js/main.js
View File


+ 0 - 0
app.js → src/app.js
View File


+ 0 - 0
logic/coreHandler.js → src/logic/coreHandler.js
View File


+ 0 - 0
logic/expressHandler.js → src/logic/expressHandler.js
View File


+ 0 - 0
logic/global.js → src/logic/global.js
View File


+ 0 - 0
logic/socketHandler.js → src/logic/socketHandler.js
View File


+ 0 - 0
logic/stations.js → src/logic/stations.js
View File


+ 0 - 16
public/css/app.css → src/sass/main.scss
View File 

@@ -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-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; }
 
 .header-room-linkLeft:hover, .header-room-linkRight:hover { cursor: pointer; background-color: #0083d3; }
 
 
 
-.body {}
 
-
 
 .body-home { width: 100%; height: auto; }
 
 .body-home { width: 100%; height: auto; }
 
 .body-home-group { width: 100%; height: 448px; margin: 64px 0 64px 0; }
 
 .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; }
 
 .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-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 {
 
 .body-overlay {
 
 	position: fixed;
 
 	position: fixed;
 
 	top: 0;
 
 	top: 0;

Some files were not shown because too many files changed in this diff