SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 75 Pull Requests 3 Projects 1 Releases 24 Wiki Activity

Implement data_migration page and logic

remotes/1708434123650076052/graphql
NaiJi ✨ 2022-08-03 05:25:33 +03:00
parent 96c7d7966a
commit c230037351
8 changed files with 393 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/translations/en.json
View File

@ -172,7 +172,15 @@
"disk_total": "{} GB total · {}",
"gb": "{} GB",
"mb": "{} MB",
"extend_volume_button": "Extend volume"
"extend_volume_button": "Extend volume",
"extending_volume_title": "Extending volume",
"extending_volume_description": "Resizing volume will allow you to store more data on your server without extending the server itself. Volume can only be extended: shrinking is not possible.",
"extending_volume_price_info": "Price includes VAT and is estimated from pricing data provided by Hetzner.",
"size": "Size",
"euro": "Euro",
"data_migration_title": "Data migration",
"data_migration_notice": "During migration all services will be turned off.",
"start_migration_button": "Start migration"
}
},
"not_ready_card": {

21
lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart
View File

@ -74,6 +74,27 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi {
RegExp getApiTokenValidation() =>
RegExp(r'\s+|[-!$%^&*()@+|~=`{}\[\]:<>?,.\/]');
@override
Future<double?> getPricePerGb() async {
double? price;
final Response dbGetResponse;
final Dio client = await getClient();
try {
dbGetResponse = await client.post('/pricing');
final volume = dbGetResponse.data['pricing']['volume'];
final volumePrice = volume['price_per_gb_month']['gross'];
price = volumePrice as double;
} catch (e) {
print(e);
} finally {
client.close();
}
return price;
}
@override
Future<ServerVolume?> createVolume() async {
ServerVolume? volume;

1
lib/logic/api_maps/rest_maps/server_providers/volume_provider.dart
View File

@ -9,4 +9,5 @@ mixin VolumeProviderApi on ApiMap {
Future<bool> detachVolume(final int volumeId);
Future<bool> resizeVolume(final int volumeId, final int sizeGb);
Future<void> deleteVolume(final int id);
Future<double?> getPricePerGb();
}

3
lib/logic/cubit/volumes/volumes_cubit.dart
View File

@ -26,6 +26,9 @@ class ApiVolumesCubit
}
}
Future<double?> getPricePerGb() async =>
providerApi.getVolumeProvider().getPricePerGb();
Future<void> refresh() async {
emit(const ApiVolumesState([], LoadingStatus.refreshing));
_refetch();

3
lib/ui/pages/recovery_key/recovery_key.dart
View File

@ -294,7 +294,6 @@ class _RecoveryKeyConfigurationState extends State<RecoveryKeyConfiguration> {
}
_amountController.addListener(_updateErrorStatuses);
_expirationController.addListener(_updateErrorStatuses);
return Column(
@ -321,6 +320,7 @@ class _RecoveryKeyConfigurationState extends State<RecoveryKeyConfiguration> {
children: [
const SizedBox(height: 8),
TextField(
textInputAction: TextInputAction.next,
enabled: _isAmountToggled,
controller: _amountController,
decoration: InputDecoration(
@ -360,6 +360,7 @@ class _RecoveryKeyConfigurationState extends State<RecoveryKeyConfiguration> {
children: [
const SizedBox(height: 8),
TextField(
textInputAction: TextInputAction.next,
enabled: _isExpirationToggled,
controller: _expirationController,
onTap: () {

135
lib/ui/pages/server_storage/data_migration.dart Normal file
View File

@ -0,0 +1,135 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
import 'package:selfprivacy/ui/components/brand_linear_indicator/brand_linear_indicator.dart';
import 'package:selfprivacy/ui/pages/server_storage/disk_status.dart';
import 'package:selfprivacy/ui/pages/server_storage/extending_volume.dart';
import 'package:selfprivacy/utils/route_transitions/basic.dart';
class ServerStoragePage extends StatefulWidget {
const ServerStoragePage({required this.diskStatus, final super.key});
final DiskStatus diskStatus;
@override
State<ServerStoragePage> createState() => _ServerStoragePageState();
}
class _ServerStoragePageState extends State<ServerStoragePage> {
List<bool> _expandedSections = [];
@override
Widget build(final BuildContext context) {
final bool isReady = context.watch<ServerInstallationCubit>().state
is ServerInstallationFinished;
if (!isReady) {
return BrandHeroScreen(
hasBackButton: true,
heroTitle: 'providers.storage.card_title'.tr(),
children: const [],
);
}
/// The first section is expanded, the rest are hidden by default.
/// ( true, false, false, etc... )
_expandedSections = [
true,
...List<bool>.filled(
widget.diskStatus.diskVolumes.length - 1,
false,
),
];
int sectionId = 0;
final List<Widget> sections = [];
for (final DiskVolume volume in widget.diskStatus.diskVolumes) {
sections.add(
const SizedBox(height: 16),
);
sections.add(
Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Icon(
Icons.storage_outlined,
size: 24,
color: Colors.white,
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'providers.storage.disk_usage'.tr(
args: [
volume.gbUsed.toString(),
],
),
style: Theme.of(context).textTheme.titleMedium,
),
Expanded(
child: BrandLinearIndicator(
value: volume.percentage,
color: volume.root
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.secondary,
backgroundColor:
Theme.of(context).colorScheme.surfaceVariant,
height: 14.0,
),
),
Text(
'providers.storage.disk_total'.tr(
args: [
volume.gbTotal.toString(),
volume.name,
],
),
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
],
),
),
);
sections.add(
AnimatedCrossFade(
duration: const Duration(milliseconds: 200),
crossFadeState: _expandedSections[sectionId]
? CrossFadeState.showFirst
: CrossFadeState.showSecond,
firstChild: FilledButton(
title: 'providers.extend_volume_button.title'.tr(),
onPressed: () => Navigator.of(context).push(
materialRoute(
ExtendingVolumePage(
diskVolume: volume,
),
),
),
),
secondChild: Container(),
),
);
++sectionId;
}
return BrandHeroScreen(
hasBackButton: true,
heroTitle: 'providers.storage.card_title'.tr(),
children: [
...sections,
const SizedBox(height: 8),
],
);
}
}

145
lib/ui/pages/server_storage/extending_volume.dart Normal file
View File

@ -0,0 +1,145 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
import 'package:selfprivacy/logic/cubit/volumes/volumes_cubit.dart';
import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
import 'package:selfprivacy/ui/pages/server_storage/disk_status.dart';
class ExtendingVolumePage extends StatefulWidget {
const ExtendingVolumePage({required this.diskVolume, final super.key});
final DiskVolume diskVolume;
@override
State<ExtendingVolumePage> createState() => _ExtendingVolumePageState();
}
class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
bool _isSizeError = false;
bool _isPriceError = false;
double _currentSliderGbValue = 20.0;
double _euroPerGb = 1.0;
final double maxGb = 500.0;
double minGb = 0.0;
final TextEditingController _sizeController = TextEditingController();
late final TextEditingController _priceController;
void _updateByPrice() {
final double price = double.parse(_priceController.text);
_currentSliderGbValue = price / _euroPerGb;
_sizeController.text = _currentSliderGbValue.round.toString();
/// Now we need to convert size back to price to round
/// it properly and display it in text field as well,
/// because size in GB can ONLY(!) be discrete.
_updateBySize();
}
void _updateBySize() {
final double size = double.parse(_sizeController.text);
_priceController.text = (size * _euroPerGb).toString();
_updateErrorStatuses();
}
void _updateErrorStatuses() {
final bool error = minGb > _currentSliderGbValue;
_isSizeError = error;
_isPriceError = error;
}
@override
Widget build(final BuildContext context) => FutureBuilder(
future: context.read<ApiVolumesCubit>().getPricePerGb(),
builder: (
final BuildContext context,
final AsyncSnapshot<void> snapshot,
) {
_euroPerGb = snapshot.data as double;
_sizeController.text = _currentSliderGbValue.toString();
_priceController.text =
(_euroPerGb * double.parse(_sizeController.text)).toString();
_sizeController.addListener(_updateBySize);
_priceController.addListener(_updateByPrice);
minGb = widget.diskVolume.gbTotal + 1 < maxGb
? widget.diskVolume.gbTotal + 1
: maxGb;
return BrandHeroScreen(
hasBackButton: true,
heroTitle: 'providers.storage.extending_volume_title'.tr(),
heroSubtitle: 'providers.storage.extending_volume_description'.tr(),
children: [
const SizedBox(height: 16),
Row(
children: [
TextField(
textInputAction: TextInputAction.next,
enabled: true,
controller: _sizeController,
decoration: InputDecoration(
border: const OutlineInputBorder(),
errorText: _isSizeError ? ' ' : null,
labelText: 'providers.storage.size'.tr(),
),
keyboardType: TextInputType.number,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.digitsOnly,
], // Only numbers can be entered
),
const SizedBox(height: 16),
TextField(
textInputAction: TextInputAction.next,
enabled: true,
controller: _priceController,
decoration: InputDecoration(
border: const OutlineInputBorder(),
errorText: _isPriceError ? ' ' : null,
labelText: 'providers.storage.euro'.tr(),
),
keyboardType: TextInputType.number,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.digitsOnly,
], // Only numbers can be entered
),
],
),
const SizedBox(height: 16),
Slider(
min: minGb,
value: widget.diskVolume.gbTotal + 5 < maxGb
? widget.diskVolume.gbTotal + 5
: maxGb,
max: maxGb,
divisions: 1,
label: _currentSliderGbValue.round().toString(),
onChanged: (final double value) {
setState(() {
_currentSliderGbValue = value;
_updateErrorStatuses();
});
},
),
const SizedBox(height: 16),
FilledButton(
title: 'providers.extend_volume_button.title'.tr(),
onPressed: null,
),
const SizedBox(height: 16),
const Divider(
height: 1.0,
),
const SizedBox(height: 16),
const Icon(Icons.info_outlined, size: 24),
const SizedBox(height: 16),
Text('providers.storage.extending_volume_price_info'.tr()),
const SizedBox(height: 16),
],
);
},
);
}

115
lib/ui/pages/server_storage/server_storage.dart
View File

@ -1,9 +1,12 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
import 'package:selfprivacy/ui/components/brand_linear_indicator/brand_linear_indicator.dart';
import 'package:selfprivacy/ui/pages/server_storage/disk_status.dart';
import 'package:selfprivacy/ui/pages/server_storage/extending_volume.dart';
import 'package:selfprivacy/utils/route_transitions/basic.dart';
class ServerStoragePage extends StatefulWidget {
const ServerStoragePage({required this.diskStatus, final super.key});
@ -15,6 +18,8 @@ class ServerStoragePage extends StatefulWidget {
}
class _ServerStoragePageState extends State<ServerStoragePage> {
List<bool> _expandedSections = [];
@override
Widget build(final BuildContext context) {
final bool isReady = context.watch<ServerInstallationCubit>().state
@ -28,60 +33,94 @@ class _ServerStoragePageState extends State<ServerStoragePage> {
);
}
/// The first section is expanded, the rest are hidden by default.
/// ( true, false, false, etc... )
_expandedSections = [
true,
...List<bool>.filled(
widget.diskStatus.diskVolumes.length - 1,
false,
),
];
int sectionId = 0;
final List<Widget> sections = [];
for (final DiskVolume volume in widget.diskStatus.diskVolumes) {
sections.add(
const SizedBox(height: 16),
);
sections.add(
Text(
'providers.storage.disk_usage'.tr(
args: [
volume.gbUsed.toString(),
Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Icon(
Icons.storage_outlined,
size: 24,
color: Colors.white,
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'providers.storage.disk_usage'.tr(
args: [
volume.gbUsed.toString(),
],
),
style: Theme.of(context).textTheme.titleMedium,
),
Expanded(
child: BrandLinearIndicator(
value: volume.percentage,
color: volume.root
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.secondary,
backgroundColor:
Theme.of(context).colorScheme.surfaceVariant,
height: 14.0,
),
),
Text(
'providers.storage.disk_total'.tr(
args: [
volume.gbTotal.toString(),
volume.name,
],
),
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
],
),
style: Theme.of(context).textTheme.titleMedium,
),
);
sections.add(
const SizedBox(height: 4),
);
sections.add(
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
const Icon(
Icons.storage_outlined,
size: 24,
color: Colors.white,
),
Expanded(
child: BrandLinearIndicator(
value: volume.percentage,
color: volume.root
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.secondary,
backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
height: 14.0,
AnimatedCrossFade(
duration: const Duration(milliseconds: 200),
crossFadeState: _expandedSections[sectionId]
? CrossFadeState.showFirst
: CrossFadeState.showSecond,
firstChild: FilledButton(
title: 'providers.extend_volume_button.title'.tr(),
onPressed: () => Navigator.of(context).push(
materialRoute(
ExtendingVolumePage(
diskVolume: volume,
),
),
),
],
),
);
sections.add(
const SizedBox(height: 4),
);
sections.add(
Text(
'providers.storage.disk_total'.tr(
args: [
volume.gbTotal.toString(),
volume.name,
],
),
style: Theme.of(context).textTheme.bodySmall,
secondChild: Container(),
),
);
++sectionId;
}
return BrandHeroScreen(