From f8e496aadab31de7dbcb80d59d678655658f37cc Mon Sep 17 00:00:00 2001
From: John Wu <76966357+jwu-fisker@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:58:57 -0700
Subject: [PATCH] Development Merge (#57)

---
 .../App/__snapshots__/App.test.js.snap        | 36 ++-----------------
 src/components/Dashboard/index.jsx            | 20 ++---------
 2 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 713340c..fe0fe69 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -1703,9 +1703,9 @@ exports[`App Route /dashboard authenticated 1`] = `
                 >
                   <iframe
                     frameborder="0"
-                    src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=5s&panelId=6"
+                    src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&refresh=5s&from=1623892020715&to=1623892320715&panelId=2"
                     style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                    title="Vehicle Connected"
+                    title="Battery Time Series"
                   />
                 </div>
               </div>
@@ -1724,38 +1724,6 @@ exports[`App Route /dashboard authenticated 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="MuiGrid-root makeStyles-root-770 MuiGrid-container MuiGrid-spacing-xs-2"
-            >
-              <div
-                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-              >
-                <div
-                  class="makeStyles-embeddedWrapper-788"
-                >
-                  <iframe
-                    frameborder="0"
-                    src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&from=1623869351185&to=1623880151186&panelId=14"
-                    style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                    title="Total Signals"
-                  />
-                </div>
-              </div>
-              <div
-                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-              >
-                <div
-                  class="makeStyles-embeddedWrapper-788"
-                >
-                  <iframe
-                    frameborder="0"
-                    src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=5s&panelId=2"
-                    style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                    title="Vehicle Signals"
-                  />
-                </div>
-              </div>
-            </div>
             <a
               aria-disabled="false"
               aria-label="create"
diff --git a/src/components/Dashboard/index.jsx b/src/components/Dashboard/index.jsx
index 52996c0..46e0413 100644
--- a/src/components/Dashboard/index.jsx
+++ b/src/components/Dashboard/index.jsx
@@ -21,8 +21,8 @@ const Dashboard = () => {
         <Grid item md={6}>
           <ResponsiveIFrame
             classes={classes}
-            src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=5s&panelId=6"
-            title="Vehicle Connected"
+            src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&refresh=5s&from=1623892020715&to=1623892320715&panelId=2"
+            title="Battery Time Series"
           />
         </Grid>
         <Grid item md={6}>
@@ -33,22 +33,6 @@ const Dashboard = () => {
           />
         </Grid>
       </Grid>
-      <Grid container className={classes.root} spacing={2}>
-        <Grid item md={6}>
-          <ResponsiveIFrame
-            classes={classes}
-            src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&from=1623869351185&to=1623880151186&panelId=14"
-            title="Total Signals"
-          />
-        </Grid>
-        <Grid item md={6}>
-          <ResponsiveIFrame
-            classes={classes}
-            src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=5s&panelId=2"
-            title="Vehicle Signals"
-          />
-        </Grid>
-      </Grid>
       <Button
         style={{ marginTop: 10 }}
         aria-label="create"