From 57fe922d729f6f5092e2bcfa120cf5347e5ef9d3 Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Wed, 6 Jan 2021 18:19:57 -0500
Subject: [PATCH 01/14] adds dev server change for running integrated

---
 vue.config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vue.config.js b/vue.config.js
index 97815470..aa5ad948 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -100,12 +100,14 @@ module.exports = {
   lintOnSave: false,
 
   devServer: {
+    // if this isn't set you can't debug remotely with dev server running.
+    disableHostCheck: true,
+    // headers: { "Access-Control-Allow-Origin": "*" },
     /**
      * disables linting overlay which disrupts workflow.
      * linting reserved for pre-commit git hook.
      */
 
-    // headers: { "Access-Control-Allow-Origin": "*" },
     overlay: {
       error: false,
       warning: false,

From 6e430864c5c8a4c169e337fdd7c7dd0d5b4b27cf Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Thu, 7 Jan 2021 15:24:47 -0500
Subject: [PATCH 02/14] Settings that allow the SPA to run integrated.

---
 docker/watching/watch.sh |  2 +-
 scripts/dev-laravel.js   | 23 +++++++++++++++++++++++
 vue.config.js            |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100755 scripts/dev-laravel.js

diff --git a/docker/watching/watch.sh b/docker/watching/watch.sh
index 7ddeff54..635c96d5 100755
--- a/docker/watching/watch.sh
+++ b/docker/watching/watch.sh
@@ -2,4 +2,4 @@
 npm config set registry https://npm.americanwhitewater.org
 npm i
 rm -rf dist/*
-npm run serve
+node ./scripts/dev-laravel.js
diff --git a/scripts/dev-laravel.js b/scripts/dev-laravel.js
new file mode 100755
index 00000000..395f33b4
--- /dev/null
+++ b/scripts/dev-laravel.js
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+require("dotenv").config();
+// grab cli service requirements.
+const { error } = require("@vue/cli-shared-utils");
+const Service = require("@vue/cli-service/lib/Service");
+const service = new Service(process.env.VUE_CLI_CONTEXT || process.cwd());
+
+//parse the environment base
+const url = require("url");
+const baseURL = process.env.VUE_APP_BASE_URL || "http://localhost:9669";
+const parts = url.parse(baseURL);
+
+const command = "serve";
+const publicHost = `${parts.hostname}:${parts.port}`;
+
+//set container name based on URL base.
+const args = ["--public", publicHost, "--port", parts.port];
+const argsV = { public: publicHost, port: parts.port };
+
+service.run(command, argsV, args).catch((err) => {
+  error(err);
+  process.exit(1);
+});
diff --git a/vue.config.js b/vue.config.js
index aa5ad948..7893af8b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -100,9 +100,9 @@ module.exports = {
   lintOnSave: false,
 
   devServer: {
-    // if this isn't set you can't debug remotely with dev server running.
+    // if these options aren't set HMR breaks and debugging remotely fails (say to local to VM)
     disableHostCheck: true,
-    // headers: { "Access-Control-Allow-Origin": "*" },
+    headers: { "Access-Control-Allow-Origin": "*" },
     /**
      * disables linting overlay which disrupts workflow.
      * linting reserved for pre-commit git hook.

From 0a86f40abd052e66565095e27b45c6cb5eb4035c Mon Sep 17 00:00:00 2001
From: Eric Jones <ericnatejones@gmail.com>
Date: Mon, 25 Jan 2021 09:45:25 -0800
Subject: [PATCH 03/14] articles done. Needs projects

---
 commonCommand.txt                             |  2 ++
 .../components/_side-bar-articles.scss        |  7 ++--
 .../components/side-bar-articles.vue          | 36 ++++++++++++++++---
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 commonCommand.txt

diff --git a/commonCommand.txt b/commonCommand.txt
new file mode 100644
index 00000000..aa80f12f
--- /dev/null
+++ b/commonCommand.txt
@@ -0,0 +1,2 @@
+npm run dev
+npm config set registry https://registry.npmjs.org/
diff --git a/src/app/assets/scss/views/river-detail/components/_side-bar-articles.scss b/src/app/assets/scss/views/river-detail/components/_side-bar-articles.scss
index 1dce408e..da3046bc 100644
--- a/src/app/assets/scss/views/river-detail/components/_side-bar-articles.scss
+++ b/src/app/assets/scss/views/river-detail/components/_side-bar-articles.scss
@@ -5,13 +5,10 @@
     align-items: center;
   }
 
-  .sidebar-article {
+  .sidebar-title {
     &:hover {
       cursor: pointer;
-      h5,
-      p {
-        text-decoration: underline;
-      }
+      text-decoration: underline;
     }
 
     .article-thumb {
diff --git a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
index b9f132bf..17c9498a 100644
--- a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
+++ b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
@@ -24,9 +24,8 @@
       <div
         v-for="(article, i) in articles.slice(0, 1)"
         :key="i + 3 * 4"
-        class="bx--row mb-spacing-xs sidebar-article"
-        @keydown.enter="readArticle(article)"
-        @click.exact="readArticle(article)"
+        class="bx--row mb-spacing-xs"
+       
       >
         <div class="bx--col-sm-12 bx--col-md-3">
           <img
@@ -38,10 +37,37 @@
         <div class="bx--col-sm-12 bx--col-md-5">
           <div class="pt-spacing-sm pb-spacing-md">
             <h5
-              class="mb-spacing-2xs"
+              class="mb-spacing-2xs sidebar-title"
+              @click.exact="readArticle(article)"
+              @keydown.enter="readArticle(article)"
               v-text="$titleCase(article.title)"
             />
-            <p v-html="article.abstract" />
+            <div
+              v-if="article.abstract.length > 200"
+              ref="abstract"
+              class="abstract-content"
+              v-html="article.abstract.slice(0, 200) + '...'"
+            />
+            <div
+              v-else
+              ref="abstract"
+              class="abstract-content"
+              v-html="article.abstract"
+            />
+            <cv-button
+              v-if="article.abstract.length > 200"
+              class="mt-spacing-md"
+              size="small"
+              kind="tertiary"
+              @click.exact="readArticle(article)"
+              @keydown.enter="readArticle(article)"
+            >See More
+            </cv-button>
+            <cv-link
+              v-if="article.abstract.length > 200"
+              action-label="Read More"
+              @action="readArticle(article)"
+            />
           </div>
         </div>
       </div>

From bc269c1689c1c4f2f9ef511c24c85d6575c971ee Mon Sep 17 00:00:00 2001
From: Eric Jones <ericnatejones@gmail.com>
Date: Mon, 25 Jan 2021 11:50:54 -0800
Subject: [PATCH 04/14] ready for review

---
 .../components/side-bar-articles.vue          | 21 +++++--------------
 .../components/side-bar-projects.vue          |  3 +++
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
index 17c9498a..a224d2fd 100644
--- a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
+++ b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
@@ -54,20 +54,9 @@
               class="abstract-content"
               v-html="article.abstract"
             />
-            <cv-button
-              v-if="article.abstract.length > 200"
-              class="mt-spacing-md"
-              size="small"
-              kind="tertiary"
-              @click.exact="readArticle(article)"
-              @keydown.enter="readArticle(article)"
-            >See More
-            </cv-button>
-            <cv-link
-              v-if="article.abstract.length > 200"
-              action-label="Read More"
-              @action="readArticle(article)"
-            />
+            <cv-link :href="articleUrl(article)">
+              Read More
+            </cv-link>
           </div>
         </div>
       </div>
@@ -105,8 +94,8 @@ export default {
       }
       return null
     },
-    readArticle (article) {
-      this.goToLink(this.formatLinkUrl(`content/Article/view/article_id/${article.id}/`))
+    articleUrl (article) {
+      return `/content/Article/view/article_id/${article.id}/`
     }
   }
 }
diff --git a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
index 71d9ee51..703abd9a 100644
--- a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
+++ b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
@@ -28,6 +28,9 @@
             </cv-link>
 
             <p v-html="project.description" />
+            <cv-link :href="projectUrl(project)">
+              Read More
+            </cv-link>
           </div>
         </div>
       </div>

From a1d07b4548594d79136fe87dbc26ed7b77d153b3 Mon Sep 17 00:00:00 2001
From: Eric Jones <ericnatejones@gmail.com>
Date: Mon, 1 Feb 2021 06:33:48 -0800
Subject: [PATCH 05/14] Reverse River Detail River & Reach Font Sizes #1924

---
 .../assets/scss/components/_article-card.scss | 11 +++++++++
 .../rapids-section/components/rapid-item.vue  |  1 +
 .../components/side-bar-articles.vue          | 17 ++++++++++----
 .../components/side-bar-projects.vue          | 23 +++++++++++++++----
 src/app/views/river-detail/river-detail.vue   | 15 +++---------
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/app/assets/scss/components/_article-card.scss b/src/app/assets/scss/components/_article-card.scss
index bd0a42ea..3b9d349d 100644
--- a/src/app/assets/scss/components/_article-card.scss
+++ b/src/app/assets/scss/components/_article-card.scss
@@ -118,4 +118,15 @@
   .bx--article-card__icon--action
   svg {
   fill: $carbon--gray-70; //$disabled-02 for gray 90
+}
+
+.abstract-content {
+  p {
+    display: inline;
+  }
+}
+
+.read-more {
+  color: $ui-02;
+  font-weight: 200;
 }
\ No newline at end of file
diff --git a/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue b/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
index 5b68333e..e0983f94 100644
--- a/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
+++ b/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
@@ -73,6 +73,7 @@
                 />
                 <div
                   v-if="sanitizedDescription && readMoreActive"
+                  class="description"
                   v-html="
                     sanitizedDescription.slice(
                       characterLimit,
diff --git a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
index a224d2fd..53082cd3 100644
--- a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
+++ b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-articles.vue
@@ -46,19 +46,26 @@
               v-if="article.abstract.length > 200"
               ref="abstract"
               class="abstract-content"
-              v-html="article.abstract.slice(0, 200) + '...'"
-            />
+            
+            >
+              <span v-html="article.abstract.slice(0, 200)"/>
+              <cv-link 
+                :href="articleUrl(article)"
+                class="read-more">
+                ... Read More
+              </cv-link>
+            </div>
             <div
               v-else
               ref="abstract"
               class="abstract-content"
               v-html="article.abstract"
             />
-            <cv-link :href="articleUrl(article)">
-              Read More
-            </cv-link>
+             
+             
           </div>
         </div>
+        
       </div>
     </template>
     <template v-else>
diff --git a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
index 703abd9a..7ae6b486 100644
--- a/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
+++ b/src/app/views/river-detail/components/main-tab/components/recent-alerts/components/side-bar-projects.vue
@@ -27,10 +27,25 @@
               </h5>
             </cv-link>
 
-            <p v-html="project.description" />
-            <cv-link :href="projectUrl(project)">
-              Read More
-            </cv-link>
+            <div
+              v-if="project.description.length > 200"
+              ref="abstract"
+              class="abstract-content"
+            
+            >
+              <span v-html="project.description.slice(0, 200)"/>
+              <cv-link 
+                :href="projectUrl(project)"
+                class="read-more">
+                ... Read More
+              </cv-link>
+            </div>
+            <div
+              v-else
+              ref="abstract"
+              class="abstract-content"
+              v-html="project.description"
+            />
           </div>
         </div>
       </div>
diff --git a/src/app/views/river-detail/river-detail.vue b/src/app/views/river-detail/river-detail.vue
index 6fcd5c4c..96d03c5a 100644
--- a/src/app/views/river-detail/river-detail.vue
+++ b/src/app/views/river-detail/river-detail.vue
@@ -13,20 +13,11 @@
             </header>
             <header v-else-if="reach" class="bx--tile">
               <div>
-                <h4>
+                <h1>
                   {{ reach.river }}
-                </h4>
+                </h1>
 
-                <h1 class="mb-spacing-md" v-text="reach.section" />
-
-                <cv-breadcrumb no-trailing-slash>
-                  <cv-breadcrumb-item>
-                    <cv-link to="/river-index"> River Index </cv-link>
-                  </cv-breadcrumb-item>
-                  <cv-breadcrumb-item>
-                    <cv-link href="#0"> River Id: {{ reach.id }} </cv-link>
-                  </cv-breadcrumb-item>
-                </cv-breadcrumb>
+                <h4 class="mb-spacing-md" v-text="reach.section" />
               </div>
               <div>
                 <cv-button

From 865774f22c0add522bee22dbcf464d353b3b7780 Mon Sep 17 00:00:00 2001
From: Eric Jones <ericnatejones@gmail.com>
Date: Mon, 1 Feb 2021 06:43:47 -0800
Subject: [PATCH 06/14] See More in rapid descriptions now same font

---
 .../rapids-section/components/rapid-item.vue      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue b/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
index e0983f94..12b6511e 100644
--- a/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
+++ b/src/app/views/river-detail/components/main-tab/components/rapids-section/components/rapid-item.vue
@@ -64,27 +64,20 @@
               <template
                 v-if="
                   sanitizedDescription &&
-                  sanitizedDescription.length > characterLimit
+                  sanitizedDescription.length > characterLimit &&
+                  !readMoreActive
                 "
               >
                 <div
                   class="description"
                   v-html="sanitizedDescription.slice(0, characterLimit) + '...'"
                 />
-                <div
-                  v-if="sanitizedDescription && readMoreActive"
-                  class="description"
-                  v-html="
-                    sanitizedDescription.slice(
-                      characterLimit,
-                      sanitizedDescription.length * 2
-                    )
-                  "
-                />
+              
               </template>
               <template v-else>
                 <div class="description" v-html="sanitizedDescription" />
               </template>
+
             </template>
             <template v-else>
               <div class>

From 35c1901230fbabe0042b5daebb864eed6836269c Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Mon, 1 Feb 2021 13:14:07 -0500
Subject: [PATCH 07/14] fixes display on #1929 - matches correct gage

---
 src/app/global/lib/gages/index.js             | 17 ++++++++++++
 .../main-tab/components/beta-box/beta-box.vue | 27 ++++++++++++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 src/app/global/lib/gages/index.js

diff --git a/src/app/global/lib/gages/index.js b/src/app/global/lib/gages/index.js
new file mode 100644
index 00000000..8d28160a
--- /dev/null
+++ b/src/app/global/lib/gages/index.js
@@ -0,0 +1,17 @@
+/**
+ * Returns the reading with the precision specified by the gauge format.
+ * @param reading {number}
+ * @param metric_format {string} - value from metrics
+ * @return number with the specified precision
+ */
+
+export function formatReading(reading, metric_format) {
+  if (metric_format) {
+    const m = metric_format.match(/%([0-9]+)\.([0-9]+)f/);
+
+    if (m.length) {
+      return reading.toFixed(Number.parseInt(m[2]));
+    }
+  }
+  return reading.toFixed(2);
+}
diff --git a/src/app/views/river-detail/components/main-tab/components/beta-box/beta-box.vue b/src/app/views/river-detail/components/main-tab/components/beta-box/beta-box.vue
index c5210879..b6528f4d 100644
--- a/src/app/views/river-detail/components/main-tab/components/beta-box/beta-box.vue
+++ b/src/app/views/river-detail/components/main-tab/components/beta-box/beta-box.vue
@@ -41,7 +41,7 @@
           <td>Gage</td>
           <template v-if="!loading">
             <td
-              v-if="gages && gages.length"
+              v-if="gages && gages.length && reachGage && reachGage.gauge"
               class="river-gages"
             >
               <a :href="formatLinkUrl(`content/gauge/detail-new/${reachGage.gauge.id || ''}`)">{{
@@ -70,7 +70,7 @@
               v-if="gages && gages.length"
               class="flow-range"
             >
-              {{ formatFlowRange(reachGage.rmin, reachGage.rmax) }}
+              {{ formatFlowRange(reachGage.rmin, reachGage.rmax, reachGage.gauge_metric) }}
             </td>
             <td
               v-else
@@ -97,7 +97,7 @@
               v-if="gages && gages.length"
               class="river-flow-rate"
             >
-              {{ gages[0].gauge_reading }}
+              {{ formatReading(reachGage.gauge_reading, reachGage.gauge_metric) }}
               {{ formatMetric(reachGage.gauge_metric) }}
               <cv-tag
                 v-if="reachGage.adjusted_reach_class"
@@ -167,6 +167,7 @@
 import { mapState } from 'vuex'
 import { humanReadable } from '@/app/global/services/human-readable'
 import { BetaBoxEditModal } from './components'
+import { formatReading } from '@/app/global/lib/gages'
 
 /**
  * @todo if reach has multiple gages, add dropdown to
@@ -200,8 +201,9 @@ export default {
       return this.$route.params.id
     },
     reachGage() {
+
       if (this.river && this.river.readingsummary && this.gages) {
-        return this.gages.find(g => g.gauge.id.toString() === this.river.readingsummary.gauge_id.toString())
+        return this.gages.find(g => g.gauge.id.toString() === this.river.readingsummary.gauge_id.toString());
       }
       return this.gages[0]
     }
@@ -227,18 +229,29 @@ export default {
       }
       return humanReadable(input)
     },
-    formatFlowRange (min, max) {
+    formatFlowRange (min, max, metricID) {
       if (min && max) {
-        return `${min} – ${max} ${this.formatMetric(this.gages[0].gauge_metric)}`
+        return `${this.formatReading(min,metricID)} – ${this.formatReading(max,metricID)} ${this.formatMetric(metricID)}`
       }
       return 'n/a'
     },
+    getMetric(metricID){
+      if(metricID && this.metrics?.length)
+      {
+        return this.metrics.find(m => m.id === metricID.toString())
+      }
+      return null;
+    },
     formatMetric (metricId) {
       if (this.metrics) {
-        return this.metrics.find(m => m.id === metricId.toString())?.unit
+        return this.getMetric(metricId)?.unit || 'n/a'
       }
       return 'n/a'
     },
+    formatReading(reading, metricID)
+    {
+      return formatReading(reading,this.getMetric(metricID)?.format || '');
+    },
     formatTag (gage) {
       if (gage.rmin && gage.rmax && gage.gauge_reading) {
         if (gage.gauge_reading < gage.rmin) {

From 6273f2f0567a290c9bffcfd0d9ab72344debbfb2 Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Mon, 1 Feb 2021 13:15:48 -0500
Subject: [PATCH 08/14] fixes a reference error with navigator object in chrome
 on non-local http development boxes.

---
 src/app/global/components/app-toaster/app-toaster.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/global/components/app-toaster/app-toaster.vue b/src/app/global/components/app-toaster/app-toaster.vue
index 0b6ee700..9ac58fd7 100644
--- a/src/app/global/components/app-toaster/app-toaster.vue
+++ b/src/app/global/components/app-toaster/app-toaster.vue
@@ -111,7 +111,8 @@ export default {
   },
   created() {
     document.addEventListener("swUpdated", this.showRefreshUI, { once: true });
-    navigator.serviceWorker.addEventListener("controllerchange", () => {
+    //navigator.serviceWorker only exists when either https://... or http://localhost/...
+    navigator && navigator.serviceWorker && navigator.serviceWorker.addEventListener("controllerchange", () => {
       if (this.refreshing) return;
       this.refreshing = true;
       window.location.reload();

From 025347e615e24e50ae25689e65006feeda333ca8 Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Mon, 1 Feb 2021 17:10:07 -0500
Subject: [PATCH 09/14] type check on parameter

---
 src/app/global/lib/gages/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/global/lib/gages/index.js b/src/app/global/lib/gages/index.js
index 8d28160a..b78276fa 100644
--- a/src/app/global/lib/gages/index.js
+++ b/src/app/global/lib/gages/index.js
@@ -13,5 +13,8 @@ export function formatReading(reading, metric_format) {
       return reading.toFixed(Number.parseInt(m[2]));
     }
   }
-  return reading.toFixed(2);
+  if (typeof reading === "number") {
+    return reading.toFixed(2);
+  }
+  return "";
 }

From 5533f127f84ee5ace43ba167ec4a6e4729a1efe8 Mon Sep 17 00:00:00 2001
From: "Ryan@AW" <rgroth@americanwhitewater.org>
Date: Mon, 1 Feb 2021 20:10:58 -0500
Subject: [PATCH 10/14] type check

---
 src/app/global/lib/gages/index.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/global/lib/gages/index.js b/src/app/global/lib/gages/index.js
index b78276fa..eb069075 100644
--- a/src/app/global/lib/gages/index.js
+++ b/src/app/global/lib/gages/index.js
@@ -6,14 +6,15 @@
  */
 
 export function formatReading(reading, metric_format) {
-  if (metric_format) {
-    const m = metric_format.match(/%([0-9]+)\.([0-9]+)f/);
+  if (typeof reading === "number") {
+    if (metric_format) {
+      const m = metric_format.match(/%([0-9]+)\.([0-9]+)f/);
 
-    if (m.length) {
-      return reading.toFixed(Number.parseInt(m[2]));
+      if (m.length) {
+        return reading.toFixed(Number.parseInt(m[2]));
+      }
     }
-  }
-  if (typeof reading === "number") {
+
     return reading.toFixed(2);
   }
   return "";

From 76e6145ceda531739c941a53d7848b54e3a7995a Mon Sep 17 00:00:00 2001
From: Nick Gottlieb <ngottlieb@gmail.com>
Date: Tue, 2 Feb 2021 16:06:38 -0800
Subject: [PATCH 11/14] fix usage of nanoid to match documentation

---
 src/app/plugins/random-id.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/plugins/random-id.js b/src/app/plugins/random-id.js
index 89ad0206..1246a239 100644
--- a/src/app/plugins/random-id.js
+++ b/src/app/plugins/random-id.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 
-import { nanoid } from 'nanoid'
+import { customAlphabet } from 'nanoid'
 
 /**
  * @description use this when creating new resources.
@@ -9,5 +9,6 @@ import { nanoid } from 'nanoid'
  */
 
 Vue.prototype.$randomId = function () {
-  return nanoid(21, '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')
+  const nanoid = customAlphabet('1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', 21);
+  return nanoid();
 }

From 7c3d01ea43f5c68b84f12665634f1c7401de2fda Mon Sep 17 00:00:00 2001
From: Nick Gottlieb <ngottlieb@gmail.com>
Date: Tue, 2 Feb 2021 16:59:26 -0800
Subject: [PATCH 12/14] fix updatePost service to work for comments like it
 used to

---
 .../post-update-modal/post-update-modal.vue   |  2 +-
 src/app/services/updatePost.js                | 30 +++++++++----------
 .../components/media-upload-form.vue          |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app/global/components/post-update-modal/post-update-modal.vue b/src/app/global/components/post-update-modal/post-update-modal.vue
index 532d5b57..2000c4d2 100644
--- a/src/app/global/components/post-update-modal/post-update-modal.vue
+++ b/src/app/global/components/post-update-modal/post-update-modal.vue
@@ -180,7 +180,7 @@ export default {
       this.formPending = true
       this.$emit('update:pending', true)
 
-      try {  
+      try {
         const result = await updatePost(this.formData)
         if (!result.errors) {
           this.$emit('update:success', result.data.postUpdate.id)
diff --git a/src/app/services/updatePost.js b/src/app/services/updatePost.js
index de6dcf41..c6fadc66 100644
--- a/src/app/services/updatePost.js
+++ b/src/app/services/updatePost.js
@@ -1,14 +1,22 @@
 import http from "@/app/http";
 
 export async function updatePost(formData, photo) {
-  //if post is coming in with an ID then remove that property.
-  const photoCopy = Object.assign({}, photo);
-  delete photoCopy.id;
-  photoCopy.post_id = formData.id;
+  const variables = {
+    id: formData.id,
+    post: formData.post
+  };
+  if (photo) {
+    // if post is coming in with an ID then remove that property.
+    const photoCopy = Object.assign({}, photo);
+    delete photoCopy.id;
+    photoCopy.post_id = formData.id;
+    variables.photo = photoCopy;
+    variables.photo_id = photo.id;
+  }
   return http
     .post("/graphql", {
       query: `
-      mutation ($id:ID!, $photo_id: ID!, $photo: PhotoInput!, $post: PostInput!) {
+      mutation ($id:ID!, ${photo ? "$photo_id: ID!, $photo: PhotoInput!, " : ''}$post: PostInput!) {
           postUpdate(id: $id, post:$post)  {
           id
           detail
@@ -24,17 +32,9 @@ export async function updatePost(formData, photo) {
             uid
           }
         }
-        photoUpdate(id: $photo_id, photo: $photo)
-          {
-            id
-          },
+        ${photo ?  "photoUpdate(id: $photo_id, photo: $photo) { id }," : '' }
       }`,
-      variables: {
-        id: formData.id,
-        post: formData.post,
-        photo: photoCopy,
-        photo_id: photo.id,
-      },
+      variables: variables,
     })
     .then((response) => {
       return response.data;
diff --git a/src/app/views/river-detail/components/media-upload-form.vue b/src/app/views/river-detail/components/media-upload-form.vue
index acbbf3d6..5c0eaa7d 100644
--- a/src/app/views/river-detail/components/media-upload-form.vue
+++ b/src/app/views/river-detail/components/media-upload-form.vue
@@ -165,7 +165,7 @@ export default {
     async submitPost () {
       this.formPending = true
       try {
-        //upload the details collected from the form, not just reach id etc.
+        // upload the details collected from the form, not just reach id etc.
         await updatePost(this.postFormData, { ...this.formData.photo, id: this.formData.id })
 
         this.$emit('form:success')

From 6225561479e1fa458dffed56bbac0f4f5a44e842 Mon Sep 17 00:00:00 2001
From: Matt Anger <matthew.anger@gmail.com>
Date: Wed, 3 Feb 2021 10:59:43 -0500
Subject: [PATCH 13/14] Fixes reach credits

---
 src/app/store/modules/river-credits.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/store/modules/river-credits.js b/src/app/store/modules/river-credits.js
index add0a9c9..e8cf73a6 100644
--- a/src/app/store/modules/river-credits.js
+++ b/src/app/store/modules/river-credits.js
@@ -17,9 +17,8 @@ export default {
         context.commit('DATA_REQUEST')
         const result = await getReachCredits(id)
         
-        
         if (!result.errors) {
-          context.commit('DATA_SUCCESS', result)
+          context.commit('DATA_SUCCESS', result.data.reach.revisions.data)
         }
         
       } catch (error) {

From 1c5b89685dae289438a124d8ee4dffe61aef4265 Mon Sep 17 00:00:00 2001
From: Eric Jones <ericnatejones@gmail.com>
Date: Wed, 3 Feb 2021 11:33:32 -0800
Subject: [PATCH 14/14] Deleted a personal notes file

small fix
---
 commonCommand.txt | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 commonCommand.txt

diff --git a/commonCommand.txt b/commonCommand.txt
deleted file mode 100644
index aa80f12f..00000000
--- a/commonCommand.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-npm run dev
-npm config set registry https://registry.npmjs.org/