Skip to content

Commit 5bc385b

Browse files
Tom-WillemsenTom-Willemsen
authored
Merge pull request #171 from ISISComputingGroup/update
dependency update
2 parents dd6e824 + 6859662 commit 5bc385b

18 files changed

+2842
-3790
lines changed

‎app/Footer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Link from "next/link";
33
export default function Footer() {
44
return (
55
<footer className="bg-white dark:bg-zinc-900 ">
6-
<div className="max-w-screen-xl p-4 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center ">
6+
<div className="max-w-(--breakpoint-xl) p-4 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center ">
77
<nav className="flex flex-wrap justify-center -mx-5 -my-2">
88
<Link
99
href="/"
@@ -25,7 +25,7 @@ export default function Footer() {
2525
Beam status
2626
</Link>
2727
<Link
28-
className="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
28+
className="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
2929
href="https://github.com/ISISComputingGroup/WebDashboard"
3030
>
3131
<svg

‎app/NavBar.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ export default function NavBar() {
2424

2525
<div className="md:flex hidden gap-2">
2626
<Link
27-
className="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
27+
className="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
2828
href="/"
2929
>
3030
Home
3131
</Link>
3232
<Link
33-
className="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
33+
className="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
3434
href="/instruments"
3535
>
3636
Instrument Status
3737
</Link>
3838
<Link
39-
className="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
39+
className="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
4040
href="https://www.isis.stfc.ac.uk/Pages/Beam-Status.aspx"
4141
target="_blank"
4242
>
4343
Beam status
4444
</Link>
4545
<Link
46-
className="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
46+
className="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
4747
href="https://github.com/ISISComputingGroup/WebDashboard"
4848
>
4949
<svg

‎app/__snapshots__/Footer.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`renders footer unchanged 1`] = `
44
<div>
55
<footer
66
class="bg-white dark:bg-zinc-900 "
77
>
88
<div
9-
class="max-w-screen-xl p-4 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center "
9+
class="max-w-(--breakpoint-xl) p-4 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8 w-full flex flex-col justify-center items-center "
1010
>
1111
<nav
1212
class="flex flex-wrap justify-center -mx-5 -my-2"
@@ -31,7 +31,7 @@ exports[`renders footer unchanged 1`] = `
3131
Beam status
3232
</a>
3333
<a
34-
class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
34+
class="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
3535
href="https://github.com/ISISComputingGroup/WebDashboard"
3636
>
3737
<svg

‎app/__snapshots__/Navbar.test.tsx.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`renders navbar unchanged 1`] = `
44
<div>
@@ -32,26 +32,26 @@ exports[`renders navbar unchanged 1`] = `
3232
class="md:flex hidden gap-2"
3333
>
3434
<a
35-
class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
35+
class="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
3636
href="/"
3737
>
3838
Home
3939
</a>
4040
<a
41-
class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
41+
class="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
4242
href="/instruments"
4343
>
4444
Instrument Status
4545
</a>
4646
<a
47-
class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
47+
class="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
4848
href="https://www.isis.stfc.ac.uk/Pages/Beam-Status.aspx"
4949
target="_blank"
5050
>
5151
Beam status
5252
</a>
5353
<a
54-
class="block py-2 px-3 rounded text-black dark:text-white hover:text-white hover:bg-zinc-800"
54+
class="block py-2 px-3 rounded-sm text-black dark:text-white hover:text-white hover:bg-zinc-800"
5555
href="https://github.com/ISISComputingGroup/WebDashboard"
5656
>
5757
<svg

‎app/__snapshots__/page.test.tsx.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`renders main page unchanged 1`] = `
44
<div>
@@ -22,7 +22,7 @@ exports[`renders main page unchanged 1`] = `
2222
</h1>
2323
2424
<h1
25-
class="block w-full mt-2 py-2 text-transparent bg-clip-text leading-12 bg-gradient-to-r from-green-400 to-purple-500 lg:inline"
25+
class="block w-full mt-2 py-2 text-transparent bg-clip-text leading-12 bg-linear-to-r from-green-400 to-purple-500 lg:inline"
2626
>
2727
Web Dashboard
2828
</h1>
@@ -35,10 +35,10 @@ exports[`renders main page unchanged 1`] = `
3535
class="relative inline-flex group"
3636
>
3737
<div
38-
class="absolute transition-all duration-1000 opacity-70 -inset-px bg-gradient-to-r from-[#44BCFF] via-[#FF44EC] to-[#FF675E] rounded-xl blur-lg group-hover:opacity-100 group-hover:-inset-1 group-hover:duration-200 animate-tilt"
38+
class="absolute transition-all duration-1000 opacity-70 -inset-px bg-linear-to-r from-[#44BCFF] via-[#FF44EC] to-[#FF675E] rounded-xl blur-lg group-hover:opacity-100 group-hover:-inset-1 group-hover:duration-200 animate-tilt"
3939
/>
4040
<a
41-
class="relative inline-flex gap-4 items-center justify-center px-8 py-4 text-lg font-bold text-gray-900 dark:text-white transition-all duration-200 bg-white dark:bg-gray-900 font-pj rounded-xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-300 dark:focus:ring-gray-900"
41+
class="relative inline-flex gap-4 items-center justify-center px-8 py-4 text-lg font-bold text-gray-900 dark:text-white transition-all duration-200 bg-white dark:bg-gray-900 font-pj rounded-xl focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-gray-300 dark:focus:ring-gray-900"
4242
href="/instruments"
4343
role="button"
4444
target="_self"

‎app/components/CheckToggle.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const CheckToggle = memo(function CheckToggle({
2525
onChange={callback}
2626
className="sr-only peer"
2727
/>
28-
<div className="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
28+
<div className="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:rtl:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
2929
<span className={"ms-3 text-sm font-medium " + textColour}>{text}</span>
3030
</label>
3131
</div>

‎app/components/InstrumentWallCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function InstrumentWallCard({
1515
<div className={"flex"}>
1616
<Link
1717
href={"/instrument?name=" + instrument.name}
18-
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
18+
className={`flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-xs border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
1919
${getStatusColour(instrument.runStateValue || UNREACHABLE)} ${getForegroundColour(
2020
instrument.runStateValue || UNREACHABLE,
2121
)}`}

‎app/components/TopBar.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const TopBar = function TopBar({
8686
className="text-sm max-w-full table-fixed flex divide-x divide-gray-200 text-wrap w-full "
8787
>
8888
<tbody className="w-1/3">
89-
<tr className="[&:not(:last-child)]:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex">
89+
<tr className="not-last:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex">
9090
<td className="py-1 px-4 flex font-bold break-words">Title</td>
9191
<td className="py-1 px-4 flex justify-between items-center break-all">
9292
<span className="font-light">
@@ -97,7 +97,7 @@ const TopBar = function TopBar({
9797
</td>
9898
</tr>
9999

100-
<tr className="[&:not(:last-child)]:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex">
100+
<tr className="not-last:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex">
101101
<td className="py-1 px-4 flex font-bold break-words">Users</td>
102102
<td className="py-1 px-4 flex justify-between items-center break-all">
103103
<span className="font-light">
@@ -114,7 +114,7 @@ const TopBar = function TopBar({
114114
{[1, 2, 3].map((row: number) => (
115115
<tr
116116
key={row}
117-
className="[&:not(:last-child)]:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex"
117+
className="not-last:border-b border-gray-300 text-black transition duration-100 hover:bg-gray-700 hover:text-white md:flex"
118118
>
119119
<td className="py-1 px-4 flex font-bold break-words">
120120
{
@@ -150,7 +150,7 @@ const TopBar = function TopBar({
150150
<div className="grid md:grid-cols-5 gap-2">
151151
{Array.from(runInfoPVs.values()).map((runInfoPV) => (
152152
<div
153-
className="mb-2 shadow-sm rounded-md"
153+
className="mb-2 shadow-xs rounded-md"
154154
key={runInfoPV.human_readable_name}
155155
>
156156
<p className="font-bold">{runInfoPV.human_readable_name}:</p>{" "}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`renders instrumentwallcard unchanged 1`] = `
44
<div>
55
<div
66
class="flex"
77
>
88
<a
9-
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
9+
class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-xs border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
1010
bg-[#90EE90] text-black"
1111
href="/instrument?name=Instrument"
1212
>
@@ -35,7 +35,7 @@ exports[`renders instrumentwallcard unchanged when runstate is unknown 1`] = `
3535
class="flex"
3636
>
3737
<a
38-
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
38+
class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-xs border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
3939
bg-[#F08080] text-black"
4040
href="/instrument?name=Instrument1"
4141
>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`renders sciencegroup unchanged 1`] = `
44
<div>
@@ -17,7 +17,7 @@ exports[`renders sciencegroup unchanged 1`] = `
1717
class="flex"
1818
>
1919
<a
20-
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
20+
class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-xs border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
2121
bg-[#90EE90] text-black"
2222
href="/instrument?name=Instrument"
2323
>
@@ -41,7 +41,7 @@ exports[`renders sciencegroup unchanged 1`] = `
4141
class="flex"
4242
>
4343
<a
44-
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
44+
class="flex items-center justify-center text-center py-1 w-28 max-h-12 rounded-lg shadow-xs border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
4545
bg-[#DAA520] text-black"
4646
href="/instrument?name=Instrument2"
4747
>

0 commit comments

Comments
 (0)