forked from SelfPrivacy/selfprivacy.org.app
update
parent
0ec549042c
commit
ab2893a075
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,46 +1,167 @@
|
||||||
{
|
{
|
||||||
"test": "en-test",
|
"test": "en-test",
|
||||||
"basis": {
|
"basis": {
|
||||||
"_comment": "базовые элементы интерфейса",
|
"_comment": "Basic interface elements",
|
||||||
"providers": "Провайдеры",
|
"providers": "Providers",
|
||||||
"services": "Сервисы",
|
"services": "Services",
|
||||||
"users": "Пользователи",
|
"users": "Users",
|
||||||
"more": "Еще",
|
"more": "More",
|
||||||
"next": "Далее",
|
"next": "Next",
|
||||||
"got_it": "Понял"
|
"got_it": "Got it",
|
||||||
|
"settings": "Settings",
|
||||||
|
"password": "Password",
|
||||||
|
"create": "Add new",
|
||||||
|
"confirmation": "Confirmation",
|
||||||
|
"cancel": "Cancel",
|
||||||
|
"delete": "Delete",
|
||||||
|
"close": "Close",
|
||||||
|
"connect": "Connect",
|
||||||
|
"domain": "Domain",
|
||||||
|
"saving": "Saving..",
|
||||||
|
"nickname": "nickname",
|
||||||
|
"loading": "loading"
|
||||||
},
|
},
|
||||||
"more": {
|
"more": {
|
||||||
"_comment": "Элементы на странице еще",
|
"_comment": "'More' tab",
|
||||||
"configuration_wizard": "Мастер Подключения",
|
"configuration_wizard": "Setup wizard",
|
||||||
"settings": "Настройки приложения",
|
"settings": "Application settings",
|
||||||
"about_project": "О проекте SelfPrivacy",
|
"about_project": "About us",
|
||||||
"about_app": "О приложении",
|
"about_app": "About application",
|
||||||
"onboarding": "Onboarding",
|
"onboarding": "Onboarding",
|
||||||
"console": "Console"
|
"console": "Console"
|
||||||
},
|
},
|
||||||
"onboarding": {
|
"onboarding": {
|
||||||
"_comment": "страницы онбординга",
|
"_comment": "Onboarding pages",
|
||||||
"page1_title": "Digital independence, available to all of us.",
|
"page1_title": "Digital independence, available to all of us",
|
||||||
"page1_text": "Mail, VPN, Messenger, social network and much more on your private server, under your control.",
|
"page1_text": "Mail, VPN, Messenger, social network and much more on your private server, under your control.",
|
||||||
"page2_title": "SelfPrivacy is not a cloud, but your personal datacenter.",
|
"page2_title": "SelfPrivacy — it's not a cloud, but your personal datacenter",
|
||||||
"page2_text": "SelfPrivacy works only with your provider accounts: Hetzner, Cloudflare, Backblaze. If you do not own those, we'll help you to create them."
|
"page2_text": "SelfPrivacy works only with your provider accounts: Hetzner, Cloudflare, Backblaze. If you do not own those, we'll help you to create them"
|
||||||
},
|
},
|
||||||
"providers": {
|
"providers": {
|
||||||
"_comment": "вкладка провайдеры",
|
"_comment": "'Providers' tab",
|
||||||
"page_title": "Your Data Center",
|
"page_title": "Your Data Center",
|
||||||
"server": {
|
"server": {
|
||||||
"card_title": "Сервер"
|
"card_title": "Server",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "It's a virtual computer, where all your services live.",
|
||||||
|
"2": "1 CPU, RAM 4Gb, 40Gb — $5 per month",
|
||||||
|
"3": "Status — Good"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"domain": {
|
"domain": {
|
||||||
"card_title": "Домен"
|
"card_title": "Domain",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "It's your personal internet address that will point to the server and other services of yours.",
|
||||||
|
"2": "{} — expires on {}",
|
||||||
|
"3": "Status — Good"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"backup": {
|
"backup": {
|
||||||
"card_title": "Резервное копирование"
|
"card_title": "Backup",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Will save your day in case of incident: hackers attack, server deletion, etc.",
|
||||||
|
"2": "3Gb/10Gb, last backup was yesterday {}",
|
||||||
|
"3": "Status — Good"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"not_ready_card": {
|
"not_ready_card": {
|
||||||
"1": "Завершите настройку приложения используя ",
|
"_comment": "Card shown when user skips initial setup",
|
||||||
|
"1": "Please finish application setup using ",
|
||||||
"2": "@:more.configuration_wizard",
|
"2": "@:more.configuration_wizard",
|
||||||
"3": " для продолжения работы"
|
"3": " for further work"
|
||||||
|
},
|
||||||
|
"services": {
|
||||||
|
"_comment": "Вкладка сервисы",
|
||||||
|
"title": "Your personal, private and independent services.",
|
||||||
|
"mail": {
|
||||||
|
"title": "E-Mail",
|
||||||
|
"subtitle": "E-Mail for company and family.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "To connect to the mailserver, please use {} domain alongside with username and password, that you created. Also feel free to invite",
|
||||||
|
"2": "new users"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"messenger": {
|
||||||
|
"title": "Messenger",
|
||||||
|
"subtitle": "Telegram or Signal not so private as Delta.Chat that uses your private server.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "For connection, please use {} domain and credentials that you created."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"password_manager": {
|
||||||
|
"title": "Password Manager",
|
||||||
|
"subtitle": "Base of your security. Bitwarden will help you to create, store and move passwords between devices, as well as input them, when requested using autocompletion.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "You can connect to the service and create a user via this link:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"video": {
|
||||||
|
"title": "Videomeet",
|
||||||
|
"subtitle": "Zoom and Google Meet are good, but Jitsi Meet is a worth alternative that also gives you confidence that you're not being listened.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Using Jitsi as simple as just visiting this link:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cloud": {
|
||||||
|
"title": "Cloud Storage",
|
||||||
|
"subtitle": "Do not allow cloud services to read your data by using NextCloud.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "You can connect and create a new user here:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"social_network": {
|
||||||
|
"title": "Social Network",
|
||||||
|
"subtitle": "It's hard to believe, but it became possible to create your own social network, with your own rules and target audience.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "You can connect and create new social user here:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"git": {
|
||||||
|
"title": "Git-server",
|
||||||
|
"subtitle": "Private alternative to the Github, that belongs to you, but not a Microsoft.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "You can connect and create a new user here:"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"users": {
|
||||||
|
"_comment": "'Users' tab",
|
||||||
|
"add_new_user": "Добавьте первого пользователя",
|
||||||
|
"new_user": "Новый пользователь",
|
||||||
|
"not_ready": "Подключите сервер, домен и DNS в разделу Провайдеры, чтобы добавить первого пользователя",
|
||||||
|
"nobody_here": "'Здесь пока никого'",
|
||||||
|
"login": "Логин",
|
||||||
|
"onboarding": "Onboarding",
|
||||||
|
"console": "Console",
|
||||||
|
"new_user_info_note": "Новый пользователь автоматически получит доступ ко всем сервисам. Ещё какое-то описание.",
|
||||||
|
"delete_confirm_question": "удалить учетную запись?",
|
||||||
|
"reset_password": "Сбросить пароль",
|
||||||
|
"account": "Учетная запись",
|
||||||
|
"send_regisration_data": "Отправить реквизиты для входа"
|
||||||
|
},
|
||||||
|
"initializing": {
|
||||||
|
"_comment": "initializing page",
|
||||||
|
"1": "Подключите сервер Hetzner",
|
||||||
|
"2": "Здесь будут жить наши данные и SelfPrivacy-сервисы",
|
||||||
|
"how": "Как получить API Token",
|
||||||
|
"3": "'Подключите CloudFlare'",
|
||||||
|
"4": "Для управления DNS вашего домена",
|
||||||
|
"5": "CloudFlare API Token",
|
||||||
|
"6": "Подключите облачное хранилище Backblaze",
|
||||||
|
"7": "На данный момент подлюченных доменов нет",
|
||||||
|
"8": "Загружаем список доменов",
|
||||||
|
"9": "Найдено больше одного домена, для вашей безопастности, просим вам удалить не нужные домены",
|
||||||
|
"10": "Сохранить домен",
|
||||||
|
"11": "Создать сервер",
|
||||||
|
"what": "Что это значит?",
|
||||||
|
"13": "Сервер презагружен, ждем последнюю проверку",
|
||||||
|
"14": "Cервер запушен, сейчас он будет проверен и перезагружен",
|
||||||
|
"15": "Cервер создан, идет проверка ДНС адресов и запуск сервера",
|
||||||
|
"16": "До следующей проверки: ",
|
||||||
|
"17": "Проверка",
|
||||||
|
"18": "Как получить Hetzner API Token'",
|
||||||
|
"19": "1 Переходим по ссылке ",
|
||||||
|
"20": "\n2 Заходим в созданный нами проект. Если такового - нет, значит создаём.\n3 Наводим мышкой на боковую панель. Она должна раскрыться, показав нам пункты меню. Нас интересует последний — Security (с иконкой ключика).\n4 Далее, в верхней части интерфейса видим примерно такой список: SSH Keys, API Tokens, Certificates, Members. Нам нужен API Tokens. Переходим по нему.\n5 В правой части интерфейса, нас будет ожидать кнопка Generate API token. Если же вы используете мобильную версию сайта, в нижнем правом углу вы увидите красный плюсик. Нажимаем на эту кнопку.\n6 В поле Description, даём нашему токену название (это может быть любое название, которые вам нравиться. Сути оно не меняет."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -7,10 +7,22 @@
|
||||||
"users": "Пользователи",
|
"users": "Пользователи",
|
||||||
"more": "Еще",
|
"more": "Еще",
|
||||||
"next": "Далее",
|
"next": "Далее",
|
||||||
"got_it": "Понял"
|
"got_it": "Понял",
|
||||||
|
"settings": "Настройки",
|
||||||
|
"password": "Пароль",
|
||||||
|
"create": "Создать",
|
||||||
|
"confirmation": "Подтверждение",
|
||||||
|
"cancel": "Отменить",
|
||||||
|
"delete": "Удалить",
|
||||||
|
"close": "Закрыть",
|
||||||
|
"connect": "Подключить",
|
||||||
|
"domain": "Домен",
|
||||||
|
"saving": "Сохранение..",
|
||||||
|
"nickname": "Никнейм",
|
||||||
|
"loading": "Загрузка"
|
||||||
},
|
},
|
||||||
"more": {
|
"more": {
|
||||||
"_comment": "Элементы на странице еще",
|
"_comment": "вкладка еще",
|
||||||
"configuration_wizard": "Мастер Подключения",
|
"configuration_wizard": "Мастер Подключения",
|
||||||
"settings": "Настройки приложения",
|
"settings": "Настройки приложения",
|
||||||
"about_project": "О проекте SelfPrivacy",
|
"about_project": "О проекте SelfPrivacy",
|
||||||
|
|
@ -29,13 +41,28 @@
|
||||||
"_comment": "вкладка провайдеры",
|
"_comment": "вкладка провайдеры",
|
||||||
"page_title": "Ваш Дата-центр",
|
"page_title": "Ваш Дата-центр",
|
||||||
"server": {
|
"server": {
|
||||||
"card_title": "Сервер"
|
"card_title": "Сервер",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Это виртульный компьютер на котором работают все ваши сервисы.",
|
||||||
|
"2": "1 CPU, RAM 4Gb, 40Gb — $5 в месяц",
|
||||||
|
"3": "Статус — в норме"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"domain": {
|
"domain": {
|
||||||
"card_title": "Домен"
|
"card_title": "Домен",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Это ваш личный адрес в интернете, который будет указывать на сервер и другие ваши сервисы.",
|
||||||
|
"2": "{} — продлен до {}",
|
||||||
|
"3": "Статус — в норме"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"backup": {
|
"backup": {
|
||||||
"card_title": "Резервное копирование"
|
"card_title": "Резервное копирование",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Выручит в любой ситуации: хакерская атака, удаление сервера и т.п.",
|
||||||
|
"2": "3Gb — бестплатно до 10Gb, последний вчера в {}",
|
||||||
|
"3": "Статус — в норме"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"not_ready_card": {
|
"not_ready_card": {
|
||||||
|
|
@ -43,5 +70,98 @@
|
||||||
"1": "Завершите настройку приложения используя ",
|
"1": "Завершите настройку приложения используя ",
|
||||||
"2": "@:more.configuration_wizard",
|
"2": "@:more.configuration_wizard",
|
||||||
"3": " для продолжения работы"
|
"3": " для продолжения работы"
|
||||||
|
},
|
||||||
|
"services": {
|
||||||
|
"_comment": "Вкладка сервисы",
|
||||||
|
"title": "Ваши личные приватные и независимые сервисы",
|
||||||
|
"mail": {
|
||||||
|
"title": "Почта",
|
||||||
|
"subtitle": "Электронная почта для семьи или компании",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Для подключения почтового ящика используйте {} и логин пароль, который вы создали. Так же приглашайте",
|
||||||
|
"2": "новых пользователей"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"messenger": {
|
||||||
|
"title": "Мессенджер",
|
||||||
|
"subtitle": "Telegram и Signal не так приватны, как Delta.Chat использующий ваш личный сервер.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Для подключения используйте {} и логин пароль, который вы создали"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"password_manager": {
|
||||||
|
"title": "Менеджер паролей",
|
||||||
|
"subtitle": "Фундамент безопасности. Создавать, хранить, копировать пароли между устройствами, вбивать их в формы поможет — Bitwarden.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Подключиться к серверу и создать пользователя можно по адресу:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"video": {
|
||||||
|
"title": "Видеоконференция",
|
||||||
|
"subtitle": "Zoom и Google meet отличные инструменты, но Jitsi meet не хуже и дает уверенность, что вас никто не подслушивает.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Для использования просто перейдите по ссылке:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cloud": {
|
||||||
|
"title": "Файловое облако",
|
||||||
|
"subtitle": "Не позволяйте облачным сервисам читать ваши данные используйте NextCloud.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Подключиться к серверу и создать пользователя можно по адресу:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"social_network": {
|
||||||
|
"title": "Социальная сеть",
|
||||||
|
"subtitle": "Сложно поверить, но стало возможным создать свою собственную социальную сеть, со своими правилами и аудиторией.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Подключиться к серверу и создать пользователя можно по адресу:"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"git": {
|
||||||
|
"title": "Git-сервер",
|
||||||
|
"subtitle": "Приватная альтернатива Github, которая принадлежит вам, а не Microsoft.",
|
||||||
|
"bottom_sheet": {
|
||||||
|
"1": "Подключиться к серверу и создать пользователя можно по адресу:"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"users": {
|
||||||
|
"_comment": "'Users' tab",
|
||||||
|
"add_new_user": "Добавьте первого пользователя",
|
||||||
|
"new_user": "Новый пользователь",
|
||||||
|
"not_ready": "Подключите сервер, домен и DNS в разделу Провайдеры, чтобы добавить первого пользователя",
|
||||||
|
"nobody_here": "'Здесь пока никого'",
|
||||||
|
"login": "Логин",
|
||||||
|
"onboarding": "Onboarding",
|
||||||
|
"console": "Console",
|
||||||
|
"new_user_info_note": "Новый пользователь автоматически получит доступ ко всем сервисам. Ещё какое-то описание.",
|
||||||
|
"delete_confirm_question": "удалить учетную запись?",
|
||||||
|
"reset_password": "Сбросить пароль",
|
||||||
|
"account": "Учетная запись",
|
||||||
|
"send_regisration_data": "Отправить реквизиты для входа"
|
||||||
|
},
|
||||||
|
"initializing": {
|
||||||
|
"_comment": "initializing page",
|
||||||
|
"1": "Подключите сервер Hetzner",
|
||||||
|
"2": "Здесь будут жить наши данные и SelfPrivacy-сервисы",
|
||||||
|
"how": "Как получить API Token",
|
||||||
|
"3": "'Подключите CloudFlare'",
|
||||||
|
"4": "Для управления DNS вашего домена",
|
||||||
|
"5": "CloudFlare API Token",
|
||||||
|
"6": "Подключите облачное хранилище Backblaze",
|
||||||
|
"7": "На данный момент подлюченных доменов нет",
|
||||||
|
"8": "Загружаем список доменов",
|
||||||
|
"9": "Найдено больше одного домена, для вашей безопастности, просим вам удалить не нужные домены",
|
||||||
|
"10": "Сохранить домен",
|
||||||
|
"11": "Создать сервер",
|
||||||
|
"what": "Что это значит?",
|
||||||
|
"13": "Сервер презагружен, ждем последнюю проверку",
|
||||||
|
"14": "Cервер запушен, сейчас он будет проверен и перезагружен",
|
||||||
|
"15": "Cервер создан, идет проверка ДНС адресов и запуск сервера",
|
||||||
|
"16": "До следующей проверки: ",
|
||||||
|
"17": "Проверка",
|
||||||
|
"18": "Как получить Hetzner API Token'",
|
||||||
|
"19": "1 Переходим по ссылке ",
|
||||||
|
"20": "\n2 Заходим в созданный нами проект. Если такового - нет, значит создаём.\n3 Наводим мышкой на боковую панель. Она должна раскрыться, показав нам пункты меню. Нас интересует последний — Security (с иконкой ключика).\n4 Далее, в верхней части интерфейса видим примерно такой список: SSH Keys, API Tokens, Certificates, Members. Нам нужен API Tokens. Переходим по нему.\n5 В правой части интерфейса, нас будет ожидать кнопка Generate API token. Если же вы используете мобильную версию сайта, в нижнем правом углу вы увидите красный плюсик. Нажимаем на эту кнопку.\n6 В поле Description, даём нашему токену название (это может быть любое название, которые вам нравиться. Сути оно не меняет."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.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/logic/cubit/app_config/app_config_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/providers/providers_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/providers/providers_cubit.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/services/services_cubit.dart';
|
|
||||||
import 'package:selfprivacy/logic/cubit/users/users_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/users/users_cubit.dart';
|
||||||
|
|
||||||
class BlocAndProviderConfig extends StatelessWidget {
|
class BlocAndProviderConfig extends StatelessWidget {
|
||||||
|
|
@ -30,7 +29,6 @@ class BlocAndProviderConfig extends StatelessWidget {
|
||||||
lazy: false,
|
lazy: false,
|
||||||
create: (_) => AppConfigCubit()..load(),
|
create: (_) => AppConfigCubit()..load(),
|
||||||
),
|
),
|
||||||
BlocProvider(create: (_) => ServicesCubit()),
|
|
||||||
BlocProvider(create: (_) => ProvidersCubit()),
|
BlocProvider(create: (_) => ProvidersCubit()),
|
||||||
BlocProvider(create: (_) => UsersCubit()),
|
BlocProvider(create: (_) => UsersCubit()),
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
|
||||||
import 'package:selfprivacy/config/text_themes.dart';
|
import 'package:selfprivacy/config/text_themes.dart';
|
||||||
|
|
||||||
import 'brand_colors.dart';
|
import 'brand_colors.dart';
|
||||||
|
|
||||||
final ligtTheme = ThemeData(
|
final ligtTheme = ThemeData(
|
||||||
primaryColor: BrandColors.primary,
|
primaryColor: BrandColors.primary,
|
||||||
|
fontFamily: 'Inter',
|
||||||
brightness: Brightness.light,
|
brightness: Brightness.light,
|
||||||
scaffoldBackgroundColor: BrandColors.scaffoldBackground,
|
scaffoldBackgroundColor: BrandColors.scaffoldBackground,
|
||||||
inputDecorationTheme: InputDecorationTheme(
|
inputDecorationTheme: InputDecorationTheme(
|
||||||
|
|
@ -33,21 +33,17 @@ final ligtTheme = ThemeData(
|
||||||
color: BrandColors.red1,
|
color: BrandColors.red1,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
errorStyle: GoogleFonts.inter(
|
errorStyle: TextStyle(
|
||||||
textStyle: TextStyle(
|
fontSize: 12,
|
||||||
fontSize: 12,
|
color: BrandColors.red1,
|
||||||
color: BrandColors.red1,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
textTheme: GoogleFonts.interTextTheme(
|
textTheme: TextTheme(
|
||||||
TextTheme(
|
headline1: headline1Style,
|
||||||
headline1: headline1Style,
|
headline2: headline2Style,
|
||||||
headline2: headline2Style,
|
caption: headline4Style,
|
||||||
caption: headline4Style,
|
bodyText1: body1Style,
|
||||||
bodyText1: body1Style,
|
subtitle1: TextStyle(fontSize: 15, height: 1.6), // text input style
|
||||||
subtitle1: TextStyle(fontSize: 15, height: 1.6), // text input style
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -57,14 +53,12 @@ var darkTheme = ligtTheme.copyWith(
|
||||||
iconTheme: IconThemeData(color: BrandColors.gray3),
|
iconTheme: IconThemeData(color: BrandColors.gray3),
|
||||||
cardColor: BrandColors.gray1,
|
cardColor: BrandColors.gray1,
|
||||||
dialogBackgroundColor: Color(0xFF202120),
|
dialogBackgroundColor: Color(0xFF202120),
|
||||||
textTheme: GoogleFonts.interTextTheme(
|
textTheme: TextTheme(
|
||||||
TextTheme(
|
headline1: headline1Style.copyWith(color: BrandColors.white),
|
||||||
headline1: headline1Style.copyWith(color: BrandColors.white),
|
headline2: headline2Style.copyWith(color: BrandColors.white),
|
||||||
headline2: headline2Style.copyWith(color: BrandColors.white),
|
caption: headline4Style.copyWith(color: BrandColors.white),
|
||||||
caption: headline4Style.copyWith(color: BrandColors.white),
|
bodyText1: body1Style.copyWith(color: BrandColors.white),
|
||||||
bodyText1: body1Style.copyWith(color: BrandColors.white),
|
subtitle1: TextStyle(fontSize: 15, height: 1.6), // text input style
|
||||||
subtitle1: TextStyle(fontSize: 15, height: 1.6), // text input style
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
inputDecorationTheme: InputDecorationTheme(
|
inputDecorationTheme: InputDecorationTheme(
|
||||||
labelStyle: TextStyle(color: BrandColors.white),
|
labelStyle: TextStyle(color: BrandColors.white),
|
||||||
|
|
|
||||||
|
|
@ -1,41 +1,38 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
|
||||||
import 'package:selfprivacy/utils/named_font_weight.dart';
|
import 'package:selfprivacy/utils/named_font_weight.dart';
|
||||||
|
|
||||||
import 'brand_colors.dart';
|
import 'brand_colors.dart';
|
||||||
|
|
||||||
final defaultTextStyle = GoogleFonts.inter(
|
final defaultTextStyle = TextStyle(
|
||||||
textStyle: TextStyle(
|
fontSize: 15,
|
||||||
fontSize: 15,
|
color: BrandColors.textColor1,
|
||||||
color: BrandColors.textColor1,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
final headline1Style = GoogleFonts.inter(
|
final headline1Style = defaultTextStyle.copyWith(
|
||||||
fontSize: 40,
|
fontSize: 40,
|
||||||
fontWeight: NamedFontWeight.extraBold,
|
fontWeight: NamedFontWeight.extraBold,
|
||||||
color: BrandColors.headlineColor,
|
color: BrandColors.headlineColor,
|
||||||
);
|
);
|
||||||
|
|
||||||
final headline2Style = GoogleFonts.inter(
|
final headline2Style = defaultTextStyle.copyWith(
|
||||||
fontSize: 24,
|
fontSize: 24,
|
||||||
fontWeight: NamedFontWeight.extraBold,
|
fontWeight: NamedFontWeight.extraBold,
|
||||||
color: BrandColors.headlineColor,
|
color: BrandColors.headlineColor,
|
||||||
);
|
);
|
||||||
|
|
||||||
final onboardingTitle = GoogleFonts.inter(
|
final onboardingTitle = defaultTextStyle.copyWith(
|
||||||
fontSize: 30,
|
fontSize: 30,
|
||||||
fontWeight: NamedFontWeight.extraBold,
|
fontWeight: NamedFontWeight.extraBold,
|
||||||
color: BrandColors.headlineColor,
|
color: BrandColors.headlineColor,
|
||||||
);
|
);
|
||||||
|
|
||||||
final headline3Style = GoogleFonts.inter(
|
final headline3Style = defaultTextStyle.copyWith(
|
||||||
fontSize: 20,
|
fontSize: 20,
|
||||||
fontWeight: NamedFontWeight.extraBold,
|
fontWeight: NamedFontWeight.extraBold,
|
||||||
color: BrandColors.headlineColor,
|
color: BrandColors.headlineColor,
|
||||||
);
|
);
|
||||||
|
|
||||||
final headline4Style = GoogleFonts.inter(
|
final headline4Style = defaultTextStyle.copyWith(
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
fontWeight: NamedFontWeight.medium,
|
fontWeight: NamedFontWeight.medium,
|
||||||
color: BrandColors.headlineColor,
|
color: BrandColors.headlineColor,
|
||||||
|
|
@ -59,16 +56,12 @@ final smallStyle = defaultTextStyle.copyWith(fontSize: 11, height: 1.45);
|
||||||
|
|
||||||
final linkStyle = defaultTextStyle.copyWith(color: BrandColors.blue);
|
final linkStyle = defaultTextStyle.copyWith(color: BrandColors.blue);
|
||||||
|
|
||||||
final progressTextStyleLight = GoogleFonts.inter(
|
final progressTextStyleLight = TextStyle(
|
||||||
textStyle: TextStyle(
|
fontSize: 11,
|
||||||
fontSize: 11,
|
color: BrandColors.textColor1,
|
||||||
color: BrandColors.textColor1,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
final progressTextStyleDark = GoogleFonts.inter(
|
final progressTextStyleDark = TextStyle(
|
||||||
textStyle: TextStyle(
|
fontSize: 11,
|
||||||
fontSize: 11,
|
color: BrandColors.white,
|
||||||
color: BrandColors.white,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import 'package:selfprivacy/logic/models/server_details.dart';
|
||||||
import 'package:selfprivacy/logic/models/user.dart';
|
import 'package:selfprivacy/logic/models/user.dart';
|
||||||
|
|
||||||
import 'app_config_repository.dart';
|
import 'app_config_repository.dart';
|
||||||
|
export 'package:provider/provider.dart';
|
||||||
|
|
||||||
part 'app_config_state.dart';
|
part 'app_config_state.dart';
|
||||||
|
|
||||||
|
|
@ -281,49 +282,3 @@ class AppConfigCubit extends Cubit<AppConfigState> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// void checkDnsAndStartServer() async {
|
|
||||||
// var ip4 = state.hetznerServer.ip4;
|
|
||||||
// var domainName = state.cloudFlareDomain.domainName;
|
|
||||||
|
|
||||||
// var isMatch = await repository.isDnsAddressesMatch(domainName, ip4);
|
|
||||||
|
|
||||||
// if (isMatch) {
|
|
||||||
// var server = await repository.startServer(
|
|
||||||
// state.hetznerKey,
|
|
||||||
// state.hetznerServer,
|
|
||||||
// );
|
|
||||||
// repository.saveServerDetails(server);
|
|
||||||
// emit(
|
|
||||||
// state.copyWith(
|
|
||||||
// hasFinalChecked: true,
|
|
||||||
// isServerStarted: true,
|
|
||||||
// isLoading: false,
|
|
||||||
// hetznerServer: server,
|
|
||||||
// ),
|
|
||||||
// );
|
|
||||||
// } else {
|
|
||||||
// emit(state.copyWith(lastDnsCheckTime: DateTime.now()));
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// void serverReset() async {
|
|
||||||
// var callBack = () async {
|
|
||||||
// var isServerWorking = await repository.isHttpServerWorking(
|
|
||||||
// state.cloudFlareDomain.domainName,
|
|
||||||
// );
|
|
||||||
// if (!isServerWorking) {
|
|
||||||
// var last = DateTime.now();
|
|
||||||
// // emit(state.copyWith(lastServerStatusCheckTime: last));
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// var hetznerServerDetails = await repository.restart(
|
|
||||||
// state.hetznerKey,
|
|
||||||
// state.hetznerServer,
|
|
||||||
// );
|
|
||||||
// emit(state.copyWith(hetznerServer: hetznerServerDetails));
|
|
||||||
// };
|
|
||||||
|
|
||||||
// _tryOrAddError(state, callBack);
|
|
||||||
// }
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,28 @@
|
||||||
import 'package:bloc/bloc.dart';
|
// import 'package:bloc/bloc.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
// import 'package:equatable/equatable.dart';
|
||||||
import 'package:meta/meta.dart';
|
// import 'package:meta/meta.dart';
|
||||||
import 'package:selfprivacy/logic/models/service.dart';
|
// import 'package:selfprivacy/logic/models/service.dart';
|
||||||
import 'package:selfprivacy/logic/models/state_types.dart';
|
// import 'package:selfprivacy/logic/models/state_types.dart';
|
||||||
|
|
||||||
export 'package:provider/provider.dart';
|
// export 'package:provider/provider.dart';
|
||||||
export 'package:selfprivacy/logic/models/state_types.dart';
|
// export 'package:selfprivacy/logic/models/state_types.dart';
|
||||||
|
|
||||||
part 'services_state.dart';
|
// part 'services_state.dart';
|
||||||
|
|
||||||
class ServicesCubit extends Cubit<ServicesState> {
|
// class ServicesCubit extends Cubit<ServicesState> {
|
||||||
ServicesCubit() : super(ServicesState(all));
|
// ServicesCubit() : super(ServicesState(all));
|
||||||
|
|
||||||
void connect(Service service) {
|
// void connect(Service service) {
|
||||||
var newState = state.updateElement(service, StateType.stable);
|
// var newState = state.updateElement(service, StateType.stable);
|
||||||
emit(newState);
|
// emit(newState);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
final all = ServiceTypes.values
|
// final all = ServiceTypes.values
|
||||||
.map(
|
// .map(
|
||||||
(type) => Service(
|
// (type) => Service(
|
||||||
state: StateType.uninitialized,
|
// state: StateType.uninitialized,
|
||||||
type: type,
|
// type: type,
|
||||||
),
|
// ),
|
||||||
)
|
// )
|
||||||
.toList();
|
// .toList();
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,26 @@
|
||||||
part of 'services_cubit.dart';
|
// part of 'services_cubit.dart';
|
||||||
|
|
||||||
@immutable
|
// @immutable
|
||||||
class ServicesState extends Equatable{
|
// class ServicesState extends Equatable{
|
||||||
ServicesState(this.all);
|
// ServicesState(this.all);
|
||||||
|
|
||||||
final List<Service> all;
|
// final List<Service> all;
|
||||||
|
|
||||||
ServicesState updateElement(Service service, StateType newState) {
|
// ServicesState updateElement(Service service, StateType newState) {
|
||||||
var newList = [...all];
|
// var newList = [...all];
|
||||||
var index = newList.indexOf(service);
|
// var index = newList.indexOf(service);
|
||||||
newList[index] = service.updateState(newState);
|
// newList[index] = service.updateState(newState);
|
||||||
return ServicesState(newList);
|
// return ServicesState(newList);
|
||||||
}
|
// }
|
||||||
|
|
||||||
List<Service> get connected => all
|
// List<Service> get connected => all
|
||||||
.where((service) => service.state != StateType.uninitialized)
|
// .where((service) => service.state != StateType.uninitialized)
|
||||||
.toList();
|
// .toList();
|
||||||
|
|
||||||
List<Service> get uninitialized => all
|
// List<Service> get uninitialized => all
|
||||||
.where((service) => service.state == StateType.uninitialized)
|
// .where((service) => service.state == StateType.uninitialized)
|
||||||
.toList();
|
// .toList();
|
||||||
|
|
||||||
@override
|
// @override
|
||||||
List<Object> get props => all;
|
// List<Object> get props => all;
|
||||||
}
|
// }
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
import 'package:equatable/equatable.dart';
|
// import 'package:equatable/equatable.dart';
|
||||||
import 'package:selfprivacy/logic/models/state_types.dart';
|
// import 'package:selfprivacy/logic/models/state_types.dart';
|
||||||
|
|
||||||
enum ServiceTypes {
|
// enum ServiceTypes {
|
||||||
messanger,
|
// messanger,
|
||||||
mail,
|
// mail,
|
||||||
passwordManager,
|
// passwordManager,
|
||||||
github,
|
// github,
|
||||||
cloud,
|
// cloud,
|
||||||
}
|
// }
|
||||||
|
|
||||||
class Service extends Equatable {
|
// class Service extends Equatable {
|
||||||
const Service({required this.state, required this.type});
|
// const Service({required this.state, required this.type});
|
||||||
|
|
||||||
final StateType state;
|
// final StateType state;
|
||||||
final ServiceTypes type;
|
// final ServiceTypes type;
|
||||||
|
|
||||||
Service updateState(StateType newState) => Service(
|
// Service updateState(StateType newState) => Service(
|
||||||
state: newState,
|
// state: newState,
|
||||||
type: type,
|
// type: type,
|
||||||
);
|
// );
|
||||||
|
|
||||||
@override
|
// @override
|
||||||
List<Object?> get props => [state, type];
|
// List<Object?> get props => [state, type];
|
||||||
}
|
// }
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/// Flutter icons BrandIcons
|
/// Flutter icons BrandIcons
|
||||||
/// Copyright (C) 2020 by original authors @ fluttericon.com, fontello.com
|
/// Copyright (C) 2021 by original authors @ fluttericon.com, fontello.com
|
||||||
/// This font was generated by FlutterIcon.com, which is derived from Fontello.
|
/// This font was generated by FlutterIcon.com, which is derived from Fontello.
|
||||||
///
|
///
|
||||||
/// To use this font, place it in your fonts/ directory and include the
|
/// To use this font, place it in your fonts/ directory and include the
|
||||||
|
|
@ -19,7 +19,7 @@ class BrandIcons {
|
||||||
BrandIcons._();
|
BrandIcons._();
|
||||||
|
|
||||||
static const _kFontFam = 'BrandIcons';
|
static const _kFontFam = 'BrandIcons';
|
||||||
static const dynamic _kFontPkg = null;
|
static const String? _kFontPkg = null;
|
||||||
|
|
||||||
static const IconData connection =
|
static const IconData connection =
|
||||||
IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
|
@ -39,8 +39,14 @@ class BrandIcons {
|
||||||
IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData check =
|
static const IconData check =
|
||||||
IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
static const IconData webcam =
|
||||||
|
IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData refresh =
|
static const IconData refresh =
|
||||||
IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
static const IconData git =
|
||||||
|
IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
static const IconData social =
|
||||||
|
IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData settings =
|
static const IconData settings =
|
||||||
IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData share =
|
static const IconData share =
|
||||||
|
|
@ -59,8 +65,6 @@ class BrandIcons {
|
||||||
IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData upload =
|
static const IconData upload =
|
||||||
IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData github =
|
|
||||||
IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
|
||||||
static const IconData arrow_left =
|
static const IconData arrow_left =
|
||||||
IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ class BrandText extends StatelessWidget {
|
||||||
);
|
);
|
||||||
@override
|
@override
|
||||||
Text build(BuildContext context) {
|
Text build(BuildContext context) {
|
||||||
TextStyle? style;
|
TextStyle style;
|
||||||
var isDark = Theme.of(context).brightness == Brightness.dark;
|
var isDark = Theme.of(context).brightness == Brightness.dark;
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:selfprivacy/config/brand_colors.dart';
|
import 'package:selfprivacy/config/brand_colors.dart';
|
||||||
|
import 'package:selfprivacy/config/text_themes.dart';
|
||||||
import 'package:selfprivacy/ui/pages/initializing/initializing.dart';
|
import 'package:selfprivacy/ui/pages/initializing/initializing.dart';
|
||||||
import 'package:selfprivacy/utils/route_transitions/basic.dart';
|
import 'package:selfprivacy/utils/route_transitions/basic.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
|
@ -21,19 +22,24 @@ class NotReadyCard extends StatelessWidget {
|
||||||
style: TextStyle(color: BrandColors.white),
|
style: TextStyle(color: BrandColors.white),
|
||||||
),
|
),
|
||||||
WidgetSpan(
|
WidgetSpan(
|
||||||
child: GestureDetector(
|
child: Padding(
|
||||||
child: Text(
|
padding: const EdgeInsets.only(bottom: 0.5),
|
||||||
'not_ready_card.2'.tr(),
|
child: GestureDetector(
|
||||||
style: TextStyle(
|
onTap: () => Navigator.of(context).push(
|
||||||
|
materialRoute(
|
||||||
|
InitializingPage(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
'not_ready_card.2'.tr(),
|
||||||
|
style: body1Style.copyWith(
|
||||||
color: Theme.of(context).brightness == Brightness.dark
|
color: Theme.of(context).brightness == Brightness.dark
|
||||||
? Colors.blueAccent
|
? Colors.black
|
||||||
: BrandColors.white,
|
: BrandColors.white,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
decoration: TextDecoration.underline),
|
decoration: TextDecoration.underline,
|
||||||
),
|
// height: 1.1,
|
||||||
onTap: () => Navigator.of(context).push(
|
),
|
||||||
materialRoute(
|
|
||||||
InitializingPage(),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ import 'package:selfprivacy/ui/components/brand_timer/brand_timer.dart';
|
||||||
import 'package:selfprivacy/ui/components/progress_bar/progress_bar.dart';
|
import 'package:selfprivacy/ui/components/progress_bar/progress_bar.dart';
|
||||||
import 'package:selfprivacy/ui/pages/rootRoute.dart';
|
import 'package:selfprivacy/ui/pages/rootRoute.dart';
|
||||||
import 'package:selfprivacy/utils/route_transitions/basic.dart';
|
import 'package:selfprivacy/utils/route_transitions/basic.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
|
||||||
class InitializingPage extends StatelessWidget {
|
class InitializingPage extends StatelessWidget {
|
||||||
@override
|
@override
|
||||||
|
|
@ -60,9 +61,9 @@ class InitializingPage extends StatelessWidget {
|
||||||
'Domain',
|
'Domain',
|
||||||
'User',
|
'User',
|
||||||
'Server',
|
'Server',
|
||||||
'Check1',
|
' ✅',
|
||||||
'Check2',
|
' ✅',
|
||||||
'Check3'
|
' ✅'
|
||||||
],
|
],
|
||||||
activeIndex: cubit.state.progress,
|
activeIndex: cubit.state.progress,
|
||||||
),
|
),
|
||||||
|
|
@ -76,8 +77,9 @@ class InitializingPage extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
title:
|
title: cubit.state.isFullyInitilized
|
||||||
cubit.state.isFullyInitilized ? 'Close' : 'Настрою потом',
|
? 'basis.close'.tr()
|
||||||
|
: 'Настрою потом',
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.of(context).pushAndRemoveUntil(
|
Navigator.of(context).pushAndRemoveUntil(
|
||||||
materialRoute(RootPage()),
|
materialRoute(RootPage()),
|
||||||
|
|
@ -105,10 +107,9 @@ class InitializingPage extends StatelessWidget {
|
||||||
width: 150,
|
width: 150,
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.h2('Подключите сервер Hetzner'),
|
BrandText.h2('initializing.1'.tr()),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.body2(
|
BrandText.body2('initializing.2'.tr()),
|
||||||
'Здесь будут жить наши данные и SelfPrivacy-сервисы'),
|
|
||||||
Spacer(),
|
Spacer(),
|
||||||
CubitFormTextField(
|
CubitFormTextField(
|
||||||
formFieldCubit: context.read<HetznerFormCubit>().apiKey,
|
formFieldCubit: context.read<HetznerFormCubit>().apiKey,
|
||||||
|
|
@ -123,12 +124,12 @@ class InitializingPage extends StatelessWidget {
|
||||||
onPressed: formCubitState.isSubmitting
|
onPressed: formCubitState.isSubmitting
|
||||||
? null
|
? null
|
||||||
: () => context.read<HetznerFormCubit>().trySubmit(),
|
: () => context.read<HetznerFormCubit>().trySubmit(),
|
||||||
title: 'Подключить',
|
title: 'basis.connect'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Как получить API Token',
|
title: 'initializing.how'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -161,16 +162,16 @@ class InitializingPage extends StatelessWidget {
|
||||||
width: 150,
|
width: 150,
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.h2('Подключите CloudFlare'),
|
BrandText.h2('initializing.3'.tr()),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.body2('Для управления DNS вашего домена'),
|
BrandText.body2('initializing.4'.tr()),
|
||||||
Spacer(),
|
Spacer(),
|
||||||
CubitFormTextField(
|
CubitFormTextField(
|
||||||
formFieldCubit: context.read<CloudFlareFormCubit>().apiKey,
|
formFieldCubit: context.read<CloudFlareFormCubit>().apiKey,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
scrollPadding: EdgeInsets.only(bottom: 70),
|
scrollPadding: EdgeInsets.only(bottom: 70),
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: 'CloudFlare API Token',
|
hintText: 'initializing.5'.tr(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Spacer(),
|
Spacer(),
|
||||||
|
|
@ -178,12 +179,12 @@ class InitializingPage extends StatelessWidget {
|
||||||
onPressed: formCubitState.isSubmitting
|
onPressed: formCubitState.isSubmitting
|
||||||
? null
|
? null
|
||||||
: () => context.read<CloudFlareFormCubit>().trySubmit(),
|
: () => context.read<CloudFlareFormCubit>().trySubmit(),
|
||||||
title: 'Подключить',
|
title: 'basis.connect'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () {},
|
onPressed: () {},
|
||||||
title: 'Как получить API Token',
|
title: 'initializing.how'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -204,7 +205,7 @@ class InitializingPage extends StatelessWidget {
|
||||||
height: 50,
|
height: 50,
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.h2('Подключите облачное хранилище Backblaze'),
|
BrandText.h2('initializing.6'.tr()),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
Spacer(),
|
Spacer(),
|
||||||
CubitFormTextField(
|
CubitFormTextField(
|
||||||
|
|
@ -229,12 +230,12 @@ class InitializingPage extends StatelessWidget {
|
||||||
onPressed: formCubitState.isSubmitting
|
onPressed: formCubitState.isSubmitting
|
||||||
? null
|
? null
|
||||||
: () => context.read<BackblazeFormCubit>().trySubmit(),
|
: () => context.read<BackblazeFormCubit>().trySubmit(),
|
||||||
title: 'Подключить',
|
title: 'basis.connect'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Как получить API Token',
|
title: 'initializing.how'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -255,19 +256,18 @@ class InitializingPage extends StatelessWidget {
|
||||||
width: 150,
|
width: 150,
|
||||||
),
|
),
|
||||||
SizedBox(height: 30),
|
SizedBox(height: 30),
|
||||||
BrandText.h2('Домен'),
|
BrandText.h2('basis.domain'.tr()),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
if (state is Empty)
|
if (state is Empty) BrandText.body2('initializing.7'.tr()),
|
||||||
BrandText.body2('На данный момент подлюченных доменов нет'),
|
|
||||||
if (state is Loading)
|
if (state is Loading)
|
||||||
BrandText.body2(
|
BrandText.body2(
|
||||||
state.type == LoadingTypes.loadingDomain
|
state.type == LoadingTypes.loadingDomain
|
||||||
? 'Загружаем список доменов'
|
? 'initializing.8'.tr()
|
||||||
: 'Сохранение..',
|
: 'basis.saving'.tr(),
|
||||||
),
|
),
|
||||||
if (state is MoreThenOne)
|
if (state is MoreThenOne)
|
||||||
BrandText.body2(
|
BrandText.body2(
|
||||||
'Найдено больше одного домена, для вашей безопастности, просим вам удалить не нужные домены',
|
'initializing.9'.tr(),
|
||||||
),
|
),
|
||||||
if (state is Loaded) ...[
|
if (state is Loaded) ...[
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
|
|
@ -322,7 +322,7 @@ class InitializingPage extends StatelessWidget {
|
||||||
SizedBox(height: 30),
|
SizedBox(height: 30),
|
||||||
BrandButton.rised(
|
BrandButton.rised(
|
||||||
onPressed: () => context.read<DomainSetupCubit>().saveDomain(),
|
onPressed: () => context.read<DomainSetupCubit>().saveDomain(),
|
||||||
title: 'Сохранить домен',
|
title: 'initializing.10'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
|
|
@ -330,7 +330,7 @@ class InitializingPage extends StatelessWidget {
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Как получить API Token',
|
title: 'initializing.how'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -354,7 +354,7 @@ class InitializingPage extends StatelessWidget {
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
scrollPadding: EdgeInsets.only(bottom: 70),
|
scrollPadding: EdgeInsets.only(bottom: 70),
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: 'Никнейм',
|
hintText: 'basis.nickname'.tr(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
|
|
@ -368,7 +368,7 @@ class InitializingPage extends StatelessWidget {
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
scrollPadding: EdgeInsets.only(bottom: 70),
|
scrollPadding: EdgeInsets.only(bottom: 70),
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: 'Пароль',
|
hintText: 'basis.password'.tr(),
|
||||||
suffixIcon: IconButton(
|
suffixIcon: IconButton(
|
||||||
icon: Icon(
|
icon: Icon(
|
||||||
isVisible ? Icons.visibility : Icons.visibility_off,
|
isVisible ? Icons.visibility : Icons.visibility_off,
|
||||||
|
|
@ -390,12 +390,12 @@ class InitializingPage extends StatelessWidget {
|
||||||
onPressed: formCubitState.isSubmitting
|
onPressed: formCubitState.isSubmitting
|
||||||
? null
|
? null
|
||||||
: () => context.read<RootUserFormCubit>().trySubmit(),
|
: () => context.read<RootUserFormCubit>().trySubmit(),
|
||||||
title: 'Подключить',
|
title: 'basis.connect'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Как получить API Token',
|
title: 'initializing.how'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -410,19 +410,19 @@ class InitializingPage extends StatelessWidget {
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Spacer(flex: 2),
|
Spacer(flex: 2),
|
||||||
BrandText.h2('Создать сервер'),
|
BrandText.h2('initializing.how'.tr()),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.body2('Создать сервер'),
|
BrandText.body2('initializing.11'.tr()),
|
||||||
Spacer(),
|
Spacer(),
|
||||||
BrandButton.rised(
|
BrandButton.rised(
|
||||||
onPressed:
|
onPressed:
|
||||||
isLoading! ? null : appConfigCubit.createServerAndSetDnsRecords,
|
isLoading! ? null : appConfigCubit.createServerAndSetDnsRecords,
|
||||||
title: isLoading ? 'loading' : 'Создать сервер',
|
title: isLoading ? 'loading' : 'initializing.11'.tr(),
|
||||||
),
|
),
|
||||||
Spacer(flex: 2),
|
Spacer(flex: 2),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Что это значит?',
|
title: 'initializing.what'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -435,11 +435,11 @@ class InitializingPage extends StatelessWidget {
|
||||||
|
|
||||||
String? text;
|
String? text;
|
||||||
if (state.isServerReseted!) {
|
if (state.isServerReseted!) {
|
||||||
text = 'Сервер презагружен, ждем последнюю проверку';
|
text = 'initializing.13'.tr();
|
||||||
} else if (state.isServerStarted!) {
|
} else if (state.isServerStarted!) {
|
||||||
text = 'Cервер запушен, сейчас он будет проверен и перезагружен';
|
text = 'initializing.14'.tr();
|
||||||
} else if (state.isServerCreated) {
|
} else if (state.isServerCreated) {
|
||||||
text = 'Cервер создан, идет проверка ДНС адресов и запуск сервера';
|
text = 'initializing.15'.tr();
|
||||||
}
|
}
|
||||||
return Builder(builder: (context) {
|
return Builder(builder: (context) {
|
||||||
return Column(
|
return Column(
|
||||||
|
|
@ -452,20 +452,20 @@ class InitializingPage extends StatelessWidget {
|
||||||
if (!state.isLoading!)
|
if (!state.isLoading!)
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
BrandText.body2('До следующей проверки: '),
|
BrandText.body2('initializing.16'.tr()),
|
||||||
BrandTimer(
|
BrandTimer(
|
||||||
startDateTime: state.timerStart,
|
startDateTime: state.timerStart,
|
||||||
duration: state.duration,
|
duration: state.duration,
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
if (state.isLoading!) BrandText.body2('Проверка'),
|
if (state.isLoading!) BrandText.body2('initializing.17'.tr()),
|
||||||
Spacer(
|
Spacer(
|
||||||
flex: 2,
|
flex: 2,
|
||||||
),
|
),
|
||||||
BrandButton.text(
|
BrandButton.text(
|
||||||
onPressed: () => _showModal(context, _HowHetzner()),
|
onPressed: () => _showModal(context, _HowHetzner()),
|
||||||
title: 'Что это значит?',
|
title: 'initializing.what'.tr(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
@ -496,13 +496,13 @@ class _HowHetzner extends StatelessWidget {
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
SizedBox(height: 40),
|
SizedBox(height: 40),
|
||||||
BrandText.h2('Как получить Hetzner API Token'),
|
BrandText.h2('initializing.18'.tr()),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
RichText(
|
RichText(
|
||||||
text: TextSpan(
|
text: TextSpan(
|
||||||
children: [
|
children: [
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: '1 Переходим по ссылке ',
|
text: 'initializing.19'.tr(),
|
||||||
style: body1Style.copyWith(
|
style: body1Style.copyWith(
|
||||||
color: isDark ? BrandColors.white : BrandColors.black,
|
color: isDark ? BrandColors.white : BrandColors.black,
|
||||||
),
|
),
|
||||||
|
|
@ -512,19 +512,7 @@ class _HowHetzner extends StatelessWidget {
|
||||||
urlString: 'https://hetzner.com',
|
urlString: 'https://hetzner.com',
|
||||||
),
|
),
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: '''
|
text: 'initializing.20'.tr(),
|
||||||
|
|
||||||
2 Заходим в созданный нами проект. Если такового - нет, значит создаём.
|
|
||||||
|
|
||||||
3 Наводим мышкой на боковую панель. Она должна раскрыться, показав нам пункты меню. Нас интересует последний — Security (с иконкой ключика).
|
|
||||||
|
|
||||||
4 Далее, в верхней части интерфейса видим примерно такой список: SSH Keys, API Tokens, Certificates, Members. Нам нужен API Tokens. Переходим по нему.
|
|
||||||
|
|
||||||
5 В правой части интерфейса, нас будет ожидать кнопка Generate API token. Если же вы используете мобильную версию сайта, в нижнем правом углу вы увидите красный плюсик. Нажимаем на эту кнопку.
|
|
||||||
|
|
||||||
6 В поле Description, даём нашему токену название (это может быть любое название, которые вам нравиться. Сути оно не меняет.
|
|
||||||
|
|
||||||
''',
|
|
||||||
style: body1Style.copyWith(
|
style: body1Style.copyWith(
|
||||||
color: isDark ? BrandColors.white : BrandColors.black,
|
color: isDark ? BrandColors.white : BrandColors.black,
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
|
||||||
'onboarding.page1_title'.tr(),
|
'onboarding.page1_title'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
BrandText.body2('onboarding.page1_text'.tr()),
|
BrandText.body2('services.page1_text'.tr()),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Image.asset(
|
child: Image.asset(
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,7 @@ class ProvidersPage extends StatefulWidget {
|
||||||
class _ProvidersPageState extends State<ProvidersPage> {
|
class _ProvidersPageState extends State<ProvidersPage> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
// var isReady = context.watch<AppConfigCubit>().state.isFullyInitilized;
|
var isReady = context.watch<AppConfigCubit>().state.isFullyInitilized;
|
||||||
var isReady = true;
|
|
||||||
|
|
||||||
final cards = ProviderType.values
|
final cards = ProviderType.values
|
||||||
.map((type) => _Card(
|
.map((type) => _Card(
|
||||||
|
|
@ -128,18 +127,45 @@ class _ProviderDetails extends StatelessWidget {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
late String title;
|
late String title;
|
||||||
|
late List<Widget> children;
|
||||||
|
|
||||||
|
var config = context.watch<AppConfigCubit>().state;
|
||||||
|
|
||||||
|
var domainName = config.isDomainFilled
|
||||||
|
? config.cloudFlareDomain!.domainName!
|
||||||
|
: 'example.com';
|
||||||
switch (provider.type) {
|
switch (provider.type) {
|
||||||
case ProviderType.server:
|
case ProviderType.server:
|
||||||
title = 'providers.server.card_title'.tr();
|
title = 'providers.server.card_title'.tr();
|
||||||
|
children = [
|
||||||
|
BrandText.body1('providers.server.bottom_sheet.1'.tr()),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1('providers.server.bottom_sheet.2'.tr()),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1('providers.server.bottom_sheet.3'.tr()),
|
||||||
|
];
|
||||||
break;
|
break;
|
||||||
case ProviderType.domain:
|
case ProviderType.domain:
|
||||||
title = 'providers.domain.card_title'.tr();
|
title = 'providers.domain.card_title'.tr();
|
||||||
|
children = [
|
||||||
|
BrandText.body1('providers.domain.bottom_sheet.1'.tr()),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1(
|
||||||
|
'providers.domain.bottom_sheet.2'.tr(args: [domainName, 'Date'])),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1('providers.domain.bottom_sheet.3'.tr()),
|
||||||
|
];
|
||||||
break;
|
break;
|
||||||
case ProviderType.backup:
|
case ProviderType.backup:
|
||||||
title = 'providers.backup.card_title'.tr();
|
title = 'providers.backup.card_title'.tr();
|
||||||
|
children = [
|
||||||
|
BrandText.body1('providers.backup.bottom_sheet.1'.tr()),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1(
|
||||||
|
'providers.backup.bottom_sheet.2'.tr(args: [domainName, 'Time'])),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body1('providers.backup.bottom_sheet.3'.tr()),
|
||||||
|
];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return BrandModalSheet(
|
return BrandModalSheet(
|
||||||
|
|
@ -176,7 +202,7 @@ class _ProviderDetails extends StatelessWidget {
|
||||||
value: _PopupMenuItemType.setting,
|
value: _PopupMenuItemType.setting,
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: EdgeInsets.only(left: 5),
|
padding: EdgeInsets.only(left: 5),
|
||||||
child: Text('Настройки'),
|
child: Text('basis.settings'.tr()),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
@ -184,11 +210,10 @@ class _ProviderDetails extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Padding(
|
Padding(
|
||||||
padding: brandPagePadding1,
|
padding: brandPagePadding2,
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
SizedBox(height: 13),
|
|
||||||
IconStatusMask(
|
IconStatusMask(
|
||||||
status: provider.state,
|
status: provider.state,
|
||||||
child:
|
child:
|
||||||
|
|
@ -197,11 +222,7 @@ class _ProviderDetails extends StatelessWidget {
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.h1(title),
|
BrandText.h1(title),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandText.body1(statusText),
|
...children
|
||||||
SizedBox(
|
|
||||||
height: 20,
|
|
||||||
),
|
|
||||||
Text('Статусы сервера и сервис провайдера и т.д.')
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import 'package:selfprivacy/ui/components/brand_divider/brand_divider.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
|
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
||||||
import 'package:selfprivacy/ui/components/switch_block/switch_bloc.dart';
|
import 'package:selfprivacy/ui/components/switch_block/switch_bloc.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
|
||||||
class SettingsPage extends StatelessWidget {
|
class SettingsPage extends StatelessWidget {
|
||||||
const SettingsPage({Key? key}) : super(key: key);
|
const SettingsPage({Key? key}) : super(key: key);
|
||||||
|
|
@ -15,7 +16,7 @@ class SettingsPage extends StatelessWidget {
|
||||||
padding: brandPagePadding2,
|
padding: brandPagePadding2,
|
||||||
children: [
|
children: [
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandHeader(title: 'Настройки', hasBackButton: true),
|
BrandHeader(title: 'basis.settings'.tr(), hasBackButton: true),
|
||||||
BrandDivider(),
|
BrandDivider(),
|
||||||
SwitcherBlock(
|
SwitcherBlock(
|
||||||
onChange: (_) {},
|
onChange: (_) {},
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_tab_bar/brand_tab_bar.dart';
|
import 'package:selfprivacy/ui/components/brand_tab_bar/brand_tab_bar.dart';
|
||||||
import 'package:selfprivacy/ui/pages/more/more.dart';
|
import 'package:selfprivacy/ui/pages/more/more.dart';
|
||||||
import 'package:selfprivacy/ui/pages/providers/providers.dart';
|
import 'package:selfprivacy/ui/pages/providers/providers.dart';
|
||||||
|
|
@ -15,7 +16,7 @@ class RootPage extends StatefulWidget {
|
||||||
|
|
||||||
class _RootPageState extends State<RootPage>
|
class _RootPageState extends State<RootPage>
|
||||||
with SingleTickerProviderStateMixin {
|
with SingleTickerProviderStateMixin {
|
||||||
TabController? tabController;
|
late TabController tabController;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
|
|
@ -26,21 +27,24 @@ class _RootPageState extends State<RootPage>
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
super.dispose();
|
super.dispose();
|
||||||
tabController!.dispose();
|
tabController.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SafeArea(
|
return SafeArea(
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
body: TabBarView(
|
body: Provider<ChangeTab>(
|
||||||
controller: tabController,
|
create: (_) => ChangeTab(tabController.animateTo),
|
||||||
children: [
|
child: TabBarView(
|
||||||
ProvidersPage(),
|
controller: tabController,
|
||||||
ServicesPage(),
|
children: [
|
||||||
UsersPage(),
|
ProvidersPage(),
|
||||||
MorePage(),
|
ServicesPage(),
|
||||||
],
|
UsersPage(),
|
||||||
|
MorePage(),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
bottomNavigationBar: BrandTabBar(
|
bottomNavigationBar: BrandTabBar(
|
||||||
controller: tabController,
|
controller: tabController,
|
||||||
|
|
@ -49,3 +53,9 @@ class _RootPageState extends State<RootPage>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ChangeTab {
|
||||||
|
final ValueChanged<int> onPress;
|
||||||
|
|
||||||
|
ChangeTab(this.onPress);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,21 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:selfprivacy/config/brand_colors.dart';
|
||||||
import 'package:selfprivacy/config/brand_theme.dart';
|
import 'package:selfprivacy/config/brand_theme.dart';
|
||||||
|
import 'package:selfprivacy/config/text_themes.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
|
import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
|
||||||
import 'package:selfprivacy/logic/cubit/services/services_cubit.dart';
|
import 'package:selfprivacy/logic/models/state_types.dart';
|
||||||
import 'package:selfprivacy/logic/models/service.dart';
|
|
||||||
import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
|
|
||||||
import 'package:selfprivacy/ui/components/brand_card/brand_card.dart';
|
import 'package:selfprivacy/ui/components/brand_card/brand_card.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
|
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
|
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
|
||||||
|
import 'package:selfprivacy/ui/components/brand_modal_sheet/brand_modal_sheet.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
||||||
import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart';
|
import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart';
|
||||||
import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
|
import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
import 'package:selfprivacy/utils/route_transitions/basic.dart';
|
||||||
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
|
import '../rootRoute.dart';
|
||||||
|
|
||||||
class ServicesPage extends StatefulWidget {
|
class ServicesPage extends StatefulWidget {
|
||||||
ServicesPage({Key? key}) : super(key: key);
|
ServicesPage({Key? key}) : super(key: key);
|
||||||
|
|
@ -21,28 +27,20 @@ class ServicesPage extends StatefulWidget {
|
||||||
class _ServicesPageState extends State<ServicesPage> {
|
class _ServicesPageState extends State<ServicesPage> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final serviceCubitState = context.watch<ServicesCubit>().state;
|
|
||||||
|
|
||||||
final connected = serviceCubitState.connected;
|
|
||||||
final uninitialized = serviceCubitState.uninitialized;
|
|
||||||
var isReady = context.watch<AppConfigCubit>().state.isFullyInitilized;
|
var isReady = context.watch<AppConfigCubit>().state.isFullyInitilized;
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: PreferredSize(
|
appBar: PreferredSize(
|
||||||
child: BrandHeader(title: 'Сервисы'),
|
child: BrandHeader(title: 'basis.services'.tr()),
|
||||||
preferredSize: Size.fromHeight(52),
|
preferredSize: Size.fromHeight(52),
|
||||||
),
|
),
|
||||||
body: ListView(
|
body: ListView(
|
||||||
padding: brandPagePadding2,
|
padding: brandPagePadding2,
|
||||||
children: [
|
children: [
|
||||||
if (!isReady) NotReadyCard(),
|
BrandText.body1('services.title'.tr()),
|
||||||
SizedBox(height: 24),
|
SizedBox(height: 24),
|
||||||
...connected.map((service) => _Card(service: service)).toList(),
|
if (!isReady) ...[NotReadyCard(), SizedBox(height: 24)],
|
||||||
if (uninitialized.isNotEmpty) ...[
|
...ServiceTypes.values.map((t) => _Card(serviceType: t)).toList()
|
||||||
BrandText.body1('не подключены'),
|
|
||||||
SizedBox(height: 30),
|
|
||||||
],
|
|
||||||
...uninitialized.map((service) => _Card(service: service)).toList()
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
@ -50,67 +48,329 @@ class _ServicesPageState extends State<ServicesPage> {
|
||||||
}
|
}
|
||||||
|
|
||||||
class _Card extends StatelessWidget {
|
class _Card extends StatelessWidget {
|
||||||
const _Card({Key? key, required this.service}) : super(key: key);
|
const _Card({Key? key, required this.serviceType}) : super(key: key);
|
||||||
|
|
||||||
final Service service;
|
final ServiceTypes serviceType;
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
String? title;
|
String title;
|
||||||
IconData? iconData;
|
IconData iconData;
|
||||||
String? description;
|
String subtitle;
|
||||||
|
|
||||||
switch (service.type) {
|
switch (serviceType) {
|
||||||
case ServiceTypes.messanger:
|
|
||||||
iconData = BrandIcons.messanger;
|
|
||||||
title = 'Мессенджер';
|
|
||||||
description =
|
|
||||||
'Delta Chat. Если бы мне надо было обсудить что-то от чего зависит жизнь. Я бы выбрал Delta.Chat + свой почтовый сервер.';
|
|
||||||
break;
|
|
||||||
case ServiceTypes.mail:
|
case ServiceTypes.mail:
|
||||||
iconData = BrandIcons.envelope;
|
iconData = BrandIcons.envelope;
|
||||||
title = 'Почта';
|
title = 'services.mail.title'.tr();
|
||||||
description = 'Электронная почта для семьи или компании ';
|
subtitle = 'services.mail.subtitle'.tr();
|
||||||
|
break;
|
||||||
|
case ServiceTypes.messenger:
|
||||||
|
iconData = BrandIcons.messanger;
|
||||||
|
title = 'services.messenger.title'.tr();
|
||||||
|
subtitle = 'services.messenger.subtitle'.tr();
|
||||||
break;
|
break;
|
||||||
case ServiceTypes.passwordManager:
|
case ServiceTypes.passwordManager:
|
||||||
iconData = BrandIcons.key;
|
iconData = BrandIcons.key;
|
||||||
title = 'Менеджер паролей';
|
title = 'services.password_manager.title'.tr();
|
||||||
description = 'Надёжное хранилище для ваших паролей и ключей доступа';
|
subtitle = 'services.password_manager.subtitle'.tr();
|
||||||
break;
|
break;
|
||||||
case ServiceTypes.github:
|
case ServiceTypes.video:
|
||||||
iconData = BrandIcons.github;
|
iconData = BrandIcons.webcam;
|
||||||
title = 'Git сервер';
|
title = 'services.video.title'.tr();
|
||||||
description = 'Сервис для приватного хранения своих разработок';
|
subtitle = 'services.video.subtitle'.tr();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ServiceTypes.cloud:
|
case ServiceTypes.cloud:
|
||||||
iconData = BrandIcons.upload;
|
iconData = BrandIcons.upload;
|
||||||
title = 'Файловое Облако';
|
title = 'services.cloud.title'.tr();
|
||||||
description = 'Сервис для доступа к вашим файлам в любой точке мира';
|
subtitle = 'services.cloud.subtitle'.tr();
|
||||||
|
break;
|
||||||
|
case ServiceTypes.socialNetwork:
|
||||||
|
iconData = BrandIcons.social;
|
||||||
|
title = 'services.social_network.title'.tr();
|
||||||
|
subtitle = 'services.social_network.subtitle'.tr();
|
||||||
|
break;
|
||||||
|
case ServiceTypes.git:
|
||||||
|
iconData = BrandIcons.git;
|
||||||
|
title = 'services.git.title'.tr();
|
||||||
|
subtitle = 'services.git.subtitle'.tr();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return BrandCard(
|
|
||||||
child: Column(
|
var isReady = context.watch<AppConfigCubit>().state.isFullyInitilized;
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
var changeTab = context.read<ChangeTab>().onPress;
|
||||||
children: [
|
return GestureDetector(
|
||||||
IconStatusMask(
|
onTap: () => showModalBottomSheet<void>(
|
||||||
status: service.state,
|
context: context,
|
||||||
child: Icon(iconData, size: 30, color: Colors.white),
|
isScrollControlled: true,
|
||||||
),
|
backgroundColor: Colors.transparent,
|
||||||
SizedBox(height: 10),
|
builder: (BuildContext context) {
|
||||||
BrandText.h2(title),
|
return _ServiceDetails(
|
||||||
SizedBox(height: 10),
|
serviceType: serviceType,
|
||||||
if (service.state == StateType.uninitialized) ...[
|
status: isReady ? StateType.stable : StateType.uninitialized,
|
||||||
BrandText.body1(description),
|
title: title,
|
||||||
|
icon: iconData,
|
||||||
|
changeTab: changeTab,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
child: BrandCard(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
IconStatusMask(
|
||||||
|
status: isReady ? StateType.stable : StateType.uninitialized,
|
||||||
|
child: Icon(iconData, size: 30, color: Colors.white),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.h2(title),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.body2(subtitle),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
BrandButton.text(
|
|
||||||
title: 'Подключить',
|
|
||||||
onPressed: () {
|
|
||||||
context.read<ServicesCubit>().connect(service);
|
|
||||||
})
|
|
||||||
],
|
],
|
||||||
if (service.state == StateType.stable) BrandText.body2('Подключен'),
|
),
|
||||||
],
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum ServiceTypes {
|
||||||
|
mail,
|
||||||
|
messenger,
|
||||||
|
passwordManager,
|
||||||
|
video,
|
||||||
|
cloud,
|
||||||
|
socialNetwork,
|
||||||
|
git,
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ServiceDetails extends StatelessWidget {
|
||||||
|
const _ServiceDetails({
|
||||||
|
Key? key,
|
||||||
|
required this.serviceType,
|
||||||
|
required this.icon,
|
||||||
|
required this.status,
|
||||||
|
required this.title,
|
||||||
|
required this.changeTab,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
final ServiceTypes serviceType;
|
||||||
|
final IconData icon;
|
||||||
|
final StateType status;
|
||||||
|
final String title;
|
||||||
|
final ValueChanged<int> changeTab;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
late Widget child;
|
||||||
|
|
||||||
|
var config = context.watch<AppConfigCubit>().state;
|
||||||
|
var domainName = config.isDomainFilled
|
||||||
|
? config.cloudFlareDomain!.domainName!
|
||||||
|
: 'example.com';
|
||||||
|
|
||||||
|
var linksStyle = body1Style.copyWith(
|
||||||
|
fontSize: 15,
|
||||||
|
color: Theme.of(context).brightness == Brightness.dark
|
||||||
|
? Colors.white
|
||||||
|
: BrandColors.black,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
decoration: TextDecoration.underline,
|
||||||
|
// height: 1.1,
|
||||||
|
);
|
||||||
|
|
||||||
|
var textStyle = body1Style.copyWith(
|
||||||
|
color: Theme.of(context).brightness == Brightness.dark
|
||||||
|
? Colors.white
|
||||||
|
: BrandColors.black,
|
||||||
|
);
|
||||||
|
switch (serviceType) {
|
||||||
|
case ServiceTypes.mail:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.mail.bottom_sheet.1'.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
child: Text(
|
||||||
|
'services.mail.bottom_sheet.2'.tr(),
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
changeTab(2);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.messenger:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.messenger.bottom_sheet.1'.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.passwordManager:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.password_manager.bottom_sheet.1'
|
||||||
|
.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: () => _launchURL('https://password.$domainName'),
|
||||||
|
child: Text(
|
||||||
|
'password.$domainName',
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.video:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.video.bottom_sheet.1'.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: () => _launchURL('https://meet.$domainName'),
|
||||||
|
child: Text(
|
||||||
|
'meet.$domainName',
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.cloud:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.cloud.bottom_sheet.1'.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: () => _launchURL('https://cloud.$domainName'),
|
||||||
|
child: Text(
|
||||||
|
'cloud.$domainName',
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.socialNetwork:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.social_network.bottom_sheet.1'
|
||||||
|
.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: () => _launchURL('https://social_network.$domainName'),
|
||||||
|
child: Text(
|
||||||
|
'social.$domainName',
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
case ServiceTypes.git:
|
||||||
|
child = RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
children: [
|
||||||
|
TextSpan(
|
||||||
|
text: 'services.git.bottom_sheet.1'.tr(args: [domainName]),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
WidgetSpan(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 0.8, left: 5),
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: () => _launchURL('https://git.$domainName'),
|
||||||
|
child: Text(
|
||||||
|
'git.$domainName',
|
||||||
|
style: linksStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return BrandModalSheet(
|
||||||
|
child: Navigator(
|
||||||
|
key: navigatorKey,
|
||||||
|
initialRoute: '/',
|
||||||
|
onGenerateRoute: (_) {
|
||||||
|
return materialRoute(
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: brandPagePadding1,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SizedBox(height: 13),
|
||||||
|
IconStatusMask(
|
||||||
|
status: status,
|
||||||
|
child: Icon(icon, size: 40, color: Colors.white),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
BrandText.h1(title),
|
||||||
|
child,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _launchURL(url) async =>
|
||||||
|
await canLaunch(url) ? await launch(url) : throw 'Could not launch $url';
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ class _NoUsers extends StatelessWidget {
|
||||||
Icon(BrandIcons.users, size: 50, color: BrandColors.grey7),
|
Icon(BrandIcons.users, size: 50, color: BrandColors.grey7),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
BrandText.h2(
|
BrandText.h2(
|
||||||
'Здесь пока никого',
|
'users.nobody_here'.tr(),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: BrandColors.grey7,
|
color: BrandColors.grey7,
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,12 @@ part of 'users.dart';
|
||||||
class _NewUser extends StatelessWidget {
|
class _NewUser extends StatelessWidget {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var config = context.watch<AppConfigCubit>().state;
|
||||||
|
|
||||||
|
var domainName = config.isDomainFilled
|
||||||
|
? config.cloudFlareDomain!.domainName!
|
||||||
|
: 'example.com';
|
||||||
|
|
||||||
return BrandModalSheet(
|
return BrandModalSheet(
|
||||||
child: BlocProvider(
|
child: BlocProvider(
|
||||||
create: (context) =>
|
create: (context) =>
|
||||||
|
|
@ -19,7 +25,9 @@ class _NewUser extends StatelessWidget {
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
BrandHeader(title: 'Новый пользователь'),
|
BrandHeader(
|
||||||
|
title: 'users.new_user'.tr(),
|
||||||
|
),
|
||||||
SizedBox(width: 14),
|
SizedBox(width: 14),
|
||||||
Padding(
|
Padding(
|
||||||
padding: brandPagePadding2,
|
padding: brandPagePadding2,
|
||||||
|
|
@ -28,8 +36,8 @@ class _NewUser extends StatelessWidget {
|
||||||
CubitFormTextField(
|
CubitFormTextField(
|
||||||
formFieldCubit: context.read<UserFormCubit>().login,
|
formFieldCubit: context.read<UserFormCubit>().login,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: 'Логин',
|
labelText: 'users.login'.tr(),
|
||||||
suffixText: '@example',
|
suffixText: '@$domainName',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
|
|
@ -37,7 +45,7 @@ class _NewUser extends StatelessWidget {
|
||||||
formFieldCubit: context.read<UserFormCubit>().password,
|
formFieldCubit: context.read<UserFormCubit>().password,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
alignLabelWithHint: false,
|
alignLabelWithHint: false,
|
||||||
labelText: 'Пароль',
|
labelText: 'basis.password'.tr(),
|
||||||
suffixIcon: Padding(
|
suffixIcon: Padding(
|
||||||
padding: const EdgeInsets.only(right: 8),
|
padding: const EdgeInsets.only(right: 8),
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
|
|
@ -56,11 +64,10 @@ class _NewUser extends StatelessWidget {
|
||||||
onPressed: formCubitState.isSubmitting
|
onPressed: formCubitState.isSubmitting
|
||||||
? null
|
? null
|
||||||
: () => context.read<UserFormCubit>().trySubmit(),
|
: () => context.read<UserFormCubit>().trySubmit(),
|
||||||
title: 'Создать',
|
title: 'basis.create'.tr(),
|
||||||
),
|
),
|
||||||
SizedBox(height: 40),
|
SizedBox(height: 40),
|
||||||
Text(
|
Text('users.new_user_info_note'.tr()),
|
||||||
'Новый пользователь автоматически получит доступ ко всем сервисам. Ещё какое-то описание.'),
|
|
||||||
SizedBox(height: 30),
|
SizedBox(height: 30),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,12 @@ class _UserDetails extends StatelessWidget {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var config = context.watch<AppConfigCubit>().state;
|
||||||
|
|
||||||
|
var domainName = config.isDomainFilled
|
||||||
|
? config.cloudFlareDomain!.domainName!
|
||||||
|
: 'example.com';
|
||||||
|
|
||||||
return BrandModalSheet(
|
return BrandModalSheet(
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
|
@ -45,24 +51,25 @@ class _UserDetails extends StatelessWidget {
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
title: Text('Подтверждение '),
|
title: Text('basis.confirmation'.tr()),
|
||||||
content: SingleChildScrollView(
|
content: SingleChildScrollView(
|
||||||
child: ListBody(
|
child: ListBody(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Text('удалить учетную запись?'),
|
Text('users.delete_confirm_question'
|
||||||
|
.tr()),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
actions: <Widget>[
|
actions: <Widget>[
|
||||||
TextButton(
|
TextButton(
|
||||||
child: Text('Отменить'),
|
child: Text('basis.cancel'.tr()),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.of(context)..pop();
|
Navigator.of(context)..pop();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
TextButton(
|
TextButton(
|
||||||
child: Text(
|
child: Text(
|
||||||
'Удалить',
|
'basis.delete'.tr(),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: BrandColors.red1,
|
color: BrandColors.red1,
|
||||||
),
|
),
|
||||||
|
|
@ -85,7 +92,7 @@ class _UserDetails extends StatelessWidget {
|
||||||
value: PopupMenuItemType.reset,
|
value: PopupMenuItemType.reset,
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: EdgeInsets.only(left: 5),
|
padding: EdgeInsets.only(left: 5),
|
||||||
child: Text('Сбросить пароль'),
|
child: Text('users.reset_password'.tr()),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
PopupMenuItem<PopupMenuItemType>(
|
PopupMenuItem<PopupMenuItemType>(
|
||||||
|
|
@ -93,7 +100,7 @@ class _UserDetails extends StatelessWidget {
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: EdgeInsets.only(left: 5),
|
padding: EdgeInsets.only(left: 5),
|
||||||
child: Text(
|
child: Text(
|
||||||
'Удалить',
|
'basis.delete'.tr(),
|
||||||
style: TextStyle(color: BrandColors.red1),
|
style: TextStyle(color: BrandColors.red1),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -122,14 +129,14 @@ class _UserDetails extends StatelessWidget {
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
BrandText.small('Учетная запись'),
|
BrandText.small('users.account'.tr()),
|
||||||
Container(
|
Container(
|
||||||
height: 40,
|
height: 40,
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
child: BrandText.h4('${user!.login}@example.com'),
|
child: BrandText.h4('${user!.login}@$domainName'),
|
||||||
),
|
),
|
||||||
SizedBox(height: 14),
|
SizedBox(height: 14),
|
||||||
BrandText.small('Пароль'),
|
BrandText.small('basis.password'.tr()),
|
||||||
Container(
|
Container(
|
||||||
height: 40,
|
height: 40,
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
|
|
@ -139,15 +146,11 @@ class _UserDetails extends StatelessWidget {
|
||||||
BrandDivider(),
|
BrandDivider(),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
BrandButton.iconText(
|
BrandButton.iconText(
|
||||||
title: 'Отправить реквизиты для входа',
|
title: 'users.send_regisration_data'.tr(),
|
||||||
icon: Icon(BrandIcons.share),
|
icon: Icon(BrandIcons.share),
|
||||||
onPressed: () {},
|
onPressed: () {},
|
||||||
),
|
),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
BrandDivider(),
|
|
||||||
SizedBox(height: 20),
|
|
||||||
Text(
|
|
||||||
'Вам был создан доступ к сервисам с логином <login> и паролем <password> к сервисам:- E-mail с адресом <username@domain.com>- Менеджер паролей: <pass.domain.com>- Файловое облако: <cloud.mydomain.com>- Видеоконференция <meet.domain.com>- Git сервер <git.mydomain.com>'),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_modal_sheet/brand_modal_sheet.dart';
|
import 'package:selfprivacy/ui/components/brand_modal_sheet/brand_modal_sheet.dart';
|
||||||
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
|
||||||
import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
|
import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
|
||||||
part 'fab.dart';
|
part 'fab.dart';
|
||||||
part 'new_user.dart';
|
part 'new_user.dart';
|
||||||
|
|
@ -39,7 +40,7 @@ class UsersPage extends StatelessWidget {
|
||||||
? Container(
|
? Container(
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
child: _NoUsers(
|
child: _NoUsers(
|
||||||
text: 'Добавьте первого пользователя',
|
text: 'users.add_new_user'.tr(),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
: ListView(
|
: ListView(
|
||||||
|
|
@ -51,7 +52,7 @@ class UsersPage extends StatelessWidget {
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: PreferredSize(
|
appBar: PreferredSize(
|
||||||
child: BrandHeader(title: 'Пользователи'),
|
child: BrandHeader(title: 'basis.users'.tr()),
|
||||||
preferredSize: Size.fromHeight(52),
|
preferredSize: Size.fromHeight(52),
|
||||||
),
|
),
|
||||||
floatingActionButton: isReady ? _Fab() : null,
|
floatingActionButton: isReady ? _Fab() : null,
|
||||||
|
|
@ -72,8 +73,7 @@ class UsersPage extends StatelessWidget {
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 15),
|
padding: const EdgeInsets.symmetric(horizontal: 15),
|
||||||
child: Center(
|
child: Center(
|
||||||
child: _NoUsers(
|
child: _NoUsers(
|
||||||
text:
|
text: 'users.not_ready'.tr(),
|
||||||
'Подключите сервер, домен и DNS в разеде Провайдеры, чтобы добавить первого пользователя',
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -329,13 +329,6 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.0"
|
version: "2.0.0"
|
||||||
google_fonts:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: google_fonts
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.0"
|
|
||||||
graphs:
|
graphs:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
||||||
13
pubspec.yaml
13
pubspec.yaml
|
|
@ -20,7 +20,6 @@ dependencies:
|
||||||
flutter_bloc: ^7.0.0-nullsafety.5
|
flutter_bloc: ^7.0.0-nullsafety.5
|
||||||
flutter_secure_storage: ^4.1.0
|
flutter_secure_storage: ^4.1.0
|
||||||
get_it: ^6.0.0
|
get_it: ^6.0.0
|
||||||
google_fonts: ^2.0.0
|
|
||||||
hive: ^2.0.0
|
hive: ^2.0.0
|
||||||
hive_flutter: ^1.0.0
|
hive_flutter: ^1.0.0
|
||||||
json_annotation: ^4.0.0
|
json_annotation: ^4.0.0
|
||||||
|
|
@ -54,3 +53,15 @@ flutter:
|
||||||
- family: BrandIcons
|
- family: BrandIcons
|
||||||
fonts:
|
fonts:
|
||||||
- asset: assets/fonts/BrandIcons.ttf
|
- asset: assets/fonts/BrandIcons.ttf
|
||||||
|
- family: Inter
|
||||||
|
fonts:
|
||||||
|
- asset: assets/fonts/Inter-Regular.ttf
|
||||||
|
- asset: assets/fonts/Inter-Medium.ttf
|
||||||
|
weight: 500
|
||||||
|
- asset: assets/fonts/Inter-SemiBold.ttf
|
||||||
|
weight: 600
|
||||||
|
- asset: assets/fonts/Inter-Bold.ttf
|
||||||
|
weight: 700
|
||||||
|
- asset: assets/fonts/Inter-ExtraBold.ttf
|
||||||
|
weight: 800
|
||||||
|
|
||||||
Loading…
Reference in New Issue