Merge pull request #84 from ISISComputingGroup/show_runstate_on_instr…

…uments_page show runstate on instruments page
ISISComputingGroup · Dec 6, 2024 · 7d04721 · 7d04721
2 parents 726f733 + 609df6e
commit 7d04721
Show file tree

Hide file tree

Showing 37 changed files with 1,410 additions and 549 deletions.
diff --git a/app/Footer.test.tsx b/app/Footer.test.tsx
@@ -0,0 +1,7 @@
+import { render } from "@testing-library/react";
+import Footer from "@/app/Footer";
+
+it("renders footer unchanged", () => {
+  const { container } = render(<Footer />);
+  expect(container).toMatchSnapshot();
+});
diff --git a/app/Footer.tsx b/app/Footer.tsx
@@ -4,7 +4,7 @@ import Image from "next/image";
 
 export default function Footer() {
   return (
-    <section className="bg-white dark:bg-zinc-900  ">
+    <footer className="bg-white dark:bg-zinc-900  ">
       <div className="max-w-screen-xl px-4 py-12 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center ">
         <Link href="/" className="flex items-center justify-center ">
           <Image
@@ -40,6 +40,6 @@ export default function Footer() {
           © 2024 Experiment Controls at ISIS. All rights reserved.
         </p>
       </div>
-    </section>
+    </footer>
   );
 }
diff --git a/app/Navbar.test.tsx b/app/Navbar.test.tsx
@@ -0,0 +1,7 @@
+import { render } from "@testing-library/react";
+import NavBar from "@/app/NavBar";
+
+it("renders navbar unchanged", () => {
+  const { container } = render(<NavBar />);
+  expect(container).toMatchSnapshot();
+});
diff --git a/app/__snapshots__/Footer.test.tsx.snap b/app/__snapshots__/Footer.test.tsx.snap
@@ -0,0 +1,59 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders footer unchanged 1`] = `
+<div>
+  <footer
+    class="bg-white dark:bg-zinc-900  "
+  >
+    <div
+      class="max-w-screen-xl px-4 py-12 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center "
+    >
+      <a
+        class="flex items-center justify-center "
+        href="/"
+      >
+        <img
+          alt="IBEX Logo"
+          class="h-16 w-auto"
+          data-nimg="1"
+          decoding="async"
+          height="128"
+          loading="lazy"
+          src="/_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=256&q=75"
+          srcset="/_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=128&q=75 1x, /_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=256&q=75 2x"
+          style="color: transparent;"
+          width="128"
+        />
+      </a>
+      <nav
+        class="flex flex-wrap justify-center -mx-5 -my-2"
+      >
+        <a
+          class="text-base leading-6 text-gray-500 hover:text-gray-900  dark:text-white dark:hover:text-gray-400 transition-color duration-100 px-5 py-2"
+          href="/"
+        >
+          Home
+        </a>
+        <a
+          class="text-base leading-6 text-gray-500 hover:text-gray-900  dark:text-white dark:hover:text-gray-400 transition-color duration-100 px-5 py-2"
+          href="/instruments"
+        >
+          Instrument statuses
+        </a>
+        <a
+          class="text-base leading-6 text-gray-500 hover:text-gray-900  dark:text-white dark:hover:text-gray-400 transition-color duration-100 px-5 py-2"
+          href="https://www.isis.stfc.ac.uk/Pages/Beam-Status.aspx"
+          target="_blank"
+        >
+          Beam status
+        </a>
+      </nav>
+      <p
+        class="mt-8 text-base leading-6 text-center text-gray-400"
+      >
+        © 2024 Experiment Controls at ISIS. All rights reserved.
+      </p>
+    </div>
+  </footer>
+</div>
+`;
diff --git a/app/__snapshots__/Navbar.test.tsx.snap b/app/__snapshots__/Navbar.test.tsx.snap
@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders navbar unchanged 1`] = `
+<div>
+  <header
+    class="items-center bg-white dark:bg-zinc-900 py-4 px-8 shadow-xl justify-between sm:flex hidden"
+  >
+    <a
+      aria-label="Home"
+      class="flex items-center gap-4 bg-white dark:bg-[#18171e] rounded-lg px-4"
+      href="/"
+    >
+      <img
+        alt="IBEX Logo"
+        class="h-16 w-auto"
+        data-nimg="1"
+        decoding="async"
+        height="100"
+        loading="lazy"
+        src="/_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=256&q=75"
+        srcset="/_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=128&q=75 1x, /_next/image?url=%2FWebDashboard%2FIBEX_logo.png&w=256&q=75 2x"
+        style="color: transparent;"
+        width="100"
+      />
+      <h1
+        class="text-black dark:text-white font-bold text-2xl"
+      >
+        Web Dashboard
+      </h1>
+    </a>
+    <div
+      class="md:flex hidden gap-2"
+    >
+      <a
+        class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
+        href="/"
+      >
+        Home
+      </a>
+      <a
+        class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
+        href="/instruments"
+      >
+        Instrument Status
+      </a>
+      <a
+        class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
+        href="https://www.isis.stfc.ac.uk/Pages/Beam-Status.aspx"
+        target="_blank"
+      >
+        Beam status
+      </a>
+      <a
+        class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
+        href="https://github.com/ISISComputingGroup/WebDashboard"
+      >
+        <svg
+          class="fill-current w-6 h-6"
+          viewBox="0 0 24 24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"
+          />
+        </svg>
+      </a>
+    </div>
+  </header>
+</div>
+`;