Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tarun/disable some options #2

Merged
merged 7 commits into from
May 31, 2024
Merged

Tarun/disable some options #2

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5bdf873
disabled settings (firewall, split tunnel, wifi control, antitracker,…
May 18, 2024
7e7af68
removed options of firewall & antitracker from home ui
May 18, 2024
ffb8caf
removed map and maximise button from home ui
May 18, 2024
0059359
redirect "add more time" to privateline.io
May 18, 2024
4dab5ac
removed map component
May 18, 2024
04fc4d2
updated privateLine link in allowed URLs
May 18, 2024
e3f460f
Merge branch 'master' into tarun/disable-some-options
swapnilsparsh May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ui/src/components/blocks/block-connection-details.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- FIREWALL -->

<OnOffButtonControl
<!-- <OnOffButtonControl
v-bind:class="{ lowOpacity: IsPaused }"
text="Firewall"
:onTextClick="onShowFirewallConfig"
Expand All @@ -29,10 +29,10 @@
: null
"
:isProgress="firewallIsProgress"
/>
/> -->

<!-- ANTITRACKER -->
<div class="horizontalLine" />
<!-- <div class="horizontalLine" />
<OnOffButtonControl
text="AntiTracker"
Expand All @@ -51,10 +51,10 @@
this.$store.state.settings.antiTracker?.Hardcore ? '#77152a' : null
"
:isProgress="antitrackerIsProgress"
/>
/> -->

<!-- PROTOCOL -->
<div class="horizontalLine" />
<!-- <div class="horizontalLine" /> -->

<SelectButtonControl
class="leftPanelBlock"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/settings/settings-account.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export default {
sender.shellOpenExternal(`https://www.ivpn.net/account`);
},
addMoreTime() {
sender.shellOpenExternal(`https://www.ivpn.net/account`);
sender.shellOpenExternal(`https://privateline.io/`);
},
},
computed: {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default {
UpdateWindowWidth: 600,

// shellOpenExternal(...) allows only URLs started with this prefix
URLsAllowedPrefixes: ["https://www.ivpn.net/", "https://ivpn.net/", "x-apple.systempreferences:"],
URLsAllowedPrefixes: ["https://privateline.io/", "x-apple.systempreferences:"],
URLApps: "https://www.ivpn.net/apps/",

IsDebug,
Expand Down
5 changes: 2 additions & 3 deletions ui/src/views/Component-Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="leftPanelTopSpace">
<transition name="smooth-display">
<div
v-if="isMinimizedButtonsVisible"
class="minimizedButtonsPanel leftPanelTopMinimizedButtonsPanel"
v-bind:class="{
minimizedButtonsPanelRightElements: isWindowHasFrame,
Expand All @@ -18,9 +17,9 @@
<img src="@/assets/settings.svg" />
</button>

<button v-on:click="onMaximize(true)" title="Show map">
<!-- <button v-on:click="onMaximize(true)" title="Show map">
<img src="@/assets/maximize.svg" />
</button>
</button> -->
</div>
</transition>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/Component-Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
>
Connection
</button>
<button
<!-- <button
v-if="isLoggedIn"
class="noBordersBtn tabTitleBtn"
v-on:click="onView('firewall')"
Expand Down Expand Up @@ -107,7 +107,7 @@
}"
>
Advanced
</button>
</button> -->

<!--
<button
Expand Down
Loading