KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gulp

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-26 17:03:02 +02:00
parent c3af36064f
commit 4fea9ae038
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
RewriteRule ^(.*)$ http://%1/$1 [R=301,L] RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
#Comment out the two folling lines when running server locally to fix issues with localhost #Comment out the two folling lines when running server locally to fix issues with localhost
#RewriteCond %{HTTPS} !=on RewriteCond %{HTTPS} !=on
#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
RewriteRule ^remote/(.*) php/controller.php?id=$1 [L] RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]

12
server/gulpfile.js
View File

@@ -10,8 +10,8 @@ gulp.task('js', function () {
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('main.js')) .pipe(concat('main-min.js'))
.pipe(gulp.dest('../static/build-js')); .pipe(gulp.dest('../static/dist'));
}); });
gulp.task('nochan', function () { gulp.task('nochan', function () {
@@ -21,8 +21,8 @@ gulp.task('nochan', function () {
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('main-fp.js')) .pipe(concat('frontpage-min.js'))
.pipe(gulp.dest('../static/build-js')); .pipe(gulp.dest('../static/dist'));
}); });
gulp.task('remotecontroller', function () { gulp.task('remotecontroller', function () {
@@ -32,8 +32,8 @@ gulp.task('remotecontroller', function () {
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('remotecontroller-min.js')) .pipe(concat('remote-min.js'))
.pipe(gulp.dest('../static/build-js')); .pipe(gulp.dest('../static/dist'));
}); });
gulp.task('default', function(){ gulp.task('default', function(){

2
server/server.js
View File

@@ -4,7 +4,7 @@ var server;
This if for the localhost running This if for the localhost running
******/ ******/
localhost = true; localhost = false;
//https server //https server
if(localhost) if(localhost)