Merge pull request #113 from ISISComputingGroup/remove_beam_image

Remove beam image

Author: Tom-Willemsen

app/components/InstrumentWallCard.tsx

@@ -12,7 +12,7 @@ export default function InstrumentWallCard({
       <Link
         href={"/instrument?name=" + instrument.name}
         target="_blank"
-        className={`flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+        className={`flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       ${getStatusColour(instrument.runStateValue || "UNKNOWN")} ${getForegroundColour(
         instrument.runStateValue || "UNKNOWN",
       )}`}

app/components/ShowHideBeamInfo.tsx

@@ -6,7 +6,7 @@ exports[`renders instrumentwallcard unchanged 1`] = `
     class="flex"
   >
     <a
-      class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+      class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-[#90EE90] text-black"
       href="/instrument?name=Instrument"
       target="_blank"
@@ -36,7 +36,7 @@ exports[`renders instrumentwallcard unchanged when runstate is unknown 1`] = `
     class="flex"
   >
     <a
-      class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+      class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-[#F08080] text-black"
       href="/instrument?name=Instrument1"
       target="_blank"

app/components/__snapshots__/InstrumentWallCard.test.tsx.snap

@@ -17,7 +17,7 @@ exports[`renders sciencegroup unchanged 1`] = `
         class="flex"
       >
         <a
-          class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+          class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-[#90EE90] text-black"
           href="/instrument?name=Instrument"
           target="_blank"
@@ -42,7 +42,7 @@ exports[`renders sciencegroup unchanged 1`] = `
         class="flex"
       >
         <a
-          class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+          class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-[#DAA520] text-black"
           href="/instrument?name=Instrument2"
           target="_blank"

app/components/__snapshots__/ScienceGroup.test.tsx.snap

@@ -19,7 +19,7 @@ exports[`renders targetstation unchanged 1`] = `
         class="flex"
       >
         <a
-          class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+          class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-green-900 text-white"
           href="/instrument?name=Instrument"
           target="_blank"
@@ -44,7 +44,7 @@ exports[`renders targetstation unchanged 1`] = `
         class="flex"
       >
         <a
-          class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
+          class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
       bg-[#FFFF00] text-black"
           href="/instrument?name=Instrument2"
           target="_blank"

app/components/__snapshots__/TargetStation.test.tsx.snap

@@ -1,4 +1,3 @@
-import ShowHideBeamInfo from "../components/ShowHideBeamInfo";
 import JenkinsJobs from "../components/JenkinsJobs";
 import InstrumentsDisplay from "@/app/components/InstrumentsDisplay";
 
@@ -7,22 +6,17 @@ export default function WallDisplay() {
     <main
       className={`flex min-h-screen bg-white dark:bg-zinc-800 flex-col items-center justify-between`}
     >
-      <section className=" rounded-xl w-full md:px-0 md:w-11/12 my-4 ">
+      <section className="rounded-xl w-full md:px-0 md:w-11/12 my-2">
         <div className="mx-auto  ">
-          <ShowHideBeamInfo />
-          <div className="w-full mx-auto text-left flex justify-center items-center p-8 dark:bg-zinc-900 rounded-xl">
+          <div className="w-full mx-auto text-left flex justify-center items-center pb-8 px-8 dark:bg-zinc-900 rounded-xl">
             <div
               id="status"
               className="flex flex-col justify-center items-center"
             >
-              <h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl   ">
-                Instrument Status:
-              </h1>
               <InstrumentsDisplay />
             </div>
           </div>
-          <hr className="h-[2px] rounded my-4 bg-gray-200 border-0 dark:bg-gray-600" />
-          <h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl pb-2 ">
+          <h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2 ">
             Jenkins jobs:
           </h1>
           <JenkinsJobs />

app/wall/page.tsx

@@ -17,7 +17,6 @@ const config: Config = {
     "!**/*layout.tsx",
     "!app/_app.tsx",
     "!app/components/JenkinsJobs.tsx", // relies on an external fetch
-    "!app/components/ShowHideBeamInfo.tsx", // relies on an external image
     "!app/components/InstrumentData.tsx", // relies on websocket
     "!app/wall/page.tsx", // relies on JenkinsJobs
     "!app/instruments/page.tsx", // no logic here