forked from FreeTubeApp/FreeTube
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into custom-builds/tmp
* development: (35 commits) Shrink mime-db even further (FreeTubeApp#6659) * Update play next recommended video setting to be "by default" (FreeTubeApp#6400) Miscellaneous performance improvements (FreeTubeApp#6658) Bump stylelint in the stylelint group across 1 directory (FreeTubeApp#6660) Bump the stylelint group across 1 directory with 4 updates (FreeTubeApp#6605) Fixes FreeTubeApp#5476: Adjusted z-index for tooltips to avoid overlapping with bars (FreeTubeApp#6656) Bump shaka-player from 4.12.8 to 4.13.0 (FreeTubeApp#6649) Migrate ProfileSettings, FtProfileBubble and FtProfileEdit to the composition API (FreeTubeApp#6639) Translated using Weblate (Arabic) Bump the eslint group with 4 updates (FreeTubeApp#6645) Bump bgutils-js from 3.1.2 to 3.1.3 (FreeTubeApp#6650) Translated using Weblate (Arabic) Translated using Weblate (Arabic) Bump electron from 34.0.0 to 34.0.1 (FreeTubeApp#6648) Bump lefthook from 1.10.9 to 1.10.10 (FreeTubeApp#6647) Bump the babel group with 2 updates (FreeTubeApp#6644) Translated using Weblate (Arabic) Avoid logging an error when a player cache entry does not exist (FreeTubeApp#6640) Move saving screenshots to the default folder to an IPC call (FreeTubeApp#6636) Replace rimraf dev dependency with clean script (FreeTubeApp#6638) ...
- Loading branch information
Showing
60 changed files
with
2,168 additions
and
1,530 deletions.
There are no files selected for viewing
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,10 @@ | ||
| import { rm } from 'fs/promises' | ||
| import { join } from 'path' | ||
|
|
||
| const BUILD_PATH = join(import.meta.dirname, '..', 'build') | ||
| const DIST_PATH = join(import.meta.dirname, '..', 'dist') | ||
|
|
||
| await Promise.all([ | ||
| rm(BUILD_PATH, { recursive: true, force: true }), | ||
| rm(DIST_PATH, { recursive: true, force: true }) | ||
| ]) |
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
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
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
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
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
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
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
File renamed without changes.
74 changes: 74 additions & 0 deletions
74
src/renderer/components/FtProfileBubble/FtProfileBubble.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,74 @@ | ||
| <template> | ||
| <div | ||
| class="bubblePadding" | ||
| tabindex="0" | ||
| role="button" | ||
| :aria-labelledby="id" | ||
| @click="click" | ||
| @keydown.space.enter.prevent="click" | ||
| > | ||
| <div | ||
| class="bubble" | ||
| :style="{ background: backgroundColor, color: textColor }" | ||
| > | ||
| <div class="initial"> | ||
| {{ profileInitial }} | ||
| </div> | ||
| </div> | ||
| <div | ||
| :id="id" | ||
| class="profileName" | ||
| > | ||
| {{ translatedProfileName }} | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup> | ||
| import { computed } from 'vue' | ||
| import { useId } from '../../composables/use-id-polyfill' | ||
| import { useI18n } from '../../composables/use-i18n-polyfill' | ||
| import { getFirstCharacter } from '../../helpers/strings' | ||
| const props = defineProps({ | ||
| profileName: { | ||
| type: String, | ||
| required: true | ||
| }, | ||
| isMainProfile: { | ||
| type: Boolean, | ||
| required: true | ||
| }, | ||
| backgroundColor: { | ||
| type: String, | ||
| required: true | ||
| }, | ||
| textColor: { | ||
| type: String, | ||
| required: true | ||
| } | ||
| }) | ||
| const { locale, t } = useI18n() | ||
| const id = useId() | ||
| const translatedProfileName = computed(() => { | ||
| return props.isMainProfile ? t('Profile.All Channels') : props.profileName | ||
| }) | ||
| const profileInitial = computed(() => { | ||
| return props.profileName | ||
| ? getFirstCharacter(translatedProfileName.value, locale.value).toUpperCase() | ||
| : '' | ||
| }) | ||
| const emit = defineEmits(['click']) | ||
| function click() { | ||
| emit('click') | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped src="./FtProfileBubble.css" /> |
File renamed without changes.
Oops, something went wrong.