From 739c6e9e9fadc3ab24fd2517b55dd68139f0e7b1 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Thu, 22 Sep 2016 10:45:07 -0400 Subject: [PATCH] Bug fixing for Standalone Viewer --- LesionTracker/.meteor/versions | 30 +++++++------ OHIFViewer/.meteor/versions | 30 +++++++------ .../server/validateServerConfiguration.js | 6 ++- StandaloneViewer/.meteor/packages | 45 ------------------- StandaloneViewer/StandaloneViewer/.gitignore | 1 + .../.meteor/.finished-upgraders | 15 +++++++ .../{ => StandaloneViewer}/.meteor/.gitignore | 0 .../{ => StandaloneViewer}/.meteor/.id | 2 +- .../StandaloneViewer/.meteor/packages | 41 +++++++++++++++++ .../{ => StandaloneViewer}/.meteor/platforms | 0 .../{ => StandaloneViewer}/.meteor/release | 0 .../{ => StandaloneViewer}/.meteor/versions | 42 +++++++++-------- .../{ => StandaloneViewer}/client/body.styl | 0 .../flexboxLayout/flexboxLayout.html | 0 .../components/flexboxLayout/flexboxLayout.js | 0 .../flexboxLayout/flexboxLayout.styl | 0 .../standaloneViewer/standaloneViewer.html | 0 .../standaloneViewer/standaloneViewer.js | 0 .../standaloneViewer/standaloneViewer.styl | 0 .../standaloneViewerMain.html | 0 .../standaloneViewerMain.js | 0 .../standaloneViewerMain.styl | 0 .../toolbarSection/toolbarSection.html | 0 .../toolbarSection/toolbarSection.js | 14 ------ .../toolbarSection/toolbarSection.styl | 0 .../client/components/viewer/viewer.html | 0 .../client/components/viewer/viewer.js | 0 .../client/components/viewer/viewer.styl | 0 .../client/cornerstoneWebImageLoader.js | 0 .../{ => StandaloneViewer}/client/head.html | 0 .../{ => StandaloneViewer}/client/log.js | 0 .../StandaloneViewer/package.json | 10 +++++ .../{ => StandaloneViewer}/routes.js | 0 .../server/collections.js | 0 34 files changed, 129 insertions(+), 107 deletions(-) delete mode 100644 StandaloneViewer/.meteor/packages create mode 100644 StandaloneViewer/StandaloneViewer/.gitignore create mode 100644 StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders rename StandaloneViewer/{ => StandaloneViewer}/.meteor/.gitignore (100%) rename StandaloneViewer/{ => StandaloneViewer}/.meteor/.id (93%) create mode 100644 StandaloneViewer/StandaloneViewer/.meteor/packages rename StandaloneViewer/{ => StandaloneViewer}/.meteor/platforms (100%) rename StandaloneViewer/{ => StandaloneViewer}/.meteor/release (100%) rename StandaloneViewer/{ => StandaloneViewer}/.meteor/versions (76%) rename StandaloneViewer/{ => StandaloneViewer}/client/body.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/flexboxLayout/flexboxLayout.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/flexboxLayout/flexboxLayout.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/flexboxLayout/flexboxLayout.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewer/standaloneViewer.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewer/standaloneViewer.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewer/standaloneViewer.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewerMain/standaloneViewerMain.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewerMain/standaloneViewerMain.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/standaloneViewerMain/standaloneViewerMain.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/toolbarSection/toolbarSection.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/toolbarSection/toolbarSection.js (93%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/toolbarSection/toolbarSection.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/viewer/viewer.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/viewer/viewer.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/components/viewer/viewer.styl (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/cornerstoneWebImageLoader.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/head.html (100%) rename StandaloneViewer/{ => StandaloneViewer}/client/log.js (100%) create mode 100644 StandaloneViewer/StandaloneViewer/package.json rename StandaloneViewer/{ => StandaloneViewer}/routes.js (100%) rename StandaloneViewer/{ => StandaloneViewer}/server/collections.js (100%) diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions index 23dedb6c0..4c34368c6 100644 --- a/LesionTracker/.meteor/versions +++ b/LesionTracker/.meteor/versions @@ -12,12 +12,12 @@ babel-compiler@6.9.1 babel-runtime@0.1.11 base64@1.0.9 binary-heap@1.0.9 -blaze@2.1.8 -blaze-html-templates@1.0.4 -blaze-tools@1.0.9 -boilerplate-generator@1.0.9 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.10 caching-compiler@1.1.7 -caching-html-compiler@1.0.6 +caching-html-compiler@1.0.7 callback-hook@1.0.9 check@1.2.3 clinical:active-entry@1.5.16 @@ -56,8 +56,8 @@ gilbertwat:bootstrap3-daterangepicker@1.3.21_1 grove:less@0.2.0 hangingprotocols@0.0.1 hot-code-push@1.0.4 -html-tools@1.0.10 -htmljs@1.0.10 +html-tools@1.0.11 +htmljs@1.0.11 http@1.2.9 ian:accounts-ui-bootstrap-3@1.2.89 id-map@1.0.8 @@ -84,7 +84,7 @@ mobile-experience@1.0.4 mobile-status-bar@1.0.12 modules@0.7.6 modules-runtime@0.7.6 -momentjs:moment@2.14.4 +momentjs:moment@2.15.1 mongo@1.1.12 mongo-id@1.0.5 mrt:moment@2.8.1 @@ -98,7 +98,7 @@ orthanc-remote@0.0.1 peppelg:bootstrap-3-modal@1.0.4 practicalmeteor:chai@2.1.0_1 practicalmeteor:loglevel@1.2.0_2 -promise@0.8.4 +promise@0.8.7 random@1.0.10 rate-limit@1.0.5 reactive-dict@1.1.8 @@ -113,21 +113,23 @@ sha@1.0.8 shell-server@0.2.1 silentcicero:jszip@0.0.4 simple:reactive-method@1.0.2 -spacebars@1.0.12 -spacebars-compiler@1.0.12 +spacebars@1.0.13 +spacebars-compiler@1.0.13 srp@1.0.9 standard-app-packages@1.0.9 standard-minifier-css@1.2.0 standard-minifier-js@1.2.0 stylus@2.513.5 -templating@1.2.14 -templating-tools@1.0.4 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 tracker@1.1.0 twbs:bootstrap@3.3.6 typ:accounts-ldap@1.0.1 typ:ldapjs@0.7.3 u2622:persistent-session@0.4.4 -ui@1.0.11 +ui@1.0.12 underscore@1.0.9 url@1.0.10 validatejs@0.0.1 diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions index 6d529819e..8c204c5c0 100644 --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -7,12 +7,12 @@ babel-compiler@6.9.1 babel-runtime@0.1.11 base64@1.0.9 binary-heap@1.0.9 -blaze@2.1.8 -blaze-html-templates@1.0.4 -blaze-tools@1.0.9 -boilerplate-generator@1.0.9 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.10 caching-compiler@1.1.7 -caching-html-compiler@1.0.6 +caching-html-compiler@1.0.7 callback-hook@1.0.9 check@1.2.3 clinical:router@2.0.19 @@ -39,8 +39,8 @@ geojson-utils@1.0.9 gilbertwat:bootstrap3-daterangepicker@1.3.21_1 hangingprotocols@0.0.1 hot-code-push@1.0.4 -html-tools@1.0.10 -htmljs@1.0.10 +html-tools@1.0.11 +htmljs@1.0.11 http@1.2.9 id-map@1.0.8 iron:controller@1.0.12 @@ -63,7 +63,7 @@ mobile-experience@1.0.4 mobile-status-bar@1.0.12 modules@0.7.6 modules-runtime@0.7.6 -momentjs:moment@2.14.4 +momentjs:moment@2.15.1 mongo@1.1.12 mongo-id@1.0.5 mrt:moment@2.8.1 @@ -76,7 +76,7 @@ orthanc-remote@0.0.1 peppelg:bootstrap-3-modal@1.0.4 practicalmeteor:chai@2.1.0_1 practicalmeteor:loglevel@1.2.0_2 -promise@0.8.4 +promise@0.8.7 random@1.0.10 reactive-dict@1.1.8 reactive-var@1.0.10 @@ -87,17 +87,19 @@ rwatts:uuid@0.1.0 session@1.1.6 shell-server@0.2.1 silentcicero:jszip@0.0.4 -spacebars@1.0.12 -spacebars-compiler@1.0.12 +spacebars@1.0.13 +spacebars-compiler@1.0.13 standard-app-packages@1.0.9 standard-minifier-css@1.2.0 standard-minifier-js@1.2.0 stylus@2.513.5 -templating@1.2.14 -templating-tools@1.0.4 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 tracker@1.1.0 twbs:bootstrap@3.3.6 -ui@1.0.11 +ui@1.0.12 underscore@1.0.9 url@1.0.10 validatejs@0.0.1 diff --git a/Packages/worklist/server/validateServerConfiguration.js b/Packages/worklist/server/validateServerConfiguration.js index 38006a52b..896349345 100644 --- a/Packages/worklist/server/validateServerConfiguration.js +++ b/Packages/worklist/server/validateServerConfiguration.js @@ -2,6 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { ServerConfiguration } from '../both/schema.js'; +/* +-- Taking this out for now to prevent confusion. + +TODO: Make the error messages more clear Meteor.startup(() => { console.log('------ Testing Meteor Settings ------'); let config = ServerConfiguration.clean(Meteor.settings); @@ -9,4 +13,4 @@ Meteor.startup(() => { Meteor.settings = config; check(config, ServerConfiguration); -}); +});*/ diff --git a/StandaloneViewer/.meteor/packages b/StandaloneViewer/.meteor/packages deleted file mode 100644 index 5f5bcd072..000000000 --- a/StandaloneViewer/.meteor/packages +++ /dev/null @@ -1,45 +0,0 @@ -# Meteor packages used by this project, one per line. -# Check this file (and the other files in this directory) into your repository. -# -# 'meteor add' and 'meteor remove' will edit this file for you, -# but you can also edit it by hand. - -twbs:bootstrap -http@1.2.8 -arsnebula:reactive-promise -promise@0.8.3 -stylus@2.513.4 -fortawesome:fontawesome -mrt:moment -meteor-base@1.0.4 -mobile-experience@1.0.4 -mongo@1.1.10 -blaze-html-templates@1.0.4 -session@1.1.6 -jquery@1.11.9 -tracker@1.1.0 -logging@1.1.14 -reload@1.1.10 -random@1.0.10 -ejson@1.0.12 -spacebars@1.0.12 -check@1.2.3 -cornerstone -dicomweb -aldeed:simple-schema # Third party package to deal with schemas -design -ohif:core -ecmascript@0.5.7 -viewerbase -reactive-var@1.0.10 -practicalmeteor:loglevel -hangingprotocols -reactive-dict@1.1.8 -clinical:router -fastclick@1.0.12 -standard-minifier-css@1.1.8 -standard-minifier-js@1.1.8 -johdirr:meteor-git-rev -wadoproxy -aldeed:template-extension -peppelg:bootstrap-3-modal \ No newline at end of file diff --git a/StandaloneViewer/StandaloneViewer/.gitignore b/StandaloneViewer/StandaloneViewer/.gitignore new file mode 100644 index 000000000..40b878db5 --- /dev/null +++ b/StandaloneViewer/StandaloneViewer/.gitignore @@ -0,0 +1 @@ +node_modules/ \ No newline at end of file diff --git a/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders b/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders new file mode 100644 index 000000000..aa607041d --- /dev/null +++ b/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders @@ -0,0 +1,15 @@ +# This file contains information which helps Meteor properly upgrade your +# app when you run 'meteor update'. You should check it into version control +# with your project. + +notices-for-0.9.0 +notices-for-0.9.1 +0.9.4-platform-file +notices-for-facebook-graph-api-2 +1.2.0-standard-minifiers-package +1.2.0-meteor-platform-split +1.2.0-cordova-changes +1.2.0-breaking-changes +1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package diff --git a/StandaloneViewer/.meteor/.gitignore b/StandaloneViewer/StandaloneViewer/.meteor/.gitignore similarity index 100% rename from StandaloneViewer/.meteor/.gitignore rename to StandaloneViewer/StandaloneViewer/.meteor/.gitignore diff --git a/StandaloneViewer/.meteor/.id b/StandaloneViewer/StandaloneViewer/.meteor/.id similarity index 93% rename from StandaloneViewer/.meteor/.id rename to StandaloneViewer/StandaloneViewer/.meteor/.id index 8eb345f7e..8a40384d1 100644 --- a/StandaloneViewer/.meteor/.id +++ b/StandaloneViewer/StandaloneViewer/.meteor/.id @@ -4,4 +4,4 @@ # - ensuring you don't accidentally deploy one app on top of another # - providing package authors with aggregated statistics -1hmfm7z9u2o2517bro6n +166midj11jxxobr39vz4 diff --git a/StandaloneViewer/StandaloneViewer/.meteor/packages b/StandaloneViewer/StandaloneViewer/.meteor/packages new file mode 100644 index 000000000..6dea5536b --- /dev/null +++ b/StandaloneViewer/StandaloneViewer/.meteor/packages @@ -0,0 +1,41 @@ +# Meteor packages used by this project, one per line. +# Check this file (and the other files in this directory) into your repository. +# +# 'meteor add' and 'meteor remove' will edit this file for you, +# but you can also edit it by hand. + +meteor-base@1.0.4 # Packages every Meteor app needs to have +mobile-experience@1.0.4 # Packages for a great mobile UX +mongo@1.1.12 # The database Meteor supports right now +blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views +reactive-var@1.0.10 # Reactive variable for tracker +jquery@1.11.9 # Helpful client-side library +tracker@1.1.0 # Meteor's client-side reactive programming library + +standard-minifier-css@1.2.0 # CSS minifier run for production mode +standard-minifier-js@1.2.0 # JS minifier run for production mode +es5-shim@4.6.14 # ECMAScript 5 compatibility for older browsers. +ecmascript@0.5.8 # Enable ECMAScript2015+ syntax in app code +shell-server@0.2.1 # Server-side component of the `meteor shell` command + +cornerstone +dicomweb +design +ohif:core +viewerbase +worklist +wadoproxy + +aldeed:template-extension +aldeed:simple-schema@1.5.3 +stylus +clinical:router +session +practicalmeteor:loglevel +reactive-dict +twbs:bootstrap +fortawesome:fontawesome +mrt:moment +fastclick +peppelg:bootstrap-3-modal +random \ No newline at end of file diff --git a/StandaloneViewer/.meteor/platforms b/StandaloneViewer/StandaloneViewer/.meteor/platforms similarity index 100% rename from StandaloneViewer/.meteor/platforms rename to StandaloneViewer/StandaloneViewer/.meteor/platforms diff --git a/StandaloneViewer/.meteor/release b/StandaloneViewer/StandaloneViewer/.meteor/release similarity index 100% rename from StandaloneViewer/.meteor/release rename to StandaloneViewer/StandaloneViewer/.meteor/release diff --git a/StandaloneViewer/.meteor/versions b/StandaloneViewer/StandaloneViewer/.meteor/versions similarity index 76% rename from StandaloneViewer/.meteor/versions rename to StandaloneViewer/StandaloneViewer/.meteor/versions index e4e0c3cf7..451daa3ff 100644 --- a/StandaloneViewer/.meteor/versions +++ b/StandaloneViewer/StandaloneViewer/.meteor/versions @@ -1,18 +1,17 @@ aldeed:simple-schema@1.5.3 aldeed:template-extension@4.0.0 allow-deny@1.0.5 -arsnebula:reactive-promise@0.9.1 autoupdate@1.3.11 babel-compiler@6.9.1 babel-runtime@0.1.11 base64@1.0.9 binary-heap@1.0.9 -blaze@2.1.8 -blaze-html-templates@1.0.4 -blaze-tools@1.0.9 -boilerplate-generator@1.0.9 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.10 caching-compiler@1.1.7 -caching-html-compiler@1.0.6 +caching-html-compiler@1.0.7 callback-hook@1.0.9 check@1.2.3 clinical:router@2.0.19 @@ -29,23 +28,24 @@ deps@1.0.12 design@0.0.1 dicomweb@0.0.1 diff-sequence@1.0.6 +dimseservice@0.0.1 ecmascript@0.5.8 ecmascript-runtime@0.3.14 ejson@1.0.12 +es5-shim@4.6.14 fastclick@1.0.12 fortawesome:fontawesome@4.5.0 geojson-utils@1.0.9 -hangingprotocols@0.0.1 +gilbertwat:bootstrap3-daterangepicker@1.3.21_1 hot-code-push@1.0.4 -html-tools@1.0.10 -htmljs@1.0.10 +html-tools@1.0.11 +htmljs@1.0.11 http@1.2.9 id-map@1.0.8 iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 -johdirr:meteor-git-rev@0.0.4 jquery@1.11.9 launch-screen@1.0.12 livedata@1.0.18 @@ -61,19 +61,20 @@ mobile-experience@1.0.4 mobile-status-bar@1.0.12 modules@0.7.6 modules-runtime@0.7.6 -momentjs:moment@2.14.4 +momentjs:moment@2.15.1 mongo@1.1.12 mongo-id@1.0.5 mrt:moment@2.8.1 natestrauser:select2@4.0.3 -npm-mongo@1.5.48 +npm-mongo@1.5.49 observe-sequence@1.0.12 ohif:core@0.0.1 ordered-dict@1.0.8 +orthanc-remote@0.0.1 peppelg:bootstrap-3-modal@1.0.4 practicalmeteor:chai@2.1.0_1 practicalmeteor:loglevel@1.2.0_2 -promise@0.8.4 +promise@0.8.7 random@1.0.10 reactive-dict@1.1.8 reactive-var@1.0.10 @@ -82,17 +83,21 @@ retry@1.0.8 routepolicy@1.0.11 rwatts:uuid@0.1.0 session@1.1.6 -spacebars@1.0.12 -spacebars-compiler@1.0.12 +shell-server@0.2.1 +silentcicero:jszip@0.0.4 +spacebars@1.0.13 +spacebars-compiler@1.0.13 standard-app-packages@1.0.9 standard-minifier-css@1.2.0 standard-minifier-js@1.2.0 stylus@2.513.5 -templating@1.2.14 -templating-tools@1.0.4 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 tracker@1.1.0 twbs:bootstrap@3.3.6 -ui@1.0.11 +ui@1.0.12 underscore@1.0.9 url@1.0.10 validatejs@0.0.1 @@ -100,3 +105,4 @@ viewerbase@0.0.1 wadoproxy@0.0.1 webapp@1.3.11 webapp-hashing@1.0.9 +worklist@0.0.1 diff --git a/StandaloneViewer/client/body.styl b/StandaloneViewer/StandaloneViewer/client/body.styl similarity index 100% rename from StandaloneViewer/client/body.styl rename to StandaloneViewer/StandaloneViewer/client/body.styl diff --git a/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.html b/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.html similarity index 100% rename from StandaloneViewer/client/components/flexboxLayout/flexboxLayout.html rename to StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.html diff --git a/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.js b/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.js similarity index 100% rename from StandaloneViewer/client/components/flexboxLayout/flexboxLayout.js rename to StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.js diff --git a/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl b/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl similarity index 100% rename from StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl rename to StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl diff --git a/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html similarity index 100% rename from StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html diff --git a/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js similarity index 100% rename from StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js diff --git a/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl similarity index 100% rename from StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl diff --git a/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.html b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.html similarity index 100% rename from StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.html rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.html diff --git a/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js similarity index 100% rename from StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js diff --git a/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl similarity index 100% rename from StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl rename to StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl diff --git a/StandaloneViewer/client/components/toolbarSection/toolbarSection.html b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.html similarity index 100% rename from StandaloneViewer/client/components/toolbarSection/toolbarSection.html rename to StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.html diff --git a/StandaloneViewer/client/components/toolbarSection/toolbarSection.js b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js similarity index 93% rename from StandaloneViewer/client/components/toolbarSection/toolbarSection.js rename to StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js index 1c6c80762..f941d2a89 100644 --- a/StandaloneViewer/client/components/toolbarSection/toolbarSection.js +++ b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js @@ -17,20 +17,6 @@ Template.toolbarSection.helpers({ }; }, - rightSidebarToggleButtonData() { - const instance = Template.instance(); - return { - toggleable: true, - key: 'rightSidebar', - value: instance.data.state, - options: [{ - value: 'hangingprotocols', - iconClasses: 'fa fa-cog', - bottomLabel: 'Hanging' - }] - }; - }, - toolbarButtons() { var buttonData = []; buttonData.push({ diff --git a/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl similarity index 100% rename from StandaloneViewer/client/components/toolbarSection/toolbarSection.styl rename to StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl diff --git a/StandaloneViewer/client/components/viewer/viewer.html b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.html similarity index 100% rename from StandaloneViewer/client/components/viewer/viewer.html rename to StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.html diff --git a/StandaloneViewer/client/components/viewer/viewer.js b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js similarity index 100% rename from StandaloneViewer/client/components/viewer/viewer.js rename to StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js diff --git a/StandaloneViewer/client/components/viewer/viewer.styl b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl similarity index 100% rename from StandaloneViewer/client/components/viewer/viewer.styl rename to StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl diff --git a/StandaloneViewer/client/cornerstoneWebImageLoader.js b/StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js similarity index 100% rename from StandaloneViewer/client/cornerstoneWebImageLoader.js rename to StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js diff --git a/StandaloneViewer/client/head.html b/StandaloneViewer/StandaloneViewer/client/head.html similarity index 100% rename from StandaloneViewer/client/head.html rename to StandaloneViewer/StandaloneViewer/client/head.html diff --git a/StandaloneViewer/client/log.js b/StandaloneViewer/StandaloneViewer/client/log.js similarity index 100% rename from StandaloneViewer/client/log.js rename to StandaloneViewer/StandaloneViewer/client/log.js diff --git a/StandaloneViewer/StandaloneViewer/package.json b/StandaloneViewer/StandaloneViewer/package.json new file mode 100644 index 000000000..21da0e085 --- /dev/null +++ b/StandaloneViewer/StandaloneViewer/package.json @@ -0,0 +1,10 @@ +{ + "name": "StandaloneViewer", + "private": true, + "scripts": { + "start": "meteor run" + }, + "dependencies": { + "meteor-node-stubs": "~0.2.0" + } +} diff --git a/StandaloneViewer/routes.js b/StandaloneViewer/StandaloneViewer/routes.js similarity index 100% rename from StandaloneViewer/routes.js rename to StandaloneViewer/StandaloneViewer/routes.js diff --git a/StandaloneViewer/server/collections.js b/StandaloneViewer/StandaloneViewer/server/collections.js similarity index 100% rename from StandaloneViewer/server/collections.js rename to StandaloneViewer/StandaloneViewer/server/collections.js