mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 08:47:42 -05:00
f6c0c39f1a
1. The previous color contrast calculation function was incorrect at least for the `#84b6eb` where it output low-contrast white instead of black. I've rewritten these functions now to accept hex colors and to match GitHub's calculation and to output pure white/black for maximum contrast. Before and after: <img width="94" alt="Screenshot 2024-04-02 at 01 53 46" src="https://github.com/go-gitea/gitea/assets/115237/00b39e15-a377-4458-95cf-ceec74b78228"><img width="90" alt="Screenshot 2024-04-02 at 01 51 30" src="https://github.com/go-gitea/gitea/assets/115237/1677067a-8d8f-47eb-82c0-76330deeb775"> 2. Fix project-related issues: - Expose the new `ContrastColor` function as template helper and use it for project cards, replacing the previous JS solution which eliminates a flash of wrong color on page load. - Fix a bug where if editing a project title, the counter would get lost. - Move `rgbToHex` function to color utils. Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Giteabot <teabot@gitea.io> --- Conflict resolution: Trivial. (cherry picked from commit 36887ed3921d03f1864360c95bd2ecf853bfbe72)
119 lines
3.7 KiB
Vue
119 lines
3.7 KiB
Vue
<script>
|
|
import {SvgIcon} from '../svg.js';
|
|
import {contrastColor} from '../utils/color.js';
|
|
import {GET} from '../modules/fetch.js';
|
|
import {emojiHTML} from '../features/emoji.js';
|
|
import {htmlEscape} from 'escape-goat';
|
|
|
|
const {appSubUrl, i18n} = window.config;
|
|
|
|
export default {
|
|
components: {SvgIcon},
|
|
data: () => ({
|
|
loading: false,
|
|
issue: null,
|
|
i18nErrorOccurred: i18n.error_occurred,
|
|
i18nErrorMessage: null,
|
|
}),
|
|
computed: {
|
|
createdAt() {
|
|
return new Date(this.issue.created_at).toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'});
|
|
},
|
|
|
|
body() {
|
|
const body = this.issue.body.replace(/\n+/g, ' ');
|
|
if (body.length > 85) {
|
|
return `${body.substring(0, 85)}…`;
|
|
}
|
|
return body;
|
|
},
|
|
|
|
icon() {
|
|
if (this.issue.pull_request !== null) {
|
|
if (this.issue.state === 'open') {
|
|
if (this.issue.pull_request.draft === true) {
|
|
return 'octicon-git-pull-request-draft'; // WIP PR
|
|
}
|
|
return 'octicon-git-pull-request'; // Open PR
|
|
} else if (this.issue.pull_request.merged === true) {
|
|
return 'octicon-git-merge'; // Merged PR
|
|
}
|
|
return 'octicon-git-pull-request'; // Closed PR
|
|
} else if (this.issue.state === 'open') {
|
|
return 'octicon-issue-opened'; // Open Issue
|
|
}
|
|
return 'octicon-issue-closed'; // Closed Issue
|
|
},
|
|
|
|
color() {
|
|
if (this.issue.pull_request !== null) {
|
|
if (this.issue.pull_request.draft === true) {
|
|
return 'grey'; // WIP PR
|
|
} else if (this.issue.pull_request.merged === true) {
|
|
return 'purple'; // Merged PR
|
|
}
|
|
}
|
|
if (this.issue.state === 'open') {
|
|
return 'green'; // Open Issue
|
|
}
|
|
return 'red'; // Closed Issue
|
|
},
|
|
|
|
labels() {
|
|
return this.issue.labels.map((label) => ({
|
|
name: htmlEscape(label.name).replaceAll(/:[-+\w]+:/g, (emoji) => {
|
|
return emojiHTML(emoji.substring(1, emoji.length - 1));
|
|
}),
|
|
color: `#${label.color}`,
|
|
textColor: contrastColor(`#${label.color}`),
|
|
}));
|
|
},
|
|
},
|
|
mounted() {
|
|
this.$refs.root.addEventListener('ce-load-context-popup', (e) => {
|
|
const data = e.detail;
|
|
if (!this.loading && this.issue === null) {
|
|
this.load(data);
|
|
}
|
|
});
|
|
},
|
|
methods: {
|
|
async load(data) {
|
|
this.loading = true;
|
|
this.i18nErrorMessage = null;
|
|
|
|
try {
|
|
const response = await GET(`${appSubUrl}/${data.owner}/${data.repo}/issues/${data.index}/info`);
|
|
const respJson = await response.json();
|
|
if (!response.ok) {
|
|
this.i18nErrorMessage = respJson.message ?? i18n.network_error;
|
|
return;
|
|
}
|
|
this.issue = respJson;
|
|
} catch {
|
|
this.i18nErrorMessage = i18n.network_error;
|
|
} finally {
|
|
this.loading = false;
|
|
}
|
|
},
|
|
},
|
|
};
|
|
</script>
|
|
<template>
|
|
<div ref="root">
|
|
<div v-if="loading" class="tw-h-12 tw-w-12 is-loading"/>
|
|
<div v-if="!loading && issue !== null" id="issue-info-popup">
|
|
<p><small>{{ issue.repository.full_name }} on {{ createdAt }}</small></p>
|
|
<p><svg-icon :name="icon" :class="['text', color]"/> <strong>{{ issue.title }}</strong> #{{ issue.number }}</p>
|
|
<p>{{ body }}</p>
|
|
<div class="labels-list">
|
|
<!-- eslint-disable-next-line vue/no-v-html -->
|
|
<div v-for="label in labels" :key="label.name" class="ui label" :style="{ color: label.textColor, backgroundColor: label.color }" v-html="label.name"/>
|
|
</div>
|
|
</div>
|
|
<div v-if="!loading && issue === null">
|
|
<p><small>{{ i18nErrorOccurred }}</small></p>
|
|
<p>{{ i18nErrorMessage }}</p>
|
|
</div>
|
|
</div>
|
|
</template>
|