mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-06-05 17:08:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2024-11-25 20:34:30 +00:00
commit 0404d7ef27
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
web/src/components/atomic/Icon.vue
View file

@ -52,6 +52,9 @@
<SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="24" /> <SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="24" />
<SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="24" /> <SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="24" />
<SvgIcon v-else-if="name === 'visibility-private'" :path="mdiLockOutline" size="24" />
<SvgIcon v-else-if="name === 'visibility-internal'" :path="mdiLockOpenOutline" size="24" />
<SvgIcon v-else-if="name === 'forgejo'" :path="siForgejo.path" size="32" /> <SvgIcon v-else-if="name === 'forgejo'" :path="siForgejo.path" size="32" />
<SvgIcon v-else-if="name === 'gitea'" :path="siGitea.path" size="32" /> <SvgIcon v-else-if="name === 'gitea'" :path="siGitea.path" size="32" />
@ -102,6 +105,8 @@ import {
mdiGithub, mdiGithub,
mdiGitlab, mdiGitlab,
mdiHelpCircleOutline, mdiHelpCircleOutline,
mdiLockOpenOutline,
mdiLockOutline,
mdiMinusCircleOutline, mdiMinusCircleOutline,
mdiPackageVariant, mdiPackageVariant,
mdiPause, mdiPause,
@ -176,7 +181,9 @@ export type IconNames =
| 'attention' | 'attention'
| 'spinner' | 'spinner'
| 'error' | 'error'
| 'remove'; | 'remove'
| 'visibility-private'
| 'visibility-internal';
defineProps<{ defineProps<{
name: IconNames; name: IconNames;

16
web/src/components/repo/RepoItem.vue
View file

@ -6,8 +6,19 @@
> >
<div class="grid grid-cols-[auto,1fr] gap-y-4 items-center"> <div class="grid grid-cols-[auto,1fr] gap-y-4 items-center">
<div class="text-wp-text-100 text-lg">{{ `${repo.owner} / ${repo.name}` }}</div> <div class="text-wp-text-100 text-lg">{{ `${repo.owner} / ${repo.name}` }}</div>
<div class="ml-auto"> <div class="ml-auto text-wp-text-100">
<Badge v-if="repo.visibility === RepoVisibility.Public" :label="$t('repo.visibility.public.public')" /> <div
v-if="repo.visibility === RepoVisibility.Private"
:title="`${$t('repo.visibility.visibility')}: ${$t(`repo.visibility.private.private`)}`"
>
<Icon name="visibility-private" />
</div>
<div
v-else-if="repo.visibility === RepoVisibility.Internal"
:title="`${$t('repo.visibility.visibility')}: ${$t(`repo.visibility.internal.internal`)}`"
>
<Icon name="visibility-internal" />
</div>
</div> </div>
<div class="col-span-2 text-wp-text-100 flex w-full gap-x-4"> <div class="col-span-2 text-wp-text-100 flex w-full gap-x-4">
@ -34,7 +45,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed } from 'vue'; import { computed } from 'vue';
import Badge from '~/components/atomic/Badge.vue';
import Icon from '~/components/atomic/Icon.vue'; import Icon from '~/components/atomic/Icon.vue';
import PipelineStatusIcon from '~/components/repo/pipeline/PipelineStatusIcon.vue'; import PipelineStatusIcon from '~/components/repo/pipeline/PipelineStatusIcon.vue';
import usePipeline from '~/compositions/usePipeline'; import usePipeline from '~/compositions/usePipeline';