Merge branch 'master' into cloudflare-caching

assets/translations/en.json

@@ -83,7 +83,7 @@
         "no_key_name": "Unnamed key",
         "root_title": "These are superuser keys",
         "root_subtitle": "Owners of these keys get full access to the server and can do anything on it. Only add your own keys to the server.",
-        "input_label": "Public ED25519 or RSA key"
+        "input_label": "Public ED25519, ECDSA or RSA key"
     },
     "onboarding": {
         "page1_title": "Digital independence, available to all of us",

lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart

@@ -455,8 +455,8 @@ class DigitalOceanApi extends RestApiMap {
   }
 
   Future<GenericResult<bool>> resizeVolume(
-    final String name,
+    final String uuid,
-    final DiskSize size,
+    final int gb,
   ) async {
     bool success = false;
 
@@ -464,11 +464,10 @@ class DigitalOceanApi extends RestApiMap {
     final Dio client = await getClient();
     try {
       resizeVolumeResponse = await client.post(
-        '/volumes/actions',
+        '/volumes/$uuid/actions',
         data: {
           'type': 'resize',
-          'volume_name': name,
+          'size_gigabytes': gb,
-          'size_gigabytes': size.gibibyte,
           'region': region,
         },
       );

lib/logic/cubit/forms/user/ssh_form_cubit.dart

@@ -12,7 +12,7 @@ class SshFormCubit extends FormCubit {
     required this.user,
   }) {
     final RegExp keyRegExp = RegExp(
-      r'^(ssh-rsa AAAAB3NzaC1yc2|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5)[0-9A-Za-z+/]+[=]{0,3}( .*)?$',
+      r'^(ecdsa-sha2-nistp256 AAAAE2VjZH|ssh-rsa AAAAB3NzaC1yc2|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5)[0-9A-Za-z+/]+[=]{0,3}( .*)?$',
     );
 
     key = FieldCubit(

lib/logic/providers/server_providers/digital_ocean.dart

@@ -698,8 +698,8 @@ class DigitalOceanServerProvider extends ServerProvider {
     final DiskSize size,
   ) async =>
       _adapter.api().resizeVolume(
-            volume.name,
+            volume.uuid!,
-            size,
+            size.gibibyte.toInt(),
           );
 
   @override

lib/ui/pages/server_storage/extending_volume.dart

@@ -157,7 +157,9 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
                     : () {
                         context.read<ApiProviderVolumeCubit>().resizeVolume(
                               widget.diskVolumeToResize,
-                              DiskSize.fromGibibyte(_currentSliderGbValue),
+                              DiskSize.fromGibibyte(
+                                _currentSliderGbValue.truncate().toDouble(),
+                              ),
                               context.read<ApiServerVolumeCubit>().reload,
                             );
                         context.router.popUntilRoot();

lib/ui/pages/server_storage/storage_card.dart

@@ -45,8 +45,11 @@ class StorageCard extends StatelessWidget {
       clipBehavior: Clip.antiAlias,
       child: InkResponse(
         highlightShape: BoxShape.rectangle,
-        onTap: () =>
+
-            context.pushRoute(ServerStorageRoute(diskStatus: diskStatus)),
+        /// TODO: when 'isEmpty' replace with a skeleton
+        onTap: () => diskStatus.diskVolumes.isEmpty
+            ? null
+            : context.pushRoute(ServerStorageRoute(diskStatus: diskStatus)),
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(