From 702ae1811c8826f833c90bcdbe976a74020a1faf Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sat, 24 Aug 2019 22:32:35 -0500 Subject: [PATCH] Complete v2 UI, pending human testing --- src/app/src/App.vue | 190 +++--------------- src/app/src/components/Home.vue | 10 +- src/app/src/components/Journal.vue | 26 +-- src/app/src/components/common/Navigation.vue | 49 +---- src/app/src/components/common/PageTitle.vue | 4 +- .../src/components/legal/PrivacyPolicy.vue | 109 +++++----- .../src/components/legal/TermsOfService.vue | 71 ++++--- .../src/components/request/ActiveRequests.vue | 2 +- .../components/request/AnsweredRequests.vue | 2 +- .../src/components/request/EditRequest.vue | 125 +++++------- .../src/components/request/FullRequest.vue | 38 ++-- src/app/src/components/request/NotesEdit.vue | 41 ++-- .../src/components/request/RequestCard.vue | 64 ++---- .../components/request/RequestListItem.vue | 23 +-- .../src/components/request/SnoozeRequest.vue | 8 +- .../components/request/SnoozedRequests.vue | 2 +- 16 files changed, 257 insertions(+), 507 deletions(-) diff --git a/src/app/src/App.vue b/src/app/src/App.vue index c4b9915..3e2898b 100644 --- a/src/app/src/App.vue +++ b/src/app/src/App.vue @@ -4,7 +4,7 @@ md-app-toolbar.md-large.md-dense.md-primary .md-toolbar-row .md-toolbar-section-start - span.md-title + router-link(to='/').md-title span(style='font-weight:100;') my span(style='font-weight:400;') Prayer span(style='font-weight:700;') Journal @@ -18,14 +18,15 @@ :md-duration='snackbar.interval' ref='snackbar') | {{ snackbar.message }} - p.mpj-muted-text.mpj-text-right - | myPrayerJournal v{{ version }} - br - em: small. - #[router-link(:to="{ name: 'PrivacyPolicy' }") Privacy Policy] • - #[router-link(:to="{ name: 'TermsOfService' }") Terms of Service] • - #[a(href='https://github.com/bit-badger/myprayerjournal' target='_blank') Developed] and hosted by - #[a(href='https://bitbadger.solutions' target='_blank') Bit Badger Solutions] + footer + p.mpj-muted-text.mpj-text-right + | myPrayerJournal v{{ version }} + br + em: small. + #[router-link(to='/legal/privacy-policy') Privacy Policy] • + #[router-link(to='/legal/terms-of-service') Terms of Service] • + #[a(href='https://github.com/bit-badger/myprayerjournal' target='_blank') Developed] and hosted by + #[a(href='https://bitbadger.solutions' target='_blank') Bit Badger Solutions] diff --git a/src/app/src/components/Home.vue b/src/app/src/components/Home.vue index 8b94bc9..c764a6b 100644 --- a/src/app/src/components/Home.vue +++ b/src/app/src/components/Home.vue @@ -1,16 +1,16 @@ - diff --git a/src/app/src/components/common/Navigation.vue b/src/app/src/components/common/Navigation.vue index 671fadf..790b700 100644 --- a/src/app/src/components/common/Navigation.vue +++ b/src/app/src/components/common/Navigation.vue @@ -1,32 +1,30 @@ - - diff --git a/src/app/src/components/common/PageTitle.vue b/src/app/src/components/common/PageTitle.vue index f3734b1..7f5c04b 100644 --- a/src/app/src/components/common/PageTitle.vue +++ b/src/app/src/components/common/PageTitle.vue @@ -1,6 +1,6 @@ - - diff --git a/src/app/src/components/request/FullRequest.vue b/src/app/src/components/request/FullRequest.vue index dd4f960..e54556f 100644 --- a/src/app/src/components/request/FullRequest.vue +++ b/src/app/src/components/request/FullRequest.vue @@ -1,22 +1,24 @@ diff --git a/src/app/src/components/request/NotesEdit.vue b/src/app/src/components/request/NotesEdit.vue index ab99bce..6f964bf 100644 --- a/src/app/src/components/request/NotesEdit.vue +++ b/src/app/src/components/request/NotesEdit.vue @@ -8,12 +8,8 @@ md-dialog(:md-active.sync='notesVisible').mpj-note-dialog md-autogrow @blur='trimText()') md-dialog-actions - md-button(@click='saveNotes()').md-primary - md-icon save - = ' Save' - md-button(@click='closeDialog()') - md-icon undo - = ' Cancel' + md-button(@click='saveNotes()').md-primary #[md-icon save] Save + md-button(@click='closeDialog()') #[md-icon undo] Cancel .mpj-dialog-content div(v-if='hasPriorNotes') p.mpj-text-center: strong Prior Notes for This Request @@ -26,8 +22,7 @@ md-dialog(:md-active.sync='notesVisible').mpj-note-dialog div(v-else-if='noPriorNotes').mpj-text-center.mpj-muted-text There are no prior notes for this request div(v-else).mpj-text-center hr - md-button(@click='loadNotes()'). - #[md-icon cloud_download] Load Prior Notes + md-button(@click='loadNotes()') #[md-icon cloud_download] Load Prior Notes - diff --git a/src/app/src/components/request/RequestCard.vue b/src/app/src/components/request/RequestCard.vue index aa91ac6..a3b5fbf 100644 --- a/src/app/src/components/request/RequestCard.vue +++ b/src/app/src/components/request/RequestCard.vue @@ -1,31 +1,27 @@ - diff --git a/src/app/src/components/request/RequestListItem.vue b/src/app/src/components/request/RequestListItem.vue index 3d14af3..0bd120f 100644 --- a/src/app/src/components/request/RequestListItem.vue +++ b/src/app/src/components/request/RequestListItem.vue @@ -1,6 +1,6 @@