mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-11 11:06:29 +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-26 19:05:39 +00:00
commit 4defcb14b8
8 changed files with 1015 additions and 1015 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,56 +1,56 @@
<!-- cSpell:ignore radiobox timelapse --> <!-- cSpell:ignore radiobox timelapse -->
<template> <template>
<SvgIcon v-if="name === 'duration'" :path="mdiTimelapse" size="24" /> <SvgIcon v-if="name === 'duration'" :path="mdiTimelapse" size="20" />
<SvgIcon v-else-if="name === 'since'" :path="mdiClockTimeEightOutline" size="24" /> <SvgIcon v-else-if="name === 'since'" :path="mdiClockTimeEightOutline" size="20" />
<SvgIcon v-else-if="name === 'push'" :path="mdiSourceBranch" size="24" /> <SvgIcon v-else-if="name === 'push'" :path="mdiSourceBranch" size="20" />
<SvgIcon v-else-if="name === 'pull-request'" :path="mdiSourcePull" size="24" /> <SvgIcon v-else-if="name === 'pull-request'" :path="mdiSourcePull" size="20" />
<SvgIcon v-else-if="name === 'pull-request-closed'" :path="mdiSourceMerge" size="24" /> <SvgIcon v-else-if="name === 'pull-request-closed'" :path="mdiSourceMerge" size="20" />
<SvgIcon v-else-if="name === 'manual-pipeline'" :path="mdiGestureTap" size="24" /> <SvgIcon v-else-if="name === 'manual-pipeline'" :path="mdiGestureTap" size="20" />
<SvgIcon v-else-if="name === 'tag'" :path="mdiTagOutline" size="24" /> <SvgIcon v-else-if="name === 'tag'" :path="mdiTagOutline" size="20" />
<SvgIcon v-else-if="name === 'deployment'" :path="mdiPackageVariant" size="24" /> <SvgIcon v-else-if="name === 'deployment'" :path="mdiPackageVariant" size="20" />
<SvgIcon v-else-if="name === 'commit'" :path="mdiSourceCommit" size="24" /> <SvgIcon v-else-if="name === 'commit'" :path="mdiSourceCommit" size="20" />
<SvgIcon v-else-if="name === 'back'" :path="mdiArrowLeft" size="24" /> <SvgIcon v-else-if="name === 'back'" :path="mdiArrowLeft" size="20" />
<SvgIcon v-else-if="name === 'github'" :path="mdiGithub" size="32" /> <SvgIcon v-else-if="name === 'github'" :path="mdiGithub" size="32" />
<SvgIcon v-else-if="name === 'repo'" :path="mdiGit" size="32" /> <SvgIcon v-else-if="name === 'repo'" :path="mdiGit" size="32" />
<SvgIcon v-else-if="name === 'settings'" :path="mdiCog" size="32" /> <SvgIcon v-else-if="name === 'settings'" :path="mdiCog" size="32" />
<SvgIcon v-else-if="name === 'trash'" :path="mdiTrashCanOutline" size="24" /> <SvgIcon v-else-if="name === 'trash'" :path="mdiTrashCanOutline" size="20" />
<SvgIcon v-else-if="name === 'status-blocked'" :path="mdiPlayCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'status-blocked'" :path="mdiPlayCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'status-declined'" :path="mdiStopCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'status-declined'" :path="mdiStopCircleOutline" size="20" />
<SvgIcon <SvgIcon
v-else-if="name === 'status-failure' || name === 'status-error' || name === 'status-killed'" v-else-if="name === 'status-failure' || name === 'status-error' || name === 'status-killed'"
type="mdi" type="mdi"
:path="mdiCloseCircleOutline" :path="mdiCloseCircleOutline"
size="24" size="20"
/> />
<SvgIcon v-else-if="name === 'status-pending'" :path="mdiRadioboxBlank" size="24" /> <SvgIcon v-else-if="name === 'status-pending'" :path="mdiRadioboxBlank" size="20" />
<SvgIcon <SvgIcon
v-else-if="name === 'status-running' || name === 'status-started'" v-else-if="name === 'status-running' || name === 'status-started'"
type="mdi" type="mdi"
:path="mdiRadioboxIndeterminateVariant" :path="mdiRadioboxIndeterminateVariant"
size="24" size="20"
/> />
<SvgIcon v-else-if="name === 'status-skipped'" :path="mdiMinusCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'status-skipped'" :path="mdiMinusCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'status-success'" :path="mdiCheckCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'status-success'" :path="mdiCheckCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'attention'" :path="mdiAlert" size="24" /> <SvgIcon v-else-if="name === 'attention'" :path="mdiAlert" size="20" />
<SvgIcon v-else-if="name === 'warning'" :path="mdiAlertOutline" size="20" /> <SvgIcon v-else-if="name === 'warning'" :path="mdiAlertOutline" size="20" />
<SvgIcon v-else-if="name === 'error'" :path="mdiAlertCircle" size="20" /> <SvgIcon v-else-if="name === 'error'" :path="mdiAlertCircle" size="20" />
<SvgIcon v-else-if="name === 'gitlab'" :path="mdiGitlab" size="32" /> <SvgIcon v-else-if="name === 'gitlab'" :path="mdiGitlab" size="32" />
<SvgIcon v-else-if="name === 'bitbucket' || name === 'bitbucket-dc'" :path="mdiBitbucket" size="32" /> <SvgIcon v-else-if="name === 'bitbucket' || name === 'bitbucket-dc'" :path="mdiBitbucket" size="32" />
<SvgIcon v-else-if="name === 'question'" :path="mdiHelpCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'question'" :path="mdiHelpCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'plus'" :path="mdiPlus" size="24" /> <SvgIcon v-else-if="name === 'plus'" :path="mdiPlus" size="20" />
<SvgIcon v-else-if="name === 'list'" :path="mdiFormatListBulleted" size="24" /> <SvgIcon v-else-if="name === 'list'" :path="mdiFormatListBulleted" size="20" />
<SvgIcon v-else-if="name === 'heal'" :path="mdiBandage" size="24" /> <SvgIcon v-else-if="name === 'heal'" :path="mdiBandage" size="20" />
<SvgIcon v-else-if="name === 'turn-off'" :path="mdiPower" size="24" /> <SvgIcon v-else-if="name === 'turn-off'" :path="mdiPower" size="20" />
<SvgIcon v-else-if="name === 'chevron-right'" :path="mdiChevronRight" size="24" /> <SvgIcon v-else-if="name === 'chevron-right'" :path="mdiChevronRight" size="20" />
<SvgIcon v-else-if="name === 'close'" :path="mdiCloseCircleOutline" size="24" /> <SvgIcon v-else-if="name === 'close'" :path="mdiCloseCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'edit'" :path="mdiPencil" size="24" /> <SvgIcon v-else-if="name === 'edit'" :path="mdiPencil" size="20" />
<SvgIcon v-else-if="name === 'download'" :path="mdiDownloadCircle" size="24" /> <SvgIcon v-else-if="name === 'download'" :path="mdiDownloadCircle" size="20" />
<SvgIcon v-else-if="name === 'stopwatch'" :path="mdiAlarm" size="24" /> <SvgIcon v-else-if="name === 'stopwatch'" :path="mdiAlarm" size="20" />
<SvgIcon v-else-if="name === 'auto-scroll'" :path="mdiDownload" size="24" /> <SvgIcon v-else-if="name === 'auto-scroll'" :path="mdiDownload" size="20" />
<SvgIcon v-else-if="name === 'auto-scroll-off'" :path="mdiDownloadOff" size="24" /> <SvgIcon v-else-if="name === 'auto-scroll-off'" :path="mdiDownloadOff" size="20" />
<SvgIcon v-else-if="name === 'pause'" :path="mdiPause" size="24" /> <SvgIcon v-else-if="name === 'pause'" :path="mdiPause" size="20" />
<SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="24" /> <SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="20" />
<SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="24" /> <SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="20" />
<SvgIcon v-else-if="name === 'visibility-private'" :path="mdiLockOutline" 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 === 'visibility-internal'" :path="mdiLockOpenOutline" size="24" />

2
web/src/components/layout/scaffold/Header.vue
View file

@ -6,7 +6,7 @@
<Container :full-width="fullWidth" class="!py-0"> <Container :full-width="fullWidth" class="!py-0">
<div class="flex w-full md:items-center flex-col py-3 gap-2 md:gap-10 md:flex-row md:justify-between"> <div class="flex w-full md:items-center flex-col py-3 gap-2 md:gap-10 md:flex-row md:justify-between">
<div <div
class="flex items-center content-start" class="flex items-center content-start min-h-10"
:class="{ :class="{
'md:flex-1': searchBoxPresent, 'md:flex-1': searchBoxPresent,
}" }"

3
web/src/components/layout/scaffold/Tabs.vue
View file

@ -13,13 +13,12 @@
v-if="isExactActive || (isActive && tab.matchChildren)" v-if="isExactActive || (isActive && tab.matchChildren)"
name="chevron-right" name="chevron-right"
class="md:hidden flex-shrink-0" class="md:hidden flex-shrink-0"
size="20"
/> />
<Icon v-else name="blank" class="md:hidden" /> <Icon v-else name="blank" class="md:hidden" />
<span <span
class="flex gap-2 items-center md:justify-center flex-row py-1 px-2 w-full min-w-20 dark:hover:bg-wp-background-100 hover:bg-wp-background-200 rounded-md" class="flex gap-2 items-center md:justify-center flex-row py-1 px-2 w-full min-w-20 dark:hover:bg-wp-background-100 hover:bg-wp-background-200 rounded-md"
> >
<Icon v-if="tab.icon" :name="tab.icon" :class="tab.iconClass" class="flex-shrink-0" size="20" /> <Icon v-if="tab.icon" :name="tab.icon" :class="tab.iconClass" class="flex-shrink-0" />
<span>{{ tab.title }}</span> <span>{{ tab.title }}</span>
<CountBadge v-if="tab.count" :value="tab.count" /> <CountBadge v-if="tab.count" :value="tab.count" />
</span> </span>

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

@ -29,7 +29,7 @@
</div> </div>
<div class="flex flex-shrink-0 gap-x-1 items-center ml-auto"> <div class="flex flex-shrink-0 gap-x-1 items-center ml-auto">
<Icon name="since" size="20" /> <Icon name="since" />
<span>{{ since }}</span> <span>{{ since }}</span>
</div> </div>
</template> </template>

1
web/src/components/repo/pipeline/PipelineStatusIcon.vue
View file

@ -5,6 +5,7 @@
> >
<Icon <Icon
:name="service ? 'settings' : `status-${status}`" :name="service ? 'settings' : `status-${status}`"
size="24"
:class="{ :class="{
'text-wp-state-error-100': pipelineStatusColors[status] === 'red', 'text-wp-state-error-100': pipelineStatusColors[status] === 'red',
'text-wp-state-neutral-100': pipelineStatusColors[status] === 'gray', 'text-wp-state-neutral-100': pipelineStatusColors[status] === 'gray',

6
web/src/views/repo/pipeline/Pipeline.vue
View file

@ -11,7 +11,7 @@
<Container v-if="pipeline!.errors?.some((e) => !e.is_warning)" fill-width class="p-0"> <Container v-if="pipeline!.errors?.some((e) => !e.is_warning)" fill-width class="p-0">
<Panel> <Panel>
<div class="flex flex-col items-center text-center gap-4"> <div class="flex flex-col items-center text-center gap-4">
<Icon name="status-error" class="w-16 h-16 text-wp-state-error-100" /> <Icon name="status-error" class="w-16 h-16 text-wp-state-error-100" size="24" />
<span class="text-xl">{{ $t('repo.pipeline.we_got_some_errors') }}</span> <span class="text-xl">{{ $t('repo.pipeline.we_got_some_errors') }}</span>
<Button color="red" :text="$t('repo.pipeline.show_errors')" :to="{ name: 'repo-pipeline-errors' }" /> <Button color="red" :text="$t('repo.pipeline.show_errors')" :to="{ name: 'repo-pipeline-errors' }" />
</div> </div>
@ -21,7 +21,7 @@
<Container v-else-if="pipeline!.status === 'blocked'" fill-width class="p-0"> <Container v-else-if="pipeline!.status === 'blocked'" fill-width class="p-0">
<Panel> <Panel>
<div class="flex flex-col items-center gap-4"> <div class="flex flex-col items-center gap-4">
<Icon name="status-blocked" class="w-16 h-16" /> <Icon name="status-blocked" size="24" class="w-16 h-16" />
<span class="text-xl">{{ $t('repo.pipeline.protected.awaits') }}</span> <span class="text-xl">{{ $t('repo.pipeline.protected.awaits') }}</span>
<div v-if="repoPermissions!.push" class="flex gap-2 flex-wrap items-center justify-center"> <div v-if="repoPermissions!.push" class="flex gap-2 flex-wrap items-center justify-center">
<Button <Button
@ -44,7 +44,7 @@
<Container v-else-if="pipeline!.status === 'declined'" fill-width class="p-0"> <Container v-else-if="pipeline!.status === 'declined'" fill-width class="p-0">
<Panel> <Panel>
<div class="flex flex-col items-center gap-4"> <div class="flex flex-col items-center gap-4">
<Icon name="status-declined" class="w-16 h-16 text-wp-state-error-100" /> <Icon name="status-declined" size="24" class="w-16 h-16 text-wp-state-error-100" />
<p class="text-xl">{{ $t('repo.pipeline.protected.declined') }}</p> <p class="text-xl">{{ $t('repo.pipeline.protected.declined') }}</p>
</div> </div>
</Panel> </Panel>