refactor: UI 일관성 개선 및 회사 타입 배지 통일
- 회사 리스트 화면의 배지를 ShadcnBadge 컴포넌트로 통일 - 본사(Blue)와 지점(Purple) 색상 차별화로 시각적 구분 강화 - 고객사(Orange), 파트너사(Green) 색상 체계 개선 - 장비/라이선스 관리 화면과 동일한 배지 스타일 적용 - 불필요한 문서 파일 정리 - 라이선스 만료 요약 모델 업데이트 - 리스트 화면들의 페이지네이션 및 필터링 로직 개선 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
JiWoong Sul
@@ -9,6 +9,7 @@ import 'package:superport/screens/user/user_list_redesign.dart';
|
||||
import 'package:superport/screens/license/license_list_redesign.dart';
|
||||
import 'package:superport/screens/warehouse_location/warehouse_location_list_redesign.dart';
|
||||
import 'package:superport/services/auth_service.dart';
|
||||
import 'package:superport/services/dashboard_service.dart';
|
||||
import 'package:superport/utils/constants.dart';
|
||||
import 'package:superport/data/models/auth/auth_user.dart';
|
||||
|
||||
@@ -32,7 +33,9 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
late AnimationController _sidebarAnimationController;
|
||||
AuthUser? _currentUser;
|
||||
late final AuthService _authService;
|
||||
late final DashboardService _dashboardService;
|
||||
late Animation<double> _sidebarAnimation;
|
||||
int _expiringLicenseCount = 0; // 30일 내 만료 예정 라이선스 수
|
||||
|
||||
// 레이아웃 상수 (1920x1080 최적화)
|
||||
static const double _sidebarExpandedWidth = 260.0;
|
||||
@@ -46,7 +49,9 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
_currentRoute = widget.initialRoute;
|
||||
_setupAnimations();
|
||||
_authService = GetIt.instance<AuthService>();
|
||||
_dashboardService = GetIt.instance<DashboardService>();
|
||||
_loadCurrentUser();
|
||||
_loadLicenseExpirySummary();
|
||||
}
|
||||
|
||||
Future<void> _loadCurrentUser() async {
|
||||
@@ -57,6 +62,36 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadLicenseExpirySummary() async {
|
||||
try {
|
||||
print('[DEBUG] 라이선스 만료 정보 로드 시작...');
|
||||
final result = await _dashboardService.getLicenseExpirySummary();
|
||||
result.fold(
|
||||
(failure) {
|
||||
// 실패 시 0으로 유지
|
||||
print('[ERROR] 라이선스 만료 정보 로드 실패: $failure');
|
||||
},
|
||||
(summary) {
|
||||
print('[DEBUG] 라이선스 만료 정보 로드 성공!');
|
||||
print('[DEBUG] 30일 내 만료: ${summary.within30Days}개');
|
||||
print('[DEBUG] 60일 내 만료: ${summary.within60Days}개');
|
||||
print('[DEBUG] 90일 내 만료: ${summary.within90Days}개');
|
||||
print('[DEBUG] 이미 만료: ${summary.expired}개');
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_expiringLicenseCount = summary.within30Days;
|
||||
print('[DEBUG] 상태 업데이트 완료: $_expiringLicenseCount');
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
print('[ERROR] 라이선스 만료 정보 로드 중 예외 발생: $e');
|
||||
print('[ERROR] 스택 트레이스: ${StackTrace.current}');
|
||||
}
|
||||
}
|
||||
|
||||
void _setupAnimations() {
|
||||
_sidebarAnimationController = AnimationController(
|
||||
@@ -114,6 +149,10 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
setState(() {
|
||||
_currentRoute = route;
|
||||
});
|
||||
// 라이선스 화면으로 이동할 때 만료 정보 새로고침
|
||||
if (route == Routes.license) {
|
||||
_loadLicenseExpirySummary();
|
||||
}
|
||||
}
|
||||
|
||||
/// 사이드바 토글
|
||||
@@ -479,6 +518,7 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
currentRoute: _currentRoute,
|
||||
onRouteChanged: _navigateTo,
|
||||
collapsed: _sidebarCollapsed,
|
||||
expiringLicenseCount: _expiringLicenseCount,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -551,6 +591,7 @@ class _AppLayoutRedesignState extends State<AppLayoutRedesign>
|
||||
onPressed: () {
|
||||
// 페이지 새로고침
|
||||
setState(() {});
|
||||
_loadLicenseExpirySummary(); // 라이선스 만료 정보도 새로고침
|
||||
},
|
||||
variant: ShadcnButtonVariant.ghost,
|
||||
size: ShadcnButtonSize.small,
|
||||
@@ -804,12 +845,14 @@ class SidebarMenuRedesign extends StatelessWidget {
|
||||
final String currentRoute;
|
||||
final Function(String) onRouteChanged;
|
||||
final bool collapsed;
|
||||
final int expiringLicenseCount;
|
||||
|
||||
const SidebarMenuRedesign({
|
||||
Key? key,
|
||||
required this.currentRoute,
|
||||
required this.onRouteChanged,
|
||||
required this.collapsed,
|
||||
required this.expiringLicenseCount,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
@@ -884,7 +927,7 @@ class SidebarMenuRedesign extends StatelessWidget {
|
||||
title: '유지보수 관리',
|
||||
route: Routes.license,
|
||||
isActive: currentRoute == Routes.license,
|
||||
badge: '3', // 만료 임박 라이선스 수
|
||||
badge: expiringLicenseCount > 0 ? expiringLicenseCount.toString() : null,
|
||||
),
|
||||
|
||||
if (!collapsed) ...[
|
||||
@@ -1003,13 +1046,13 @@ class SidebarMenuRedesign extends StatelessWidget {
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.error,
|
||||
color: Colors.orange,
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Text(
|
||||
badge,
|
||||
style: ShadcnTheme.caption.copyWith(
|
||||
color: ShadcnTheme.errorForeground,
|
||||
color: Colors.white,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
@@ -1024,7 +1067,7 @@ class SidebarMenuRedesign extends StatelessWidget {
|
||||
width: 8,
|
||||
height: 8,
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.error,
|
||||
color: Colors.orange,
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -140,37 +140,27 @@ class _CompanyListRedesignState extends State<CompanyListRedesign> {
|
||||
spacing: 4,
|
||||
runSpacing: 2,
|
||||
children: types.map((type) {
|
||||
Color bgColor;
|
||||
Color textColor;
|
||||
ShadcnBadgeVariant variant;
|
||||
String displayText;
|
||||
|
||||
switch (type) {
|
||||
case CompanyType.customer:
|
||||
bgColor = ShadcnTheme.green.withValues(alpha: 0.9);
|
||||
textColor = Colors.white;
|
||||
variant = ShadcnBadgeVariant.companyCustomer; // Orange
|
||||
displayText = '고객사';
|
||||
break;
|
||||
case CompanyType.partner:
|
||||
bgColor = ShadcnTheme.purple.withValues(alpha: 0.9);
|
||||
textColor = Colors.white;
|
||||
variant = ShadcnBadgeVariant.companyPartner; // Green
|
||||
displayText = '파트너사';
|
||||
break;
|
||||
default:
|
||||
bgColor = ShadcnTheme.muted.withValues(alpha: 0.9);
|
||||
textColor = ShadcnTheme.foreground;
|
||||
variant = ShadcnBadgeVariant.secondary;
|
||||
displayText = companyTypeToString(type);
|
||||
}
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1),
|
||||
decoration: BoxDecoration(
|
||||
color: bgColor,
|
||||
borderRadius: BorderRadius.circular(3),
|
||||
),
|
||||
child: Text(
|
||||
companyTypeToString(type),
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: textColor,
|
||||
),
|
||||
),
|
||||
return ShadcnBadge(
|
||||
text: displayText,
|
||||
variant: variant,
|
||||
size: ShadcnBadgeSize.small,
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
@@ -181,23 +171,12 @@ class _CompanyListRedesignState extends State<CompanyListRedesign> {
|
||||
|
||||
/// 본사/지점 구분 배지 생성
|
||||
Widget _buildCompanyTypeLabel(bool isBranch) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
|
||||
decoration: BoxDecoration(
|
||||
color:
|
||||
isBranch
|
||||
? ShadcnTheme.blue.withValues(alpha: 0.9)
|
||||
: ShadcnTheme.primary.withValues(alpha: 0.9),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(
|
||||
isBranch ? '지점' : '본사',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
return ShadcnBadge(
|
||||
text: isBranch ? '지점' : '본사',
|
||||
variant: isBranch
|
||||
? ShadcnBadgeVariant.companyBranch // Purple (#7C3AED) - 차별화
|
||||
: ShadcnBadgeVariant.companyHeadquarters, // Blue (#2563EB)
|
||||
size: ShadcnBadgeSize.small,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,11 @@ import 'package:superport/models/license_model.dart';
|
||||
import 'package:superport/screens/common/theme_shadcn.dart';
|
||||
import 'package:superport/screens/common/components/shadcn_components.dart';
|
||||
import 'package:superport/screens/common/widgets/pagination.dart';
|
||||
import 'package:superport/screens/common/widgets/unified_search_bar.dart';
|
||||
import 'package:superport/screens/common/widgets/standard_data_table.dart' as std_table;
|
||||
import 'package:superport/screens/common/widgets/standard_action_bar.dart';
|
||||
import 'package:superport/screens/common/widgets/standard_states.dart';
|
||||
import 'package:superport/screens/common/layouts/base_list_screen.dart';
|
||||
import 'package:superport/screens/license/controllers/license_list_controller.dart';
|
||||
import 'package:superport/utils/constants.dart';
|
||||
import 'package:superport/services/mock_data_service.dart';
|
||||
@@ -244,26 +249,31 @@ class _LicenseListRedesignState extends State<LicenseListRedesign> {
|
||||
value: _controller,
|
||||
child: Consumer<LicenseListController>(
|
||||
builder: (context, controller, child) {
|
||||
return Container(
|
||||
color: ShadcnTheme.background,
|
||||
child: Column(
|
||||
children: [
|
||||
// 상단 통계 카드
|
||||
_buildStatisticsCards(),
|
||||
|
||||
// 필터 및 액션 바
|
||||
_buildFilterBar(),
|
||||
|
||||
// 라이선스 테이블
|
||||
Expanded(
|
||||
child: controller.isLoading && controller.licenses.isEmpty
|
||||
? _buildLoadingState()
|
||||
: controller.error != null
|
||||
? _buildErrorState()
|
||||
: _buildLicenseTable(),
|
||||
),
|
||||
],
|
||||
),
|
||||
final licenses = controller.licenses;
|
||||
final totalCount = licenses.length;
|
||||
|
||||
return BaseListScreen(
|
||||
headerSection: _buildStatisticsCards(),
|
||||
searchBar: _buildSearchBar(),
|
||||
actionBar: _buildActionBar(),
|
||||
dataTable: _buildDataTable(),
|
||||
pagination: totalCount > _pageSize
|
||||
? Pagination(
|
||||
totalCount: totalCount,
|
||||
currentPage: _currentPage,
|
||||
pageSize: _pageSize,
|
||||
onPageChanged: (page) {
|
||||
setState(() {
|
||||
_currentPage = page;
|
||||
});
|
||||
},
|
||||
)
|
||||
: null,
|
||||
isLoading: controller.isLoading && controller.licenses.isEmpty,
|
||||
error: controller.error,
|
||||
onRefresh: () => _controller.loadData(),
|
||||
emptyMessage: '등록된 라이선스가 없습니다',
|
||||
emptyIcon: Icons.description_outlined,
|
||||
);
|
||||
},
|
||||
),
|
||||
@@ -351,267 +361,168 @@ class _LicenseListRedesignState extends State<LicenseListRedesign> {
|
||||
);
|
||||
}
|
||||
|
||||
/// 필터 바
|
||||
Widget _buildFilterBar() {
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
// 검색 및 필터 섹션
|
||||
Row(
|
||||
children: [
|
||||
// 검색 입력
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Container(
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.card,
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
border: Border.all(color: Colors.black),
|
||||
),
|
||||
child: TextField(
|
||||
controller: _searchController,
|
||||
onSubmitted: (_) => _onSearch(),
|
||||
decoration: InputDecoration(
|
||||
hintText: '제품명, 라이선스 키, 벤더명, 현위치 검색...',
|
||||
hintStyle: TextStyle(color: ShadcnTheme.mutedForeground.withValues(alpha: 0.8), fontSize: 14),
|
||||
prefixIcon: Icon(Icons.search, color: ShadcnTheme.muted, size: 20),
|
||||
border: InputBorder.none,
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
),
|
||||
style: ShadcnTheme.bodyMedium,
|
||||
),
|
||||
),
|
||||
/// 검색바
|
||||
Widget _buildSearchBar() {
|
||||
return Row(
|
||||
children: [
|
||||
// 검색 입력
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Container(
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.card,
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
border: Border.all(color: Colors.black),
|
||||
),
|
||||
child: TextField(
|
||||
controller: _searchController,
|
||||
onSubmitted: (_) => _onSearch(),
|
||||
decoration: InputDecoration(
|
||||
hintText: '제품명, 라이선스 키, 벤더명, 현위치 검색...',
|
||||
hintStyle: TextStyle(color: ShadcnTheme.mutedForeground.withValues(alpha: 0.8), fontSize: 14),
|
||||
prefixIcon: Icon(Icons.search, color: ShadcnTheme.muted, size: 20),
|
||||
border: InputBorder.none,
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 검색 버튼
|
||||
SizedBox(
|
||||
height: 40,
|
||||
child: ShadcnButton(
|
||||
text: '검색',
|
||||
onPressed: _onSearch,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: const Icon(Icons.search, size: 16),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 상태 필터 드롭다운
|
||||
Container(
|
||||
height: 40,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.card,
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
),
|
||||
child: DropdownButtonHideUnderline(
|
||||
child: DropdownButton<LicenseStatusFilter>(
|
||||
value: _controller.statusFilter,
|
||||
onChanged: (value) {
|
||||
if (value != null) {
|
||||
_controller.changeStatusFilter(value);
|
||||
}
|
||||
},
|
||||
style: TextStyle(fontSize: 14, color: ShadcnTheme.foreground),
|
||||
icon: const Icon(Icons.arrow_drop_down, size: 20),
|
||||
items: const [
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.all,
|
||||
child: Text('전체'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.active,
|
||||
child: Text('활성'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.inactive,
|
||||
child: Text('비활성'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.expiringSoon,
|
||||
child: Text('만료예정'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.expired,
|
||||
child: Text('만료됨'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
style: ShadcnTheme.bodyMedium,
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 액션 버튼들 및 상태 표시
|
||||
Row(
|
||||
children: [
|
||||
// 액션 버튼들
|
||||
ShadcnButton(
|
||||
text: '유지보수 연장',
|
||||
onPressed: _navigateToAdd,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: const Icon(Icons.add, size: 16),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
|
||||
ShadcnButton(
|
||||
text: '삭제',
|
||||
onPressed: _controller.selectedCount > 0 ? _showBulkDeleteDialog : null,
|
||||
variant: _controller.selectedCount > 0
|
||||
? ShadcnButtonVariant.destructive
|
||||
: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.delete, size: 16),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
|
||||
ShadcnButton(
|
||||
text: '엑셀 내보내기',
|
||||
onPressed: _showExportInfo,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.download, size: 16),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
|
||||
ShadcnButton(
|
||||
text: '엑셀 가져오기',
|
||||
onPressed: _showImportInfo,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.upload, size: 16),
|
||||
),
|
||||
|
||||
const Spacer(),
|
||||
|
||||
// 선택 및 총 개수 표시
|
||||
if (_controller.selectedCount > 0)
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
vertical: 8,
|
||||
horizontal: 16,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.muted.withValues(alpha: 0.3),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusSm),
|
||||
),
|
||||
child: Text(
|
||||
'${_controller.selectedCount}개 선택됨',
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
if (_controller.selectedCount > 0) const SizedBox(width: 12),
|
||||
|
||||
Text(
|
||||
'총 ${_controller.licenses.length}개',
|
||||
style: ShadcnTheme.bodyMuted,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// 새로고침 버튼
|
||||
IconButton(
|
||||
icon: const Icon(Icons.refresh),
|
||||
onPressed: () => _controller.refresh(),
|
||||
tooltip: '새로고침',
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 로딩 상태
|
||||
Widget _buildLoadingState() {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
CircularProgressIndicator(color: ShadcnTheme.primary),
|
||||
const SizedBox(height: 16),
|
||||
Text('라이선스 데이터를 불러오는 중...', style: ShadcnTheme.bodyMuted),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 에러 상태
|
||||
Widget _buildErrorState() {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(Icons.error_outline, size: 48, color: ShadcnTheme.destructive),
|
||||
const SizedBox(height: 16),
|
||||
Text('데이터를 불러오는 중 오류가 발생했습니다.', style: ShadcnTheme.bodyMuted),
|
||||
const SizedBox(height: 8),
|
||||
Text(_controller.error ?? '', style: ShadcnTheme.bodySmall),
|
||||
const SizedBox(height: 16),
|
||||
ShadcnButton(
|
||||
text: '다시 시도',
|
||||
onPressed: () => _controller.refresh(),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 검색 버튼
|
||||
SizedBox(
|
||||
height: 40,
|
||||
child: ShadcnButton(
|
||||
text: '검색',
|
||||
onPressed: _onSearch,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: const Icon(Icons.search, size: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 상태 필터 드롭다운
|
||||
Container(
|
||||
height: 40,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.card,
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
),
|
||||
child: DropdownButtonHideUnderline(
|
||||
child: DropdownButton<LicenseStatusFilter>(
|
||||
value: _controller.statusFilter,
|
||||
onChanged: (value) {
|
||||
if (value != null) {
|
||||
_controller.changeStatusFilter(value);
|
||||
}
|
||||
},
|
||||
style: TextStyle(fontSize: 14, color: ShadcnTheme.foreground),
|
||||
icon: const Icon(Icons.arrow_drop_down, size: 20),
|
||||
items: const [
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.all,
|
||||
child: Text('전체'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.active,
|
||||
child: Text('활성'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.inactive,
|
||||
child: Text('비활성'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.expiringSoon,
|
||||
child: Text('만료예정'),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: LicenseStatusFilter.expired,
|
||||
child: Text('만료됨'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
/// 라이선스 테이블
|
||||
Widget _buildLicenseTable() {
|
||||
/// 액션 바
|
||||
Widget _buildActionBar() {
|
||||
return StandardActionBar(
|
||||
leftActions: [
|
||||
ShadcnButton(
|
||||
text: '유지보수 연장',
|
||||
onPressed: _navigateToAdd,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: const Icon(Icons.add, size: 16),
|
||||
),
|
||||
|
||||
ShadcnButton(
|
||||
text: '삭제',
|
||||
onPressed: _controller.selectedCount > 0 ? _showBulkDeleteDialog : null,
|
||||
variant: _controller.selectedCount > 0
|
||||
? ShadcnButtonVariant.destructive
|
||||
: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.delete, size: 16),
|
||||
),
|
||||
|
||||
ShadcnButton(
|
||||
text: '엑셀 내보내기',
|
||||
onPressed: _showExportInfo,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.download, size: 16),
|
||||
),
|
||||
|
||||
ShadcnButton(
|
||||
text: '엑셀 가져오기',
|
||||
onPressed: _showImportInfo,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
icon: const Icon(Icons.upload, size: 16),
|
||||
),
|
||||
],
|
||||
selectedCount: _controller.selectedCount,
|
||||
totalCount: _controller.licenses.length,
|
||||
onRefresh: () => _controller.refresh(),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/// 데이터 테이블
|
||||
Widget _buildDataTable() {
|
||||
final licenses = _controller.licenses;
|
||||
|
||||
if (licenses.isEmpty) {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.description_outlined,
|
||||
size: 48,
|
||||
color: ShadcnTheme.mutedForeground,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text('등록된 라이선스가 없습니다.', style: ShadcnTheme.bodyMuted),
|
||||
const SizedBox(height: 16),
|
||||
ShadcnButton(
|
||||
text: '라이선스 추가',
|
||||
onPressed: _navigateToAdd,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: const Icon(Icons.add, size: 16),
|
||||
),
|
||||
],
|
||||
return StandardEmptyState(
|
||||
title: '등록된 라이선스가 없습니다',
|
||||
icon: Icons.description_outlined,
|
||||
action: StandardActionButtons.addButton(
|
||||
text: '첫 라이선스 추가하기',
|
||||
onPressed: _navigateToAdd,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final pagedLicenses = _getPagedLicenses();
|
||||
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
// 테이블 컨테이너 (가로 스크롤 지원)
|
||||
SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
controller: _horizontalScrollController,
|
||||
child: Container(
|
||||
constraints: BoxConstraints(
|
||||
minWidth: MediaQuery.of(context).size.width - 48, // padding 고려
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
),
|
||||
child: SizedBox(
|
||||
width: 1360, // 모든 컬럼 너비의 합
|
||||
child: Column(
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
),
|
||||
child: SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
controller: _horizontalScrollController,
|
||||
child: SizedBox(
|
||||
width: 1360, // 모든 컬럼 너비의 합
|
||||
child: Column(
|
||||
children: [
|
||||
// 테이블 헤더
|
||||
Container(
|
||||
@@ -858,24 +769,8 @@ class _LicenseListRedesignState extends State<LicenseListRedesign> {
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// 페이지네이션 컴포넌트 (항상 표시)
|
||||
if (licenses.length > _pageSize)
|
||||
Pagination(
|
||||
totalCount: licenses.length,
|
||||
currentPage: _currentPage,
|
||||
pageSize: _pageSize,
|
||||
onPageChanged: (page) {
|
||||
setState(() {
|
||||
_currentPage = page;
|
||||
});
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 라이선스 상태 표시 배지
|
||||
|
||||
@@ -3,6 +3,12 @@ import 'package:provider/provider.dart';
|
||||
import 'package:superport/models/warehouse_location_model.dart';
|
||||
import 'package:superport/screens/common/theme_shadcn.dart';
|
||||
import 'package:superport/screens/common/components/shadcn_components.dart';
|
||||
import 'package:superport/screens/common/widgets/pagination.dart';
|
||||
import 'package:superport/screens/common/widgets/unified_search_bar.dart';
|
||||
import 'package:superport/screens/common/widgets/standard_data_table.dart' as std_table;
|
||||
import 'package:superport/screens/common/widgets/standard_action_bar.dart';
|
||||
import 'package:superport/screens/common/widgets/standard_states.dart';
|
||||
import 'package:superport/screens/common/layouts/base_list_screen.dart';
|
||||
import 'package:superport/screens/warehouse_location/controllers/warehouse_location_list_controller.dart';
|
||||
import 'package:superport/utils/constants.dart';
|
||||
|
||||
@@ -97,37 +103,6 @@ class _WarehouseLocationListRedesignState
|
||||
value: _controller,
|
||||
child: Consumer<WarehouseLocationListController>(
|
||||
builder: (context, controller, child) {
|
||||
// 로딩 중일 때
|
||||
if (controller.isLoading && controller.warehouseLocations.isEmpty) {
|
||||
return Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
}
|
||||
|
||||
// 에러가 있을 때
|
||||
if (controller.error != null) {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(Icons.error_outline, size: 48, color: Colors.red),
|
||||
SizedBox(height: 16),
|
||||
Text(
|
||||
'오류가 발생했습니다',
|
||||
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
Text(controller.error!),
|
||||
SizedBox(height: 16),
|
||||
ElevatedButton(
|
||||
onPressed: _reload,
|
||||
child: Text('다시 시도'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final int totalCount = controller.warehouseLocations.length;
|
||||
final int startIndex = (_currentPage - 1) * _pageSize;
|
||||
final int endIndex =
|
||||
@@ -138,258 +113,223 @@ class _WarehouseLocationListRedesignState
|
||||
? controller.warehouseLocations.sublist(startIndex, endIndex)
|
||||
: [];
|
||||
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(ShadcnTheme.spacing6),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 헤더 액션 바
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text('총 ${totalCount}개 입고지', style: ShadcnTheme.bodyMuted),
|
||||
if (controller.searchQuery.isNotEmpty)
|
||||
Text(
|
||||
'"${controller.searchQuery}" 검색 결과',
|
||||
style: ShadcnTheme.bodyMuted.copyWith(fontSize: 12),
|
||||
),
|
||||
],
|
||||
),
|
||||
ShadcnButton(
|
||||
text: '입고지 추가',
|
||||
onPressed: _navigateToAdd,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: Icon(Icons.add),
|
||||
),
|
||||
],
|
||||
),
|
||||
return BaseListScreen(
|
||||
isLoading: controller.isLoading && controller.warehouseLocations.isEmpty,
|
||||
error: controller.error,
|
||||
onRefresh: _reload,
|
||||
emptyMessage:
|
||||
controller.searchQuery.isNotEmpty
|
||||
? '검색 결과가 없습니다'
|
||||
: '등록된 입고지가 없습니다',
|
||||
emptyIcon: Icons.warehouse_outlined,
|
||||
|
||||
const SizedBox(height: ShadcnTheme.spacing4),
|
||||
// 검색바 (기본 비어있음)
|
||||
searchBar: Container(),
|
||||
|
||||
// 테이블 컨테이너
|
||||
Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
// 액션바
|
||||
actionBar: StandardActionBar(
|
||||
leftActions: [
|
||||
ShadcnButton(
|
||||
text: '입고지 추가',
|
||||
onPressed: _navigateToAdd,
|
||||
variant: ShadcnButtonVariant.primary,
|
||||
textColor: Colors.white,
|
||||
icon: Icon(Icons.add),
|
||||
),
|
||||
],
|
||||
totalCount: totalCount,
|
||||
onRefresh: _reload,
|
||||
statusMessage:
|
||||
controller.searchQuery.isNotEmpty
|
||||
? '"${controller.searchQuery}" 검색 결과'
|
||||
: null,
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 테이블 헤더
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: ShadcnTheme.spacing4,
|
||||
vertical: 10,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.muted.withValues(alpha: 0.3),
|
||||
border: Border(
|
||||
bottom: BorderSide(color: Colors.black),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text('번호', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 3,
|
||||
child: Text('입고지명', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 4,
|
||||
child: Text('주소', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Text('비고', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text('관리', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// 테이블 데이터
|
||||
if (controller.isLoading)
|
||||
Container(
|
||||
padding: const EdgeInsets.all(ShadcnTheme.spacing8),
|
||||
child: Center(
|
||||
child: Column(
|
||||
children: [
|
||||
CircularProgressIndicator(),
|
||||
SizedBox(height: 8),
|
||||
Text('데이터를 불러오는 중...', style: ShadcnTheme.bodyMuted),
|
||||
],
|
||||
),
|
||||
),
|
||||
)
|
||||
else if (pagedLocations.isEmpty)
|
||||
Container(
|
||||
padding: const EdgeInsets.all(ShadcnTheme.spacing8),
|
||||
child: Center(
|
||||
child: Text(
|
||||
controller.searchQuery.isNotEmpty
|
||||
? '검색 결과가 없습니다.'
|
||||
: '등록된 입고지가 없습니다.',
|
||||
style: ShadcnTheme.bodyMuted,
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
...pagedLocations.asMap().entries.map((entry) {
|
||||
final int index = entry.key;
|
||||
final WarehouseLocation location = entry.value;
|
||||
// 데이터 테이블
|
||||
dataTable: _buildDataTable(pagedLocations, startIndex),
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: ShadcnTheme.spacing4,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
bottom: BorderSide(color: Colors.black),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
// 번호
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text(
|
||||
'${startIndex + index + 1}',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
),
|
||||
),
|
||||
// 입고지명
|
||||
Expanded(
|
||||
flex: 3,
|
||||
child: Text(
|
||||
location.name,
|
||||
style: ShadcnTheme.bodyMedium,
|
||||
),
|
||||
),
|
||||
// 주소
|
||||
Expanded(
|
||||
flex: 4,
|
||||
child: Text(
|
||||
'${location.address.region} ${location.address.detailAddress}',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// 비고
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Text(
|
||||
location.remark ?? '-',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// 관리
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Flexible(
|
||||
child: IconButton(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 30,
|
||||
minHeight: 30,
|
||||
),
|
||||
padding: const EdgeInsets.all(4),
|
||||
icon: Icon(
|
||||
Icons.edit,
|
||||
size: 16,
|
||||
color: ShadcnTheme.primary,
|
||||
),
|
||||
onPressed: () => _navigateToEdit(location),
|
||||
tooltip: '수정',
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
child: IconButton(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 30,
|
||||
minHeight: 30,
|
||||
),
|
||||
padding: const EdgeInsets.all(4),
|
||||
icon: Icon(
|
||||
Icons.delete,
|
||||
size: 16,
|
||||
color: ShadcnTheme.destructive,
|
||||
),
|
||||
onPressed: () =>
|
||||
_showDeleteDialog(location.id),
|
||||
tooltip: '삭제',
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 페이지네이션 (항상 표시)
|
||||
const SizedBox(height: ShadcnTheme.spacing6),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
ShadcnButton(
|
||||
text: '이전',
|
||||
onPressed:
|
||||
_currentPage > 1
|
||||
? () {
|
||||
setState(() {
|
||||
_currentPage--;
|
||||
});
|
||||
}
|
||||
: null,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
size: ShadcnButtonSize.small,
|
||||
),
|
||||
const SizedBox(width: ShadcnTheme.spacing2),
|
||||
Text(
|
||||
totalCount > 0
|
||||
? '$_currentPage / ${(totalCount / _pageSize).ceil()}'
|
||||
: '1 / 1',
|
||||
style: ShadcnTheme.bodyMuted,
|
||||
),
|
||||
const SizedBox(width: ShadcnTheme.spacing2),
|
||||
ShadcnButton(
|
||||
text: '다음',
|
||||
onPressed:
|
||||
_currentPage < (totalCount / _pageSize).ceil() && totalCount > _pageSize
|
||||
? () {
|
||||
setState(() {
|
||||
_currentPage++;
|
||||
});
|
||||
}
|
||||
: null,
|
||||
variant: ShadcnButtonVariant.secondary,
|
||||
size: ShadcnButtonSize.small,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
// 페이지네이션
|
||||
pagination: totalCount > _pageSize ? Pagination(
|
||||
totalCount: totalCount,
|
||||
currentPage: _currentPage,
|
||||
pageSize: _pageSize,
|
||||
onPageChanged: (page) {
|
||||
setState(() {
|
||||
_currentPage = page;
|
||||
});
|
||||
},
|
||||
) : null,
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 데이터 테이블
|
||||
Widget _buildDataTable(List<WarehouseLocation> pagedLocations, int startIndex) {
|
||||
if (pagedLocations.isEmpty) {
|
||||
return StandardEmptyState(
|
||||
title:
|
||||
_controller.searchQuery.isNotEmpty
|
||||
? '검색 결과가 없습니다'
|
||||
: '등록된 입고지가 없습니다',
|
||||
icon: Icons.warehouse_outlined,
|
||||
action:
|
||||
_controller.searchQuery.isEmpty
|
||||
? StandardActionButtons.addButton(
|
||||
text: '첫 입고지 추가하기',
|
||||
onPressed: _navigateToAdd,
|
||||
)
|
||||
: null,
|
||||
);
|
||||
}
|
||||
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.black),
|
||||
borderRadius: BorderRadius.circular(ShadcnTheme.radiusMd),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 테이블 헤더
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: ShadcnTheme.spacing4,
|
||||
vertical: 10,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: ShadcnTheme.muted.withValues(alpha: 0.3),
|
||||
border: Border(
|
||||
bottom: BorderSide(color: Colors.black),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text('번호', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 3,
|
||||
child: Text('입고지명', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 4,
|
||||
child: Text('주소', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Text('비고', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text('관리', style: ShadcnTheme.bodyMedium),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// 테이블 데이터
|
||||
...pagedLocations.asMap().entries.map((entry) {
|
||||
final int index = entry.key;
|
||||
final WarehouseLocation location = entry.value;
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: ShadcnTheme.spacing4,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
bottom: BorderSide(color: Colors.black),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
// 번호
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Text(
|
||||
'${startIndex + index + 1}',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
),
|
||||
),
|
||||
// 입고지명
|
||||
Expanded(
|
||||
flex: 3,
|
||||
child: Text(
|
||||
location.name,
|
||||
style: ShadcnTheme.bodyMedium,
|
||||
),
|
||||
),
|
||||
// 주소
|
||||
Expanded(
|
||||
flex: 4,
|
||||
child: Text(
|
||||
'${location.address.region} ${location.address.detailAddress}',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// 비고
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: Text(
|
||||
location.remark ?? '-',
|
||||
style: ShadcnTheme.bodySmall,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// 관리
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Flexible(
|
||||
child: IconButton(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 30,
|
||||
minHeight: 30,
|
||||
),
|
||||
padding: const EdgeInsets.all(4),
|
||||
icon: Icon(
|
||||
Icons.edit,
|
||||
size: 16,
|
||||
color: ShadcnTheme.primary,
|
||||
),
|
||||
onPressed: () => _navigateToEdit(location),
|
||||
tooltip: '수정',
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
child: IconButton(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 30,
|
||||
minHeight: 30,
|
||||
),
|
||||
padding: const EdgeInsets.all(4),
|
||||
icon: Icon(
|
||||
Icons.delete,
|
||||
size: 16,
|
||||
color: ShadcnTheme.destructive,
|
||||
),
|
||||
onPressed: () =>
|
||||
_showDeleteDialog(location.id),
|
||||
tooltip: '삭제',
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user