Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Windows Support #27

Closed
wants to merge 4 commits into from
Closed

Add Windows Support #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6041d
add cross-env support
walexnelson Apr 3, 2017
d757d72
add devtoken support in proxy
walexnelson Apr 3, 2017
0910698
explicit angular dependencies
walexnelson Apr 3, 2017
83c6c9e
lock ngMaterial version to avoid future bugs with ng dependencies
walexnelson Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions other/server.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
17 changes: 9 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
1 change: 0 additions & 1 deletion src/desktop/desktop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-animate.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.18/angular-ui-router.min.js"></script>
<link rel="stylesheet" type="text/css" href="https://domoapps.s3.amazonaws.com/cdn/domo-bits/v1/icon-bits.css">
</head>
Expand Down