Compare commits
14 Commits
Author | SHA1 | Date |
---|---|---|
dettlaff | d77dcc7167 | |
NaiJi ✨ | 291a6507ae | |
Inex Code | 4930fc2387 | |
Inex Code | 11d0e58334 | |
NaiJi ✨ | a6b846cc78 | |
NaiJi ✨ | 6819192219 | |
NaiJi ✨ | ffdb9d92fb | |
NaiJi ✨ | 1c42598787 | |
dettlaff | c179a109fd | |
def | add2366e6b | |
dettlaff | 0dc281a4f6 | |
dettlaff | a4737e9f05 | |
Inex Code | bf66717854 | |
Inex Code | d3b7f31c65 |
|
@ -40,3 +40,9 @@ app.*.symbols
|
||||||
|
|
||||||
# Obfuscation related
|
# Obfuscation related
|
||||||
app.*.map.json
|
app.*.map.json
|
||||||
|
|
||||||
|
# Flatpak
|
||||||
|
.flatpak-builder/
|
||||||
|
flatpak-build/
|
||||||
|
flatpak-repo/
|
||||||
|
*.flatpak
|
||||||
|
|
|
@ -52,8 +52,8 @@ android {
|
||||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||||
applicationId "org.selfprivacy.app"
|
applicationId "org.selfprivacy.app"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 33
|
targetSdkVersion 34
|
||||||
compileSdkVersion 33
|
compileSdkVersion 34
|
||||||
versionCode flutterVersionCode.toInteger()
|
versionCode flutterVersionCode.toInteger()
|
||||||
versionName flutterVersionName
|
versionName flutterVersionName
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
Login as root user to your server and look at the contents of the file `/etc/nixos/userdata/tokens.json`
|
[Login as root user to your server](https://selfprivacy.org/docs/how-to-guides/root_ssh/) and enter this command:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cat /etc/nixos/userdata/tokens.json
|
sp-print-api-token
|
||||||
```
|
```
|
||||||
|
|
||||||
This file will have a similar construction:
|
Copy the token from the terminal and paste it in the next window.
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"tokens": [
|
|
||||||
{
|
|
||||||
"token": "token_to_copy",
|
|
||||||
"name": "device_name",
|
|
||||||
"date": "date"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Copy the token from the file and paste it in the next window.
|
|
||||||
|
|
|
@ -565,6 +565,8 @@
|
||||||
"upgrade_success": "Server upgrade started",
|
"upgrade_success": "Server upgrade started",
|
||||||
"upgrade_failed": "Failed to upgrade server",
|
"upgrade_failed": "Failed to upgrade server",
|
||||||
"upgrade_server": "Upgrade server",
|
"upgrade_server": "Upgrade server",
|
||||||
|
"collect_nix_garbage": "Collect system garbage",
|
||||||
|
"collect_nix_garbage_failed": "Failed to collect system garbage",
|
||||||
"reboot_server": "Reboot server",
|
"reboot_server": "Reboot server",
|
||||||
"create_ssh_key": "Create SSH key for {}",
|
"create_ssh_key": "Create SSH key for {}",
|
||||||
"delete_ssh_key": "Delete SSH key for {}",
|
"delete_ssh_key": "Delete SSH key for {}",
|
||||||
|
@ -606,5 +608,16 @@
|
||||||
"reset_onboarding": "Reset onboarding switch",
|
"reset_onboarding": "Reset onboarding switch",
|
||||||
"reset_onboarding_description": "Reset onboarding switch to show onboarding screen again",
|
"reset_onboarding_description": "Reset onboarding switch to show onboarding screen again",
|
||||||
"cubit_statuses": "Cubit loading statuses"
|
"cubit_statuses": "Cubit loading statuses"
|
||||||
|
},
|
||||||
|
"countries": {
|
||||||
|
"germany": "Germany",
|
||||||
|
"netherlands": "Netherlands",
|
||||||
|
"singapore": "Singapore",
|
||||||
|
"united_kingdom": "United Kingdom",
|
||||||
|
"canada": "Canada",
|
||||||
|
"india": "India",
|
||||||
|
"australia": "Australia",
|
||||||
|
"united_states": "United States",
|
||||||
|
"finland": "Finland"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
app-id: org.selfprivacy.app
|
app-id: org.selfprivacy.app
|
||||||
runtime: org.freedesktop.Platform
|
runtime: org.freedesktop.Platform
|
||||||
runtime-version: '22.08'
|
runtime-version: '23.08'
|
||||||
sdk: org.freedesktop.Sdk
|
sdk: org.freedesktop.Sdk
|
||||||
command: selfprivacy
|
command: selfprivacy
|
||||||
finish-args:
|
finish-args:
|
||||||
|
@ -11,6 +11,7 @@ finish-args:
|
||||||
- "--share=network"
|
- "--share=network"
|
||||||
- "--own-name=org.selfprivacy.app"
|
- "--own-name=org.selfprivacy.app"
|
||||||
- "--device=dri"
|
- "--device=dri"
|
||||||
|
- "--talk-name=org.freedesktop.secrets"
|
||||||
modules:
|
modules:
|
||||||
- name: selfprivacy
|
- name: selfprivacy
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
|
@ -35,7 +36,7 @@ modules:
|
||||||
sources:
|
sources:
|
||||||
- type: git
|
- type: git
|
||||||
url: https://gitlab.gnome.org/GNOME/libsecret.git
|
url: https://gitlab.gnome.org/GNOME/libsecret.git
|
||||||
tag: 0.20.5
|
tag: 0.21.4
|
||||||
- name: libjsoncpp
|
- name: libjsoncpp
|
||||||
buildsystem: meson
|
buildsystem: meson
|
||||||
config-opts:
|
config-opts:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:typed_data';
|
|
||||||
|
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||||
import 'package:hive_flutter/hive_flutter.dart';
|
import 'package:hive_flutter/hive_flutter.dart';
|
||||||
import 'package:selfprivacy/logic/models/hive/backblaze_bucket.dart';
|
import 'package:selfprivacy/logic/models/hive/backblaze_bucket.dart';
|
||||||
|
@ -28,6 +28,7 @@ class HiveConfig {
|
||||||
|
|
||||||
await Hive.openBox(BNames.appSettingsBox);
|
await Hive.openBox(BNames.appSettingsBox);
|
||||||
|
|
||||||
|
try {
|
||||||
final HiveAesCipher cipher = HiveAesCipher(
|
final HiveAesCipher cipher = HiveAesCipher(
|
||||||
await getEncryptedKey(BNames.serverInstallationEncryptionKey),
|
await getEncryptedKey(BNames.serverInstallationEncryptionKey),
|
||||||
);
|
);
|
||||||
|
@ -42,12 +43,21 @@ class HiveConfig {
|
||||||
await deprecatedUsers.clear();
|
await deprecatedUsers.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
await Hive.openBox(BNames.serverInstallationBox, encryptionCipher: cipher);
|
await Hive.openBox(
|
||||||
|
BNames.serverInstallationBox,
|
||||||
|
encryptionCipher: cipher,
|
||||||
|
);
|
||||||
|
} on PlatformException catch (e) {
|
||||||
|
print('HiveConfig: Error while opening boxes: $e');
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<Uint8List> getEncryptedKey(final String encKey) async {
|
static Future<Uint8List> getEncryptedKey(final String encKey) async {
|
||||||
const FlutterSecureStorage secureStorage = FlutterSecureStorage();
|
const FlutterSecureStorage secureStorage = FlutterSecureStorage();
|
||||||
final bool hasEncryptionKey = await secureStorage.containsKey(key: encKey);
|
try {
|
||||||
|
final bool hasEncryptionKey =
|
||||||
|
await secureStorage.containsKey(key: encKey);
|
||||||
if (!hasEncryptionKey) {
|
if (!hasEncryptionKey) {
|
||||||
final List<int> key = Hive.generateSecureKey();
|
final List<int> key = Hive.generateSecureKey();
|
||||||
await secureStorage.write(key: encKey, value: base64UrlEncode(key));
|
await secureStorage.write(key: encKey, value: base64UrlEncode(key));
|
||||||
|
@ -55,6 +65,10 @@ class HiveConfig {
|
||||||
|
|
||||||
final String? string = await secureStorage.read(key: encKey);
|
final String? string = await secureStorage.read(key: encKey);
|
||||||
return base64Url.decode(string!);
|
return base64Url.decode(string!);
|
||||||
|
} on PlatformException catch (e) {
|
||||||
|
print('HiveConfig: Error while getting encryption key: $e');
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -443,6 +443,7 @@ type SystemMutations {
|
||||||
runSystemUpgrade: GenericJobMutationReturn!
|
runSystemUpgrade: GenericJobMutationReturn!
|
||||||
rebootSystem: GenericMutationReturn!
|
rebootSystem: GenericMutationReturn!
|
||||||
pullRepositoryChanges: GenericMutationReturn!
|
pullRepositoryChanges: GenericMutationReturn!
|
||||||
|
nixCollectGarbage: GenericJobMutationReturn!
|
||||||
}
|
}
|
||||||
|
|
||||||
type SystemProviderInfo {
|
type SystemProviderInfo {
|
||||||
|
|
|
@ -79,6 +79,17 @@ mutation RunSystemUpgrade {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutation NixCollectGarbage {
|
||||||
|
system {
|
||||||
|
nixCollectGarbage {
|
||||||
|
...basicMutationReturnFields
|
||||||
|
job {
|
||||||
|
...basicApiJobsFields
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mutation RunSystemUpgradeFallback {
|
mutation RunSystemUpgradeFallback {
|
||||||
system {
|
system {
|
||||||
runSystemUpgrade {
|
runSystemUpgrade {
|
||||||
|
|
|
@ -7043,6 +7043,663 @@ class _CopyWithStubImpl$Mutation$RunSystemUpgrade$system$runSystemUpgrade<TRes>
|
||||||
CopyWith$Fragment$basicApiJobsFields.stub(_res);
|
CopyWith$Fragment$basicApiJobsFields.stub(_res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class Mutation$NixCollectGarbage {
|
||||||
|
Mutation$NixCollectGarbage({
|
||||||
|
required this.system,
|
||||||
|
this.$__typename = 'Mutation',
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Mutation$NixCollectGarbage.fromJson(Map<String, dynamic> json) {
|
||||||
|
final l$system = json['system'];
|
||||||
|
final l$$__typename = json['__typename'];
|
||||||
|
return Mutation$NixCollectGarbage(
|
||||||
|
system: Mutation$NixCollectGarbage$system.fromJson(
|
||||||
|
(l$system as Map<String, dynamic>)),
|
||||||
|
$__typename: (l$$__typename as String),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final Mutation$NixCollectGarbage$system system;
|
||||||
|
|
||||||
|
final String $__typename;
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final _resultData = <String, dynamic>{};
|
||||||
|
final l$system = system;
|
||||||
|
_resultData['system'] = l$system.toJson();
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
_resultData['__typename'] = l$$__typename;
|
||||||
|
return _resultData;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode {
|
||||||
|
final l$system = system;
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
return Object.hashAll([
|
||||||
|
l$system,
|
||||||
|
l$$__typename,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
if (identical(this, other)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (!(other is Mutation$NixCollectGarbage) ||
|
||||||
|
runtimeType != other.runtimeType) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$system = system;
|
||||||
|
final lOther$system = other.system;
|
||||||
|
if (l$system != lOther$system) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
final lOther$$__typename = other.$__typename;
|
||||||
|
if (l$$__typename != lOther$$__typename) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension UtilityExtension$Mutation$NixCollectGarbage
|
||||||
|
on Mutation$NixCollectGarbage {
|
||||||
|
CopyWith$Mutation$NixCollectGarbage<Mutation$NixCollectGarbage>
|
||||||
|
get copyWith => CopyWith$Mutation$NixCollectGarbage(
|
||||||
|
this,
|
||||||
|
(i) => i,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class CopyWith$Mutation$NixCollectGarbage<TRes> {
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage(
|
||||||
|
Mutation$NixCollectGarbage instance,
|
||||||
|
TRes Function(Mutation$NixCollectGarbage) then,
|
||||||
|
) = _CopyWithImpl$Mutation$NixCollectGarbage;
|
||||||
|
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage.stub(TRes res) =
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage;
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
Mutation$NixCollectGarbage$system? system,
|
||||||
|
String? $__typename,
|
||||||
|
});
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system<TRes> get system;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithImpl$Mutation$NixCollectGarbage<TRes>
|
||||||
|
implements CopyWith$Mutation$NixCollectGarbage<TRes> {
|
||||||
|
_CopyWithImpl$Mutation$NixCollectGarbage(
|
||||||
|
this._instance,
|
||||||
|
this._then,
|
||||||
|
);
|
||||||
|
|
||||||
|
final Mutation$NixCollectGarbage _instance;
|
||||||
|
|
||||||
|
final TRes Function(Mutation$NixCollectGarbage) _then;
|
||||||
|
|
||||||
|
static const _undefined = <dynamic, dynamic>{};
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
Object? system = _undefined,
|
||||||
|
Object? $__typename = _undefined,
|
||||||
|
}) =>
|
||||||
|
_then(Mutation$NixCollectGarbage(
|
||||||
|
system: system == _undefined || system == null
|
||||||
|
? _instance.system
|
||||||
|
: (system as Mutation$NixCollectGarbage$system),
|
||||||
|
$__typename: $__typename == _undefined || $__typename == null
|
||||||
|
? _instance.$__typename
|
||||||
|
: ($__typename as String),
|
||||||
|
));
|
||||||
|
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system<TRes> get system {
|
||||||
|
final local$system = _instance.system;
|
||||||
|
return CopyWith$Mutation$NixCollectGarbage$system(
|
||||||
|
local$system, (e) => call(system: e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithStubImpl$Mutation$NixCollectGarbage<TRes>
|
||||||
|
implements CopyWith$Mutation$NixCollectGarbage<TRes> {
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage(this._res);
|
||||||
|
|
||||||
|
TRes _res;
|
||||||
|
|
||||||
|
call({
|
||||||
|
Mutation$NixCollectGarbage$system? system,
|
||||||
|
String? $__typename,
|
||||||
|
}) =>
|
||||||
|
_res;
|
||||||
|
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system<TRes> get system =>
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system.stub(_res);
|
||||||
|
}
|
||||||
|
|
||||||
|
const documentNodeMutationNixCollectGarbage = DocumentNode(definitions: [
|
||||||
|
OperationDefinitionNode(
|
||||||
|
type: OperationType.mutation,
|
||||||
|
name: NameNode(value: 'NixCollectGarbage'),
|
||||||
|
variableDefinitions: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: SelectionSetNode(selections: [
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: 'system'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: SelectionSetNode(selections: [
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: 'nixCollectGarbage'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: SelectionSetNode(selections: [
|
||||||
|
FragmentSpreadNode(
|
||||||
|
name: NameNode(value: 'basicMutationReturnFields'),
|
||||||
|
directives: [],
|
||||||
|
),
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: 'job'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: SelectionSetNode(selections: [
|
||||||
|
FragmentSpreadNode(
|
||||||
|
name: NameNode(value: 'basicApiJobsFields'),
|
||||||
|
directives: [],
|
||||||
|
),
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: '__typename'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: null,
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: '__typename'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: null,
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: '__typename'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: null,
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
FieldNode(
|
||||||
|
name: NameNode(value: '__typename'),
|
||||||
|
alias: null,
|
||||||
|
arguments: [],
|
||||||
|
directives: [],
|
||||||
|
selectionSet: null,
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
fragmentDefinitionbasicMutationReturnFields,
|
||||||
|
fragmentDefinitionbasicApiJobsFields,
|
||||||
|
]);
|
||||||
|
Mutation$NixCollectGarbage _parserFn$Mutation$NixCollectGarbage(
|
||||||
|
Map<String, dynamic> data) =>
|
||||||
|
Mutation$NixCollectGarbage.fromJson(data);
|
||||||
|
typedef OnMutationCompleted$Mutation$NixCollectGarbage = FutureOr<void>
|
||||||
|
Function(
|
||||||
|
Map<String, dynamic>?,
|
||||||
|
Mutation$NixCollectGarbage?,
|
||||||
|
);
|
||||||
|
|
||||||
|
class Options$Mutation$NixCollectGarbage
|
||||||
|
extends graphql.MutationOptions<Mutation$NixCollectGarbage> {
|
||||||
|
Options$Mutation$NixCollectGarbage({
|
||||||
|
String? operationName,
|
||||||
|
graphql.FetchPolicy? fetchPolicy,
|
||||||
|
graphql.ErrorPolicy? errorPolicy,
|
||||||
|
graphql.CacheRereadPolicy? cacheRereadPolicy,
|
||||||
|
Object? optimisticResult,
|
||||||
|
Mutation$NixCollectGarbage? typedOptimisticResult,
|
||||||
|
graphql.Context? context,
|
||||||
|
OnMutationCompleted$Mutation$NixCollectGarbage? onCompleted,
|
||||||
|
graphql.OnMutationUpdate<Mutation$NixCollectGarbage>? update,
|
||||||
|
graphql.OnError? onError,
|
||||||
|
}) : onCompletedWithParsed = onCompleted,
|
||||||
|
super(
|
||||||
|
operationName: operationName,
|
||||||
|
fetchPolicy: fetchPolicy,
|
||||||
|
errorPolicy: errorPolicy,
|
||||||
|
cacheRereadPolicy: cacheRereadPolicy,
|
||||||
|
optimisticResult: optimisticResult ?? typedOptimisticResult?.toJson(),
|
||||||
|
context: context,
|
||||||
|
onCompleted: onCompleted == null
|
||||||
|
? null
|
||||||
|
: (data) => onCompleted(
|
||||||
|
data,
|
||||||
|
data == null
|
||||||
|
? null
|
||||||
|
: _parserFn$Mutation$NixCollectGarbage(data),
|
||||||
|
),
|
||||||
|
update: update,
|
||||||
|
onError: onError,
|
||||||
|
document: documentNodeMutationNixCollectGarbage,
|
||||||
|
parserFn: _parserFn$Mutation$NixCollectGarbage,
|
||||||
|
);
|
||||||
|
|
||||||
|
final OnMutationCompleted$Mutation$NixCollectGarbage? onCompletedWithParsed;
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get properties => [
|
||||||
|
...super.onCompleted == null
|
||||||
|
? super.properties
|
||||||
|
: super.properties.where((property) => property != onCompleted),
|
||||||
|
onCompletedWithParsed,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
class WatchOptions$Mutation$NixCollectGarbage
|
||||||
|
extends graphql.WatchQueryOptions<Mutation$NixCollectGarbage> {
|
||||||
|
WatchOptions$Mutation$NixCollectGarbage({
|
||||||
|
String? operationName,
|
||||||
|
graphql.FetchPolicy? fetchPolicy,
|
||||||
|
graphql.ErrorPolicy? errorPolicy,
|
||||||
|
graphql.CacheRereadPolicy? cacheRereadPolicy,
|
||||||
|
Object? optimisticResult,
|
||||||
|
Mutation$NixCollectGarbage? typedOptimisticResult,
|
||||||
|
graphql.Context? context,
|
||||||
|
Duration? pollInterval,
|
||||||
|
bool? eagerlyFetchResults,
|
||||||
|
bool carryForwardDataOnException = true,
|
||||||
|
bool fetchResults = false,
|
||||||
|
}) : super(
|
||||||
|
operationName: operationName,
|
||||||
|
fetchPolicy: fetchPolicy,
|
||||||
|
errorPolicy: errorPolicy,
|
||||||
|
cacheRereadPolicy: cacheRereadPolicy,
|
||||||
|
optimisticResult: optimisticResult ?? typedOptimisticResult?.toJson(),
|
||||||
|
context: context,
|
||||||
|
document: documentNodeMutationNixCollectGarbage,
|
||||||
|
pollInterval: pollInterval,
|
||||||
|
eagerlyFetchResults: eagerlyFetchResults,
|
||||||
|
carryForwardDataOnException: carryForwardDataOnException,
|
||||||
|
fetchResults: fetchResults,
|
||||||
|
parserFn: _parserFn$Mutation$NixCollectGarbage,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
extension ClientExtension$Mutation$NixCollectGarbage on graphql.GraphQLClient {
|
||||||
|
Future<graphql.QueryResult<Mutation$NixCollectGarbage>>
|
||||||
|
mutate$NixCollectGarbage(
|
||||||
|
[Options$Mutation$NixCollectGarbage? options]) async =>
|
||||||
|
await this.mutate(options ?? Options$Mutation$NixCollectGarbage());
|
||||||
|
graphql.ObservableQuery<
|
||||||
|
Mutation$NixCollectGarbage> watchMutation$NixCollectGarbage(
|
||||||
|
[WatchOptions$Mutation$NixCollectGarbage? options]) =>
|
||||||
|
this.watchMutation(options ?? WatchOptions$Mutation$NixCollectGarbage());
|
||||||
|
}
|
||||||
|
|
||||||
|
class Mutation$NixCollectGarbage$system {
|
||||||
|
Mutation$NixCollectGarbage$system({
|
||||||
|
required this.nixCollectGarbage,
|
||||||
|
this.$__typename = 'SystemMutations',
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Mutation$NixCollectGarbage$system.fromJson(
|
||||||
|
Map<String, dynamic> json) {
|
||||||
|
final l$nixCollectGarbage = json['nixCollectGarbage'];
|
||||||
|
final l$$__typename = json['__typename'];
|
||||||
|
return Mutation$NixCollectGarbage$system(
|
||||||
|
nixCollectGarbage:
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage.fromJson(
|
||||||
|
(l$nixCollectGarbage as Map<String, dynamic>)),
|
||||||
|
$__typename: (l$$__typename as String),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final Mutation$NixCollectGarbage$system$nixCollectGarbage nixCollectGarbage;
|
||||||
|
|
||||||
|
final String $__typename;
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final _resultData = <String, dynamic>{};
|
||||||
|
final l$nixCollectGarbage = nixCollectGarbage;
|
||||||
|
_resultData['nixCollectGarbage'] = l$nixCollectGarbage.toJson();
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
_resultData['__typename'] = l$$__typename;
|
||||||
|
return _resultData;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode {
|
||||||
|
final l$nixCollectGarbage = nixCollectGarbage;
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
return Object.hashAll([
|
||||||
|
l$nixCollectGarbage,
|
||||||
|
l$$__typename,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
if (identical(this, other)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (!(other is Mutation$NixCollectGarbage$system) ||
|
||||||
|
runtimeType != other.runtimeType) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$nixCollectGarbage = nixCollectGarbage;
|
||||||
|
final lOther$nixCollectGarbage = other.nixCollectGarbage;
|
||||||
|
if (l$nixCollectGarbage != lOther$nixCollectGarbage) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
final lOther$$__typename = other.$__typename;
|
||||||
|
if (l$$__typename != lOther$$__typename) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension UtilityExtension$Mutation$NixCollectGarbage$system
|
||||||
|
on Mutation$NixCollectGarbage$system {
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system<Mutation$NixCollectGarbage$system>
|
||||||
|
get copyWith => CopyWith$Mutation$NixCollectGarbage$system(
|
||||||
|
this,
|
||||||
|
(i) => i,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class CopyWith$Mutation$NixCollectGarbage$system<TRes> {
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage$system(
|
||||||
|
Mutation$NixCollectGarbage$system instance,
|
||||||
|
TRes Function(Mutation$NixCollectGarbage$system) then,
|
||||||
|
) = _CopyWithImpl$Mutation$NixCollectGarbage$system;
|
||||||
|
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage$system.stub(TRes res) =
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage$system;
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage? nixCollectGarbage,
|
||||||
|
String? $__typename,
|
||||||
|
});
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes>
|
||||||
|
get nixCollectGarbage;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithImpl$Mutation$NixCollectGarbage$system<TRes>
|
||||||
|
implements CopyWith$Mutation$NixCollectGarbage$system<TRes> {
|
||||||
|
_CopyWithImpl$Mutation$NixCollectGarbage$system(
|
||||||
|
this._instance,
|
||||||
|
this._then,
|
||||||
|
);
|
||||||
|
|
||||||
|
final Mutation$NixCollectGarbage$system _instance;
|
||||||
|
|
||||||
|
final TRes Function(Mutation$NixCollectGarbage$system) _then;
|
||||||
|
|
||||||
|
static const _undefined = <dynamic, dynamic>{};
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
Object? nixCollectGarbage = _undefined,
|
||||||
|
Object? $__typename = _undefined,
|
||||||
|
}) =>
|
||||||
|
_then(Mutation$NixCollectGarbage$system(
|
||||||
|
nixCollectGarbage:
|
||||||
|
nixCollectGarbage == _undefined || nixCollectGarbage == null
|
||||||
|
? _instance.nixCollectGarbage
|
||||||
|
: (nixCollectGarbage
|
||||||
|
as Mutation$NixCollectGarbage$system$nixCollectGarbage),
|
||||||
|
$__typename: $__typename == _undefined || $__typename == null
|
||||||
|
? _instance.$__typename
|
||||||
|
: ($__typename as String),
|
||||||
|
));
|
||||||
|
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes>
|
||||||
|
get nixCollectGarbage {
|
||||||
|
final local$nixCollectGarbage = _instance.nixCollectGarbage;
|
||||||
|
return CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
local$nixCollectGarbage, (e) => call(nixCollectGarbage: e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithStubImpl$Mutation$NixCollectGarbage$system<TRes>
|
||||||
|
implements CopyWith$Mutation$NixCollectGarbage$system<TRes> {
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage$system(this._res);
|
||||||
|
|
||||||
|
TRes _res;
|
||||||
|
|
||||||
|
call({
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage? nixCollectGarbage,
|
||||||
|
String? $__typename,
|
||||||
|
}) =>
|
||||||
|
_res;
|
||||||
|
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes>
|
||||||
|
get nixCollectGarbage =>
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage.stub(
|
||||||
|
_res);
|
||||||
|
}
|
||||||
|
|
||||||
|
class Mutation$NixCollectGarbage$system$nixCollectGarbage
|
||||||
|
implements Fragment$basicMutationReturnFields$$GenericJobMutationReturn {
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage({
|
||||||
|
required this.code,
|
||||||
|
required this.message,
|
||||||
|
required this.success,
|
||||||
|
this.$__typename = 'GenericJobMutationReturn',
|
||||||
|
this.job,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Mutation$NixCollectGarbage$system$nixCollectGarbage.fromJson(
|
||||||
|
Map<String, dynamic> json) {
|
||||||
|
final l$code = json['code'];
|
||||||
|
final l$message = json['message'];
|
||||||
|
final l$success = json['success'];
|
||||||
|
final l$$__typename = json['__typename'];
|
||||||
|
final l$job = json['job'];
|
||||||
|
return Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
code: (l$code as int),
|
||||||
|
message: (l$message as String),
|
||||||
|
success: (l$success as bool),
|
||||||
|
$__typename: (l$$__typename as String),
|
||||||
|
job: l$job == null
|
||||||
|
? null
|
||||||
|
: Fragment$basicApiJobsFields.fromJson(
|
||||||
|
(l$job as Map<String, dynamic>)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final int code;
|
||||||
|
|
||||||
|
final String message;
|
||||||
|
|
||||||
|
final bool success;
|
||||||
|
|
||||||
|
final String $__typename;
|
||||||
|
|
||||||
|
final Fragment$basicApiJobsFields? job;
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final _resultData = <String, dynamic>{};
|
||||||
|
final l$code = code;
|
||||||
|
_resultData['code'] = l$code;
|
||||||
|
final l$message = message;
|
||||||
|
_resultData['message'] = l$message;
|
||||||
|
final l$success = success;
|
||||||
|
_resultData['success'] = l$success;
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
_resultData['__typename'] = l$$__typename;
|
||||||
|
final l$job = job;
|
||||||
|
_resultData['job'] = l$job?.toJson();
|
||||||
|
return _resultData;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode {
|
||||||
|
final l$code = code;
|
||||||
|
final l$message = message;
|
||||||
|
final l$success = success;
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
final l$job = job;
|
||||||
|
return Object.hashAll([
|
||||||
|
l$code,
|
||||||
|
l$message,
|
||||||
|
l$success,
|
||||||
|
l$$__typename,
|
||||||
|
l$job,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
if (identical(this, other)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (!(other is Mutation$NixCollectGarbage$system$nixCollectGarbage) ||
|
||||||
|
runtimeType != other.runtimeType) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$code = code;
|
||||||
|
final lOther$code = other.code;
|
||||||
|
if (l$code != lOther$code) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$message = message;
|
||||||
|
final lOther$message = other.message;
|
||||||
|
if (l$message != lOther$message) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$success = success;
|
||||||
|
final lOther$success = other.success;
|
||||||
|
if (l$success != lOther$success) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$$__typename = $__typename;
|
||||||
|
final lOther$$__typename = other.$__typename;
|
||||||
|
if (l$$__typename != lOther$$__typename) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final l$job = job;
|
||||||
|
final lOther$job = other.job;
|
||||||
|
if (l$job != lOther$job) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension UtilityExtension$Mutation$NixCollectGarbage$system$nixCollectGarbage
|
||||||
|
on Mutation$NixCollectGarbage$system$nixCollectGarbage {
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage>
|
||||||
|
get copyWith =>
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
this,
|
||||||
|
(i) => i,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<
|
||||||
|
TRes> {
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
Mutation$NixCollectGarbage$system$nixCollectGarbage instance,
|
||||||
|
TRes Function(Mutation$NixCollectGarbage$system$nixCollectGarbage) then,
|
||||||
|
) = _CopyWithImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage;
|
||||||
|
|
||||||
|
factory CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage.stub(
|
||||||
|
TRes res) =
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage;
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
int? code,
|
||||||
|
String? message,
|
||||||
|
bool? success,
|
||||||
|
String? $__typename,
|
||||||
|
Fragment$basicApiJobsFields? job,
|
||||||
|
});
|
||||||
|
CopyWith$Fragment$basicApiJobsFields<TRes> get job;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes>
|
||||||
|
implements
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes> {
|
||||||
|
_CopyWithImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
this._instance,
|
||||||
|
this._then,
|
||||||
|
);
|
||||||
|
|
||||||
|
final Mutation$NixCollectGarbage$system$nixCollectGarbage _instance;
|
||||||
|
|
||||||
|
final TRes Function(Mutation$NixCollectGarbage$system$nixCollectGarbage)
|
||||||
|
_then;
|
||||||
|
|
||||||
|
static const _undefined = <dynamic, dynamic>{};
|
||||||
|
|
||||||
|
TRes call({
|
||||||
|
Object? code = _undefined,
|
||||||
|
Object? message = _undefined,
|
||||||
|
Object? success = _undefined,
|
||||||
|
Object? $__typename = _undefined,
|
||||||
|
Object? job = _undefined,
|
||||||
|
}) =>
|
||||||
|
_then(Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
code:
|
||||||
|
code == _undefined || code == null ? _instance.code : (code as int),
|
||||||
|
message: message == _undefined || message == null
|
||||||
|
? _instance.message
|
||||||
|
: (message as String),
|
||||||
|
success: success == _undefined || success == null
|
||||||
|
? _instance.success
|
||||||
|
: (success as bool),
|
||||||
|
$__typename: $__typename == _undefined || $__typename == null
|
||||||
|
? _instance.$__typename
|
||||||
|
: ($__typename as String),
|
||||||
|
job: job == _undefined
|
||||||
|
? _instance.job
|
||||||
|
: (job as Fragment$basicApiJobsFields?),
|
||||||
|
));
|
||||||
|
|
||||||
|
CopyWith$Fragment$basicApiJobsFields<TRes> get job {
|
||||||
|
final local$job = _instance.job;
|
||||||
|
return local$job == null
|
||||||
|
? CopyWith$Fragment$basicApiJobsFields.stub(_then(_instance))
|
||||||
|
: CopyWith$Fragment$basicApiJobsFields(local$job, (e) => call(job: e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CopyWithStubImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage<
|
||||||
|
TRes>
|
||||||
|
implements
|
||||||
|
CopyWith$Mutation$NixCollectGarbage$system$nixCollectGarbage<TRes> {
|
||||||
|
_CopyWithStubImpl$Mutation$NixCollectGarbage$system$nixCollectGarbage(
|
||||||
|
this._res);
|
||||||
|
|
||||||
|
TRes _res;
|
||||||
|
|
||||||
|
call({
|
||||||
|
int? code,
|
||||||
|
String? message,
|
||||||
|
bool? success,
|
||||||
|
String? $__typename,
|
||||||
|
Fragment$basicApiJobsFields? job,
|
||||||
|
}) =>
|
||||||
|
_res;
|
||||||
|
|
||||||
|
CopyWith$Fragment$basicApiJobsFields<TRes> get job =>
|
||||||
|
CopyWith$Fragment$basicApiJobsFields.stub(_res);
|
||||||
|
}
|
||||||
|
|
||||||
class Mutation$RunSystemUpgradeFallback {
|
class Mutation$RunSystemUpgradeFallback {
|
||||||
Mutation$RunSystemUpgradeFallback({
|
Mutation$RunSystemUpgradeFallback({
|
||||||
required this.system,
|
required this.system,
|
||||||
|
|
|
@ -144,4 +144,38 @@ mixin ServerActionsApi on GraphQLApiMap {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<GenericResult<ServerJob?>> collectNixGarbage() async {
|
||||||
|
try {
|
||||||
|
final GraphQLClient client = await getClient();
|
||||||
|
final result = await client.mutate$NixCollectGarbage();
|
||||||
|
if (result.hasException) {
|
||||||
|
return GenericResult(
|
||||||
|
success: false,
|
||||||
|
data: null,
|
||||||
|
);
|
||||||
|
} else if (result.parsedData!.system.nixCollectGarbage.success &&
|
||||||
|
result.parsedData!.system.nixCollectGarbage.job != null) {
|
||||||
|
return GenericResult(
|
||||||
|
success: true,
|
||||||
|
data: ServerJob.fromGraphQL(
|
||||||
|
result.parsedData!.system.nixCollectGarbage.job!,
|
||||||
|
),
|
||||||
|
message: result.parsedData!.system.nixCollectGarbage.message,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return GenericResult(
|
||||||
|
success: false,
|
||||||
|
message: result.parsedData!.system.nixCollectGarbage.message,
|
||||||
|
data: null,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
return GenericResult(
|
||||||
|
success: false,
|
||||||
|
message: e.toString(),
|
||||||
|
data: null,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -178,6 +178,45 @@ class JobsCubit extends Cubit<JobsState> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> collectNixGarbage() async {
|
||||||
|
if (state is JobsStateEmpty) {
|
||||||
|
emit(
|
||||||
|
JobsStateLoading(
|
||||||
|
[CollectNixGarbageJob(status: JobStatusEnum.running)],
|
||||||
|
null,
|
||||||
|
const [],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final result =
|
||||||
|
await getIt<ApiConnectionRepository>().api.collectNixGarbage();
|
||||||
|
if (result.success && result.data != null) {
|
||||||
|
emit(
|
||||||
|
JobsStateLoading(
|
||||||
|
[CollectNixGarbageJob(status: JobStatusEnum.finished)],
|
||||||
|
result.data!.uid,
|
||||||
|
const [],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else if (result.success) {
|
||||||
|
emit(
|
||||||
|
JobsStateFinished(
|
||||||
|
[CollectNixGarbageJob(status: JobStatusEnum.finished)],
|
||||||
|
null,
|
||||||
|
const [],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
emit(
|
||||||
|
JobsStateFinished(
|
||||||
|
[CollectNixGarbageJob(status: JobStatusEnum.error)],
|
||||||
|
null,
|
||||||
|
const [],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> acknowledgeFinished() async {
|
Future<void> acknowledgeFinished() async {
|
||||||
if (state is! JobsStateFinished) {
|
if (state is! JobsStateFinished) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -62,6 +62,36 @@ class UpgradeServerJob extends ClientJob {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class CollectNixGarbageJob extends ClientJob {
|
||||||
|
CollectNixGarbageJob({
|
||||||
|
super.status,
|
||||||
|
super.message,
|
||||||
|
super.id,
|
||||||
|
}) : super(title: 'jobs.collect_nix_garbage'.tr());
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool canAddTo(final List<ClientJob> jobs) =>
|
||||||
|
!jobs.any((final job) => job is CollectNixGarbageJob);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<(bool, String)> execute() async {
|
||||||
|
final result =
|
||||||
|
await getIt<ApiConnectionRepository>().api.collectNixGarbage();
|
||||||
|
return (result.success, result.message ?? '');
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
CollectNixGarbageJob copyWithNewStatus({
|
||||||
|
required final JobStatusEnum status,
|
||||||
|
final String? message,
|
||||||
|
}) =>
|
||||||
|
CollectNixGarbageJob(
|
||||||
|
status: status,
|
||||||
|
message: message,
|
||||||
|
id: id,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
class RebootServerJob extends ClientJob {
|
class RebootServerJob extends ClientJob {
|
||||||
RebootServerJob({
|
RebootServerJob({
|
||||||
super.status,
|
super.status,
|
||||||
|
|
|
@ -65,14 +65,59 @@ class DigitalOceanLocation {
|
||||||
emoji = '🇮🇳';
|
emoji = '🇮🇳';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'syd':
|
||||||
|
emoji = '🇦🇺';
|
||||||
|
break;
|
||||||
|
|
||||||
case 'nyc':
|
case 'nyc':
|
||||||
case 'sfo':
|
case 'sfo':
|
||||||
emoji = '🇺🇸';
|
emoji = '🇺🇸';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return emoji;
|
return emoji;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get countryDisplayKey {
|
||||||
|
String displayKey = 'countries.';
|
||||||
|
switch (slug.substring(0, 3)) {
|
||||||
|
case 'fra':
|
||||||
|
displayKey += 'germany';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'ams':
|
||||||
|
displayKey += 'netherlands';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'sgp':
|
||||||
|
displayKey += 'singapore';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'lon':
|
||||||
|
displayKey += 'united_kingdom';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'tor':
|
||||||
|
displayKey += 'canada';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'blr':
|
||||||
|
displayKey += 'india';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'syd':
|
||||||
|
displayKey += 'australia';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'nyc':
|
||||||
|
case 'sfo':
|
||||||
|
displayKey += 'united_states';
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
displayKey = slug;
|
||||||
|
}
|
||||||
|
return displayKey;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
|
|
|
@ -155,6 +155,27 @@ class HetznerLocation {
|
||||||
}
|
}
|
||||||
return emoji;
|
return emoji;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get countryDisplayKey {
|
||||||
|
String displayKey = 'countries.';
|
||||||
|
switch (country.substring(0, 2)) {
|
||||||
|
case 'DE':
|
||||||
|
displayKey += 'germany';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'FI':
|
||||||
|
displayKey += 'finland';
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'US':
|
||||||
|
displayKey += 'united_states';
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
displayKey = country;
|
||||||
|
}
|
||||||
|
return displayKey;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A Volume is a highly-available, scalable, and SSD-based block storage for Servers.
|
/// A Volume is a highly-available, scalable, and SSD-based block storage for Servers.
|
||||||
|
|
|
@ -2,12 +2,14 @@ class ServerProviderLocation {
|
||||||
ServerProviderLocation({
|
ServerProviderLocation({
|
||||||
required this.title,
|
required this.title,
|
||||||
required this.identifier,
|
required this.identifier,
|
||||||
|
required this.countryDisplayKey,
|
||||||
this.description,
|
this.description,
|
||||||
this.flag = '',
|
this.flag = '',
|
||||||
});
|
});
|
||||||
|
|
||||||
final String title;
|
final String title;
|
||||||
final String identifier;
|
final String identifier;
|
||||||
|
final String countryDisplayKey;
|
||||||
final String? description;
|
final String? description;
|
||||||
final String flag;
|
final String flag;
|
||||||
}
|
}
|
||||||
|
|
|
@ -438,6 +438,7 @@ class DigitalOceanServerProvider extends ServerProvider {
|
||||||
description: rawLocation.name,
|
description: rawLocation.name,
|
||||||
flag: rawLocation.flag,
|
flag: rawLocation.flag,
|
||||||
identifier: rawLocation.slug,
|
identifier: rawLocation.slug,
|
||||||
|
countryDisplayKey: rawLocation.countryDisplayKey,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -156,6 +156,7 @@ class HetznerServerProvider extends ServerProvider {
|
||||||
description: server.location.description,
|
description: server.location.description,
|
||||||
flag: server.location.flag,
|
flag: server.location.flag,
|
||||||
identifier: server.location.name,
|
identifier: server.location.name,
|
||||||
|
countryDisplayKey: server.location.countryDisplayKey,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -456,6 +457,7 @@ class HetznerServerProvider extends ServerProvider {
|
||||||
description: rawLocation.description,
|
description: rawLocation.description,
|
||||||
flag: rawLocation.flag,
|
flag: rawLocation.flag,
|
||||||
identifier: rawLocation.name,
|
identifier: rawLocation.name,
|
||||||
|
countryDisplayKey: rawLocation.countryDisplayKey,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:selfprivacy/config/bloc_config.dart';
|
import 'package:selfprivacy/config/bloc_config.dart';
|
||||||
import 'package:selfprivacy/config/bloc_observer.dart';
|
import 'package:selfprivacy/config/bloc_observer.dart';
|
||||||
|
@ -9,13 +10,20 @@ import 'package:selfprivacy/config/hive_config.dart';
|
||||||
import 'package:selfprivacy/config/localization.dart';
|
import 'package:selfprivacy/config/localization.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/app_settings/app_settings_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/app_settings/app_settings_cubit.dart';
|
||||||
import 'package:selfprivacy/theming/factory/app_theme_factory.dart';
|
import 'package:selfprivacy/theming/factory/app_theme_factory.dart';
|
||||||
|
import 'package:selfprivacy/ui/pages/errors/failed_to_init_secure_storage.dart';
|
||||||
import 'package:selfprivacy/ui/router/router.dart';
|
import 'package:selfprivacy/ui/router/router.dart';
|
||||||
// import 'package:wakelock/wakelock.dart';
|
// import 'package:wakelock/wakelock.dart';
|
||||||
import 'package:timezone/data/latest.dart' as tz;
|
import 'package:timezone/data/latest.dart' as tz;
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
try {
|
||||||
await HiveConfig.init();
|
await HiveConfig.init();
|
||||||
|
} on PlatformException catch (e) {
|
||||||
|
runApp(
|
||||||
|
FailedToInitSecureStorageScreen(e: e),
|
||||||
|
);
|
||||||
|
}
|
||||||
// await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
// await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||||
|
|
||||||
// try {
|
// try {
|
||||||
|
|
|
@ -24,8 +24,10 @@ abstract class AppThemeFactory {
|
||||||
final ColorScheme? dynamicColorsScheme =
|
final ColorScheme? dynamicColorsScheme =
|
||||||
await _getDynamicColors(brightness);
|
await _getDynamicColors(brightness);
|
||||||
|
|
||||||
|
final Color? accentColor = await _getAccentColor();
|
||||||
|
|
||||||
final ColorScheme fallbackColorScheme = ColorScheme.fromSeed(
|
final ColorScheme fallbackColorScheme = ColorScheme.fromSeed(
|
||||||
seedColor: fallbackColor,
|
seedColor: accentColor ?? fallbackColor,
|
||||||
brightness: brightness,
|
brightness: brightness,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -55,6 +57,14 @@ abstract class AppThemeFactory {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Future<Color?> _getAccentColor() {
|
||||||
|
try {
|
||||||
|
return DynamicColorPlugin.getAccentColor();
|
||||||
|
} on PlatformException {
|
||||||
|
return Future.value(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static Future<CorePalette?> getCorePalette() async {
|
static Future<CorePalette?> getCorePalette() async {
|
||||||
try {
|
try {
|
||||||
return await DynamicColorPlugin.getCorePalette();
|
return await DynamicColorPlugin.getCorePalette();
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'package:collection/collection.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:gap/gap.dart';
|
||||||
import 'package:selfprivacy/config/brand_theme.dart';
|
import 'package:selfprivacy/config/brand_theme.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/server_jobs/server_jobs_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/server_jobs/server_jobs_bloc.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
||||||
|
@ -63,7 +64,7 @@ class JobsContent extends StatelessWidget {
|
||||||
context.read<ServerInstallationCubit>().state;
|
context.read<ServerInstallationCubit>().state;
|
||||||
if (state is JobsStateEmpty) {
|
if (state is JobsStateEmpty) {
|
||||||
widgets = [
|
widgets = [
|
||||||
const SizedBox(height: 80),
|
const Gap(80),
|
||||||
Center(
|
Center(
|
||||||
child: Text(
|
child: Text(
|
||||||
'jobs.empty'.tr(),
|
'jobs.empty'.tr(),
|
||||||
|
@ -75,12 +76,12 @@ class JobsContent extends StatelessWidget {
|
||||||
if (installationState is ServerInstallationFinished) {
|
if (installationState is ServerInstallationFinished) {
|
||||||
widgets = [
|
widgets = [
|
||||||
...widgets,
|
...widgets,
|
||||||
const SizedBox(height: 80),
|
const Gap(80),
|
||||||
BrandButton.rised(
|
BrandButton.rised(
|
||||||
onPressed: () => context.read<JobsCubit>().upgradeServer(),
|
onPressed: () => context.read<JobsCubit>().upgradeServer(),
|
||||||
text: 'jobs.upgrade_server'.tr(),
|
text: 'jobs.upgrade_server'.tr(),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 10),
|
const Gap(10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
title: 'jobs.reboot_server'.tr(),
|
title: 'jobs.reboot_server'.tr(),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
@ -189,7 +190,7 @@ class JobsContent extends StatelessWidget {
|
||||||
style:
|
style:
|
||||||
Theme.of(context).textTheme.labelSmall,
|
Theme.of(context).textTheme.labelSmall,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
value: rebuildJob?.progress == null
|
value: rebuildJob?.progress == null
|
||||||
? 0.0
|
? 0.0
|
||||||
|
@ -206,7 +207,7 @@ class JobsContent extends StatelessWidget {
|
||||||
minHeight: 7.0,
|
minHeight: 7.0,
|
||||||
borderRadius: BorderRadius.circular(7.0),
|
borderRadius: BorderRadius.circular(7.0),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
if (rebuildJob?.error != null ||
|
if (rebuildJob?.error != null ||
|
||||||
rebuildJob?.result != null ||
|
rebuildJob?.result != null ||
|
||||||
rebuildJob?.statusText != null)
|
rebuildJob?.statusText != null)
|
||||||
|
@ -282,7 +283,7 @@ class JobsContent extends StatelessWidget {
|
||||||
(final job) => job.uid == state.rebuildJobUid,
|
(final job) => job.uid == state.rebuildJobUid,
|
||||||
);
|
);
|
||||||
if (rebuildJob == null) {
|
if (rebuildJob == null) {
|
||||||
return const SizedBox();
|
return const Gap(0);
|
||||||
}
|
}
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
|
@ -322,7 +323,7 @@ class JobsContent extends StatelessWidget {
|
||||||
rebuildJob.description,
|
rebuildJob.description,
|
||||||
style: Theme.of(context).textTheme.labelSmall,
|
style: Theme.of(context).textTheme.labelSmall,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
value: rebuildJob.progress == null
|
value: rebuildJob.progress == null
|
||||||
? 0.0
|
? 0.0
|
||||||
|
@ -339,7 +340,7 @@ class JobsContent extends StatelessWidget {
|
||||||
minHeight: 7.0,
|
minHeight: 7.0,
|
||||||
borderRadius: BorderRadius.circular(7.0),
|
borderRadius: BorderRadius.circular(7.0),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
if (rebuildJob.error != null ||
|
if (rebuildJob.error != null ||
|
||||||
rebuildJob.result != null ||
|
rebuildJob.result != null ||
|
||||||
rebuildJob.statusText != null)
|
rebuildJob.statusText != null)
|
||||||
|
@ -360,7 +361,7 @@ class JobsContent extends StatelessWidget {
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
BrandButton.rised(
|
BrandButton.rised(
|
||||||
onPressed: () => context.read<JobsCubit>().acknowledgeFinished(),
|
onPressed: () => context.read<JobsCubit>().acknowledgeFinished(),
|
||||||
text: 'basis.done'.tr(),
|
text: 'basis.done'.tr(),
|
||||||
|
@ -403,7 +404,7 @@ class JobsContent extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(width: 8),
|
const Gap(8),
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
backgroundColor:
|
backgroundColor:
|
||||||
|
@ -423,7 +424,7 @@ class JobsContent extends StatelessWidget {
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
BrandButton.rised(
|
BrandButton.rised(
|
||||||
onPressed: hasBlockingJobs
|
onPressed: hasBlockingJobs
|
||||||
? null
|
? null
|
||||||
|
@ -436,18 +437,18 @@ class JobsContent extends StatelessWidget {
|
||||||
controller: controller,
|
controller: controller,
|
||||||
padding: paddingH15V0,
|
padding: paddingH15V0,
|
||||||
children: [
|
children: [
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
Center(
|
Center(
|
||||||
child: Text(
|
child: Text(
|
||||||
'jobs.title'.tr(),
|
'jobs.title'.tr(),
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 20),
|
const Gap(20),
|
||||||
...widgets,
|
...widgets,
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
const Divider(height: 0),
|
const Divider(height: 0),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
if (serverJobs.isNotEmpty)
|
if (serverJobs.isNotEmpty)
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.all(8.0),
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
@ -489,7 +490,7 @@ class JobsContent extends StatelessWidget {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 24),
|
const Gap(24),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import 'package:auto_route/auto_route.dart';
|
import 'package:auto_route/auto_route.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:ionicons/ionicons.dart';
|
import 'package:ionicons/ionicons.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
||||||
|
@ -126,7 +127,9 @@ class _HeroSliverAppBarState extends State<HeroSliverAppBar> {
|
||||||
Widget build(final BuildContext context) {
|
Widget build(final BuildContext context) {
|
||||||
final isMobile =
|
final isMobile =
|
||||||
widget.ignoreBreakpoints ? true : Breakpoints.small.isActive(context);
|
widget.ignoreBreakpoints ? true : Breakpoints.small.isActive(context);
|
||||||
final isJobsListEmpty = context.watch<JobsCubit>().state is JobsStateEmpty;
|
final isJobsListEmpty = widget.hasFlashButton
|
||||||
|
? context.watch<JobsCubit>().state is JobsStateEmpty
|
||||||
|
: true;
|
||||||
return SliverAppBar(
|
return SliverAppBar(
|
||||||
expandedHeight:
|
expandedHeight:
|
||||||
widget.hasHeroIcon ? 148.0 + _size.height : 72.0 + _size.height,
|
widget.hasHeroIcon ? 148.0 + _size.height : 72.0 + _size.height,
|
||||||
|
@ -164,6 +167,7 @@ class _HeroSliverAppBarState extends State<HeroSliverAppBar> {
|
||||||
color: isJobsListEmpty
|
color: isJobsListEmpty
|
||||||
? Theme.of(context).colorScheme.onBackground
|
? Theme.of(context).colorScheme.onBackground
|
||||||
: Theme.of(context).colorScheme.primary,
|
: Theme.of(context).colorScheme.primary,
|
||||||
|
tooltip: 'jobs.title'.tr(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox.shrink(),
|
const SizedBox.shrink(),
|
||||||
|
|
|
@ -100,7 +100,7 @@ class _RootAppBar extends StatelessWidget {
|
||||||
leading: context.router.pageCount > 1
|
leading: context.router.pageCount > 1
|
||||||
? IconButton(
|
? IconButton(
|
||||||
icon: const Icon(Icons.arrow_back),
|
icon: const Icon(Icons.arrow_back),
|
||||||
onPressed: () => context.router.pop(),
|
onPressed: () => context.router.maybePop(),
|
||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
actions: const [
|
actions: const [
|
||||||
|
|
|
@ -38,8 +38,14 @@ class BackupDetailsPage extends StatelessWidget {
|
||||||
: StateType.uninitialized;
|
: StateType.uninitialized;
|
||||||
final bool preventActions = backupsState.preventActions;
|
final bool preventActions = backupsState.preventActions;
|
||||||
final List<Backup> backups = backupsState.backups;
|
final List<Backup> backups = backupsState.backups;
|
||||||
final List<Service> services =
|
final List<Service> services = context
|
||||||
context.watch<ServicesBloc>().state.servicesThatCanBeBackedUp;
|
.watch<ServicesBloc>()
|
||||||
|
.state
|
||||||
|
.servicesThatCanBeBackedUp
|
||||||
|
.where(
|
||||||
|
(final service) => service.isEnabled,
|
||||||
|
)
|
||||||
|
.toList();
|
||||||
final Duration? autobackupPeriod = backupsState.autobackupPeriod;
|
final Duration? autobackupPeriod = backupsState.autobackupPeriod;
|
||||||
final List<ServerJob> backupJobs = context
|
final List<ServerJob> backupJobs = context
|
||||||
.watch<ServerJobsBloc>()
|
.watch<ServerJobsBloc>()
|
||||||
|
|
|
@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/backups/backups_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/backups/backups_bloc.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/server_jobs/server_jobs_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/server_jobs/server_jobs_bloc.dart';
|
||||||
|
import 'package:selfprivacy/logic/bloc/volumes/volumes_bloc.dart';
|
||||||
import 'package:selfprivacy/logic/models/json/server_job.dart';
|
import 'package:selfprivacy/logic/models/json/server_job.dart';
|
||||||
import 'package:selfprivacy/logic/models/service.dart';
|
import 'package:selfprivacy/logic/models/service.dart';
|
||||||
|
|
||||||
|
@ -103,6 +104,29 @@ class _CreateBackupsModalState extends State<CreateBackupsModal> {
|
||||||
...widget.services.map(
|
...widget.services.map(
|
||||||
(final Service service) {
|
(final Service service) {
|
||||||
final bool busy = busyServices.contains(service.id);
|
final bool busy = busyServices.contains(service.id);
|
||||||
|
final List<Widget> descriptionWidgets = [];
|
||||||
|
if (busy) {
|
||||||
|
descriptionWidgets.add(Text('backup.service_busy'.tr()));
|
||||||
|
} else {
|
||||||
|
descriptionWidgets.add(
|
||||||
|
Text(
|
||||||
|
'service_page.uses'.tr(
|
||||||
|
namedArgs: {
|
||||||
|
'usage': service.storageUsage.used.toString(),
|
||||||
|
'volume': context
|
||||||
|
.read<VolumesBloc>()
|
||||||
|
.state
|
||||||
|
.getVolume(service.storageUsage.volume ?? '')
|
||||||
|
.displayName,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
style: Theme.of(context).textTheme.labelMedium,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
descriptionWidgets.add(
|
||||||
|
Text(service.backupDescription),
|
||||||
|
);
|
||||||
|
}
|
||||||
return CheckboxListTile.adaptive(
|
return CheckboxListTile.adaptive(
|
||||||
onChanged: !busy
|
onChanged: !busy
|
||||||
? (final bool? value) {
|
? (final bool? value) {
|
||||||
|
@ -122,8 +146,9 @@ class _CreateBackupsModalState extends State<CreateBackupsModal> {
|
||||||
title: Text(
|
title: Text(
|
||||||
service.displayName,
|
service.displayName,
|
||||||
),
|
),
|
||||||
subtitle: Text(
|
subtitle: Column(
|
||||||
busy ? 'backup.service_busy'.tr() : service.backupDescription,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: descriptionWidgets,
|
||||||
),
|
),
|
||||||
secondary: SvgPicture.string(
|
secondary: SvgPicture.string(
|
||||||
service.svgIcon,
|
service.svgIcon,
|
||||||
|
|
|
@ -0,0 +1,71 @@
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:gap/gap.dart';
|
||||||
|
import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart';
|
||||||
|
import 'package:selfprivacy/ui/pages/more/about_application.dart';
|
||||||
|
|
||||||
|
class FailedToInitSecureStorageScreen extends StatelessWidget {
|
||||||
|
const FailedToInitSecureStorageScreen({
|
||||||
|
required this.e,
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
|
final PlatformException e;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(final BuildContext context) => MaterialApp(
|
||||||
|
home: BrandHeroScreen(
|
||||||
|
heroIcon: Icons.error_outline,
|
||||||
|
heroTitle: 'Failed to initialize secure storage',
|
||||||
|
hasBackButton: false,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'SelfPrivacy requires a secure storage provided by your operating system to encrypt sensitive data, but it failed to initialize.',
|
||||||
|
),
|
||||||
|
if (Platform.isLinux)
|
||||||
|
const Text(
|
||||||
|
'Please make sure that the libsecret library is installed.',
|
||||||
|
),
|
||||||
|
const Gap(16),
|
||||||
|
Text('Error: ${e.message}'),
|
||||||
|
const Gap(16),
|
||||||
|
const Divider(),
|
||||||
|
const Gap(16),
|
||||||
|
const LinkListTile(
|
||||||
|
title: 'Our website',
|
||||||
|
subtitle: 'selfprivacy.org',
|
||||||
|
uri: 'https://selfprivacy.org/',
|
||||||
|
icon: Icons.language_outlined,
|
||||||
|
),
|
||||||
|
const LinkListTile(
|
||||||
|
title: 'Documentation',
|
||||||
|
subtitle: 'selfprivacy.org/docs',
|
||||||
|
uri: 'https://selfprivacy.org/docs/',
|
||||||
|
icon: Icons.library_books_outlined,
|
||||||
|
),
|
||||||
|
const LinkListTile(
|
||||||
|
title: 'Privacy Policy',
|
||||||
|
subtitle: 'selfprivacy.org/privacy-policy',
|
||||||
|
uri: 'https://selfprivacy.org/privacy-policy/',
|
||||||
|
icon: Icons.policy_outlined,
|
||||||
|
),
|
||||||
|
const LinkListTile(
|
||||||
|
title: 'Matrix support chat',
|
||||||
|
subtitle: '#chat:selfprivacy.org',
|
||||||
|
uri: 'https://matrix.to/#/#chat:selfprivacy.org',
|
||||||
|
icon: Icons.question_answer_outlined,
|
||||||
|
longPressText: '#chat:selfprivacy.org',
|
||||||
|
),
|
||||||
|
const LinkListTile(
|
||||||
|
title: 'Telegram support chat',
|
||||||
|
subtitle: '@selfprivacy_chat',
|
||||||
|
uri: 'https://t.me/selfprivacy_chat',
|
||||||
|
icon: Icons.question_answer_outlined,
|
||||||
|
longPressText: '@selfprivacy_chat',
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
|
@ -35,7 +35,8 @@ class CpuChart extends StatelessWidget {
|
||||||
lineTouchData: LineTouchData(
|
lineTouchData: LineTouchData(
|
||||||
enabled: true,
|
enabled: true,
|
||||||
touchTooltipData: LineTouchTooltipData(
|
touchTooltipData: LineTouchTooltipData(
|
||||||
tooltipBgColor: Theme.of(context).colorScheme.surface,
|
getTooltipColor: (final LineBarSpot _) =>
|
||||||
|
Theme.of(context).colorScheme.surface,
|
||||||
tooltipPadding: const EdgeInsets.all(8),
|
tooltipPadding: const EdgeInsets.all(8),
|
||||||
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) {
|
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) {
|
||||||
final List<LineTooltipItem> res = [];
|
final List<LineTooltipItem> res = [];
|
||||||
|
|
|
@ -38,7 +38,8 @@ class NetworkChart extends StatelessWidget {
|
||||||
lineTouchData: LineTouchData(
|
lineTouchData: LineTouchData(
|
||||||
enabled: true,
|
enabled: true,
|
||||||
touchTooltipData: LineTouchTooltipData(
|
touchTooltipData: LineTouchTooltipData(
|
||||||
tooltipBgColor: Theme.of(context).colorScheme.surface,
|
getTooltipColor: (final LineBarSpot _) =>
|
||||||
|
Theme.of(context).colorScheme.surface,
|
||||||
tooltipPadding: const EdgeInsets.all(8),
|
tooltipPadding: const EdgeInsets.all(8),
|
||||||
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) {
|
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) {
|
||||||
final List<LineTooltipItem> res = [];
|
final List<LineTooltipItem> res = [];
|
||||||
|
|
|
@ -2,7 +2,9 @@ import 'package:auto_route/auto_route.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
import 'package:gap/gap.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/services/services_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/services/services_bloc.dart';
|
||||||
|
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
|
||||||
import 'package:selfprivacy/logic/models/disk_status.dart';
|
import 'package:selfprivacy/logic/models/disk_status.dart';
|
||||||
import 'package:selfprivacy/logic/models/service.dart';
|
import 'package:selfprivacy/logic/models/service.dart';
|
||||||
|
@ -43,8 +45,9 @@ class _ServerStoragePageState extends State<ServerStoragePage> {
|
||||||
return BrandHeroScreen(
|
return BrandHeroScreen(
|
||||||
hasBackButton: true,
|
hasBackButton: true,
|
||||||
heroTitle: 'storage.card_title'.tr(),
|
heroTitle: 'storage.card_title'.tr(),
|
||||||
|
bodyPadding: const EdgeInsets.symmetric(vertical: 16.0),
|
||||||
|
hasFlashButton: true,
|
||||||
children: [
|
children: [
|
||||||
// ...sections,
|
|
||||||
...widget.diskStatus.diskVolumes.map(
|
...widget.diskStatus.diskVolumes.map(
|
||||||
(final volume) => Column(
|
(final volume) => Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
@ -59,13 +62,20 @@ class _ServerStoragePageState extends State<ServerStoragePage> {
|
||||||
)
|
)
|
||||||
.toList(),
|
.toList(),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
const Divider(),
|
const Divider(),
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const Gap(8),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||||
|
child: BrandOutlinedButton(
|
||||||
|
title: 'jobs.collect_nix_garbage'.tr(),
|
||||||
|
onPressed: context.read<JobsCubit>().collectNixGarbage,
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -87,19 +97,29 @@ class ServerStorageSection extends StatelessWidget {
|
||||||
Widget build(final BuildContext context) => Column(
|
Widget build(final BuildContext context) => Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
ServerStorageListItem(
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||||
|
child: ServerStorageListItem(
|
||||||
volume: volume,
|
volume: volume,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
),
|
||||||
|
const Gap(16),
|
||||||
...services.map(
|
...services.map(
|
||||||
(final service) => ServerConsumptionListTile(
|
(final service) => ServerConsumptionListTile(
|
||||||
service: service,
|
service: service,
|
||||||
volume: volume,
|
volume: volume,
|
||||||
|
onTap: () {
|
||||||
|
context.pushRoute(
|
||||||
|
ServiceRoute(serviceId: service.id),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (volume.isResizable) ...[
|
if (volume.isResizable) ...[
|
||||||
const SizedBox(height: 16),
|
const Gap(16),
|
||||||
BrandOutlinedButton(
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||||
|
child: BrandOutlinedButton(
|
||||||
title: 'storage.extend_volume_button.title'.tr(),
|
title: 'storage.extend_volume_button.title'.tr(),
|
||||||
onPressed: () => context.pushRoute(
|
onPressed: () => context.pushRoute(
|
||||||
ExtendingVolumeRoute(
|
ExtendingVolumeRoute(
|
||||||
|
@ -108,6 +128,7 @@ class ServerStorageSection extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
@ -117,20 +138,24 @@ class ServerConsumptionListTile extends StatelessWidget {
|
||||||
const ServerConsumptionListTile({
|
const ServerConsumptionListTile({
|
||||||
required this.service,
|
required this.service,
|
||||||
required this.volume,
|
required this.volume,
|
||||||
|
required this.onTap,
|
||||||
super.key,
|
super.key,
|
||||||
});
|
});
|
||||||
|
|
||||||
final Service service;
|
final Service service;
|
||||||
final DiskVolume volume;
|
final DiskVolume volume;
|
||||||
|
final VoidCallback onTap;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(final BuildContext context) => Padding(
|
Widget build(final BuildContext context) => InkWell(
|
||||||
padding: const EdgeInsets.symmetric(vertical: 8),
|
onTap: onTap,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
|
||||||
child: ConsumptionListItem(
|
child: ConsumptionListItem(
|
||||||
title: service.displayName,
|
title: service.displayName,
|
||||||
icon: SvgPicture.string(
|
icon: SvgPicture.string(
|
||||||
service.svgIcon,
|
service.svgIcon,
|
||||||
width: 24.0,
|
width: 22.0,
|
||||||
height: 24.0,
|
height: 24.0,
|
||||||
colorFilter: ColorFilter.mode(
|
colorFilter: ColorFilter.mode(
|
||||||
Theme.of(context).colorScheme.onBackground,
|
Theme.of(context).colorScheme.onBackground,
|
||||||
|
@ -145,5 +170,6 @@ class ServerConsumptionListTile extends StatelessWidget {
|
||||||
backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
|
backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||||
dense: true,
|
dense: true,
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
import 'package:selfprivacy/config/get_it_config.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/services/services_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/services/services_bloc.dart';
|
||||||
import 'package:selfprivacy/logic/bloc/volumes/volumes_bloc.dart';
|
import 'package:selfprivacy/logic/bloc/volumes/volumes_bloc.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/client_jobs/client_jobs_cubit.dart';
|
||||||
|
@ -11,6 +12,7 @@ import 'package:selfprivacy/ui/components/cards/filled_card.dart';
|
||||||
import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart';
|
import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart';
|
||||||
import 'package:selfprivacy/ui/router/router.dart';
|
import 'package:selfprivacy/ui/router/router.dart';
|
||||||
import 'package:selfprivacy/utils/launch_url.dart';
|
import 'package:selfprivacy/utils/launch_url.dart';
|
||||||
|
import 'package:selfprivacy/utils/platform_adapter.dart';
|
||||||
|
|
||||||
@RoutePage()
|
@RoutePage()
|
||||||
class ServicePage extends StatefulWidget {
|
class ServicePage extends StatefulWidget {
|
||||||
|
@ -65,6 +67,11 @@ class _ServicePageState extends State<ServicePage> {
|
||||||
ListTile(
|
ListTile(
|
||||||
iconColor: Theme.of(context).colorScheme.onBackground,
|
iconColor: Theme.of(context).colorScheme.onBackground,
|
||||||
onTap: () => launchURL(service.url),
|
onTap: () => launchURL(service.url),
|
||||||
|
onLongPress: () {
|
||||||
|
PlatformAdapter.setClipboard(service.url!);
|
||||||
|
getIt<NavigationService>()
|
||||||
|
.showSnackBar('basis.copied_to_clipboard'.tr());
|
||||||
|
},
|
||||||
leading: const Icon(Icons.open_in_browser),
|
leading: const Icon(Icons.open_in_browser),
|
||||||
title: Text(
|
title: Text(
|
||||||
'service_page.open_in_browser'.tr(),
|
'service_page.open_in_browser'.tr(),
|
||||||
|
|
|
@ -57,7 +57,7 @@ class _DnsProviderPickerState extends State<DnsProviderPicker> {
|
||||||
providerCubit: widget.formCubit,
|
providerCubit: widget.formCubit,
|
||||||
providerInfo: const ProviderPageInfo(
|
providerInfo: const ProviderPageInfo(
|
||||||
providerType: DnsProviderType.digitalOcean,
|
providerType: DnsProviderType.digitalOcean,
|
||||||
pathToHow: 'how_digital_ocean_dns',
|
pathToHow: 'how_digital_ocean',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,9 @@ class InitializingPage extends StatelessWidget {
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
if (cubit.state is ServerInstallationEmpty ||
|
if (cubit.state is ServerInstallationEmpty ||
|
||||||
cubit.state is ServerInstallationNotFinished)
|
cubit.state is ServerInstallationNotFinished &&
|
||||||
|
cubit.state.progress ==
|
||||||
|
ServerSetupProgress.nothingYet)
|
||||||
Container(
|
Container(
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
child: BrandButton.filled(
|
child: BrandButton.filled(
|
||||||
|
|
|
@ -120,6 +120,14 @@ class SelectLocationPage extends StatelessWidget {
|
||||||
.titleMedium,
|
.titleMedium,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
location.countryDisplayKey.tr(),
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.bodyMedium,
|
||||||
|
),
|
||||||
|
if (location.description != null)
|
||||||
|
const SizedBox(height: 4),
|
||||||
if (location.description != null)
|
if (location.description != null)
|
||||||
Text(
|
Text(
|
||||||
location.description!,
|
location.description!,
|
||||||
|
|
|
@ -38,7 +38,7 @@ class NewUserPage extends StatelessWidget {
|
||||||
return BlocListener<UserFormCubit, FormCubitState>(
|
return BlocListener<UserFormCubit, FormCubitState>(
|
||||||
listener: (final BuildContext context, final FormCubitState state) {
|
listener: (final BuildContext context, final FormCubitState state) {
|
||||||
if (state.isSubmitted) {
|
if (state.isSubmitted) {
|
||||||
context.router.pop();
|
context.router.maybePop();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
child: BrandHeroScreen(
|
child: BrandHeroScreen(
|
||||||
|
|
|
@ -103,7 +103,7 @@ class _DeleteUserTile extends StatelessWidget {
|
||||||
TextButton(
|
TextButton(
|
||||||
child: Text('basis.cancel'.tr()),
|
child: Text('basis.cancel'.tr()),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
context.router.pop();
|
context.router.maybePop();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
TextButton(
|
TextButton(
|
||||||
|
@ -115,8 +115,8 @@ class _DeleteUserTile extends StatelessWidget {
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
context.read<JobsCubit>().addJob(DeleteUserJob(user: user));
|
context.read<JobsCubit>().addJob(DeleteUserJob(user: user));
|
||||||
context.router.childControllers.first.pop();
|
context.router.childControllers.first.maybePop();
|
||||||
context.router.pop();
|
context.router.maybePop();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
@ -244,7 +244,7 @@ class _SshKeysCard extends StatelessWidget {
|
||||||
publicKey: key,
|
publicKey: key,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
context.popRoute();
|
context.maybePop();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
444
pubspec.lock
444
pubspec.lock
File diff suppressed because it is too large
Load Diff
38
pubspec.yaml
38
pubspec.yaml
|
@ -5,30 +5,29 @@ version: 0.11.0+22
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.2.1 <4.0.0'
|
sdk: '>=3.2.1 <4.0.0'
|
||||||
flutter: ">=3.16.1"
|
flutter: ">=3.19.5"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
animations: ^2.0.8
|
animations: ^2.0.11
|
||||||
auto_route: ^7.8.4
|
auto_route: ^8.0.3
|
||||||
auto_size_text: ^3.0.0
|
auto_size_text: ^3.0.0
|
||||||
bloc_concurrency: ^0.2.3
|
bloc_concurrency: ^0.2.5
|
||||||
crypt: ^4.3.1
|
crypt: ^4.3.1
|
||||||
collection: ^1.18.0
|
collection: ^1.18.0
|
||||||
cubit_form: ^2.0.1
|
cubit_form: ^2.0.1
|
||||||
device_info_plus: ^9.1.1
|
device_info_plus: ^10.0.1
|
||||||
dio: ^5.4.0
|
dio: ^5.4.2+1
|
||||||
duration: ^3.0.13
|
duration: ^3.0.13
|
||||||
dynamic_color: ^1.6.8
|
dynamic_color: ^1.7.0
|
||||||
easy_localization: ^3.0.3
|
easy_localization: ^3.0.5
|
||||||
either_option: ^2.0.1-dev.1
|
|
||||||
equatable: ^2.0.5
|
equatable: ^2.0.5
|
||||||
fl_chart: ^0.65.0
|
fl_chart: ^0.67.0
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_bloc: ^8.1.3
|
flutter_bloc: ^8.1.5
|
||||||
flutter_markdown: ^0.6.18+2
|
flutter_markdown: ^0.6.22
|
||||||
flutter_secure_storage: ^9.0.0
|
flutter_secure_storage: ^9.0.0
|
||||||
flutter_svg: ^2.0.9
|
flutter_svg: ^2.0.10+1
|
||||||
gap: ^3.0.1
|
gap: ^3.0.1
|
||||||
get_it: ^7.6.4
|
get_it: ^7.6.4
|
||||||
gql: ^1.0.0
|
gql: ^1.0.0
|
||||||
|
@ -38,12 +37,11 @@ dependencies:
|
||||||
hive: ^2.2.3
|
hive: ^2.2.3
|
||||||
hive_flutter: ^1.1.0
|
hive_flutter: ^1.1.0
|
||||||
http: ^1.1.2
|
http: ^1.1.2
|
||||||
intl: ^0.18.0
|
intl: ^0.18.1
|
||||||
ionicons: ^0.2.2
|
ionicons: ^0.2.2
|
||||||
json_annotation: ^4.8.1
|
json_annotation: ^4.8.1
|
||||||
local_auth: ^2.1.7
|
material_color_utilities: ^0.8.0
|
||||||
material_color_utilities: ^0.5.0
|
modal_bottom_sheet: ^3.0.0
|
||||||
modal_bottom_sheet: ^3.0.0-pre
|
|
||||||
nanoid: ^1.0.0
|
nanoid: ^1.0.0
|
||||||
package_info: ^2.0.2
|
package_info: ^2.0.2
|
||||||
pretty_dio_logger: ^1.3.1
|
pretty_dio_logger: ^1.3.1
|
||||||
|
@ -55,14 +53,14 @@ dependencies:
|
||||||
# wakelock: ^0.6.2
|
# wakelock: ^0.6.2
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
auto_route_generator: ^7.3.2
|
auto_route_generator: ^8.0.0
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
build_runner: ^2.4.7
|
build_runner: ^2.4.9
|
||||||
flutter_launcher_icons: ^0.13.1
|
flutter_launcher_icons: ^0.13.1
|
||||||
hive_generator: ^2.0.1
|
hive_generator: ^2.0.1
|
||||||
json_serializable: ^6.7.1
|
json_serializable: ^6.7.1
|
||||||
flutter_lints: ^3.0.1
|
flutter_lints: ^3.0.2
|
||||||
|
|
||||||
flutter_icons:
|
flutter_icons:
|
||||||
android: "launcher_icon"
|
android: "launcher_icon"
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include <connectivity_plus/connectivity_plus_windows_plugin.h>
|
#include <connectivity_plus/connectivity_plus_windows_plugin.h>
|
||||||
#include <dynamic_color/dynamic_color_plugin_c_api.h>
|
#include <dynamic_color/dynamic_color_plugin_c_api.h>
|
||||||
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
|
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
|
||||||
#include <local_auth_windows/local_auth_plugin.h>
|
|
||||||
#include <url_launcher_windows/url_launcher_windows.h>
|
#include <url_launcher_windows/url_launcher_windows.h>
|
||||||
|
|
||||||
void RegisterPlugins(flutter::PluginRegistry* registry) {
|
void RegisterPlugins(flutter::PluginRegistry* registry) {
|
||||||
|
@ -19,8 +18,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
|
||||||
registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
|
registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
|
||||||
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
|
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
|
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
|
||||||
LocalAuthPluginRegisterWithRegistrar(
|
|
||||||
registry->GetRegistrarForPlugin("LocalAuthPlugin"));
|
|
||||||
UrlLauncherWindowsRegisterWithRegistrar(
|
UrlLauncherWindowsRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
|
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
|
||||||
connectivity_plus
|
connectivity_plus
|
||||||
dynamic_color
|
dynamic_color
|
||||||
flutter_secure_storage_windows
|
flutter_secure_storage_windows
|
||||||
local_auth_windows
|
|
||||||
url_launcher_windows
|
url_launcher_windows
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue