Minify-css and remove spectrum css

This commit is contained in:
Kasper Rynning-Tønnesen
2018-08-08 21:24:02 +02:00
parent 08055bca72
commit 5cd8cd5864
5 changed files with 1364 additions and 657 deletions

View File

@@ -2,7 +2,32 @@ var gulp = require('gulp'),
gutil = require('gulp-util'),
uglify = require('gulp-uglify'),
//sourcemaps = require('gulp-sourcemaps'),
concat = require('gulp-concat');
concat = require('gulp-concat'),
cssnano = require('gulp-cssnano');
gulp.task('css', function() {
return gulp.src('server/public/assets/css/style.css')
.pipe(cssnano({
preset: ['default', {
discardComments: {
removeAll: true,
},
}]
}))
.pipe(gulp.dest('server/public/assets/dist'));
});
gulp.task('css-embed', function() {
return gulp.src('server/public/assets/css/embed.css')
.pipe(cssnano({
preset: ['default', {
discardComments: {
removeAll: true,
},
}]
}))
.pipe(gulp.dest('server/public/assets/dist'));
});
gulp.task('js', function () {
return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
@@ -60,7 +85,7 @@ gulp.task('callback', function () {
});
gulp.task('build', function() {
return gulp.run(['js', 'embed', 'remotecontroller', 'callback', 'token']);
return gulp.run(['css', 'css-embed', 'js', 'embed', 'remotecontroller', 'callback', 'token']);
})
gulp.task('remotecontroller', function () {
@@ -79,6 +104,7 @@ gulp.task('remotecontroller', function () {
gulp.task('default', function(){
gulp.watch(['server/VERSION.js', 'server/public/assets/js/*.js'], ['js']);
gulp.watch(['server/public/assets/css/*.css'], ['css']);
gulp.watch(['server/public/assets/js/token*.js', 'server/public/assets/js/helpers.js'], ['token']);
gulp.watch(['server/VERSION.js', 'server/public/assets/js/*.js'], ['embed']);
gulp.watch(['server/VERSION.js', 'server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']);

1969
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,7 @@
"description": "Zoff, the shared YouTube based radio services",
"main": "server/app.js",
"scripts": {
"start": "gulp build && node server/app.js",
"start": "npm install --only=dev && npm install && gulp build && node server/app.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
@@ -22,7 +22,8 @@
"devDependencies": {
"gulp": "~3.9.0",
"gulp-concat": "^2.6.1",
"gulp-uglifyjs": "~0.6.2",
"gulp-cssnano": "^2.1.3",
"gulp-uglify": "^3.0.1",
"gulp-util": "~3.0.6"
},
"homepage": "https://github.com/zoff-music/zoff#readme",
@@ -39,11 +40,6 @@
"express-recaptcha": "^3.0.1",
"express-session": "^1.15.6",
"express-sessions": "^1.0.6",
"farmhash": "^2.1.0",
"gulp": "^3.9.1",
"gulp-uglify": "^3.0.0",
"gulp-uglifyjs": "^0.6.2",
"gulp-util": "^3.0.8",
"helmet": "^3.12.0",
"jimp": "^0.2.28",
"mongodb": "^2.2.35",

View File

@@ -27,8 +27,6 @@ var Channel = {
Helper.addClass(".volume-container", "volume-container-cast");
}
if(!embed) {
console.log("qq");
console.log(Helper.computedStyle(document.querySelector("#video-container")));
document.querySelector("#main-container").insertAdjacentHTML("beforeend", "<a id='hide-playlist' class='hide-on-small-only hide-playlist-button' href='#!'><i class='material-icons'>keyboard_arrow_right</i></div>");
document.querySelector("#hide-playlist").style.left = (document.querySelector("#video-container").offsetWidth - document.querySelector("#hide-playlist").offsetWidth) + "px";
}
@@ -578,9 +576,10 @@ var Channel = {
Helper.css("#embed-button", "display", "none");
if(!Helper.mobilecheck()) {
Helper.tooltip('.castButton', "destroy");
Helper.tooltip(".castButton", "destroy");
Helper.tooltip("#viewers", "destroy");
Helper.tooltip("#offline-mode", "destroy");
Helper.tooltip("search-btn", "destroy");
Helper.tooltip('#fullscreen', "destroy");
if(M.Tooltip.getInstance(document.getElementById("admin-lock")) != undefined) {
Helper.tooltip('#admin-lock', "destroy");

View File

@@ -24,17 +24,16 @@
<meta property="fb:app_id" content="1581693815380949" />
<link rel="manifest" href="/assets/manifest.json">
{{#unless embed}}
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.css" media="none" onload="if(media!='all')media='all'">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon-32x32.png">
<link rel="icon" id="favicon" type="image/png" sizes="16x16" href="/assets/images/favicon-16x16.png">
<link rel="mask-icon" href="/assets/images/safari-pinned-tab.svg" color="#2d2d2d">
{{/unless}}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-rc.2/css/materialize.min.css">
<link rel="stylesheet" type="text/css" href="/assets/css/{{stylesheet}}">
<link rel="stylesheet" type="text/css" href="/assets/dist/{{stylesheet}}">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" media="none" onload="if(media!='all')media='all'">
{{#unless embed}}
<script async type="text/javascript">
<script>
if(window.location.hostname.indexOf("localhost") < 0) {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -84,7 +83,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.slim.js"></script>
<script type="text/javascript" src="/assets/dist/{{javascript_file}}"></script>
{{#unless embed}}
<script type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>
<script async type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>
{{/unless}}
</body>
</html>