diff --git a/src/app/package.json b/src/app/package.json
index cbb914b..a805f38 100644
--- a/src/app/package.json
+++ b/src/app/package.json
@@ -20,7 +20,6 @@
"vue-material": "^1.0.0-beta-11",
"vue-progressbar": "^0.7.3",
"vue-router": "^3.0.0",
- "vue-toast": "^3.1.0",
"vuex": "^3.0.1"
},
"devDependencies": {
diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index ea2dfac..c9b9cae 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -1,28 +1,38 @@
-md-app(md-waterfall md-mode='fixed-last' role='application')
- p navigation here
- navigation
- p navigation there
- md-app-drawer(:md-active.sync='menuVisible')
- | test
- md-app-content
- router-view
- vue-progress-bar
- toast(ref='toast')
- p.mpj-muted-text
- | 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]
+#app
+ md-app(md-waterfall md-mode='fixed-last' role='application')
+ md-app-toolbar.md-large.md-dense.md-primary
+ .md-toolbar-row
+ .md-toolbar-section-start
+ span.md-title
+ span(style='font-weight:100;') my
+ span(style='font-weight:400;') Prayer
+ span(style='font-weight:700;') Journal
+ navigation
+ md-app-content
+ router-view
+ vue-progress-bar
+ md-snackbar(:md-active.sync='snackbar.visible'
+ md-position='center'
+ :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]
@@ -58,10 +95,6 @@ html, body {
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-size: 1rem;
}
-body {
- padding-top: 50px;
- margin: 0;
-}
h1, h2, h3, h4, h5 {
font-weight: 500;
margin-top: 0;
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index 5156b63..62ebf73 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -11,15 +11,11 @@ article.mpj-main-content-wide(role='main')
.mpj-journal(v-if='journal.length > 0')
request-card(v-for='request in journal'
:key='request.requestId'
- :request='request'
- :events='eventBus'
- :toast='toast')
+ :request='request')
p.text-center(v-else): em.
No requests found; click the “Add a New Request” button to add one
- notes-edit(:events='eventBus'
- :toast='toast')
- snooze-request(:events='eventBus'
- :toast='toast')
+ notes-edit
+ snooze-request
diff --git a/src/app/src/components/common/Navigation.vue b/src/app/src/components/common/Navigation.vue
index 7c98818..7dce5d4 100644
--- a/src/app/src/components/common/Navigation.vue
+++ b/src/app/src/components/common/Navigation.vue
@@ -1,42 +1,32 @@
-md-toolbar.md-large.md-dense.md-primary
- .md-toolbar-row
- .md-toolbar-section-start
- | howdy
- span.md-title
- span(style='font-weight:100;') my
- span(style='font-weight:600;') Prayer
- span(style='font-weight:700;') Journal
- .md-toolbar-section-end
- | ""
- .md-toolbar-row
- md-tabs.md-primary
- md-tab#mpj-home(md-label='Home'
- :to="{ name: 'Home' }")
- md-tab#mpj-journal(v-if='isAuthenticated'
- md-label='Journal'
- :to="{ name: 'Journal' }")
- md-tab#mpj-active(v-if='isAuthenticated'
- md-label='Active'
- :to="{ name: 'ActiveRequests' }")
- md-tab#mpj-snoozed(v-if='hasSnoozed'
- md-label='Snoozed'
- :to="{ name: 'SnoozedRequests' }")
- md-tab#mpj-answered(v-if='isAuthenticated'
- md-label='Answered'
- :to="{ name: 'AnsweredRequests' }")
- md-tab#mpj-log-off(v-if='isAuthenticated'
- md-label='Log Off'
- href='#'
- @click.stop='logOff()')
- md-tab#mpj-log-on(v-if='!isAuthenticated'
- md-label='Log On'
- href='#'
- @click.stop='logOn()')
- md-tab#mpj-docs(md-label='Docs'
- href='https://docs.prayerjournal.me'
- target='_blank'
- @click.stop='')
+.md-toolbar-row
+ md-tabs.md-primary
+ md-tab#mpj-home(md-label='Home'
+ :to="{ name: 'Home' }")
+ md-tab#mpj-journal(v-if='isAuthenticated'
+ md-label='Journal'
+ :to="{ name: 'Journal' }")
+ md-tab#mpj-active(v-if='isAuthenticated'
+ md-label='Active'
+ :to="{ name: 'ActiveRequests' }")
+ md-tab#mpj-snoozed(v-if='hasSnoozed'
+ md-label='Snoozed'
+ :to="{ name: 'SnoozedRequests' }")
+ md-tab#mpj-answered(v-if='isAuthenticated'
+ md-label='Answered'
+ :to="{ name: 'AnsweredRequests' }")
+ md-tab#mpj-log-off(v-if='isAuthenticated'
+ md-label='Log Off'
+ href='#'
+ @click.stop='logOff()')
+ md-tab#mpj-log-on(v-if='!isAuthenticated'
+ md-label='Log On'
+ href='#'
+ @click.stop='logOn()')
+ md-tab#mpj-docs(md-label='Docs'
+ href='https://docs.prayerjournal.me'
+ target='_blank'
+ @click.stop='')