diff --git a/app/styles/components/_contribution-details.scss b/app/styles/components/_contribution-details.scss index 80c04b6..5cdc1e9 100644 --- a/app/styles/components/_contribution-details.scss +++ b/app/styles/components/_contribution-details.scss @@ -84,5 +84,17 @@ section#contribution-details { } } } - +} + +// On small screens, hide intro text, contributor and contributions list when +// showing details +@include media-max(small) { + #dashboard.with-details { + #contributions, #stats { + display: none; + } + } + #intro.with-details { + display: none; + } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 4aba212..5b34596 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -1,5 +1,5 @@ {{#if showIntroText}} -
+

Welcome to the contribution dashboard of the Kosmos project! @@ -92,7 +92,7 @@

- {{outlet}} + {{liquid-outlet}}
diff --git a/app/templates/dashboard/contributions/show.hbs b/app/templates/dashboard/contributions/show.hbs index 73a1de2..9760897 100644 --- a/app/templates/dashboard/contributions/show.hbs +++ b/app/templates/dashboard/contributions/show.hbs @@ -42,7 +42,7 @@ kredits will be issued.

- {{link-to "Re-submit contribution …" "contributions.resubmit" model class="button small green"}}. + {{link-to "Re-submit contribution …" "contributions.resubmit" model class="button small green"}}

{{/if}} @@ -50,7 +50,7 @@

- {{link-to "Copy & edit as new" "contributions.resubmit" model class="button small"}}. + {{link-to "Copy & edit as new" "contributions.resubmit" model class="button small"}} {{#if model.ipfsHash}} diff --git a/app/transitions.js b/app/transitions.js new file mode 100644 index 0000000..3b8954e --- /dev/null +++ b/app/transitions.js @@ -0,0 +1,25 @@ +export default function () { + this.transition( + this.fromRoute('dashboard.index'), + this.toRoute('dashboard.contributions'), + this.media('(max-width: 600px)'), + this.use('toLeft'), + this.reverse('toRight'), + ); + + this.transition( + this.fromRoute('dashboard.index'), + this.toRoute('dashboard.contributors'), + this.media('(max-width: 600px)'), + this.use('toLeft'), + this.reverse('toRight') + ); + + this.transition( + this.fromRoute('dashboard.contributions'), + this.toRoute('dashboard.contributors'), + this.media('(max-width: 600px)'), + this.use('toLeft'), + this.reverse('toRight') + ); +} diff --git a/package-lock.json b/package-lock.json index 40ee7ce..60a38a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9401,8 +9401,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -9423,14 +9422,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9445,20 +9442,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -9575,8 +9569,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -9588,7 +9581,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9603,7 +9595,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9611,14 +9602,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9637,7 +9626,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -9718,8 +9706,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -9731,7 +9718,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -9817,8 +9803,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -9854,7 +9839,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9874,7 +9858,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9918,14 +9901,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -10867,7 +10848,7 @@ "bs58": "^4.0.1", "buffer": "^5.2.1", "cids": "~0.5.5", - "concat-stream": "github:hugomrdias/concat-stream#feat/smaller", + "concat-stream": "github:hugomrdias/concat-stream#057bc7b5d6d8df26c8cf00a3f151b6721a0a8034", "debug": "^4.1.0", "detect-node": "^2.0.4", "end-of-stream": "^1.4.1", @@ -10889,7 +10870,7 @@ "multibase": "~0.6.0", "multicodec": "~0.5.0", "multihashes": "~0.4.14", - "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3", + "ndjson": "github:hugomrdias/ndjson#4db16da6b42e5b39bf300c3a7cde62abb3fa3a11", "once": "^1.4.0", "peer-id": "~0.12.2", "peer-info": "~0.15.1", @@ -11859,6 +11840,54 @@ "uc.micro": "^1.0.1" } }, + "liquid-fire": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/liquid-fire/-/liquid-fire-0.31.0.tgz", + "integrity": "sha512-KVI2vBB+6I1kvkOSD/S/Vjq5hYqlFw3zBLiRoCSIDj9LMWmm2GEKvQcmpxiqgsdjMS2VAFaqUd+9BJFRvCmIjA==", + "dev": true, + "requires": { + "broccoli-funnel": "^2.0.2", + "broccoli-merge-trees": "^3.0.2", + "broccoli-stew": "^2.1.0", + "ember-cli-babel": "^7.7.3", + "ember-cli-htmlbars": "^3.0.1", + "ember-cli-version-checker": "^3.1.3", + "match-media": "^0.2.0", + "velocity-animate": "^1.5.2" + }, + "dependencies": { + "broccoli-merge-trees": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz", + "integrity": "sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==", + "dev": true, + "requires": { + "broccoli-plugin": "^1.3.0", + "merge-trees": "^2.0.0" + } + }, + "ember-cli-version-checker": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz", + "integrity": "sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==", + "dev": true, + "requires": { + "resolve-package-path": "^1.2.6", + "semver": "^5.6.0" + } + }, + "merge-trees": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-2.0.0.tgz", + "integrity": "sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==", + "dev": true, + "requires": { + "fs-updater": "^1.0.4", + "heimdalljs": "^0.2.5" + } + } + } + }, "livereload-js": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz", @@ -12611,6 +12640,12 @@ } } }, + "match-media": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/match-media/-/match-media-0.2.0.tgz", + "integrity": "sha1-6k4JdC5yU8x9fhWZumJ+D6KfvFA=", + "dev": true + }, "matcher-collection": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz", @@ -17219,6 +17254,12 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, + "velocity-animate": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/velocity-animate/-/velocity-animate-1.5.2.tgz", + "integrity": "sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==", + "dev": true + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", diff --git a/package.json b/package.json index e1e0bde..c00d206 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "ethers": "^4.0.27", "kosmos-schemas": "^2.0.0", "kredits-contracts": "^5.5.0", + "liquid-fire": "^0.31.0", "loader.js": "^4.7.0", "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3", "qunit-dom": "^0.8.4",