diff --git a/.gitignore b/.gitignore index 86fceae7af4fb5a8de2c3c125e7f9a64c3ffbe0c..eca6c38b084168afc3ce5f1c919a8b50139fe3d7 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 b1d0e174dce7c8f27402026b2055cb9927105707..931713e3527cfe27e9609bc1bac9abcf1673e351 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 0000000000000000000000000000000000000000..bba476cf7546bba57d504754d6c8773cd2463b67 --- /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 cd95840b6ecfa6627362831a957ae9a2401ab493..32b9949cb8e44e7e2691a647431fbc77b99cd27b 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 b8064b753e24e44d79851bf278432e8be751d43e..ddb6211b1ddfbeba2af692a8da51502b3ae2dbca 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');