From a1c835caed24d7272acf4ef9c5974c97e6635fd6 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 5 Mar 2018 06:13:51 -0700 Subject: [PATCH] WIP: need to proxy the DT values --- .../collection/create-container.hbs | 15 +- bower.json | 9 - ember-cli-build.js | 8 +- package-lock.json | 256 ++++++++++++++++++ package.json | 2 + 5 files changed, 276 insertions(+), 14 deletions(-) delete mode 100644 bower.json diff --git a/app/templates/components/collection/create-container.hbs b/app/templates/components/collection/create-container.hbs index 720a3d6..93e571b 100644 --- a/app/templates/components/collection/create-container.hbs +++ b/app/templates/components/collection/create-container.hbs @@ -83,7 +83,13 @@ {{/validated-field}} {{#validated-field property='collectionStartTime' label='Collection start time' changeset=changeset}} - {{input value=changeset.collectionStartTime type='time' class='form-control'}} + {{bs-datetimepicker + date=changeset.collectionStartTime + updateDate=(action (mut changeset.collectionStartTime)) + placeholder='HH:mm a' + format='HH:mm a' + class='form-control' + }} {{/validated-field}} {{#validated-field property='collectionEndDate' label='Collection end date' changeset=changeset}} @@ -91,7 +97,12 @@ {{/validated-field}} {{#validated-field property='collectionEndTime' label='Collection end time' changeset=changeset}} - {{input value=changeset.collectionEndTime type='time' class='form-control'}} + {{bs-datetimepicker + date=changeset.collectionEndTime + updateDate=(action (mut changeset.collectionEndTime)) + format='LT' + class='form-control' + }} {{/validated-field}} {{/with}} {{/f.content}} diff --git a/bower.json b/bower.json deleted file mode 100644 index 23a5f4a..0000000 --- a/bower.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "ccdb-web", - "dependencies": { - "bootstrap": "^3.3.7" - }, - "devDependencies": { - "bootstrap": "^3.3.7" - } -} diff --git a/ember-cli-build.js b/ember-cli-build.js index 2e0af58..dbb164f 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -8,10 +8,12 @@ module.exports = function(defaults) { 'ember-cli-babel': { includePolyfill: (EmberApp.env() === 'test'), }, + 'ember-bootstrap-datetimepicker': { + 'importBootstrapCSS': true, + 'importBootstrapJS': true, + 'importBootstrapTheme': true + }, }); - app.import('bower_components/bootstrap/dist/css/bootstrap.min.css'); - app.import('bower_components/bootstrap/dist/css/bootstrap-theme.min.css'); - return app.toTree(); }; diff --git a/package-lock.json b/package-lock.json index 9c8be61..4515d2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1488,6 +1488,12 @@ "type-is": "1.6.15" } }, + "bootstrap": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=", + "dev": true + }, "bower-config": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-1.4.1.tgz", @@ -3287,6 +3293,233 @@ "ember-wormhole": "0.5.4" } }, + "ember-bootstrap-datetimepicker": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ember-bootstrap-datetimepicker/-/ember-bootstrap-datetimepicker-1.1.0.tgz", + "integrity": "sha1-io6PN78NJ/My2mLgvJNUKTT45TM=", + "dev": true, + "requires": { + "broccoli-funnel": "1.2.0", + "broccoli-merge-trees": "1.2.4", + "ember-cli-babel": "5.2.4", + "ember-runtime-enumerable-includes-polyfill": "1.0.4" + }, + "dependencies": { + "babel-core": { + "version": "5.8.38", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz", + "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=", + "dev": true, + "requires": { + "babel-plugin-constant-folding": "1.0.1", + "babel-plugin-dead-code-elimination": "1.0.2", + "babel-plugin-eval": "1.0.1", + "babel-plugin-inline-environment-variables": "1.0.1", + "babel-plugin-jscript": "1.0.4", + "babel-plugin-member-expression-literals": "1.0.1", + "babel-plugin-property-literals": "1.0.1", + "babel-plugin-proto-to-assign": "1.0.4", + "babel-plugin-react-constant-elements": "1.0.3", + "babel-plugin-react-display-name": "1.0.3", + "babel-plugin-remove-console": "1.0.1", + "babel-plugin-remove-debugger": "1.0.1", + "babel-plugin-runtime": "1.0.7", + "babel-plugin-undeclared-variables-check": "1.0.2", + "babel-plugin-undefined-to-void": "1.1.6", + "babylon": "5.8.38", + "bluebird": "2.11.0", + "chalk": "1.1.3", + "convert-source-map": "1.5.1", + "core-js": "1.2.7", + "debug": "2.6.9", + "detect-indent": "3.0.1", + "esutils": "2.0.2", + "fs-readdir-recursive": "0.1.2", + "globals": "6.4.1", + "home-or-tmp": "1.0.0", + "is-integer": "1.0.7", + "js-tokens": "1.0.1", + "json5": "0.4.0", + "lodash": "3.10.1", + "minimatch": "2.0.10", + "output-file-sync": "1.1.2", + "path-exists": "1.0.0", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "regenerator": "0.8.40", + "regexpu": "1.3.0", + "repeating": "1.1.3", + "resolve": "1.5.0", + "shebang-regex": "1.0.0", + "slash": "1.0.0", + "source-map": "0.5.7", + "source-map-support": "0.2.10", + "to-fast-properties": "1.0.3", + "trim-right": "1.0.1", + "try-resolve": "1.0.1" + } + }, + "babylon": { + "version": "5.8.38", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz", + "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=", + "dev": true + }, + "broccoli-babel-transpiler": { + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz", + "integrity": "sha512-gI14Pqc4qbmn5RW4SuAmybLiOoYW59D+HzQyhY6WdaGMAjikKBwJN0p17phyvafQ+kvG0mUiMd83lgHLeATnEA==", + "dev": true, + "requires": { + "babel-core": "5.8.38", + "broccoli-funnel": "1.2.0", + "broccoli-merge-trees": "1.2.4", + "broccoli-persistent-filter": "1.4.3", + "clone": "0.2.0", + "hash-for-dep": "1.2.3", + "heimdalljs-logger": "0.1.9", + "json-stable-stringify": "1.0.1", + "rsvp": "3.6.2", + "workerpool": "2.3.0" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + } + } + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=", + "dev": true + }, + "detect-indent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", + "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "minimist": "1.2.0", + "repeating": "1.1.3" + } + }, + "ember-cli-babel": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz", + "integrity": "sha1-XOT0awjtb20h6Hhhn7aJcZ1ujhM=", + "dev": true, + "requires": { + "broccoli-babel-transpiler": "5.7.4", + "broccoli-funnel": "1.2.0", + "clone": "2.1.1", + "ember-cli-version-checker": "1.3.1", + "resolve": "1.5.0" + } + }, + "ember-cli-version-checker": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz", + "integrity": "sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=", + "dev": true, + "requires": { + "semver": "5.5.0" + } + }, + "ember-runtime-enumerable-includes-polyfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz", + "integrity": "sha1-FqdhLjR6Lt8H2osvLwnb/ucN66A=", + "dev": true, + "requires": { + "ember-cli-babel": "5.2.4", + "ember-cli-version-checker": "1.3.1" + } + }, + "globals": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", + "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=", + "dev": true + }, + "home-or-tmp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz", + "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2", + "user-home": "1.1.1" + } + }, + "js-tokens": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz", + "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=", + "dev": true + }, + "json5": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz", + "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=", + "dev": true + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "repeating": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "source-map-support": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz", + "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=", + "dev": true, + "requires": { + "source-map": "0.1.32" + }, + "dependencies": { + "source-map": { + "version": "0.1.32", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", + "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + } + } + }, "ember-changeset": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ember-changeset/-/ember-changeset-1.3.0.tgz", @@ -6878,6 +7111,29 @@ "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", "dev": true }, + "eonasdan-bootstrap-datetimepicker": { + "version": "4.17.47", + "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.47.tgz", + "integrity": "sha1-ekmXAEQGUnbnll79Fvgic1IZ5zU=", + "dev": true, + "requires": { + "bootstrap": "3.3.7", + "jquery": "3.3.1", + "moment": "2.20.1", + "moment-timezone": "0.4.1" + }, + "dependencies": { + "moment-timezone": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz", + "integrity": "sha1-gfWYw61eIs2teWtn7NjYjQ9bqgY=", + "dev": true, + "requires": { + "moment": "2.20.1" + } + } + } + }, "error": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz", diff --git a/package.json b/package.json index ce59058..744e363 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^3.0.0", + "ember-bootstrap-datetimepicker": "^1.1.0", "ember-changeset": "1.3.0", "ember-changeset-validations": "1.2.8", "ember-cli": "^2.16.2", @@ -49,6 +50,7 @@ "ember-simple-auth": "1.4.0", "ember-sinon": "^1.0.0", "ember-source": "~2.16.0", + "eonasdan-bootstrap-datetimepicker": "^4.17.47", "loader.js": "^4.2.3" }, "engines": {