luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-04 20:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed domain search

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-02-04 21:20:10 +01:00
parent 7e1dbc2388
commit 47d01de33a
8 changed files with 68 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/l10n/app_en.arb
View file

@ -581,5 +581,6 @@
"dnsCacheCleared": "DNS cache cleared successfully", "dnsCacheCleared": "DNS cache cleared successfully",
"clearingDnsCache": "Clearing cache...", "clearingDnsCache": "Clearing cache...",
"dnsCacheNotCleared": "DNS cache couldn't be cleared", "dnsCacheNotCleared": "DNS cache couldn't be cleared",
"clientsSelected": "clients selected" "clientsSelected": "clients selected",
"invalidDomain": "Invalid domain"
} }

3
lib/l10n/app_es.arb
View file

@ -581,5 +581,6 @@
"dnsCacheCleared": "Caché de DNS borrada correctamente", "dnsCacheCleared": "Caché de DNS borrada correctamente",
"clearingDnsCache": "Borrando caché...", "clearingDnsCache": "Borrando caché...",
"dnsCacheNotCleared": "La caché de DNS no pudo ser borrada", "dnsCacheNotCleared": "La caché de DNS no pudo ser borrada",
"clientsSelected": "clientes seleccionados" "clientsSelected": "clientes seleccionados",
"invalidDomain": "Dominio no válido"
} }

4
lib/models/applied_filters.dart
View file

@ -1,11 +1,11 @@
class AppliedFiters { class AppliedFiters {
String selectedResultStatus = 'all'; String selectedResultStatus = 'all';
String? searchText; String? domainText;
List<String>? clients; List<String>? clients;
AppliedFiters({ AppliedFiters({
required this.selectedResultStatus, required this.selectedResultStatus,
required this.searchText, required this.domainText,
required this.clients required this.clients
}); });
} }

14
lib/providers/logs_provider.dart
View file

@ -12,7 +12,7 @@ class LogsProvider with ChangeNotifier {
DateTime? _logsOlderThan; DateTime? _logsOlderThan;
String _selectedResultStatus = 'all'; String _selectedResultStatus = 'all';
String? _searchText; String? _domainText;
List<String>? _selectedClients; List<String>? _selectedClients;
int _logsQuantity = 100; int _logsQuantity = 100;
@ -20,7 +20,7 @@ class LogsProvider with ChangeNotifier {
AppliedFiters _appliedFilters = AppliedFiters( AppliedFiters _appliedFilters = AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: null, domainText: null,
clients: null clients: null
); );
@ -44,8 +44,8 @@ class LogsProvider with ChangeNotifier {
return _selectedResultStatus; return _selectedResultStatus;
} }
String? get searchText { String? get domainText {
return _searchText; return _domainText;
} }
int get logsQuantity { int get logsQuantity {
@ -98,7 +98,7 @@ class LogsProvider with ChangeNotifier {
_logsOlderThan = null; _logsOlderThan = null;
_offset = 0; _offset = 0;
_selectedResultStatus = 'all'; _selectedResultStatus = 'all';
_searchText = null; _domainText = null;
notifyListeners(); notifyListeners();
} }
@ -116,8 +116,8 @@ class LogsProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
} }
void setSearchText(String? value) { void setDomainText(String? value) {
_searchText = value; _domainText = value;
notifyListeners(); notifyListeners();
} }

8
lib/screens/home/top_items.dart
View file

@ -140,24 +140,24 @@ class TopItems extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () { onTap: () {
if (type == 'topQueriedDomains' || type == 'topBlockedDomains') { if (type == 'topQueriedDomains' || type == 'topBlockedDomains') {
logsProvider.setSearchText(item.keys.toList()[0]); logsProvider.setDomainText(item.keys.toList()[0]);
logsProvider.setSelectedClients(null); logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: item.keys.toList()[0], domainText: item.keys.toList()[0],
clients: null clients: null
) )
); );
appConfigProvider.setSelectedScreen(2); appConfigProvider.setSelectedScreen(2);
} }
else if (type == 'topClients') { else if (type == 'topClients') {
logsProvider.setSearchText(null); logsProvider.setDomainText(null);
logsProvider.setSelectedClients([item.keys.toList()[0]]); logsProvider.setSelectedClients([item.keys.toList()[0]]);
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: null, domainText: null,
clients: [item.keys.toList()[0]] clients: [item.keys.toList()[0]]
) )
); );

28
lib/screens/logs/logs.dart
View file

@ -31,7 +31,7 @@ class Logs extends StatelessWidget {
appConfigProvider: appConfigProvider, appConfigProvider: appConfigProvider,
logsProvider: logsProvider, logsProvider: logsProvider,
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus, selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
searchText: logsProvider.appliedFilters.searchText, domainText: logsProvider.appliedFilters.domainText,
); );
} }
} }
@ -41,7 +41,7 @@ class LogsWidget extends StatefulWidget {
final AppConfigProvider appConfigProvider; final AppConfigProvider appConfigProvider;
final LogsProvider logsProvider; final LogsProvider logsProvider;
final String selectedResultStatus; final String selectedResultStatus;
final String? searchText; final String? domainText;
const LogsWidget({ const LogsWidget({
Key? key, Key? key,
@ -49,7 +49,7 @@ class LogsWidget extends StatefulWidget {
required this.appConfigProvider, required this.appConfigProvider,
required this.logsProvider, required this.logsProvider,
required this.selectedResultStatus, required this.selectedResultStatus,
required this.searchText, required this.domainText,
}) : super(key: key); }) : super(key: key);
@override @override
@ -67,12 +67,12 @@ class _LogsWidgetState extends State<LogsWidget> {
int? inOffset, int? inOffset,
bool? loadingMore, bool? loadingMore,
String? responseStatus, String? responseStatus,
String? searchText, String? domainText,
}) async { }) async {
int offst = inOffset ?? widget.logsProvider.offset; int offst = inOffset ?? widget.logsProvider.offset;
String resStatus = responseStatus ?? widget.selectedResultStatus; String resStatus = responseStatus ?? widget.selectedResultStatus;
String? search = searchText ?? widget.searchText; String? search = domainText ?? widget.domainText;
if (loadingMore != null && loadingMore == true) { if (loadingMore != null && loadingMore == true) {
setState(() => isLoadingMore = true); setState(() => isLoadingMore = true);
@ -402,7 +402,7 @@ class _LogsWidgetState extends State<LogsWidget> {
), ),
const SizedBox(width: 5), const SizedBox(width: 5),
], ],
bottom: logsProvider.appliedFilters.searchText != null || logsProvider.appliedFilters.selectedResultStatus != 'all' || logsProvider.appliedFilters.clients != null bottom: logsProvider.appliedFilters.domainText != null || logsProvider.appliedFilters.selectedResultStatus != 'all' || logsProvider.appliedFilters.clients != null
? PreferredSize( ? PreferredSize(
preferredSize: const Size(double.maxFinite, 50), preferredSize: const Size(double.maxFinite, 50),
child: Container( child: Container(
@ -421,16 +421,16 @@ class _LogsWidgetState extends State<LogsWidget> {
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: [ children: [
if (logsProvider.appliedFilters.searchText != null) ...[ if (logsProvider.appliedFilters.domainText != null) ...[
const SizedBox(width: 15), const SizedBox(width: 15),
Chip( Chip(
avatar: const Icon( avatar: const Icon(
Icons.search, Icons.link_rounded,
), ),
label: Row( label: Row(
children: [ children: [
Text( Text(
logsProvider.appliedFilters.searchText!, logsProvider.appliedFilters.domainText!,
), ),
], ],
), ),
@ -442,14 +442,14 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus, selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
searchText: null, domainText: null,
clients: logsProvider.appliedFilters.clients clients: logsProvider.appliedFilters.clients
) )
); );
logsProvider.setSearchText(null); logsProvider.setDomainText(null);
fetchLogs( fetchLogs(
inOffset: 0, inOffset: 0,
searchText: '' domainText: ''
); );
}, },
), ),
@ -475,7 +475,7 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: logsProvider.appliedFilters.searchText, domainText: logsProvider.appliedFilters.domainText,
clients: logsProvider.appliedFilters.clients clients: logsProvider.appliedFilters.clients
) )
); );
@ -510,7 +510,7 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus, selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
searchText: logsProvider.appliedFilters.searchText, domainText: logsProvider.appliedFilters.domainText,
clients: null clients: null
) )
); );

119
lib/screens/logs/logs_filters_modal.dart
View file

@ -12,7 +12,6 @@ import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart'; import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/models/applied_filters.dart'; import 'package:adguard_home_manager/models/applied_filters.dart';
import 'package:adguard_home_manager/functions/format_time.dart';
import 'package:adguard_home_manager/providers/logs_provider.dart'; import 'package:adguard_home_manager/providers/logs_provider.dart';
class LogsFiltersModal extends StatelessWidget { class LogsFiltersModal extends StatelessWidget {
@ -41,11 +40,13 @@ class LogsFiltersModalWidget extends StatefulWidget {
} }
class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> { class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
TextEditingController searchController = TextEditingController(); TextEditingController domainController = TextEditingController();
String? domainError;
@override @override
void initState() { void initState() {
searchController.text = widget.logsProvider.searchText ?? ''; domainController.text = widget.logsProvider.domainText ?? '';
domainError = null;
super.initState(); super.initState();
} }
@ -66,38 +67,9 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
"safe_search": AppLocalizations.of(context)!.blockedSafeSearchRow, "safe_search": AppLocalizations.of(context)!.blockedSafeSearchRow,
}; };
void selectTime() async {
DateTime now = DateTime.now();
DateTime? dateValue = await showDatePicker(
context: context,
initialDate: now,
firstDate: DateTime(now.year, now.month-1, now.day),
lastDate: now
);
if (dateValue != null) {
TimeOfDay? timeValue = await showTimePicker(
context: context,
initialTime: TimeOfDay.now(),
helpText: AppLocalizations.of(context)!.selectTime,
);
if (timeValue != null) {
DateTime value = DateTime(
dateValue.year,
dateValue.month,
dateValue.day,
timeValue.hour,
timeValue.minute,
dateValue.second
).toUtc();
logsProvider.setLogsOlderThan(value);
}
}
}
void resetFilters() async { void resetFilters() async {
setState(() { setState(() {
searchController.text = ''; domainController.text = '';
}); });
logsProvider.setLoadStatus(0); logsProvider.setLoadStatus(0);
@ -112,7 +84,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: null, domainText: null,
clients: null clients: null
) )
); );
@ -161,13 +133,13 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
count: logsProvider.logsQuantity, count: logsProvider.logsQuantity,
olderThan: logsProvider.logsOlderThan, olderThan: logsProvider.logsOlderThan,
responseStatus: logsProvider.selectedResultStatus, responseStatus: logsProvider.selectedResultStatus,
search: logsProvider.searchText, search: logsProvider.domainText,
); );
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: logsProvider.selectedResultStatus, selectedResultStatus: logsProvider.selectedResultStatus,
searchText: logsProvider.searchText, domainText: logsProvider.domainText,
clients: logsProvider.selectedClients clients: logsProvider.selectedClients
) )
); );
@ -185,7 +157,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
return Padding( return Padding(
padding: MediaQuery.of(context).viewInsets, padding: MediaQuery.of(context).viewInsets,
child: Container( child: Container(
height: 430, height: 455,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).dialogBackgroundColor, color: Theme.of(context).dialogBackgroundColor,
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
@ -229,25 +201,39 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
children: [ children: [
Expanded( Expanded(
child: TextFormField( child: TextFormField(
controller: searchController, controller: domainController,
onChanged: (value) => logsProvider.setSearchText(value), onChanged: (value) {
logsProvider.setDomainText(value);
RegExp domain = RegExp(r'^([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+$');
if (value == '' || domain.hasMatch(value) == true) {
setState(() {
domainError = null;
});
}
else {
setState(() {
domainError = AppLocalizations.of(context)!.invalidDomain;
});
}
},
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: const Icon(Icons.search_rounded), prefixIcon: const Icon(Icons.link_rounded),
border: const OutlineInputBorder( border: const OutlineInputBorder(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(10) Radius.circular(10)
) )
), ),
labelText: AppLocalizations.of(context)!.search, labelText: AppLocalizations.of(context)!.domain,
suffixIcon: IconButton( suffixIcon: IconButton(
onPressed: () { onPressed: () {
setState(() { setState(() {
searchController.text = ''; domainController.text = '';
}); });
logsProvider.setSearchText(null); logsProvider.setDomainText(null);
}, },
icon: const Icon(Icons.clear) icon: const Icon(Icons.clear)
) ),
errorText: domainError
), ),
), ),
) )
@ -255,47 +241,6 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
), ),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
// Material(
// color: Colors.transparent,
// child: InkWell(
// onTap: selectTime,
// child: Padding(
// padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
// child: Row(
// children: [
// const Icon(
// Icons.schedule,
// size: 24,
// color: Colors.grey,
// ),
// const SizedBox(width: 20),
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Text(
// AppLocalizations.of(context)!.logsOlderThan,
// style: const TextStyle(
// fontSize: 16,
// fontWeight: FontWeight.w500
// ),
// ),
// const SizedBox(height: 5),
// Text(
// logsProvider.logsOlderThan != null
// ? convertTimestampLocalTimezone(logsProvider.logsOlderThan!, 'HH:mm - dd/MM/yyyy')
// : AppLocalizations.of(context)!.notSelected,
// style: const TextStyle(
// fontSize: 14,
// color: Colors.grey
// ),
// )
// ],
// )
// ],
// ),
// ),
// ),
// ),
CustomListTile( CustomListTile(
title: AppLocalizations.of(context)!.client, title: AppLocalizations.of(context)!.client,
subtitle: logsProvider.selectedClients != null subtitle: logsProvider.selectedClients != null
@ -342,7 +287,9 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
child: Text(AppLocalizations.of(context)!.resetFilters) child: Text(AppLocalizations.of(context)!.resetFilters)
), ),
TextButton( TextButton(
onPressed: filterLogs, onPressed: domainError == null
? () => filterLogs()
: null,
child: Text(AppLocalizations.of(context)!.apply) child: Text(AppLocalizations.of(context)!.apply)
), ),
], ],

8
lib/screens/top_items/top_items.dart
View file

@ -200,12 +200,12 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
return CustomListTile( return CustomListTile(
onTap: () { onTap: () {
if (widget.type == 'topQueriedDomains' || widget.type == 'topBlockedDomains') { if (widget.type == 'topQueriedDomains' || widget.type == 'topBlockedDomains') {
logsProvider.setSearchText(screenData[index].keys.toList()[0]); logsProvider.setDomainText(screenData[index].keys.toList()[0]);
logsProvider.setSelectedClients(null); logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: screenData[index].keys.toList()[0], domainText: screenData[index].keys.toList()[0],
clients: null clients: null
) )
); );
@ -213,12 +213,12 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
Navigator.pop(context); Navigator.pop(context);
} }
else if (widget.type == 'topClients') { else if (widget.type == 'topClients') {
logsProvider.setSearchText(null); logsProvider.setDomainText(null);
logsProvider.setSelectedClients([screenData[index].keys.toList()[0]]); logsProvider.setSelectedClients([screenData[index].keys.toList()[0]]);
logsProvider.setAppliedFilters( logsProvider.setAppliedFilters(
AppliedFiters( AppliedFiters(
selectedResultStatus: 'all', selectedResultStatus: 'all',
searchText: null, domainText: null,
clients: [screenData[index].keys.toList()[0]] clients: [screenData[index].keys.toList()[0]]
) )
); );