From f2aa71db4d08537d5a147642c4660bcd7e683e1e Mon Sep 17 00:00:00 2001 From: "Kristine.K" Date: Thu, 16 Nov 2017 11:37:05 +0200 Subject: [PATCH 1/5] [#345] - Change default history page --- frontend/app/components/health-dashboard.js | 4 ++-- frontend/app/templates/components/health-dashboard.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/health-dashboard.js b/frontend/app/components/health-dashboard.js index 0f636ed4b..39308760c 100644 --- a/frontend/app/components/health-dashboard.js +++ b/frontend/app/components/health-dashboard.js @@ -10,8 +10,8 @@ const { } = Ember; export default Component.extend(CheckinByDate, { - patternsVisible: true, - chartVisible: false, + patternsVisible: false, + chartVisible: true, journalIsVisible: alias('chartJournalSwitcher.journalIsVisible'), chartJournalSwitcher: service(), i18n: service(), diff --git a/frontend/app/templates/components/health-dashboard.hbs b/frontend/app/templates/components/health-dashboard.hbs index 7bc3cc494..9167c86f4 100644 --- a/frontend/app/templates/components/health-dashboard.hbs +++ b/frontend/app/templates/components/health-dashboard.hbs @@ -1,6 +1,6 @@
- +
From 1b2dbb0b588dfc7bef0beb7d1ca5f08534d72847 Mon Sep 17 00:00:00 2001 From: "Kristine.K" Date: Thu, 16 Nov 2017 12:59:59 +0200 Subject: [PATCH 2/5] [#345] - Add sharing button to the history chart page --- frontend/app/components/pattern/index-step.js | 4 ---- frontend/app/locales/en/translations.js | 6 +++++- frontend/app/router.js | 4 ++++ frontend/app/styles/global.scss | 2 +- frontend/app/templates/components/health-chart.hbs | 10 ++++++++++ frontend/app/templates/components/health-dashboard.hbs | 4 ++-- .../app/templates/components/pattern/index-step.hbs | 4 ++-- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/frontend/app/components/pattern/index-step.js b/frontend/app/components/pattern/index-step.js index 1756bbfca..2d273566e 100644 --- a/frontend/app/components/pattern/index-step.js +++ b/frontend/app/components/pattern/index-step.js @@ -142,9 +142,5 @@ export default Component.extend({ setProperties(this, { startAt: startAt, endAt: endAt }); }, - - sharePattern() { - this.transitionTo('patterns'); - }, } }); diff --git a/frontend/app/locales/en/translations.js b/frontend/app/locales/en/translations.js index 40e6ceea8..9c2c4ed6a 100644 --- a/frontend/app/locales/en/translations.js +++ b/frontend/app/locales/en/translations.js @@ -81,6 +81,10 @@ export default { }, history: { + charts: { + shareButtonText: 'Share Charts', + }, + step: { initial: { title: 'History', @@ -100,7 +104,7 @@ export default { }, index: { newPatternText: '+ Create new pattern', - sharePatternText: 'Share Patterns', + shareButtonText: 'Share Patterns', } } }, diff --git a/frontend/app/router.js b/frontend/app/router.js index 5b50c12f7..7bcc2511d 100644 --- a/frontend/app/router.js +++ b/frontend/app/router.js @@ -12,6 +12,10 @@ Router.map(function() { this.route('signup'); this.route('chart'); + this.route('charts', function() { + this.route('shared', { path: '/:friendly_id' }); + }); + this.route('patterns', function() { this.route('shared', { path: '/:friendly_id' }); }); diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss index 4a9c8fc48..96f507fca 100644 --- a/frontend/app/styles/global.scss +++ b/frontend/app/styles/global.scss @@ -512,7 +512,7 @@ input[type="submit"] { } } -.sharePatternLink { +.shareHistoryBtn { display: flex; justify-content: center; margin-bottom: 10px; diff --git a/frontend/app/templates/components/health-chart.hbs b/frontend/app/templates/components/health-chart.hbs index 7b391d478..7c1f062b3 100644 --- a/frontend/app/templates/components/health-chart.hbs +++ b/frontend/app/templates/components/health-chart.hbs @@ -1,3 +1,13 @@ +{{#if authorPage}} +
+ {{#link-to 'charts' class="history-index-btn btn"}} + {{t "history.step.index.shareButtonText"}} + {{/link-to}} +
+{{else}} +

{{authorName}}'s Health History

+{{/if}} + {{#if chartLoaded }} diff --git a/frontend/app/templates/components/health-dashboard.hbs b/frontend/app/templates/components/health-dashboard.hbs index 9167c86f4..789df46e4 100644 --- a/frontend/app/templates/components/health-dashboard.hbs +++ b/frontend/app/templates/components/health-dashboard.hbs @@ -1,13 +1,13 @@
- +
{{#if journalIsVisible}} {{journal-list}} {{else if chartVisible}} - {{health-chart onDateClicked=(action "routeToCheckin")}} + {{health-chart onDateClicked=(action "routeToCheckin") authorPage=true}} {{else}} {{chart-patterns}} {{/if}} diff --git a/frontend/app/templates/components/pattern/index-step.hbs b/frontend/app/templates/components/pattern/index-step.hbs index 007d2d514..6e13a99bb 100644 --- a/frontend/app/templates/components/pattern/index-step.hbs +++ b/frontend/app/templates/components/pattern/index-step.hbs @@ -1,7 +1,7 @@ {{#if authorPage}} -
+
{{#link-to 'patterns' class="history-index-btn btn"}} - Share Patterns + {{t "history.step.index.shareButtonText"}} {{/link-to}}
{{else}} From fbab0c93a4ece2aca6dcad11af63f7aa7f10465e Mon Sep 17 00:00:00 2001 From: "Kristine.K" Date: Thu, 16 Nov 2017 13:22:36 +0200 Subject: [PATCH 3/5] [#345] - Change shared dialogs for patterns --- .../dialog.js => shared-dialogs/patterns-dialog.js} | 0 .../dialog.hbs => shared-dialogs/patterns-dialog.hbs} | 0 frontend/app/templates/patterns/index.hbs | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename frontend/app/components/{shared-patterns/dialog.js => shared-dialogs/patterns-dialog.js} (100%) rename frontend/app/templates/components/{shared-patterns/dialog.hbs => shared-dialogs/patterns-dialog.hbs} (100%) diff --git a/frontend/app/components/shared-patterns/dialog.js b/frontend/app/components/shared-dialogs/patterns-dialog.js similarity index 100% rename from frontend/app/components/shared-patterns/dialog.js rename to frontend/app/components/shared-dialogs/patterns-dialog.js diff --git a/frontend/app/templates/components/shared-patterns/dialog.hbs b/frontend/app/templates/components/shared-dialogs/patterns-dialog.hbs similarity index 100% rename from frontend/app/templates/components/shared-patterns/dialog.hbs rename to frontend/app/templates/components/shared-dialogs/patterns-dialog.hbs diff --git a/frontend/app/templates/patterns/index.hbs b/frontend/app/templates/patterns/index.hbs index fedb811cd..cc343fae0 100644 --- a/frontend/app/templates/patterns/index.hbs +++ b/frontend/app/templates/patterns/index.hbs @@ -1 +1 @@ -{{shared-patterns/dialog patterns=model}} +{{shared-dialogs/patterns-dialog patterns=model}} From e8967d8215d1af0a04309204a92377677a0f9aa9 Mon Sep 17 00:00:00 2001 From: "Kristine.K" Date: Thu, 16 Nov 2017 13:53:54 +0200 Subject: [PATCH 4/5] [#345] - Shared page for Charts --- frontend/app/locales/en/translations.js | 9 +++++++++ frontend/app/styles/global.scss | 9 +++++++++ frontend/app/templates/charts/index.hbs | 1 + .../components/shared-dialogs/charts-dialog.hbs | 12 ++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 frontend/app/templates/charts/index.hbs create mode 100644 frontend/app/templates/components/shared-dialogs/charts-dialog.hbs diff --git a/frontend/app/locales/en/translations.js b/frontend/app/locales/en/translations.js index 9c2c4ed6a..5eff65096 100644 --- a/frontend/app/locales/en/translations.js +++ b/frontend/app/locales/en/translations.js @@ -118,4 +118,13 @@ export default { loadMore: 'Load more...', }, }, + + sharedCharts: { + dialog: { + title: 'You will share all visible Charts', + buttonText: 'Share via Email', + sharedUrl: 'Or copy this link to share anywhere', + done: 'Done', + } + }, }; diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss index 96f507fca..200ee92be 100644 --- a/frontend/app/styles/global.scss +++ b/frontend/app/styles/global.scss @@ -579,3 +579,12 @@ input[type="submit"] { margin-top: 0.5em; } +// Sharing Charts +.sharedChartsBtn { + width: 100%; +} + +.sharedChartsUrl { + margin-top: 20px; +} + diff --git a/frontend/app/templates/charts/index.hbs b/frontend/app/templates/charts/index.hbs new file mode 100644 index 000000000..1a631596f --- /dev/null +++ b/frontend/app/templates/charts/index.hbs @@ -0,0 +1 @@ +{{shared-dialogs/charts-dialog}} diff --git a/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs b/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs new file mode 100644 index 000000000..0f5a32202 --- /dev/null +++ b/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs @@ -0,0 +1,12 @@ +

{{t "sharedCharts.dialog.title"}}

+ +{{input type="submit" class="sharedChartsBtn" value=(t "sharedCharts.dialog.buttonText")}} + +
+ + {{input value=encryptedUrl}} +
+ +
+ {{#link-to 'chart'}}{{t "sharedCharts.dialog.done"}}{{/link-to}} +
From a6c24806cc8978aaa8da2ecb8bc5ff0306c0e983 Mon Sep 17 00:00:00 2001 From: "Kristine.K" Date: Thu, 16 Nov 2017 15:54:24 +0200 Subject: [PATCH 5/5] [#345] - shared dialog page for charts --- .../shared-dialogs/charts-dialog.js | 33 +++++++++++++++++++ frontend/app/routes/charts/index.js | 6 ++++ frontend/app/styles/global.scss | 6 ++++ .../shared-dialogs/charts-dialog.hbs | 12 ++++--- 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 frontend/app/components/shared-dialogs/charts-dialog.js create mode 100644 frontend/app/routes/charts/index.js diff --git a/frontend/app/components/shared-dialogs/charts-dialog.js b/frontend/app/components/shared-dialogs/charts-dialog.js new file mode 100644 index 000000000..384a48830 --- /dev/null +++ b/frontend/app/components/shared-dialogs/charts-dialog.js @@ -0,0 +1,33 @@ +import config from 'flaredown/config/environment'; +import CryptoJS from 'cryptojs'; +import Component from '@ember/component'; +import { get, set, computed } from '@ember/object'; + +export default Component.extend({ + classNames: ['flaredown-white-box', 'sharedChartsDialog'], + + secretPhrase: config.encryptionSecret, + staticUrl: config.staticUrl, + + encryptedUrl: computed('session.isAuthenticated', 'session.email', function() { + if(get(this, 'session.isAuthenticated')) { + const email = get(this, 'session.email'); + const encryptedEmail = CryptoJS.AES.encrypt(email, get(this, 'secretPhrase')); + + return `${get(this, 'staticUrl')}/charts/${encodeURIComponent(encryptedEmail)}`; + } else { + return ''; + } + }), + + actions: { + sendEmail() { + const encryptedUrl = encodeURIComponent(get(this, 'encryptedUrl')); + const currentUser = get(this, 'session.currentUser'); + const screenName = currentUser ? get(currentUser, 'profile.screenName') : ""; + const subject = `${screenName} would like to share their health charts with you`; + + window.location.href = `mailto:?subject=${subject}&body=${encryptedUrl}`; + }, + }, +}); diff --git a/frontend/app/routes/charts/index.js b/frontend/app/routes/charts/index.js new file mode 100644 index 000000000..4b5417d84 --- /dev/null +++ b/frontend/app/routes/charts/index.js @@ -0,0 +1,6 @@ +import AuthenticatedRouteMixin from 'flaredown/mixins/authenticated-route-mixin'; +import Route from '@ember/routing/route'; +import { get } from '@ember/object'; + +export default Route.extend(AuthenticatedRouteMixin, { +}); diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss index 200ee92be..50aa0ebd5 100644 --- a/frontend/app/styles/global.scss +++ b/frontend/app/styles/global.scss @@ -582,6 +582,12 @@ input[type="submit"] { // Sharing Charts .sharedChartsBtn { width: 100%; + background-color: $primary; + + &:hover, + &:focus { + background-color: darken($primary, 10%); + } } .sharedChartsUrl { diff --git a/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs b/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs index 0f5a32202..242559a65 100644 --- a/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs +++ b/frontend/app/templates/components/shared-dialogs/charts-dialog.hbs @@ -1,11 +1,13 @@

{{t "sharedCharts.dialog.title"}}

-{{input type="submit" class="sharedChartsBtn" value=(t "sharedCharts.dialog.buttonText")}} + -
- - {{input value=encryptedUrl}} -
+
+ + {{input value=encryptedUrl}} +
{{#link-to 'chart'}}{{t "sharedCharts.dialog.done"}}{{/link-to}}