diff --git a/.travis.yml b/.travis.yml index 328d73c..ccb41f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: node_js node_js: # we recommend testing addons with the same minimum supported node version as Ember CLI # so that your addon works for all apps - - "6" + - "8" sudo: false dist: trusty @@ -52,10 +52,5 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-canary - env: EMBER_TRY_SCENARIO=ember-default-with-jquery -before_install: - - npm config set spin false - - npm install -g npm@4 - - npm --version - script: - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO diff --git a/README.md b/README.md index 1766787..6bf5dec 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ guidemaker-cardstack-template This addon handles style and layout of the cards. -It is a modified fork of [guidemaker-cardstack-template](https://github.com/empress/guidemaker-cardstack-template) +It is a modified fork of [guidemaker-default-template](https://github.com/empress/guidemaker-default-template) by Chris Manson. Installation diff --git a/addon/templates/components/search-input.hbs b/addon/templates/components/search-input.hbs index 0cbd1c5..460fac3 100644 --- a/addon/templates/components/search-input.hbs +++ b/addon/templates/components/search-input.hbs @@ -1,42 +1,42 @@ {{#if searchFunction}} - + -{{!-- Search results dropdown --}} -{{#ember-tether - target='#search-input' - targetAttachment='bottom right' - attachment='top right' - constraints=_resultTetherConstraints - class='ds-dropdown-results' -}} - {{#if response.hits}} - -
-
-
- + {{!-- Search results dropdown --}} + {{#ember-tether + target="#search-input" + targetAttachment="bottom right" + attachment="top right" + constraints=_resultTetherConstraints + class="ds-dropdown-results" + }} + {{#if response.hits}} + +
+
+
+ Search Results - + +
+
-
-
- {{#each response.hits as |result|}} - {{search-result result=result}} - {{/each}} -
- - Search Powered by Algolia - -
- - {{/if}} -{{/ember-tether}} + {{#each response.hits as |result|}} + {{search-result result=result}} + {{/each}} +
+ + Search Powered by Algolia + +
+ + {{/if}} + {{/ember-tether}} {{/if}} diff --git a/package-lock.json b/package-lock.json index 2af3d2b..a083372 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6915,24 +6915,24 @@ } }, "ember-try": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ember-try/-/ember-try-1.1.0.tgz", - "integrity": "sha512-NL1rKPz2LuyVEqwoNV+SQD4c2w1/A0rrdeT6jqTYqlt/P7y3+SWcsxyReBnImebaIu7Drtz6p9yiAsrJq5Chyg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ember-try/-/ember-try-1.2.1.tgz", + "integrity": "sha512-/10g+5bvGNBoN3uN+MMGxidUj4bw0ne453aphjeFf4T/ZF1UoFTPZ8JV+g4XhdVL49zAoeTOLpsbwV0D1M+X6w==", "dev": true, "requires": { - "chalk": "^2.3.0", + "chalk": "^2.4.2", "cli-table3": "^0.5.1", "core-object": "^3.1.5", - "debug": "^3.1.0", + "debug": "^4.1.1", "ember-try-config": "^3.0.0", "execa": "^1.0.0", "extend": "^3.0.0", "fs-extra": "^5.0.0", "promise-map-series": "^0.2.1", - "resolve": "^1.1.6", - "rimraf": "^2.3.2", + "resolve": "^1.10.1", + "rimraf": "^2.6.3", "rsvp": "^4.7.0", - "walk-sync": "^0.3.3" + "walk-sync": "^1.1.3" }, "dependencies": { "ansi-styles": { @@ -6956,20 +6956,73 @@ } }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, + "ensure-posix-path": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz", + "integrity": "sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==", + "dev": true + }, + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "matcher-collection": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz", + "integrity": "sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", + "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -6980,13 +7033,14 @@ } }, "walk-sync": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz", - "integrity": "sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-1.1.4.tgz", + "integrity": "sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==", "dev": true, "requires": { - "ensure-posix-path": "^1.0.0", - "matcher-collection": "^1.0.0" + "@types/minimatch": "^3.0.3", + "ensure-posix-path": "^1.1.0", + "matcher-collection": "^1.1.1" } } } @@ -12856,9 +12910,9 @@ } }, "registry-auth-token": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", - "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", + "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", "dev": true, "requires": { "rc": "^1.1.6", diff --git a/package.json b/package.json index d23150f..dfe8e2c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "ember-cli": "~3.7.1", "ember-cli-dependency-checker": "^3.0.0", "ember-cli-eslint": "^4.2.3", - "ember-cli-htmlbars": "^3.0.0", "ember-cli-htmlbars-inline-precompile": "^1.0.3", "ember-cli-inject-live-reload": "^1.8.2", "ember-cli-sri": "^2.1.1", @@ -57,7 +56,7 @@ "ember-resolver": "^5.0.1", "ember-source": "~3.7.0", "ember-source-channel-url": "^1.1.0", - "ember-try": "^1.0.0", + "ember-try": "^1.2.1", "eslint-plugin-ember": "^5.2.0", "eslint-plugin-node": "^7.0.1", "loader.js": "^4.7.0",