-
Notifications
You must be signed in to change notification settings - Fork 842
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.
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
Migrate ExperimentalSettings and ParentalControlSettings to the composition API #6088
Open
absidue
wants to merge
1
commit into
FreeTubeApp:development
Choose a base branch
from
absidue:experimental-parental-settings-composition-api
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+153
−146
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
78 changes: 78 additions & 0 deletions
78
src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<template> | ||
<FtSettingsSection | ||
:title="$t('Settings.Experimental Settings.Experimental Settings')" | ||
> | ||
<p class="experimental-warning"> | ||
{{ $t('Settings.Experimental Settings.Warning') }} | ||
</p> | ||
<FtFlexBox> | ||
<FtToggleSwitch | ||
tooltip-position="top" | ||
:label="$t('Settings.Experimental Settings.Replace HTTP Cache')" | ||
compact | ||
:default-value="replaceHttpCache" | ||
:disabled="replaceHttpCacheLoading" | ||
:tooltip="$t('Tooltips.Experimental Settings.Replace HTTP Cache')" | ||
@change="handleRestartPrompt" | ||
/> | ||
</FtFlexBox> | ||
<FtPrompt | ||
v-if="showRestartPrompt" | ||
:label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')" | ||
:option-names="[$t('Yes, Restart'), $t('Cancel')]" | ||
:option-values="['restart', 'cancel']" | ||
@click="handleReplaceHttpCache" | ||
/> | ||
</FtSettingsSection> | ||
</template> | ||
|
||
<script setup> | ||
import { onMounted, ref } from 'vue' | ||
|
||
import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' | ||
import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' | ||
import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' | ||
import FtPrompt from '../ft-prompt/ft-prompt.vue' | ||
|
||
import { IpcChannels } from '../../../constants' | ||
|
||
const replaceHttpCacheLoading = ref(false) | ||
const replaceHttpCache = ref(false) | ||
const showRestartPrompt = ref(false) | ||
|
||
onMounted(async () => { | ||
if (process.env.IS_ELECTRON) { | ||
const { ipcRenderer } = require('electron') | ||
replaceHttpCache.value = await ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE) | ||
} | ||
|
||
replaceHttpCacheLoading.value = false | ||
}) | ||
|
||
/** | ||
* @param {boolean} value | ||
*/ | ||
function handleRestartPrompt(value) { | ||
replaceHttpCache.value = value | ||
showRestartPrompt.value = true | ||
} | ||
|
||
/** | ||
* @param {'restart' | 'cancel' | null} value | ||
*/ | ||
function handleReplaceHttpCache(value) { | ||
showRestartPrompt.value = false | ||
|
||
if (value === null || value === 'cancel') { | ||
replaceHttpCache.value = !replaceHttpCache.value | ||
return | ||
} | ||
|
||
if (process.env.IS_ELECTRON) { | ||
const { ipcRenderer } = require('electron') | ||
ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE) | ||
} | ||
} | ||
</script> | ||
|
||
<style scoped src="./ExperimentalSettings.css" /> |
72 changes: 72 additions & 0 deletions
72
src/renderer/components/ParentalControlSettings/ParentalControlSettings.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<template> | ||
<FtSettingsSection | ||
:title="$t('Settings.Parental Control Settings.Parental Control Settings')" | ||
> | ||
<div class="switchColumnGrid"> | ||
<div class="switchColumn"> | ||
<FtToggleSwitch | ||
:label="$t('Settings.Parental Control Settings.Hide Unsubscribe Button')" | ||
compact | ||
:default-value="hideUnsubscribeButton" | ||
@change="updateHideUnsubscribeButton" | ||
/> | ||
<FtToggleSwitch | ||
:label="$t('Settings.Parental Control Settings.Show Family Friendly Only')" | ||
compact | ||
:default-value="showFamilyFriendlyOnly" | ||
@change="updateShowFamilyFriendlyOnly" | ||
/> | ||
</div> | ||
<div class="switchColumn"> | ||
<FtToggleSwitch | ||
:label="$t('Settings.Parental Control Settings.Hide Search Bar')" | ||
compact | ||
:default-value="hideSearchBar" | ||
@change="updateHideSearchBar" | ||
/> | ||
</div> | ||
</div> | ||
</FtSettingsSection> | ||
</template> | ||
|
||
<script setup> | ||
import { computed } from 'vue' | ||
|
||
import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' | ||
import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' | ||
|
||
import store from '../../store/index' | ||
|
||
const hideSearchBar = computed(() => { | ||
return store.getters.getHideSearchBar | ||
}) | ||
|
||
const hideUnsubscribeButton = computed(() => { | ||
return store.getters.getHideUnsubscribeButton | ||
}) | ||
|
||
const showFamilyFriendlyOnly = computed(() => { | ||
return store.getters.getShowFamilyFriendlyOnly | ||
}) | ||
|
||
/** | ||
* @param {boolean} value | ||
*/ | ||
function updateHideSearchBar(value) { | ||
store.dispatch('updateHideSearchBar', value) | ||
} | ||
|
||
/** | ||
* @param {boolean} value | ||
*/ | ||
function updateHideUnsubscribeButton(value) { | ||
store.dispatch('updateHideUnsubscribeButton', value) | ||
} | ||
|
||
/** | ||
* @param {boolean} value | ||
*/ | ||
function updateShowFamilyFriendlyOnly(value) { | ||
store.dispatch('updateShowFamilyFriendlyOnly', value) | ||
} | ||
</script> |
51 changes: 0 additions & 51 deletions
51
src/renderer/components/experimental-settings/experimental-settings.js
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
src/renderer/components/experimental-settings/experimental-settings.vue
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
src/renderer/components/parental-control-settings/parental-control-settings.js
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
src/renderer/components/parental-control-settings/parental-control-settings.vue
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Default value changed?