From fd40e2b7bcddc917cee83c423a48b94decd23ec4 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Thu, 3 Apr 2025 10:46:32 +0200
Subject: [PATCH] Replace most stylesheets with tailwind styles

---
 src/common/MainHeader.scss                   | 22 --------------------
 src/common/MainHeader.tsx                    | 13 ++++++------
 src/common/ShlinkVersionsContainer.scss      |  9 --------
 src/common/ShlinkVersionsContainer.tsx       |  5 +----
 src/servers/helpers/ServerError.scss         | 17 ---------------
 src/servers/helpers/ServerError.tsx          | 21 ++++++++-----------
 src/tailwind.css                             |  8 +++++++
 src/utils/mixins/horizontal-align.scss       |  5 -----
 src/utils/mixins/vertical-align.scss         |  5 -----
 test/common/MainHeader.test.tsx              | 10 ++++-----
 test/common/ShlinkVersionsContainer.test.tsx | 15 ++++++++-----
 11 files changed, 39 insertions(+), 91 deletions(-)
 delete mode 100644 src/common/MainHeader.scss
 delete mode 100644 src/common/ShlinkVersionsContainer.scss
 delete mode 100644 src/servers/helpers/ServerError.scss
 delete mode 100644 src/utils/mixins/horizontal-align.scss
 delete mode 100644 src/utils/mixins/vertical-align.scss

diff --git a/src/common/MainHeader.scss b/src/common/MainHeader.scss
deleted file mode 100644
index 43c7e4f6..00000000
--- a/src/common/MainHeader.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.main-header.main-header {
-  color: white;
-  background-color: var(--brand-color) !important;
-
-  .navbar-brand {
-    color: inherit !important;
-  }
-}
-
-.main-header__brand-logo {
-  width: 26px;
-  margin-right: 5px;
-}
-
-.main-header__toggle-icon {
-  width: 20px;
-  transition: transform 300ms;
-}
-
-.main-header__toggle-icon--opened {
-  transform: rotate(180deg);
-}
diff --git a/src/common/MainHeader.tsx b/src/common/MainHeader.tsx
index 31e5a39e..37a488e0 100644
--- a/src/common/MainHeader.tsx
+++ b/src/common/MainHeader.tsx
@@ -9,7 +9,6 @@ import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } f
 import type { FCWithDeps } from '../container/utils';
 import { componentFactory, useDependencies } from '../container/utils';
 import { ShlinkLogo } from './img/ShlinkLogo';
-import './MainHeader.scss';
 
 type MainHeaderDeps = {
   ServersDropdown: FC;
@@ -25,20 +24,22 @@ const MainHeader: FCWithDeps<unknown, MainHeaderDeps> = () => {
   useEffect(collapse, [location, collapse]);
 
   const settingsPath = '/settings';
-  const toggleClass = clsx('main-header__toggle-icon', { 'main-header__toggle-icon--opened': isNotCollapsed });
 
   return (
-    <Navbar color="primary" dark fixed="top" className="main-header" expand="md">
+    <Navbar color="primary" dark fixed="top" expand="md" className="tw:text-white tw:bg-lm-brand tw:dark:bg-dm-brand">
       <NavbarBrand tag={Link} to="/">
-        <ShlinkLogo className="main-header__brand-logo tw:inline" color="white" /> Shlink
+        <ShlinkLogo className="tw:inline tw:w-7 tw:mr-1" color="white" /> Shlink
       </NavbarBrand>
 
       <NavbarToggler onClick={toggleCollapse}>
-        <FontAwesomeIcon icon={arrowIcon} className={toggleClass} />
+        <FontAwesomeIcon
+          icon={arrowIcon}
+          className={clsx('tw:transition-transform tw:duration-300', { 'tw:rotate-180': isNotCollapsed })}
+        />
       </NavbarToggler>
 
       <Collapse navbar isOpen={isNotCollapsed}>
-        <Nav navbar className="ms-auto">
+        <Nav navbar className="tw:ml-auto">
           <NavItem>
             <NavLink tag={Link} to={settingsPath} active={pathname.startsWith(settingsPath)}>
               <FontAwesomeIcon icon={cogsIcon} />&nbsp; Settings
diff --git a/src/common/ShlinkVersionsContainer.scss b/src/common/ShlinkVersionsContainer.scss
deleted file mode 100644
index 4bb9f3dc..00000000
--- a/src/common/ShlinkVersionsContainer.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@use '../../node_modules/@shlinkio/shlink-frontend-kit/dist/base';
-
-.shlink-versions-container--with-sidebar {
-  margin-left: 0;
-
-  @media (min-width: base.$mdMin) {
-    margin-left: base.$asideMenuWidth;
-  }
-}
diff --git a/src/common/ShlinkVersionsContainer.tsx b/src/common/ShlinkVersionsContainer.tsx
index b1756057..18e1a680 100644
--- a/src/common/ShlinkVersionsContainer.tsx
+++ b/src/common/ShlinkVersionsContainer.tsx
@@ -2,7 +2,6 @@ import { clsx } from 'clsx';
 import type { SelectedServer } from '../servers/data';
 import { isReachableServer } from '../servers/data';
 import { ShlinkVersions } from './ShlinkVersions';
-import './ShlinkVersionsContainer.scss';
 
 export type ShlinkVersionsContainerProps = {
   selectedServer: SelectedServer;
@@ -10,9 +9,7 @@ export type ShlinkVersionsContainerProps = {
 
 export const ShlinkVersionsContainer = ({ selectedServer }: ShlinkVersionsContainerProps) => (
   <div
-    className={clsx('text-center', {
-      'shlink-versions-container--with-sidebar': isReachableServer(selectedServer),
-    })}
+    className={clsx('text-center', { 'tw:md:ml-(--aside-menu-width)': isReachableServer(selectedServer) })}
   >
     <ShlinkVersions selectedServer={selectedServer} />
   </div>
diff --git a/src/servers/helpers/ServerError.scss b/src/servers/helpers/ServerError.scss
deleted file mode 100644
index bd6dd061..00000000
--- a/src/servers/helpers/ServerError.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@use '../../../node_modules/@shlinkio/shlink-frontend-kit/dist/base';
-
-.server-error__container {
-  text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.server-error__delete-btn {
-  color: base.$dangerColor;
-  font-weight: inherit;
-}
-
-.server-error__delete-btn:hover {
-  text-decoration: underline;
-}
diff --git a/src/servers/helpers/ServerError.tsx b/src/servers/helpers/ServerError.tsx
index 826e2947..c95b39a3 100644
--- a/src/servers/helpers/ServerError.tsx
+++ b/src/servers/helpers/ServerError.tsx
@@ -8,7 +8,6 @@ import type { SelectedServer, ServersMap } from '../data';
 import { isServerWithId } from '../data';
 import type { DeleteServerButtonProps } from '../DeleteServerButton';
 import { ServersListGroup } from '../ServersListGroup';
-import './ServerError.scss';
 
 type ServerErrorProps = {
   servers: ServersMap;
@@ -24,8 +23,8 @@ const ServerError: FCWithDeps<ServerErrorProps, ServerErrorDeps> = ({ servers, s
 
   return (
     <NoMenuLayout>
-      <div className="server-error__container flex-column">
-        <Message className="w-100 mb-3 mb-md-5" variant="error">
+      <div className="tw:flex tw:flex-col tw:items-center tw:gap-y-4 tw:md:gap-y-8">
+        <Message className="tw:w-full tw:lg:w-[80%]" variant="error">
           {!isServerWithId(selectedServer) && 'Could not find this Shlink server.'}
           {isServerWithId(selectedServer) && (
             <>
@@ -39,19 +38,17 @@ const ServerError: FCWithDeps<ServerErrorProps, ServerErrorDeps> = ({ servers, s
           These are the Shlink servers currently configured. Choose one of
           them or <Link to="/server/create">add a new one</Link>.
         </p>
-        <Card className="tw:w-full tw:max-w-100 tw:overflow-hidden tw:mt-4">
+        <Card className="tw:w-full tw:max-w-100 tw:overflow-hidden">
           <ServersListGroup borderless servers={Object.values(servers)} />
         </Card>
 
         {isServerWithId(selectedServer) && (
-          <div className="container mt-3 mt-md-5">
-            <p className="tw:text-xl">
-              Alternatively, if you think you may have misconfigured this server, you
-              can <DeleteServerButton server={selectedServer} className="server-error__delete-btn">remove
-                it</DeleteServerButton> or&nbsp;
-              <Link to={`/server/${selectedServer.id}/edit?reconnect=true`}>edit it</Link>.
-            </p>
-          </div>
+          <p className="tw:text-xl">
+            Alternatively, if you think you may have misconfigured this server, you
+            can <DeleteServerButton server={selectedServer} className="tw:text-danger tw:hover:underline">remove
+              it</DeleteServerButton> or&nbsp;
+            <Link to={`/server/${selectedServer.id}/edit?reconnect=true`}>edit it</Link>.
+          </p>
         )}
       </div>
     </NoMenuLayout>
diff --git a/src/tailwind.css b/src/tailwind.css
index 568bcdef..78ee9f46 100644
--- a/src/tailwind.css
+++ b/src/tailwind.css
@@ -14,3 +14,11 @@
         border-radius: .5rem;
     }
 }
+
+@layer base {
+    :root {
+        --header-height: 56px;
+        /* Width of ShlinkWebComponent's side menu when not collapsed */
+        --aside-menu-width: 260px;
+    }
+}
diff --git a/src/utils/mixins/horizontal-align.scss b/src/utils/mixins/horizontal-align.scss
deleted file mode 100644
index 4daffffc..00000000
--- a/src/utils/mixins/horizontal-align.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin horizontal-align {
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-}
diff --git a/src/utils/mixins/vertical-align.scss b/src/utils/mixins/vertical-align.scss
deleted file mode 100644
index 95b5985c..00000000
--- a/src/utils/mixins/vertical-align.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin vertical-align($extraTransforms: null) {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%) $extraTransforms;
-}
diff --git a/test/common/MainHeader.test.tsx b/test/common/MainHeader.test.tsx
index 324973f6..3832ff6f 100644
--- a/test/common/MainHeader.test.tsx
+++ b/test/common/MainHeader.test.tsx
@@ -51,14 +51,12 @@ describe('<MainHeader />', () => {
     const toggle = screen.getByLabelText('Toggle navigation');
     const icon = toggle.firstChild;
 
-    expect(icon).toHaveAttribute('class', expect.stringMatching(/main-header__toggle-icon$/));
+    expect(icon).not.toHaveClass('tw:rotate-180');
     await user.click(toggle);
-    expect(icon).toHaveAttribute(
-      'class',
-      expect.stringMatching(/main-header__toggle-icon main-header__toggle-icon--opened$/),
-    );
+
+    expect(icon).toHaveClass('tw:rotate-180');
     await user.click(toggle);
-    expect(icon).toHaveAttribute('class', expect.stringMatching(/main-header__toggle-icon$/));
+    expect(icon).not.toHaveClass('tw:rotate-180');
   });
 
   it('opens Collapse when clicking toggle', async () => {
diff --git a/test/common/ShlinkVersionsContainer.test.tsx b/test/common/ShlinkVersionsContainer.test.tsx
index e1afee57..07776265 100644
--- a/test/common/ShlinkVersionsContainer.test.tsx
+++ b/test/common/ShlinkVersionsContainer.test.tsx
@@ -16,11 +16,16 @@ describe('<ShlinkVersionsContainer />', () => {
   ])('passes a11y checks', (selectedServer) => checkAccessibility(setUp(selectedServer)));
 
   it.each([
-    [null, 'text-center'],
-    [fromPartial<SelectedServer>({}), 'text-center'],
-    [fromPartial<ReachableServer>({ version: '1.0.0' }), 'text-center shlink-versions-container--with-sidebar'],
-  ])('renders proper col classes based on sidebar status', (selectedServer, expectedClasses) => {
+    [null, false],
+    [fromPartial<SelectedServer>({}), false],
+    [fromPartial<ReachableServer>({ version: '1.0.0' }), true],
+  ])('renders proper col classes based on sidebar status', (selectedServer, shouldAddMargin) => {
     const { container } = setUp(selectedServer);
-    expect(container.firstChild).toHaveAttribute('class', `${expectedClasses}`);
+
+    if (shouldAddMargin) {
+      expect(container.firstChild).toHaveClass('tw:md:ml-(--aside-menu-width)');
+    } else {
+      expect(container.firstChild).not.toHaveClass('tw:md:ml-(--aside-menu-width)');
+    }
   });
 });