mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-04-20 13:59:12 +00:00
Add persistent client logs
This commit is contained in:
parent
442c7d9264
commit
ad6cb92d4b
6 changed files with 75 additions and 4 deletions
|
@ -779,5 +779,6 @@
|
||||||
"enablePlainDnsDescription": "Plain DNS is enabled by default. You can disable it to force all devices to use encrypted DNS. To do this, you must enable at least one encrypted DNS protocol.",
|
"enablePlainDnsDescription": "Plain DNS is enabled by default. You can disable it to force all devices to use encrypted DNS. To do this, you must enable at least one encrypted DNS protocol.",
|
||||||
"date": "Date",
|
"date": "Date",
|
||||||
"loadingChangelog": "Loading changelog...",
|
"loadingChangelog": "Loading changelog...",
|
||||||
"invalidIpOrUrl": "Invalid IP address or URL"
|
"invalidIpOrUrl": "Invalid IP address or URL",
|
||||||
|
"addPersistentClient": "Add as a persistent client"
|
||||||
}
|
}
|
|
@ -779,5 +779,6 @@
|
||||||
"enablePlainDnsDescription": "El DNS simple (sin cifrado) está activado de forma predeterminada. Puedes desactivarlo para obligar a todos los dispositivos a utilizar DNS cifrado. Para ello, debes habilitar al menos un protocolo DNS cifrado.",
|
"enablePlainDnsDescription": "El DNS simple (sin cifrado) está activado de forma predeterminada. Puedes desactivarlo para obligar a todos los dispositivos a utilizar DNS cifrado. Para ello, debes habilitar al menos un protocolo DNS cifrado.",
|
||||||
"date": "Fecha",
|
"date": "Fecha",
|
||||||
"loadingChangelog": "Cargando registro de cambios...",
|
"loadingChangelog": "Cargando registro de cambios...",
|
||||||
"invalidIpOrUrl": "Dirección IP o URL no válida"
|
"invalidIpOrUrl": "Dirección IP o URL no válida",
|
||||||
|
"addPersistentClient": "Añadir como cliente persistente"
|
||||||
}
|
}
|
|
@ -10,6 +10,16 @@ import 'package:adguard_home_manager/models/safe_search.dart';
|
||||||
import 'package:adguard_home_manager/providers/clients_provider.dart';
|
import 'package:adguard_home_manager/providers/clients_provider.dart';
|
||||||
import 'package:adguard_home_manager/models/clients.dart';
|
import 'package:adguard_home_manager/models/clients.dart';
|
||||||
|
|
||||||
|
class ClientInitialData {
|
||||||
|
final String name;
|
||||||
|
final String ip;
|
||||||
|
|
||||||
|
const ClientInitialData({
|
||||||
|
required this.name,
|
||||||
|
required this.ip,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
class ControllerListItem {
|
class ControllerListItem {
|
||||||
final String id;
|
final String id;
|
||||||
final TextEditingController controller;
|
final TextEditingController controller;
|
||||||
|
@ -25,13 +35,15 @@ class ClientScreen extends StatefulWidget {
|
||||||
final void Function(Client) onConfirm;
|
final void Function(Client) onConfirm;
|
||||||
final void Function(Client)? onDelete;
|
final void Function(Client)? onDelete;
|
||||||
final bool fullScreen;
|
final bool fullScreen;
|
||||||
|
final ClientInitialData? initialData;
|
||||||
|
|
||||||
const ClientScreen({
|
const ClientScreen({
|
||||||
super.key,
|
super.key,
|
||||||
this.client,
|
this.client,
|
||||||
required this.onConfirm,
|
required this.onConfirm,
|
||||||
this.onDelete,
|
this.onDelete,
|
||||||
required this.fullScreen
|
required this.fullScreen,
|
||||||
|
this.initialData,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -146,6 +158,13 @@ class _ClientScreenState extends State<ClientScreen> {
|
||||||
_blockedServicesSchedule = widget.client!.blockedServicesSchedule!;
|
_blockedServicesSchedule = widget.client!.blockedServicesSchedule!;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (widget.initialData != null) {
|
||||||
|
nameController.text = widget.initialData!.name;
|
||||||
|
identifiersControllers[0] = ControllerListItem(
|
||||||
|
id: uuid.v4(),
|
||||||
|
controller: TextEditingController(text: widget.initialData!.ip)
|
||||||
|
);
|
||||||
|
}
|
||||||
super.initState();
|
super.initState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,7 @@ void openClientFormModal({
|
||||||
Client? client,
|
Client? client,
|
||||||
required void Function(Client) onConfirm,
|
required void Function(Client) onConfirm,
|
||||||
void Function(Client)? onDelete,
|
void Function(Client)? onDelete,
|
||||||
|
ClientInitialData? initialData,
|
||||||
}) {
|
}) {
|
||||||
showGeneralDialog(
|
showGeneralDialog(
|
||||||
context: context,
|
context: context,
|
||||||
|
@ -105,6 +106,7 @@ void openClientFormModal({
|
||||||
client: client,
|
client: client,
|
||||||
onConfirm: onConfirm,
|
onConfirm: onConfirm,
|
||||||
onDelete: onDelete,
|
onDelete: onDelete,
|
||||||
|
initialData: initialData,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
|
|
||||||
class ClientsFab extends StatelessWidget {
|
class ClientsFab extends StatelessWidget {
|
||||||
const ClientsFab({Key? key}) : super(key: key);
|
const ClientsFab({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
|
|
@ -4,12 +4,16 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/screens/clients/client/client_screen_functions.dart';
|
||||||
|
import 'package:adguard_home_manager/screens/clients/client/client_screen.dart';
|
||||||
import 'package:adguard_home_manager/widgets/options_menu.dart';
|
import 'package:adguard_home_manager/widgets/options_menu.dart';
|
||||||
|
|
||||||
import 'package:adguard_home_manager/providers/status_provider.dart';
|
import 'package:adguard_home_manager/providers/status_provider.dart';
|
||||||
import 'package:adguard_home_manager/classes/process_modal.dart';
|
import 'package:adguard_home_manager/classes/process_modal.dart';
|
||||||
import 'package:adguard_home_manager/functions/snackbar.dart';
|
import 'package:adguard_home_manager/functions/snackbar.dart';
|
||||||
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
|
import 'package:adguard_home_manager/functions/copy_clipboard.dart';
|
||||||
|
import 'package:adguard_home_manager/models/clients.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/clients_provider.dart';
|
||||||
import 'package:adguard_home_manager/models/menu_option.dart';
|
import 'package:adguard_home_manager/models/menu_option.dart';
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
import 'package:adguard_home_manager/functions/get_filtered_status.dart';
|
import 'package:adguard_home_manager/functions/get_filtered_status.dart';
|
||||||
|
@ -40,6 +44,7 @@ class LogTile extends StatelessWidget {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||||
final statusProvider = Provider.of<StatusProvider>(context);
|
final statusProvider = Provider.of<StatusProvider>(context);
|
||||||
|
final clientsProvider = Provider.of<ClientsProvider>(context);
|
||||||
|
|
||||||
Widget logStatusWidget({
|
Widget logStatusWidget({
|
||||||
required IconData icon,
|
required IconData icon,
|
||||||
|
@ -118,6 +123,39 @@ class LogTile extends StatelessWidget {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void confirmAddClient(Client client) async {
|
||||||
|
ProcessModal processModal = ProcessModal();
|
||||||
|
processModal.open(AppLocalizations.of(context)!.addingClient);
|
||||||
|
|
||||||
|
final result = await clientsProvider.addClient(client);
|
||||||
|
|
||||||
|
processModal.close();
|
||||||
|
|
||||||
|
if (result == true) {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.clientAddedSuccessfully,
|
||||||
|
color: Colors.green
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
showSnacbkar(
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
label: AppLocalizations.of(context)!.clientNotAdded,
|
||||||
|
color: Colors.red
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void openAddClient() {
|
||||||
|
openClientFormModal(
|
||||||
|
context: context,
|
||||||
|
width: MediaQuery.of(context).size.width,
|
||||||
|
onConfirm: confirmAddClient,
|
||||||
|
initialData: ClientInitialData(name: "Client ${log.client}", ip: log.client)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
final domainBlocked = isDomainBlocked(log.reason);
|
final domainBlocked = isDomainBlocked(log.reason);
|
||||||
|
|
||||||
if (twoColumns && !(useAlwaysNormalTile == true)) {
|
if (twoColumns && !(useAlwaysNormalTile == true)) {
|
||||||
|
@ -141,6 +179,11 @@ class LogTile extends StatelessWidget {
|
||||||
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
if (log.clientInfo?.name == "") MenuOption(
|
||||||
|
title: AppLocalizations.of(context)!.addPersistentClient,
|
||||||
|
icon: Icons.add_rounded,
|
||||||
|
action: openAddClient
|
||||||
|
),
|
||||||
if (log.question.name != null) MenuOption(
|
if (log.question.name != null) MenuOption(
|
||||||
title: AppLocalizations.of(context)!.copyClipboard,
|
title: AppLocalizations.of(context)!.copyClipboard,
|
||||||
icon: Icons.copy_rounded,
|
icon: Icons.copy_rounded,
|
||||||
|
@ -319,6 +362,11 @@ class LogTile extends StatelessWidget {
|
||||||
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
newStatus: domainBlocked == true ? 'unblock' : 'block'
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
if (log.clientInfo?.name == "") MenuOption(
|
||||||
|
title: AppLocalizations.of(context)!.addPersistentClient,
|
||||||
|
icon: Icons.add_rounded,
|
||||||
|
action: openAddClient
|
||||||
|
),
|
||||||
if (log.question.name != null) MenuOption(
|
if (log.question.name != null) MenuOption(
|
||||||
title: AppLocalizations.of(context)!.copyClipboard,
|
title: AppLocalizations.of(context)!.copyClipboard,
|
||||||
icon: Icons.copy_rounded,
|
icon: Icons.copy_rounded,
|
||||||
|
|
Loading…
Add table
Reference in a new issue