From d3adc0dcacf7de87b9819277e6598ac3993bbfa3 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 10 Mar 2023 15:08:07 +0800 Subject: [PATCH 1/8] refactor --- templates/user/dashboard/repolist.tmpl | 173 +++++++++++---------- web_src/js/components/DashboardRepoList.js | 123 ++++----------- web_src/js/svg.js | 22 ++- 3 files changed, 149 insertions(+), 169 deletions(-) diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 97234176bd210..16168a76b89de 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -1,80 +1,101 @@ + +
- +
diff --git a/web_src/js/components/RepoBranchTagDropdown.js b/web_src/js/components/RepoBranchTagDropdown.js index e1bf35c1294d0..a8945b82d162d 100644 --- a/web_src/js/components/RepoBranchTagDropdown.js +++ b/web_src/js/components/RepoBranchTagDropdown.js @@ -1,6 +1,5 @@ import {createApp, nextTick} from 'vue'; import $ from 'jquery'; -import {vueDelimiters} from './VueComponentLoader.js'; export function initRepoBranchTagDropdown(selector) { $(selector).each(function (dropdownIndex, elRoot) { @@ -39,7 +38,7 @@ export function initRepoBranchTagDropdown(selector) { } const view = createApp({ - delimiters: vueDelimiters, + delimiters: ['${', '}'], data() { return data; }, diff --git a/web_src/js/components/VueComponentLoader.js b/web_src/js/components/VueComponentLoader.js deleted file mode 100644 index 5f3bb237e2c5b..0000000000000 --- a/web_src/js/components/VueComponentLoader.js +++ /dev/null @@ -1,25 +0,0 @@ -import {createApp} from 'vue'; - -export const vueDelimiters = ['${', '}']; - -let vueEnvInited = false; -export function initVueEnv() { - if (vueEnvInited) return; - vueEnvInited = true; - - // As far as I could tell, this is no longer possible. - // But there seem not to be a guide what to do instead. - // const isProd = window.config.runModeIsProd; - // Vue.config.devtools = !isProd; -} - -export function initVueApp(el, opts = {}) { - if (typeof el === 'string') { - el = document.querySelector(el); - } - if (!el) return null; - - return createApp( - {delimiters: vueDelimiters, ...opts} - ).mount(el); -} diff --git a/web_src/js/index.js b/web_src/js/index.js index 3740f1d86bc13..480661118bc65 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2,7 +2,6 @@ import './bootstrap.js'; import $ from 'jquery'; -import {initVueEnv} from './components/VueComponentLoader.js'; import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue'; import {initDashboardRepoList} from './components/DashboardRepoList.vue'; @@ -100,7 +99,6 @@ $.fn.tab.settings.silent = true; // Disable the behavior of fomantic to toggle the checkbox when you press enter on a checkbox element. $.fn.checkbox.settings.enableEnterKey = false; -initVueEnv(); $(document).ready(() => { initGlobalCommon(); From 64e04941696d533256d71adede95013544d4385e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 14 Mar 2023 11:06:21 +0800 Subject: [PATCH 7/8] move svg icon to make conflict resolving easier --- web_src/js/svg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/svg.js b/web_src/js/svg.js index 83d8575bb7d61..225c81ccd7710 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -30,10 +30,10 @@ import octiconXCircleFill from '../../public/img/svg/octicon-x-circle-fill.svg'; import octiconSkip from '../../public/img/svg/octicon-skip.svg'; import octiconMeter from '../../public/img/svg/octicon-meter.svg'; import octiconBlocked from '../../public/img/svg/octicon-blocked.svg'; +import octiconFilter from '../../public/img/svg/octicon-filter.svg'; import octiconSync from '../../public/img/svg/octicon-sync.svg'; import octiconPlus from '../../public/img/svg/octicon-plus.svg'; import octiconSearch from '../../public/img/svg/octicon-search.svg'; -import octiconFilter from '../../public/img/svg/octicon-filter.svg'; import octiconArchive from '../../public/img/svg/octicon-archive.svg'; import octiconStar from '../../public/img/svg/octicon-star.svg'; import giteaDoubleChevronLeft from '../../public/img/svg/gitea-double-chevron-left.svg'; @@ -75,9 +75,9 @@ const svgs = { 'octicon-triangle-down': octiconTriangleDown, 'octicon-x': octiconX, 'octicon-x-circle-fill': octiconXCircleFill, + 'octicon-filter': octiconFilter, 'octicon-plus': octiconPlus, 'octicon-search': octiconSearch, - 'octicon-filter': octiconFilter, 'octicon-archive': octiconArchive, 'octicon-star': octiconStar, 'gitea-double-chevron-left': giteaDoubleChevronLeft, From d1870812eacc8058b30417f8a22787eb5c0e1c1f Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 14 Mar 2023 11:07:17 +0800 Subject: [PATCH 8/8] move svg icon to make conflict resolving easier --- web_src/js/svg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/svg.js b/web_src/js/svg.js index 225c81ccd7710..9eabca3fd3f45 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -30,8 +30,8 @@ import octiconXCircleFill from '../../public/img/svg/octicon-x-circle-fill.svg'; import octiconSkip from '../../public/img/svg/octicon-skip.svg'; import octiconMeter from '../../public/img/svg/octicon-meter.svg'; import octiconBlocked from '../../public/img/svg/octicon-blocked.svg'; -import octiconFilter from '../../public/img/svg/octicon-filter.svg'; import octiconSync from '../../public/img/svg/octicon-sync.svg'; +import octiconFilter from '../../public/img/svg/octicon-filter.svg'; import octiconPlus from '../../public/img/svg/octicon-plus.svg'; import octiconSearch from '../../public/img/svg/octicon-search.svg'; import octiconArchive from '../../public/img/svg/octicon-archive.svg';