Skip to content

Commit e4a4ea1

Browse files
committed
chore(ui): refactor filter modals across pages for mobile support
1 parent 5a2abd7 commit e4a4ea1

46 files changed

Lines changed: 641 additions & 522 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ui/dashboard/src/@locales/en/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
"see-more": "See more",
223223
"default": "Default",
224224
"sort-by": "Sort by: {{sortBy}}",
225+
"sort-by-placeholder": "Sort by",
225226
"sort-asc": "Ascending",
226227
"sort-desc": "Descending",
227228
"no-options-found": "No options found",

ui/dashboard/src/@locales/ja/common.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
"see-more": "もっと見る",
223223
"default": "デフォルト",
224224
"sort-by": "並び替え: {{sortBy}}",
225+
"sort-by-placeholder": "並び替え",
225226
"sort-asc": "昇順",
226227
"sort-desc": "降順",
227228
"no-options-found": "オプションが見つかりません",
@@ -385,7 +386,10 @@
385386
"all": "<b>all:</b> すべての評価結果を返し、SDK キャッシュ全体を更新します。"
386387
}
387388
}
388-
}
389-
},
390-
"load-more": "もっと読み込む"
389+
}
390+
},
391+
"detail": "詳細",
392+
"last-seen": "最終アクセス日時",
393+
"time-stop": "終了日時",
394+
"time-start": "開始日時"
391395
}

ui/dashboard/src/app/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export const Root = memo(() => {
166166
return (
167167
<div className="flex flex-col sm:flex-row w-full h-full">
168168
<div className="flex fixed z-20 top-0 left-0 gap-3 items-center justify-between sm:hidden w-full h-[50px] px-4 bg-primary-400">
169-
<img src={logo} alt="Bucketer" />
169+
<img src={logo} alt="Bucketeer" />
170170
{!showMenu && (
171171
<Button
172172
className="bg-transparent hover:bg-transparent p-0"

ui/dashboard/src/components/date-range-picker/customize-date-range-picker.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
}
157157

158158
.rdrMonthsVertical{
159-
@apply max-h-[600px] overflow-y-scroll
159+
@apply max-h-[600px] overflow-y-scroll;
160160
}
161161

162162
.rdrCalendarWrapper {

ui/dashboard/src/components/date-time-picker/custom-datepicker.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
@apply text-gray-500;
8080
}
8181
.react-datepicker__view-calendar-icon input{
82-
@apply w-full
82+
@apply w-full;
8383
}
8484

8585
@media (max-width: 599px) {
@@ -115,10 +115,10 @@
115115
@apply w-full;
116116
}
117117
.react-datepicker__time-list {
118-
@apply !h-[56px] flex overflow-x-auto overflow-y-hidden;
118+
@apply !h-auto flex flex-wrap gap-2 overflow-visible p-3;
119119
}
120120
.react-datepicker__time-list-item {
121-
@apply shrink-0 px-3;
121+
@apply !h-auto shrink-0 rounded-md border border-gray-200 px-3 py-2;
122122
}
123123
.react-datepicker__time-box {
124124
@apply !w-full;

ui/dashboard/src/components/dropdown/content.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import { cn } from 'utils/style';
44

55
export type DropdownMenuContentProps = ComponentPropsWithoutRef<
66
typeof DropdownMenuPrimitive.Content
7-
> & {
8-
isExpand?: boolean;
9-
};
7+
>;
108

119
export const DropdownMenuContent = forwardRef<
1210
HTMLDivElement,

ui/dashboard/src/components/dropdown/trigger.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Spinner from 'components/spinner';
1616

1717
const triggerVariants = cva(
1818
[
19-
'flex items-center px-3 py-[11px] gap-x-3 w-fit border rounded-lg bg-white max-[600px]:py-2 max-[600px]:text-sm',
19+
'flex items-center px-3 py-[11px] gap-x-3 w-fit border rounded-lg bg-white max-sm:py-2 max-sm:text-sm',
2020
'disabled:cursor-not-allowed disabled:border-gray-400 disabled:bg-gray-100 disabled:!shadow-none'
2121
],
2222
{

ui/dashboard/src/components/input/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const inputVariants = cva(
2929
},
3030
size: {
3131
sm: 'px-4 py-2',
32-
md: 'px-4 py-[11px] max-[600px]:py-2 max-[600px]:text-sm',
32+
md: 'px-4 py-[11px] max-sm:py-2 max-sm:text-sm',
3333
lg: 'px-4 py-4'
3434
},
3535
addonSlot: {

ui/dashboard/src/components/mobile-card/api-card/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { useCallback } from 'react';
2-
import { IconEditOutlined } from 'react-icons-material-design';
2+
import {
3+
IconEditOutlined,
4+
IconMoreVertOutlined
5+
} from 'react-icons-material-design';
36
import { useAuthAccess } from 'auth';
47
import { useToast } from 'hooks';
58
import { useTranslation } from 'i18n';
@@ -144,6 +147,7 @@ export const ApiCard: React.FC<ApiCardProps> = ({ data, onActions }) => {
144147
>
145148
<Card.Action>
146149
<DisabledPopoverTooltip
150+
icon={IconMoreVertOutlined}
147151
isNeedAdminAccess
148152
options={compact([
149153
{

ui/dashboard/src/components/mobile-card/env-card/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
IconArchiveOutlined,
3-
IconEditOutlined
3+
IconEditOutlined,
4+
IconMoreVertOutlined
45
} from 'react-icons-material-design';
56
import { getCurrentEnvironment, useAuth } from 'auth';
67
import { useTranslation } from 'i18n';
@@ -55,6 +56,7 @@ export const EnvironmentCard: React.FC<EnvCardProps> = ({
5556
>
5657
<Card.Action>
5758
<DisabledPopoverTooltip
59+
icon={IconMoreVertOutlined}
5860
isNeedAdminAccess
5961
content={
6062
isDisabled ? t('table:disabled-archive-current-env') : undefined

0 commit comments

Comments
 (0)