From 5f99cf53beaaddb83c351c16cb4e9444fc73e17a Mon Sep 17 00:00:00 2001 From: Richard Torenvliet Date: Sun, 14 Jan 2018 12:52:02 +0100 Subject: [PATCH] Remove specific references --- .gitignore | 2 ++ app/router.js | 1 + app/templates/index.hbs | 11 +++++++++++ config/environment.js | 12 ++++++------ ember-cli-build.js | 3 ++- 5 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 app/templates/index.hbs diff --git a/.gitignore b/.gitignore index 86fceae..eca6c38 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /libpeerconnection.log npm-debug.log testem.log +makefile +.idea/ diff --git a/app/router.js b/app/router.js index b1d0e17..931713e 100644 --- a/app/router.js +++ b/app/router.js @@ -6,6 +6,7 @@ const Router = Ember.Router.extend({ }); Router.map(function() { + this.route('index', { path: '/' }); this.route('reconstruction'); }); diff --git a/app/templates/index.hbs b/app/templates/index.hbs new file mode 100644 index 0000000..bba476c --- /dev/null +++ b/app/templates/index.hbs @@ -0,0 +1,11 @@ +
+
+
+ {{#link-to "reconstruction" class="btn white bg-silver border p4 py2"}} + Reconstruction + {{/link-to}} +
+
+
+ +{{outlet}} diff --git a/config/environment.js b/config/environment.js index cd95840..32b9949 100644 --- a/config/environment.js +++ b/config/environment.js @@ -23,9 +23,9 @@ module.exports = function(environment) { }; if (environment === 'development') { - ENV.APP.websocketsURL = 'ws://localhost:6930/reconstruction'; - ENV.APP.staticURL = 'http://localhost:6930/data/'; - ENV.APP.APIURL = 'http://localhost:6930'; + ENV.APP.websocketsURL = ''; + ENV.APP.staticURL = ''; + ENV.APP.APIURL = ''; // ENV.APP.LOG_RESOLVER = true; // ENV.APP.LOG_ACTIVE_GENERATION = true; @@ -47,9 +47,9 @@ module.exports = function(environment) { } if (environment === 'production') { - ENV.APP.websocketsURL = 'wss://richard.kompiler.org/reconstruction'; - ENV.APP.staticURL = 'https://richard.kompiler.org/data/'; - ENV.APP.APIURL = 'https://richard.kompiler.org'; + ENV.APP.websocketsURL = ''; + ENV.APP.staticURL = '; + ENV.APP.APIURL = ''; ENV.baseURL = '/face-reconstruction/'; ENV.rootURL = '/face-reconstruction/'; } diff --git a/ember-cli-build.js b/ember-cli-build.js index b8064b7..ddb6211 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -16,7 +16,8 @@ module.exports = function(defaults) { } }); - // bower compoenents + // bower components + // TODO: fix loading bascss locally instead of including it in the index.html. //app.import('bower_components/basscss/modules/align/index.css'); //app.import('bower_components/basscss/modules/border/index.css'); //app.import('bower_components/basscss/modules/flexbox/index.css'); -- 2.22.0