mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
vkamn
847bb6923b
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
483 lines
18 KiB
QML
483 lines
18 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import Qt5Compat.GraphicalEffects
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ContainerProps 1.0
|
|
import ContainersModelFilters 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
property var containersDropDownRef: null
|
|
|
|
Connections {
|
|
target: Qt.application
|
|
|
|
function onStateChanged() {
|
|
if (Qt.application.state !== Qt.ApplicationActive) {
|
|
if (drawer.isOpened) {
|
|
drawer.closeTriggered()
|
|
}
|
|
if (homeSplitTunnelingDrawer.isOpened) {
|
|
homeSplitTunnelingDrawer.closeTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
objectName: "pageControllerConnections"
|
|
|
|
target: PageController
|
|
|
|
function onRestorePageHomeState(isContainerInstalled) {
|
|
drawer.openTriggered()
|
|
if (isContainerInstalled && root.containersDropDownRef) {
|
|
root.containersDropDownRef.rootButtonClickedFunction()
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
Item {
|
|
objectName: "homeColumnItem"
|
|
|
|
anchors.fill: parent
|
|
anchors.bottomMargin: drawer.collapsedHeight
|
|
|
|
ColumnLayout {
|
|
objectName: "homeColumnLayout"
|
|
|
|
anchors.fill: parent
|
|
anchors.topMargin: 12 + PageController.safeAreaTopMargin
|
|
anchors.bottomMargin: 16
|
|
|
|
BasicButtonType {
|
|
id: loggingButton
|
|
objectName: "loggingButton"
|
|
|
|
property bool isLoggingEnabled: SettingsController.isLoggingEnabled
|
|
|
|
Layout.alignment: Qt.AlignHCenter
|
|
|
|
implicitHeight: 36
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
borderWidth: 0
|
|
|
|
visible: isLoggingEnabled ? true : false
|
|
text: qsTr("Logging enabled")
|
|
|
|
Keys.onEnterPressed: this.clicked()
|
|
Keys.onReturnPressed: this.clicked()
|
|
|
|
onClicked: {
|
|
PageController.goToPage(PageEnum.PageSettingsLogging)
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: devGatewayButton
|
|
objectName: "devGatewayButton"
|
|
|
|
property bool isDevGatewayEnabled: SettingsController.isDevGatewayEnv
|
|
|
|
Layout.alignment: Qt.AlignHCenter
|
|
|
|
implicitHeight: 36
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
borderWidth: 0
|
|
|
|
visible: SettingsController.isDevModeEnabled && isDevGatewayEnabled
|
|
text: qsTr("Dev gateway enabled")
|
|
|
|
Keys.onEnterPressed: this.clicked()
|
|
Keys.onReturnPressed: this.clicked()
|
|
|
|
onClicked: {
|
|
PageController.goToPage(PageEnum.PageDevMenu)
|
|
}
|
|
}
|
|
|
|
ConnectButton {
|
|
id: connectButton
|
|
objectName: "connectButton"
|
|
|
|
Layout.fillHeight: true
|
|
Layout.alignment: Qt.AlignCenter
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: splitTunnelingButton
|
|
objectName: "splitTunnelingButton"
|
|
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
|
|
leftPadding: 16
|
|
rightPadding: 16
|
|
|
|
implicitHeight: 36
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
borderWidth: 0
|
|
|
|
buttonTextLabel.lineHeight: 20
|
|
buttonTextLabel.font.pixelSize: 14
|
|
buttonTextLabel.font.weight: 500
|
|
|
|
property bool isSplitTunnelingEnabled: IpSplitTunnelingController.isSplitTunnelingEnabled || AppSplitTunnelingController.isSplitTunnelingEnabled ||
|
|
ServersUiController.isDefaultServerDefaultContainerHasSplitTunneling
|
|
|
|
text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
|
|
|
|
leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
|
|
leftImageColor: ""
|
|
rightImageSource: "qrc:/images/controls/chevron-down.svg"
|
|
|
|
Keys.onEnterPressed: this.clicked()
|
|
Keys.onReturnPressed: this.clicked()
|
|
|
|
onClicked: {
|
|
homeSplitTunnelingDrawer.openTriggered()
|
|
}
|
|
|
|
HomeSplitTunnelingDrawer {
|
|
id: homeSplitTunnelingDrawer
|
|
objectName: "homeSplitTunnelingDrawer"
|
|
|
|
parent: root
|
|
}
|
|
}
|
|
|
|
AdLabel {
|
|
id: adLabel
|
|
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: adLabel.contentHeight
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.topMargin: 22
|
|
}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: drawer
|
|
objectName: "drawerProtocol"
|
|
|
|
anchors.fill: parent
|
|
|
|
collapsedStateContent: Item {
|
|
objectName: "ProtocolDrawerCollapsedContent"
|
|
|
|
implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
|
|
Component.onCompleted: {
|
|
drawer.expandedHeight = implicitHeight
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: collapsed
|
|
objectName: "collapsedColumnLayout"
|
|
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
spacing: 0
|
|
|
|
Component.onCompleted: {
|
|
drawer.collapsedHeight = collapsed.implicitHeight
|
|
}
|
|
|
|
DividerType {
|
|
Layout.topMargin: 10
|
|
Layout.fillWidth: false
|
|
Layout.preferredWidth: 20
|
|
Layout.preferredHeight: 2
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
}
|
|
|
|
RowLayout {
|
|
objectName: "rowLayout"
|
|
|
|
Layout.topMargin: 14
|
|
Layout.leftMargin: 24
|
|
Layout.rightMargin: 24
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
|
|
spacing: 0
|
|
|
|
Connections {
|
|
objectName: "drawerConnections"
|
|
|
|
target: drawer
|
|
function onCursorEntered() {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
|
|
collapsedButtonHeader.opacity = 0.8
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
|
|
function onCursorExited() {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
|
|
collapsedButtonHeader.opacity = 1
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
|
|
function onPressed(pressed, entered) {
|
|
if (drawer.isCollapsedStateActive) {
|
|
collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
|
|
collapsedButtonHeader.opacity = 0.7
|
|
} else {
|
|
collapsedButtonHeader.opacity = 1
|
|
}
|
|
}
|
|
}
|
|
|
|
Header1TextType {
|
|
id: collapsedButtonHeader
|
|
objectName: "collapsedButtonHeader"
|
|
|
|
Layout.maximumWidth: drawer.width - 48 - 18 - 12
|
|
|
|
maximumLineCount: 2
|
|
elide: Qt.ElideRight
|
|
|
|
text: ServersUiController.defaultServerName
|
|
horizontalAlignment: Qt.AlignHCenter
|
|
|
|
Behavior on opacity {
|
|
PropertyAnimation { duration: 200 }
|
|
}
|
|
}
|
|
|
|
ImageButtonType {
|
|
id: collapsedButtonChevron
|
|
objectName: "collapsedButtonChevron"
|
|
|
|
Layout.leftMargin: 8
|
|
|
|
visible: drawer.isCollapsedStateActive()
|
|
|
|
hoverEnabled: false
|
|
image: "qrc:/images/controls/chevron-down.svg"
|
|
imageColor: AmneziaStyle.color.paleGray
|
|
|
|
icon.width: 18
|
|
icon.height: 18
|
|
backgroundRadius: 16
|
|
horizontalPadding: 4
|
|
topPadding: 4
|
|
bottomPadding: 3
|
|
|
|
Keys.onEnterPressed: this.clicked()
|
|
Keys.onReturnPressed: this.clicked()
|
|
|
|
onClicked: {
|
|
if (drawer.isCollapsedStateActive()) {
|
|
drawer.openTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
RowLayout {
|
|
objectName: "rowLayoutLabel"
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
Layout.topMargin: 8
|
|
Layout.bottomMargin: drawer.isCollapsedStateActive ? 44 : ServersUiController.isDefaultServerFromApi ? 61 : 16
|
|
spacing: 0
|
|
|
|
BasicButtonType {
|
|
enabled: (ServersUiController.defaultServerImagePathCollapsed !== "") && drawer.isCollapsedStateActive
|
|
hoverEnabled: enabled
|
|
|
|
implicitHeight: 36
|
|
|
|
leftPadding: 16
|
|
rightPadding: 16
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.transparent
|
|
textColor: AmneziaStyle.color.mutedGray
|
|
|
|
buttonTextLabel.lineHeight: 16
|
|
buttonTextLabel.font.pixelSize: 13
|
|
buttonTextLabel.font.weight: 400
|
|
|
|
text: drawer.isCollapsedStateActive ? ServersUiController.defaultServerDescriptionCollapsed : ServersUiController.defaultServerDescriptionExpanded
|
|
leftImageSource: ServersUiController.defaultServerImagePathCollapsed
|
|
leftImageColor: ""
|
|
changeLeftImageSize: false
|
|
|
|
rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
|
|
|
|
Keys.onEnterPressed: this.clicked()
|
|
Keys.onReturnPressed: this.clicked()
|
|
|
|
onClicked: {
|
|
ServersUiController.processedIndex = ServersUiController.defaultIndex
|
|
|
|
if (ServersModel.getProcessedServerData("isServerFromGatewayApi")) {
|
|
if (ServersModel.getProcessedServerData("isCountrySelectionAvailable")) {
|
|
PageController.goToPage(PageEnum.PageSettingsApiAvailableCountries)
|
|
} else {
|
|
PageController.showBusyIndicator(true)
|
|
let result = SubscriptionUiController.getAccountInfo(ServersUiController.getProcessedServerIndex(), false)
|
|
PageController.showBusyIndicator(false)
|
|
if (!result) {
|
|
return
|
|
}
|
|
|
|
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
|
|
}
|
|
} else {
|
|
PageController.goToPage(PageEnum.PageSettingsServerInfo)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: serversMenuHeader
|
|
objectName: "serversMenuHeader"
|
|
|
|
anchors.top: collapsed.bottom
|
|
anchors.right: parent.right
|
|
anchors.left: parent.left
|
|
|
|
RowLayout {
|
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
|
spacing: 8
|
|
|
|
visible: !ServersUiController.isDefaultServerFromApi
|
|
|
|
DropDownType {
|
|
id: containersDropDown
|
|
objectName: "containersDropDown"
|
|
|
|
Component.onCompleted: root.containersDropDownRef = containersDropDown
|
|
|
|
rootButtonImageColor: AmneziaStyle.color.midnightBlack
|
|
rootButtonBackgroundColor: AmneziaStyle.color.paleGray
|
|
rootButtonBackgroundHoveredColor: AmneziaStyle.color.mistyGray
|
|
rootButtonBackgroundPressedColor: AmneziaStyle.color.cloudyGray
|
|
rootButtonHoveredBorderColor: AmneziaStyle.color.transparent
|
|
rootButtonDefaultBorderColor: AmneziaStyle.color.transparent
|
|
rootButtonTextTopMargin: 8
|
|
rootButtonTextBottomMargin: 8
|
|
|
|
enabled: drawer.isOpened
|
|
|
|
text: ServersUiController.defaultServerDefaultContainerName
|
|
textColor: AmneziaStyle.color.midnightBlack
|
|
headerText: qsTr("VPN protocol")
|
|
headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
|
|
|
|
rootButtonClickedFunction: function() {
|
|
containersDropDown.openTriggered()
|
|
}
|
|
|
|
drawerParent: root
|
|
|
|
listView: HomeContainersListView {
|
|
id: containersListView
|
|
objectName: "containersListView"
|
|
|
|
rootWidth: root.width
|
|
|
|
Connections {
|
|
objectName: "rowLayoutConnections"
|
|
|
|
target: ServersUiController
|
|
|
|
function onDefaultServerIndexChanged() {
|
|
updateContainersModelFilters()
|
|
}
|
|
}
|
|
|
|
function updateContainersModelFilters() {
|
|
if (ServersModel.isDefaultServerHasWriteAccess()) {
|
|
proxyDefaultServerContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
|
|
} else {
|
|
proxyDefaultServerContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
|
|
}
|
|
}
|
|
|
|
model: SortFilterProxyModel {
|
|
id: proxyDefaultServerContainersModel
|
|
sourceModel: DefaultServerContainersModel
|
|
|
|
sorters: [
|
|
RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
|
|
]
|
|
}
|
|
|
|
Component.onCompleted: updateContainersModelFilters()
|
|
}
|
|
}
|
|
}
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 48
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("Servers")
|
|
}
|
|
}
|
|
|
|
ButtonGroup {
|
|
id: serversRadioButtonGroup
|
|
objectName: "serversRadioButtonGroup"
|
|
}
|
|
|
|
ServersListView {
|
|
id: serversMenuContent
|
|
objectName: "serversMenuContent"
|
|
|
|
isFocusable: false
|
|
|
|
Connections {
|
|
target: drawer
|
|
|
|
// this item shouldn't be focused when drawer is closed
|
|
function onIsOpenedChanged() {
|
|
serversMenuContent.isFocusable = drawer.isOpened
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|