- {user &&
- <>
-
-
-
-
-
-
- }
-
+ const navigate = useNavigate();
+ const { inputs, setInputs, user, setUser, UpdateInput, UpdateConfig, Reset, DisableAccount, EnableAccount, UpdateRouterFile, ToggleLogging, ToggleAR, ToggleKS, UpdateUser, ToggleSubscription, autoLogout, ToggleAutoLogout, ToggleBlockList, ApplyBlocklistConfigurations, setBlockList, blockList, ToggleIP6, ToggleAllBlocking, ToggleCC, blockedLogging, setBlockedLogging, ToggleBlockedDomainLogging, ToggleCustomDNS } = useForm(props);
-
-
-
-
-
- Account
-
-
-
- {inputs["Email"].Email}
-
-
-
- Account Status
- {`${user.Disabled ? "Disabled" : "Active"}`}
-
-
-
- Last Account Update
-
- {dayjs(user.Updated).format("DD-MM-YYYY HH:mm:ss")}
-
-
-
-
- {(user.SubLevel > 0 && user.SubLevel !== 666) &&
- <>
- Subcription
-
- {user.SubLevel === 1 &&
- <>Nice
- }
- {user.SubLevel === 2 &&
- <>Nicer
- }
- {user.SubLevel === 3 &&
- <>Nicest
- }
- {(user.SubLevel === 0 || user.SubLevel === 666) &&
-
- NavigateToSubscriptions()}>Click To Subscribe
- }
-
-
- Status
- {`${user.CancelSub ? "Disabled" : "Active"}`}
-
-
- {user.CancelSub &&
- Expires
- {user.SubExpirationString}
-
-
- }
- {!user.CancelSub &&
- ToggleSubscription(false)} >Enable Subscription
-
-
- }
-
- }
- {!user?.Disabled &&
- ToggleSubscription(true)} >Disable Subscription
-
-
- }
-
-
- DisableAccount()} >Disable Account
-
-
- NavigateToTokens()} >Device Logins
-
-
-
- {user?.Disabled &&
- NavigateTo2fa()} >Two-Factor Authentication
-
-
- }
-
-
- EnableAccount()} >Enable Account
-
+ const ResetApp = async () => {
+ await props.disconnectFromVPN()
+ STORE.Cache.Clear()
+ CloseApp()
+ }
-
-
+ const CreateApiKey = () => {
+ let i = { ...inputs }
+ i["APIKey"].APIKey = uuidv4()
+ setInputs(i)
+ }
+
+ useEffect(() => {
+
+ if (props.state?.BlockLists?.length > 0) {
+ setBlockList(props.state.BlockLists)
+ }
+
+ let i = {}
+ i["Email"] = {}
+ i["Email"].Errors = {}
-
+ i["Password"] = {}
+ i["Password"].Errors = {}
+
+ i["APIKey"] = {}
+ i["APIKey"].Errors = {}
+
+ let u = STORE.Cache.GetObject("user");
+ let newUser = undefined
+ if (u) {
+ newUser = { ...u }
+ }
+
+ if (newUser) {
+ i["Email"].Email = newUser.Email
+ i["Password"].Password = newUser.Password
+ i["APIKey"].APIKey = newUser.APIKey
+ let splitDate = u.SubExpiration.split("T")
+ let finalDate = dayjs(splitDate[0]).format("DD MMMM YYYY")
+ newUser.SubExpirationString = finalDate
+ setUser(newUser)
+ }
+
+ i["RP"] = {}
+ i["RP"].Errors = {}
+
+ i["DB"] = {}
+ i["DB"].Errors = {}
+
+ i["KS"] = {}
+ i["KS"].Errors = {}
+
+ i["CC"] = {}
+ i["CC"].Errors = {}
+
+ i["IP6"] = {}
+ i["IP6"].Errors = {}
+
+ i["AR"] = {}
+ i["AR"].Errors = {}
+
+ i["DT"] = {}
+ i["DT"].Errors = {}
+
+ i["DNS"] = {}
+ i["DNS"].Errors = {}
+ i["DNS"].DNS1 = ""
+ i["DNS"].DNS2 = ""
+
+ let config = STORE.Cache.GetObject("config")
+ if (config) {
+ i["DNS"].DNS1 = config.DNS1
+ i["DNS"].DNS2 = config.DNS2
+ i["RP"].RP = config.RouterFilePath
+ i["DB"].DB = config.DebugLogging
+ i["KS"].KS = config.KillSwitch
+ i["AR"].AR = config.AutoReconnect
+ i["DT"].DT = config.CustomDNS
+ i["IP6"].IP6 = config.DisableIPv6OnConnect
+ i["CC"].CC = config.CloseConnectionsOnConnect
+ setBlockedLogging(config.LogBlockedDomains)
+ } else {
+ i["DNS"].DNS0 = "1.1.1.1"
+ i["DNS"].DNS2 = "8.8.8.8"
+ i["DB"].DB = true
+ }
+
+ setInputs(i)
+
+
+
+ }, []);
+
+ const NavigateToSubscriptions = () => {
+ OpenURL("https://www.nicelandvpn.is/#/pricing")
+ }
+
+ const NavigateTo2fa = () => {
+ navigate("/twofactor")
+ }
+
+ const NavigateToLogs = () => {
+ navigate("/logs")
+ }
+ const NavigateToTokens = () => {
+ navigate("/tokens")
+ }
+
+ return (
+ Utility
- UpdateConfig()}>Save
-
+ {user &&
+ <>
+
- }
-
-
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+ Account
+
+
+
+ {inputs["Email"].Email}
+
+
+
+ Account Status
+ {`${user.Disabled ? "Disabled" : "Active"}`}
+
+
+
+ Last Account Update
+
+ {dayjs(user.Updated).format("DD-MM-YYYY HH:mm:ss")}
+
+
+
+
+ {(user.SubLevel > 0 && user.SubLevel !== 666) &&
+ <>
+ Subcription
+
+ {user.SubLevel === 1 &&
+ <>Nice
+ }
+ {user.SubLevel === 2 &&
+ <>Nicer
+ }
+ {user.SubLevel === 3 &&
+ <>Nicest
+ }
+ {(user.SubLevel === 0 || user.SubLevel === 666) &&
+
+ NavigateToSubscriptions()}>Click To Subscribe
+ }
+
+
+ Status
+ {`${user.CancelSub ? "Disabled" : "Active"}`}
+
+
+ {user.CancelSub &&
+ Expires
+ {user.SubExpirationString}
+
+
+ }
+ {!user.CancelSub &&
+ ToggleSubscription(false)} >Enable Subscription
+
+
+ }
+
+ }
+ {!user?.Disabled &&
+ ToggleSubscription(true)} >Disable Subscription
+
+
+ }
+
+
+ DisableAccount()} >Disable Account
+
+
+ NavigateToTokens()} >Device Logins
+
+
+
+ {user?.Disabled &&
+ NavigateTo2fa()} >Two-Factor Authentication
+
+
+ }
+
+
+ EnableAccount()} >Enable Account
+
+
+
+
+ {props.advancedMode &&
+
+
+
+
+
+ Utility
+ UpdateConfig()}>Save
+
+
+
+
+
+
+
+ Advanced Mode
+
+
+
+
+ {props.advancedMode &&
+ <>
+
+
+
+
+
+ Auto Reconnect
+
+
+
+
+
+
+
+
+
+ Killswitch
+
+
+
+
+
+
+
+
+ Disable IPv6
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ Logging
+
+
+
+
+ Reset()} >Reset Network Settings
+
+
+
+ ResetApp()} >Reset App Settings
+
+
+
-
+
+
+
+
+ Routing
+ UpdateConfig()}>Save
+
+
+
+
+
+
+
+ Use Custom DNS
+
+
+
+
+ Primary DNS
+ UpdateInput("DNS", "DNS1", e.target.value)}
+ value={inputs["DNS"] ? inputs["DNS"].DNS1 : ""} />
+
+
- Backup DNS
+ UpdateInput("DNS", "DNS2", e.target.value)}
+ value={inputs["DNS"] ? inputs["DNS"].DNS2 : ""} />
+
-
+
-
-
-
- Advanced Mode
-
-
-
+
-
+
-
-
-
- Auto Reconnect
-
- UpdateRouterFile(false)} className="title neutral-color">Select A Router File
- {props.advancedMode &&
- <>
-
-
-
+
-
-
-
- Killswitch
-
-
+
- UpdateRouterFile(true)} >Clear Router File
+
-
+
-
-
-
- Disable IPv6
-
-
-
-
+ }
- }
+
-
-
-
- Logging
-
-
+
+
+
+ Domain Blocking
+ ApplyBlocklistConfigurations()}>Save
+
+
+ Enabling blocklists will increase memory usage
+
+
+
+
+
+
+
+ Log blocked domains
+
+
+
- ToggleAllBlocking(true)} >Enable All
+ ToggleAllBlocking(false)} >Disable All
+
-
+
- Reset()} >Reset Network Settings
-
-
+ {blockList?.map((item) => {
+ return (
- ResetApp()} >Reset App Settings
-
+
+ )
- {props.advancedMode &&
-
+
+
+
+ {item.Tag} ( {item.Domains}{' Domains'} )
+
+
-
+
-
-
-
-
- Routing
- UpdateConfig()}>Save
-
-
-
- Primary DNS
- UpdateInput("DNS", "DNS1", e.target.value)}
- value={inputs["DNS"] ? inputs["DNS"].DNS1 : ""} />
-
-
-
- Backup DNS
- UpdateInput("DNS", "DNS2", e.target.value)}
- value={inputs["DNS"] ? inputs["DNS"].DNS2 : ""} />
-
+ })}
-
-
- UpdateRouterFile(false)} className="title neutral-color">Select A Router File
-
-
-
- UpdateRouterFile(true)} >Clear Router File
-
-
-
-
- {/*
-
-
-
- Domain Blocking
- ApplyBlocklistConfigurations()}>Save
-
-
-
- Enabling blocklists will increase memory usage
-
-
- ToggleAllBlocking(true)} >Enable All
- ToggleAllBlocking(false)} >Disable All
-
-
-
- {blockList?.map((item) => {
- return (
-
-
-
- )
-
-
- })}
-
-
-
-
-
-
- {item.Tag} ( {item.Domains}{' Domains'} )
-
-
+ {/*
+ )
}
-export default Settings;
\ No newline at end of file
+
+export default Settings
diff --git a/frontend/src/App/SideBar.jsx b/frontend/src/App/SideBar.jsx
index c4c7746..faea5ca 100644
--- a/frontend/src/App/SideBar.jsx
+++ b/frontend/src/App/SideBar.jsx
@@ -2,251 +2,253 @@ import { useNavigate, useLocation } from "react-router-dom";
import React, { useEffect, useState } from "react";
import { ActivityLogIcon, BarChartIcon, ChatBubbleIcon, DesktopIcon, EnterIcon, ExitIcon, ExternalLinkIcon, FileTextIcon, GearIcon, GlobeIcon, HamburgerMenuIcon, LinkBreak2Icon, MobileIcon, Share1Icon, } from '@radix-ui/react-icons'
-import Loader from "react-spinners/PacmanLoader";
+import Loader from "react-spinners/ClockLoader";
import toast from 'react-hot-toast';
+import x from "../assets/images/ripple.svg"
import { OpenURL } from "../../wailsjs/go/main/App";
import STORE from "../store";
const SideBar = (props) => {
- const navigate = useNavigate();
- const location = useLocation();
- const [menuTab, setMenuTab] = useState(1)
-
- let { pathname } = location
- let sp = pathname.split("/")
-
- const clickHandler = (path) => {
- console.log("navigating to:", path)
- navigate(path)
- }
-
- const HandleLogout = async () => {
- props.toggleLoading({ logTag: "disconnect", tag: "LOGOUT", show: true, msg: "Disconnecting and logging out...", includeLogs: true })
- await props.disconnectFromVPN()
- STORE.CleanupOnLogout()
- navigate("/login")
- }
-
- const ConfirmLogout = () => {
-
- toast.error((t) =>
- (
-
-
-
-
- {props.advancedMode &&
-
-
-
-
-
-
- {user &&
- Other
- {user &&
- UpdateUser()}>Save
- }
-
-
- }
-
- {user &&
- Account ID
- {user._id}
-
-
- }
-
- {(user && props.advancedMode) &&
- <>
- {inputs["APIKey"] &&
- Cash Payment Code
- {user.CashCode}
-
-
- }
- API Key
- {inputs["APIKey"].APIKey}
-
-
-
- }
-
- {props.state?.LogPath &&
- CreateApiKey()} >Refresh API Key
-
-
- }
-
- {props.state?.ConfigPath &&
- Log File
-
- {props.state.LogFileName}
-
-
-
- }
- {props.state?.C?.RouterFilePath !== "" &&
- Config Backup
-
- {props.state.ConfigPath}
-
-
-
- }
-
- Router File
-
- {props.state?.C?.RouterFilePath}
-
-
-
-
- }
-
-
-
-
-
-
-
- Experimental Features
- {user &&
- UpdateConfig()}>Save
- }
-
-
-
- All features in this section are experimental, use with caution
-
-
-
-
-
-
-
-
- Close Sockets On Connect
-
-
-
- This feature will attempt to close TCP sockets when the VPN connects, preventing network leakage outside the VPN connection. Currently this feature only works on Windows
-
+
+
+
+ {props.advancedMode &&
+
+
+
+
+
+
+ {user &&
+ Other
+ {user &&
+ UpdateUser()}>Save
+ }
+
+
+ }
+
+ {user &&
+ Account ID
+ {user._id}
+
+
+ }
+
+ {(user && props.advancedMode) &&
+ <>
+ {inputs["APIKey"] &&
+ Cash Payment Code
+ {user.CashCode}
+
+
+ }
+ API Key
+ {inputs["APIKey"].APIKey}
+
+
+
+ }
+
+ {props.state?.LogPath &&
+ CreateApiKey()} >Refresh API Key
+
+
+ }
+
+ {props.state?.ConfigPath &&
+ Log File
+
+ {props.state.LogFileName}
+
+
+
+ }
+ {props.state?.C?.RouterFilePath !== "" &&
+ Config Backup
+
+ {props.state.ConfigPath}
+
+
+
+ }
+
+ Router File
+
+ {props.state?.C?.RouterFilePath}
+
+
+
+
+ }
+
+
+
+
+
+
+
+ Experimental Features
+ {user &&
+ UpdateConfig()}>Save
+ }
+
+
+
+ All features in this section are experimental, use with caution
+
+
+
+
+
+
+
+
+ Close Sockets On Connect
+
+
+
+ This feature will attempt to close TCP sockets when the VPN connects, preventing network leakage outside the VPN connection. Currently this feature only works on Windows
+
-
-
- ), { id: "logout", duration: 999999 }
- )
- }
-
- const ConfirmDisconnect = () => {
-
- toast.error((t) =>
- (
-
- Are you sure you want to
-
-
- Logout
-
-
-
-
-
-
- ), { id: "logout", duration: 999999 }
- )
- }
-
- let user = STORE.GetUser()
- let hasSub = false
- let needsUpdate = false
-
- if (user) {
- if (user.Version !== props.state.Version) {
- needsUpdate = true
- }
-
- if (user.SubLevel === 666) {
- hasSub = false
- } else if (user.SubLevel > 0) {
- hasSub = true
- }
- }
-
- const RenderPopovers = () => {
- return (
-
- Are you sure you want to
-
-
- Disconnect
-
-
-
-
- {needsUpdate &&
-
- )
- }
-
- if (!props.state) {
- return (
-
- A new version is available
- -
- }
-
- {(!hasSub && user) &&
- - -
OpenURL("https://nicelandvpn.is")}>Please visit the website to download the latest version
-
- No active subscription
-
- }
- -
OpenURL("https://www.nicelandvpn.is/#/pricing")} >Visit the website to subscribe
-
-
- )
- }
-
-
- return (
- setMenuTab(1)}> {`<`} Menu
- Loading state ...
-
- {RenderPopovers()}
- {props.loading &&
-
- )
+ const navigate = useNavigate();
+ const location = useLocation();
+ const [menuTab, setMenuTab] = useState(1)
+
+ let { pathname } = location
+ let sp = pathname.split("/")
+
+ const clickHandler = (path) => {
+ console.log("navigating to:", path)
+ navigate(path)
+ }
+
+ const HandleLogout = async () => {
+ props.toggleLoading({ logTag: "disconnect", tag: "LOGOUT", show: true, msg: "Disconnecting and logging out...", includeLogs: true })
+ await props.disconnectFromVPN()
+ STORE.CleanupOnLogout()
+ navigate("/login")
+ }
+
+ const ConfirmLogout = () => {
+
+ toast.error((t) =>
+ (
+
-
- }
- {!props.loading &&
-
-
- }
-
-
- {!user &&
-
- clickHandler("/login")} >
-
-
- }
- {user &&
-
- Login
-
- clickHandler("/")} >
-
- }
-
- {props.advancedMode &&
-
- <>
-
- VPNs
-
- clickHandler("/routers")} >
-
-
- {!props.stats &&
-
- Routers
-
- props.setStats(true)} >
-
- }
-
- {props.stats &&
-
- Stats
-
- props.setStats(false)} >
-
- }
-
-
-
- }
-
-
-
-
- Stats
-
- clickHandler("/settings")} >
-
-
-
- Settings
-
- clickHandler("/logs")} >
-
-
-
- Logs
-
- clickHandler("/support")} >
-
-
- {props.state?.ActiveAccessPoint &&
-
- Help
-
- ConfirmDisconnect()} >
-
- }
-
-
- {user &&
-
- Disconnect
-
- ConfirmLogout()} >
-
- }
-
-
-
- Logout
-
-
+
+
+ ), { id: "logout", duration: 999999 }
+ )
+ }
+
+ const ConfirmDisconnect = () => {
+
+ toast.error((t) =>
+ (
+
+ Are you sure you want to
+
+
+ Logout
+
+
+
+
+
+
+ ), { id: "logout", duration: 999999 }
+ )
+ }
+
+ let user = STORE.GetUser()
+ let hasSub = false
+ let needsUpdate = false
+
+ if (user) {
+ if (user.Version !== props.state.Version) {
+ needsUpdate = true
+ }
+
+ if (user.SubLevel === 666) {
+ hasSub = false
+ } else if (user.SubLevel > 0) {
+ hasSub = true
+ }
+ }
+
+ const RenderPopovers = () => {
+ return (
+
+ Are you sure you want to
+
+
+ Disconnect
+
+
+
+
+ {needsUpdate &&
+
+ )
+ }
+
+ if (!props.state) {
+ return (
+
+ A new version is available
+ +
+ }
+
+ {(!hasSub && user) &&
+ + +
OpenURL("https://nicelandvpn.is/#/download")}>Click here to download the latest version
+
+ No active subscription
+
+ }
+ +
OpenURL("https://www.nicelandvpn.is/#/pricing")} >Click here to subscribe
+
+
+ )
+ }
+
+
+ return (
+ setMenuTab(1)}> {`<`} Menu
+ Loading state ...
+
+ {RenderPopovers()}
+ {props.loading &&
+ 
+ //
+ )
}
-export default SideBar;
\ No newline at end of file
+export default SideBar;
diff --git a/frontend/src/assets/images/inf.svg b/frontend/src/assets/images/inf.svg
new file mode 100644
index 0000000..acd9199
--- /dev/null
+++ b/frontend/src/assets/images/inf.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/frontend/src/assets/images/ripple.svg b/frontend/src/assets/images/ripple.svg
new file mode 100644
index 0000000..7dc4764
--- /dev/null
+++ b/frontend/src/assets/images/ripple.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/frontend/src/assets/style/layout.scss b/frontend/src/assets/style/layout.scss
index 0720cc1..b8ee33d 100644
--- a/frontend/src/assets/style/layout.scss
+++ b/frontend/src/assets/style/layout.scss
@@ -12,6 +12,14 @@ html,
html a {
background-color: $body-dark-bg;
}
+ .big-loader {
+--wails-draggable: drag;
+position: relative;
+width: 120px;
+height: 120px;
+left: 20px;
+top: 40px;
+ }
body {
height: auto;
@@ -335,6 +343,11 @@ body::-webkit-scrollbar {
width: 300px;
.popover {
+
+ .popover-click{
+ cursor: pointer;
+ text-decoration: underline;
+ }
// margin-top: 20px;
padding: 10px;
color: $popover-color;
@@ -1109,6 +1122,11 @@ button {
font-size: 0.8em;
color: gray;
}
+
+ .offline {
+ color: rgb(151, 41, 41);
+ font-weight: bold;
+ }
}
.connected-flag {
@@ -1710,6 +1728,7 @@ button {
}
.panel {
+ max-width:500px;
margin-left: 20px;
width: 250px;
min-width: 250px;
@@ -2947,11 +2966,10 @@ button {
background: none;
background-color: none;
padding-left: 10px;
- padding-top: 10px;
+ padding-top: 6px;
z-index: 2000;
outline: none;
border: none;
color: white;
}
}
-
diff --git a/go.mod b/go.mod
index 5dc5e76..f4b4ba2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/tunnels-is/nicelandvpn-desktop
-go 1.19
+go 1.21
require (
github.com/charmbracelet/bubbles v0.16.1
@@ -8,6 +8,7 @@ require (
github.com/charmbracelet/lipgloss v0.7.1
github.com/go-ping/ping v1.1.0
github.com/miekg/dns v1.1.55
+ github.com/muesli/termenv v0.15.1
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/wailsapp/wails/v2 v2.6.0
github.com/xlzd/gotp v0.1.0
@@ -16,6 +17,8 @@ require (
golang.org/x/sys v0.13.0
)
+replace github.com/wailsapp/wails/v2 => ../wails-fork/v2
+
require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
@@ -29,6 +32,7 @@ require (
github.com/leaanthony/go-ansi-parser v1.6.0 // indirect
github.com/leaanthony/gosod v1.0.3 // indirect
github.com/leaanthony/slicer v1.6.0 // indirect
+ github.com/leaanthony/u v1.1.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
@@ -37,7 +41,6 @@ require (
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
- github.com/muesli/termenv v0.15.1 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
@@ -45,7 +48,7 @@ require (
github.com/tkrajina/go-reflector v0.5.6 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
- github.com/wailsapp/go-webview2 v1.0.1 // indirect
+ github.com/wailsapp/go-webview2 v1.0.7 // indirect
github.com/wailsapp/mimetype v1.4.1 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/mod v0.12.0 // indirect
diff --git a/go.sum b/go.sum
index 7ca3872..4be4514 100644
--- a/go.sum
+++ b/go.sum
@@ -40,6 +40,8 @@ github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRC
github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
github.com/leaanthony/slicer v1.6.0 h1:1RFP5uiPJvT93TAHi+ipd3NACobkW53yUiBqZheE/Js=
github.com/leaanthony/slicer v1.6.0/go.mod h1:o/Iz29g7LN0GqH3aMjWAe90381nyZlDNquK+mtH2Fj8=
+github.com/leaanthony/u v1.1.0 h1:2n0d2BwPVXSUq5yhe8lJPHdxevE2qK5G99PMStMZMaI=
+github.com/leaanthony/u v1.1.0/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQcaRfI=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -84,6 +86,7 @@ github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod h1:P5HUIBuIWK
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE=
github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -91,12 +94,10 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/wailsapp/go-webview2 v1.0.1 h1:dEJIeEApW/MhO2tTMISZBFZPuW7kwrFA1NtgFB1z1II=
-github.com/wailsapp/go-webview2 v1.0.1/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
+github.com/wailsapp/go-webview2 v1.0.7 h1:s95+7irJsAsTy1RsjJ6N0cYX7tZ4gP7Uzawds0L2urs=
+github.com/wailsapp/go-webview2 v1.0.7/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.6.0 h1:EyH0zR/EO6dDiqNy8qU5spaXDfkluiq77xrkabPYD4c=
-github.com/wailsapp/wails/v2 v2.6.0/go.mod h1:WBG9KKWuw0FKfoepBrr/vRlyTmHaMibWesK3yz6nNiM=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
@@ -170,3 +171,4 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index 1e1baab..e3fc2c7 100644
--- a/main.go
+++ b/main.go
@@ -17,18 +17,21 @@ import (
//go:embed all:frontend/dist
var assets embed.FS
-const VERSION = "1.1.5"
-const PRODUCTION = false
-const ENABLE_INSTERFACE = false
+const (
+ VERSION = "1.1.5"
+ PRODUCTION = true
+ ENABLE_INTERFACE = true
+)
var MONITOR = make(chan int, 200)
-var APP = NewApp()
-var SERVICE = NewService()
+var (
+ APP = NewApp()
+ SERVICE = NewService()
+)
func main() {
-
- var WebViewGPUPolicy = 0
+ WebViewGPUPolicy := 0
for i := range os.Args {
argToLower := strings.ToLower(os.Args[i])
if argToLower == "-disablegpu" {
@@ -37,7 +40,7 @@ func main() {
}
core.PRODUCTION = PRODUCTION
- core.ENABLE_INSTERFACE = ENABLE_INSTERFACE
+ core.ENABLE_INSTERFACE = ENABLE_INTERFACE
core.GLOBAL_STATE.Version = VERSION
go core.StartService(MONITOR)
@@ -105,10 +108,12 @@ func main() {
},
Debug: options.Debug{
- OpenInspectorOnStartup: !PRODUCTION,
+ OpenInspectorOnStartup: true,
},
+ // Debug: options.Debug{
+ // OpenInspectorOnStartup: !PRODUCTION,
+ // },
})
-
if err != nil {
if core.LogFile != nil {
_, _ = core.LogFile.WriteString("Unable to start the GUI(wails.io): " + err.Error())
diff --git a/service.go b/service.go
index ff5b777..5a54f0a 100644
--- a/service.go
+++ b/service.go
@@ -196,7 +196,6 @@ func (s *Service) DisableDNSWhitelist() {
func (s *Service) StartDNSCapture() {
core.StartCapturing()
- return
}
func (s *Service) StopDNSCapture() string {
@@ -225,6 +224,11 @@ func (s *Service) StopDNSCapture() string {
return ""
}
+func (s *Service) BlockedDomainLogging(enabled bool) {
+ core.GLOBAL_STATE.C.LogBlockedDomains = enabled
+ _ = core.SaveConfig()
+}
+
func (s *Service) RebuildDomainBlocklist() {
core.BuildDomainBlocklist()
+ //
+ }
+ {!props.loading &&
+
+
+ }
+
+
+ {!user &&
+
+ clickHandler("/login")} >
+
+
+ }
+ {user &&
+
+ Login
+
+ clickHandler("/")} >
+
+ }
+
+ {props.advancedMode &&
+
+ <>
+
+ VPNs
+
+ clickHandler("/routers")} >
+
+
+ {!props.stats &&
+
+ Routers
+
+ props.setStats(true)} >
+
+ }
+
+ {props.stats &&
+
+ Stats
+
+ props.setStats(false)} >
+
+ }
+
+
+
+ }
+
+
+
+
+ Stats
+
+ clickHandler("/settings")} >
+
+
+
+ Settings
+
+ clickHandler("/logs")} >
+
+
+
+ Logs
+
+ clickHandler("/support")} >
+
+
+ {props.state?.ActiveAccessPoint &&
+
+ Help
+
+ ConfirmDisconnect()} >
+
+ }
+
+
+ {user &&
+
+ Disconnect
+
+ ConfirmLogout()} >
+
+ }
+
+
+
+ Logout
+
+