diff --git a/other/server.es6.js b/other/server.es6.js index bd6b185..06dc427 100644 --- a/other/server.es6.js +++ b/other/server.es6.js @@ -155,6 +155,12 @@ function createContext(designId, mapping) { function checkSession() { return new Promise((resolve, reject) => { + if (typeof mostRecent.devtoken !== 'undefined') { + // we don't have any way to check tokens, so we'll default to accept + // until this is fixed + resolve(true); + } + const options = { url: `https://${mostRecent.instance}/auth/validate`, method: 'GET', diff --git a/package.json b/package.json index 9685afd..b5975f5 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "description": "A sample app created with starter-kit", "scripts": { "setup": "node other/setup.js", - "start": "NODE_ENV=development node server.js", - "test-ci": "npm run lint && NODE_ENV=test karma start ./karma.conf.js --single-run --browsers PhantomJS", - "test": "npm run lint && NODE_ENV=test karma start ./karma.conf.js --single-run", - "tdd": "NODE_ENV=test karma start ./karma.conf.js --browsers Chrome", + "start": "cross-env NODE_ENV=development node server.js", + "test-ci": "npm run lint && cross-env NODE_ENV=test karma start ./karma.conf.js --single-run --browsers PhantomJS", + "test": "npm run lint && cross-env NODE_ENV=test karma start ./karma.conf.js --single-run", + "tdd": "cross-env NODE_ENV=test karma start ./karma.conf.js --browsers Chrome", "lint": "eslint src/**", "coveralls": "npm run test-ci && node node_modules/lcov-filter/index.js ./coverage/phantomjs/lcov.info spec | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", - "build": "rm -rf ./dist && NODE_ENV=production ./node_modules/.bin/webpack && cp -r domo/* dist/", + "build": "rm -rf ./dist && cross-env NODE_ENV=production ./node_modules/.bin/webpack && cp -r domo/* dist/", "preversion": "npm run test-ci", "version": "npm run build && npm run changelog && git add -A CHANGELOG.md", "postversion": "git push && git push --tags", @@ -26,9 +26,8 @@ "@domoinc/da-plop": "^3.0.0", "@domoinc/multi-line-chart": "^4.0.11", "@domoinc/query": "^1.0.3", - "angular-animate": "^1.5.7", - "angular-aria": "^1.5.7", - "angular-material": "^1.1.0-rc.5", + "angular-aria": "1.5.3", + "angular-animate": "1.5.3", "autoprefixer": "^6.1.2", "babel-core": "^6.3.17", "babel-loader": "^6.2.0", @@ -45,6 +44,7 @@ "chalk": "^1.1.1", "conventional-changelog": "^0.5.3", "coveralls": "^2.11.6", + "cross-env": "^4.0.0", "css-loader": "^0.23.0", "cssnano": "^3.4.0", "cz-conventional-changelog": "^1.1.5", @@ -98,6 +98,7 @@ "webpack-dev-server": "^1.14.0" }, "dependencies": { + "angular-material": "1.1.3", "enquire.js": "^2.1.1", "ryuu.js": "2.5.4" }, diff --git a/src/desktop/desktop.html b/src/desktop/desktop.html index 7fc286b..cd87425 100644 --- a/src/desktop/desktop.html +++ b/src/desktop/desktop.html @@ -14,7 +14,6 @@ -