From ddd30a1a9834ada519f14ebf2724b81913014575 Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 22 Oct 2023 21:35:54 -0500 Subject: [PATCH] - Low/High Bade for Vital Measurement - Mobile nav bar fills screen with labels - VitalSummaryChart shows low/high for measurement - Note view with edit button --- package.json | 4 + src/components/Layout.vue | 70 +++++--- src/components/Measurements/LowHighBadge.vue | 29 ++++ src/components/Notes/View.vue | 45 +++++ .../Person/Logbook/MeasurementLogItem.vue | 8 +- src/components/Person/Logbook/NoteLogItem.vue | 2 +- src/components/Person/Person.vue | 2 +- src/components/Person/Vital.vue | 2 +- src/components/Person/VitalChartSummary.vue | 163 ++++++++++++------ src/components/Person/Vitals.vue | 2 +- src/router/index.js | 21 ++- src/style.css | 48 +++--- 12 files changed, 284 insertions(+), 112 deletions(-) create mode 100644 src/components/Measurements/LowHighBadge.vue create mode 100644 src/components/Notes/View.vue diff --git a/package.json b/package.json index 480c031..289f6d6 100644 --- a/package.json +++ b/package.json @@ -41,5 +41,9 @@ "postcss": "^8.4.29", "tailwindcss": "^3.3.3", "vite": "^4.4.5" + }, + "prettier": { + "singleQuote": true, + "printWidth": 100 } } diff --git a/src/components/Layout.vue b/src/components/Layout.vue index 08610a3..6b4e55c 100644 --- a/src/components/Layout.vue +++ b/src/components/Layout.vue @@ -1,5 +1,11 @@ diff --git a/src/components/Person/Vitals.vue b/src/components/Person/Vitals.vue index e84ece7..ebdcaf1 100644 --- a/src/components/Person/Vitals.vue +++ b/src/components/Person/Vitals.vue @@ -45,7 +45,7 @@ const vitalMeasurements = (vitalId) => { subtitle="Track Vitals and record new Measurements." > diff --git a/src/router/index.js b/src/router/index.js index 2ada57f..e97747d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ const VitalCreate = () => import(/* webpackChunkName: "group-vitals" */ '../comp const VitalUpdate = () => import(/* webpackChunkName: "group-vitals" */ '../components/Vitals/Update.vue'); const MeasurementCreate = () => import(/* webpackChunkName: "group-measurements" */ '../components/Measurements/Create.vue'); const MeasurementUpdate = () => import(/* webpackChunkName: "group-measurements" */ '../components/Measurements/Update.vue'); +const NoteView = () => import(/* webpackChunkName: "group-notes" */ '../components/Notes/View.vue'); const NoteCreate = () => import(/* webpackChunkName: "group-notes" */ '../components/Notes/Create.vue'); const NoteUpdate = () => import(/* webpackChunkName: "group-notes" */ '../components/Notes/Update.vue'); const Person = () => import(/* webpackChunkName: "group-person" */ '../components/Person/Person.vue'); @@ -106,10 +107,10 @@ const routes = [ }, children: [ { - path: 'measurement/create', - name: 'PersonVitalsMeasurementCreate', + path: 'create', + name: 'PersonVitalCreate', components: { - modal: MeasurementCreate + modal: VitalCreate } } ] @@ -144,6 +145,13 @@ const routes = [ modal: NoteUpdate } }, + { + path: 'note/:noteId', + name: 'VitalMeasurementNoteView', + components: { + modal: NoteView + } + }, ] } ] @@ -169,6 +177,13 @@ const routes = [ modal: NoteUpdate } }, + { + path: 'note/:noteId', + name: 'PersonLogbookNoteView', + components: { + modal: NoteView + } + }, { path: 'measurement/:measurementId/update', name: 'PersonLogbookMeasurementUpdate', diff --git a/src/style.css b/src/style.css index 2903525..94d24e4 100644 --- a/src/style.css +++ b/src/style.css @@ -4,7 +4,11 @@ @media (hover: none) and (display-mode: standalone) { .main-header { - @apply bottom-[env(safe-area-inset-bottom)] md:bottom-auto mb-0; + @apply pb-[env(safe-area-inset-bottom)] md:bottom-auto mb-0; + + .main-nav a { + @apply !pb-0; + } } } @@ -20,10 +24,10 @@ body { .main-nav { li > a { - @apply grid grid-flow-col gap-4 p-2 px-3 justify-start items-center rounded-md text-gray-500 hover:bg-gray-800 hover:text-gray-400; + @apply grid lg:grid-flow-col lg:gap-4 p-2 px-3 justify-center lg:justify-start place-items-center lg:place-items-start rounded-md text-gray-500 hover:bg-gray-800 hover:text-gray-400; span:last-child { - @apply hidden lg:inline; + @apply text-xs md:text-sm lg:text-base; } &.router-link-exact-active, @@ -87,7 +91,7 @@ body { .menu-button { @apply block rounded-full text-gray-400 hover:text-black hover:bg-gray-200 focus:outline-none transition-all; - &[aria-expanded=true] { + &[aria-expanded='true'] { @apply bg-gray-200 text-black; } @@ -110,15 +114,15 @@ body { } button { - -webkit-tap-highlight-color: rgba(0,0,0,0); + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } -input[type=text], -input[type=email], -input[type=date], -input[type=datetime-local], -input[type=password], -input[type=url], +input[type='text'], +input[type='email'], +input[type='date'], +input[type='datetime-local'], +input[type='password'], +input[type='url'], textarea, select { @apply border-gray-200 rounded py-2 px-3 text-gray-700; @@ -128,33 +132,31 @@ select { } &:invalid::-webkit-datetime-edit { - @apply text-gray-300 + @apply text-gray-300; } &::placeholder { - @apply text-gray-300 font-light text-sm + @apply text-gray-300 font-light text-sm; } } - form { - label { @apply block text-gray-500 text-sm font-light mb-2 cursor-pointer; } - input[type=text], - input[type=email], - input[type=date], - input[type=datetime-local], - input[type=password], - input[type=url], + input[type='text'], + input[type='email'], + input[type='date'], + input[type='datetime-local'], + input[type='password'], + input[type='url'], textarea, select { @apply shadow-sm mb-3 w-full; } - input[type=radio] { + input[type='radio'] { @apply border-gray-300 text-indigo-500 cursor-pointer align-text-top; &:hover, @@ -216,4 +218,4 @@ form { .list-leave-active { position: absolute; width: 100%; -} \ No newline at end of file +}