Skip to content

Commit bb2e348

Browse files
committed
Migrate dev to tailwind utility classes
1 parent 805205c commit bb2e348

7 files changed

Lines changed: 15 additions & 26 deletions

File tree

dev/App.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ShlinkApiClient } from '@shlinkio/shlink-js-sdk';
22
import { FetchHttpClient } from '@shlinkio/shlink-js-sdk/fetch';
3+
import { clsx } from 'clsx';
34
import type { FC } from 'react';
45
import { useCallback , useEffect, useMemo, useState } from 'react';
56
import { Link, Navigate, Route, Routes, useLocation } from 'react-router';
@@ -39,21 +40,24 @@ export const App: FC = () => {
3940

4041
return (
4142
<>
42-
<header className="header fixed-top text-white d-flex justify-content-between">
43+
<header className={clsx(
44+
'tw:h-(--header-height) tw:fixed tw:top-0 tw:left-0 tw:right-0 tw:flex tw:justify-between',
45+
'tw:bg-lm-main tw:dark:bg-dm-main tw:text-white',
46+
)}>
4347
<ServerInfoForm serverInfo={serverInfo} onChange={onServerInfoChange} />
4448
<div className="tw:h-full tw:pr-4 tw:flex tw:items-center tw:gap-4">
45-
<Link to="/" className="text-white">Home</Link>
46-
<Link to="/settings" className="text-white">Settings</Link>
49+
<Link to="/" className="tw:text-white">Home</Link>
50+
<Link to="/settings" className="tw:text-white">Settings</Link>
4751
<ThemeToggle />
4852
</div>
4953
</header>
50-
<div className="wrapper">
54+
<div className="tw:py-(--header-height)">
5155
<Routes>
5256
<Route path="/settings">
5357
<Route
5458
path="*"
5559
element={(
56-
<div className="container pt-4">
60+
<div className="tw:container tw:mx-auto tw:pt-6">
5761
<ShlinkWebSettings
5862
settings={settings}
5963
onUpdateSettings={setSettings}
@@ -73,9 +77,9 @@ export const App: FC = () => {
7377
settings={settings}
7478
routesPrefix={routesPrefix}
7579
/>
76-
) : <div className="container pt-4">Not connected</div>}
80+
) : <div className="tw:container tw:mx-auto tw:pt-6">Not connected</div>}
7781
/>
78-
<Route path="*" element={<h3 className="mt-3 text-center">Not found</h3>} />
82+
<Route path="*" element={<h3 className="tw:mt-4 tw:text-center">Not found</h3>} />
7983
</Routes>
8084
</div>
8185
</>

dev/index.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,3 @@
44
);
55
@use '../node_modules/@shlinkio/shlink-frontend-kit/dist/index';
66
@use '../src/index.scss' as dev-index;
7-
8-
.header {
9-
height: base.$headerHeight;
10-
background-color: var(--brand-color);
11-
}
12-
13-
.wrapper {
14-
padding: base.$headerHeight 0;
15-
}

dev/server-info/ServerInfoForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const ServerInfoForm: FC<ServerInfoFormProps> = ({ serverInfo, onChange }
2424
}, [serverInfo]);
2525

2626
return (
27-
<form className="py-2 ps-2 d-flex gap-2" onSubmit={handleSubmit}>
27+
<form className="tw:py-2 tw:pl-2 tw:flex tw:gap-2" onSubmit={handleSubmit}>
2828
<Input
2929
name="baseUrl"
3030
placeholder="Server URL"

package-lock.json

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"react": "^18.3 || ^19.0",
5252
"react-dom": "^18.3 || ^19.0",
5353
"react-redux": "^9.2.0",
54-
"react-router": "^7.1.5",
55-
"reactstrap": "^9.2.0"
54+
"react-router": "^7.1.5"
5655
},
5756
"peerDependenciesMeta": {
5857
"@shlinkio/shlink-js-sdk": {

test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ describe('<ShortUrlsFilterDropdown />', () => {
3939

4040
it.each([
4141
[() => setUp({ filterShortUrlsByDomain: true })],
42-
// TODO Enable back once https://github.com/reactstrap/reactstrap/issues/2759 is fixed
43-
// [() => setUpOpened({ filterShortUrlsByDomain: true })],
42+
[() => setUpOpened({ filterShortUrlsByDomain: true })],
4443
])('passes a11y checks', (setUp) => checkAccessibility(setUp()));
4544

4645
it.each([

vite.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ export default defineConfig({
101101
},
102102
},
103103

104-
// Silent warnings due to use of propTypes in reactstrap
105-
onConsoleLog: (log) => !log.includes('Support for defaultProps will be removed'),
106-
107104
// Workaround for bug in react-router (or vitest module resolution) which causes different react-router versions to
108105
// be resolved for the main package and dependencies which have a peer dependency in react-router.
109106
// This ensures always the same version is resolved.

0 commit comments

Comments
 (0)