diff --git a/site/app.class.js b/site/app.class.js index 481945d..70353ba 100644 --- a/site/app.class.js +++ b/site/app.class.js @@ -22,6 +22,9 @@ class App constructor( _options ) { this.set_options( _options ) + + this.domain = 'http://' + ip.address() + ':' + this.options.port + this.set_express() this.set_server() this.set_socket() @@ -81,6 +84,8 @@ class App this.express.set( 'views', path.join( __dirname, 'views' ) ) this.express.use( express.static( path.join( __dirname, 'public' ) ) ) + this.express.locals.domain = this.domain + // Controllers this.express.use( '/', require( './controllers/index.js' ) ) } @@ -97,11 +102,9 @@ class App this.server.listen( this.options.port, () => { // URL - let url = 'http://' + ip.address() + ':' + this.options.port - console.log( colors.green( '---------------------------' ) ) console.log( 'server'.green.bold + ' - ' + 'started'.cyan ) - console.log( 'server'.green.bold + ' - ' + url.cyan ) + console.log( 'server'.green.bold + ' - ' + this.domain.cyan ) } ) } diff --git a/site/public/javascript/application/application.js b/site/public/javascript/application/application.js index 2b482e9..a16b2c3 100644 --- a/site/public/javascript/application/application.js +++ b/site/public/javascript/application/application.js @@ -1 +1,3 @@ -var angular_module = angular.module( 'application', [] ); +var application = angular.module( 'application', [] ); + +application.constant( 'config', config ); \ No newline at end of file diff --git a/site/public/javascript/controllers/project.js b/site/public/javascript/controllers/project.js index 79dbef4..443f7bd 100644 --- a/site/public/javascript/controllers/project.js +++ b/site/public/javascript/controllers/project.js @@ -1,4 +1,4 @@ -angular_module.controller( +application.controller( 'ProjectController', [ '$scope', diff --git a/site/public/javascript/controllers/projects.js b/site/public/javascript/controllers/projects.js index dca9844..1c027da 100644 --- a/site/public/javascript/controllers/projects.js +++ b/site/public/javascript/controllers/projects.js @@ -1,4 +1,4 @@ -angular_module.controller( +application.controller( 'ProjectsController', [ '$scope', diff --git a/site/public/javascript/services/project.js b/site/public/javascript/services/project.js index 05456b2..fd4c376 100644 --- a/site/public/javascript/services/project.js +++ b/site/public/javascript/services/project.js @@ -1,8 +1,9 @@ -angular_module.factory( +application.factory( 'project', [ + 'config', '$timeout', - function( $timeout ) + function( config, $timeout ) { var update_callback = null; @@ -85,7 +86,7 @@ angular_module.factory( result.connect = function( project_name ) { // Connect to socket - var socket = io( 'http://192.168.1.4:3000/project/' + project_name ); + var socket = io( config.domain + '/project/' + project_name ); // Connect event socket.on( 'connect', function() diff --git a/site/public/javascript/services/projects.js b/site/public/javascript/services/projects.js index 158b62d..e4918b6 100644 --- a/site/public/javascript/services/projects.js +++ b/site/public/javascript/services/projects.js @@ -1,7 +1,8 @@ -angular_module.factory( +application.factory( 'projects', [ - function() + 'config', + function( config ) { update_callback = null; @@ -14,7 +15,7 @@ angular_module.factory( }; // Socket - var socket = io( 'http://192.168.1.4:3000/projects' ); + var socket = io( config.domain + '/projects' ); socket.on( 'update_projects', function( data ) { diff --git a/site/views/pages/index/project.jade b/site/views/pages/index/project.jade index 016906c..018b261 100644 --- a/site/views/pages/index/project.jade +++ b/site/views/pages/index/project.jade @@ -10,10 +10,6 @@ script(type="text/ng-template",id="folder_template.html") | {{_file.name}} section(ng-controller="ProjectController as controller",ng-init="init('" + project_slug + "')") - header.main-header - h1 - a(href="/") - | Code Spectat aside header.aside-header | {{project.name}} diff --git a/site/views/partials/header.jade b/site/views/partials/header.jade index d86a1e8..5810b60 100644 --- a/site/views/partials/header.jade +++ b/site/views/partials/header.jade @@ -2,6 +2,10 @@ html(ng-app="application") head title | Code Spectat + script. + var config = { + domain : '#{domain}' + } script(src="/socket.io/socket.io.js") script(src="/vendors/moment.min.js") script(src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js") @@ -14,3 +18,7 @@ html(ng-app="application") script(src="/javascript/services/projects.js") link(rel="stylesheet", href="/stylesheets/style.css") body + header.main-header + h1 + a(href=domain) + | Code Spectat \ No newline at end of file diff --git a/test-folder/folder-1/test-4.txt b/test-folder/folder-1/test-4.txt index cb1ef8a..1d4c156 100644 --- a/test-folder/folder-1/test-4.txt +++ b/test-folder/folder-1/test-4.txt @@ -1 +1,4 @@ sdnufoisdf +dodshfosdif +sdfiuhsdf +azeiuazhe \ No newline at end of file diff --git a/test-folder/test-1.txt b/test-folder/test-1.txt index ede7957..53a9f38 100644 --- a/test-folder/test-1.txt +++ b/test-folder/test-1.txt @@ -9,3 +9,4 @@ bbbbiuhsdfiuhsdfdsf dsfsdf sodifja +dsfiuhdsifh \ No newline at end of file