Skip to content

Commit 456632d

Browse files
wxiaoguangwxiaoguang
committed
fix code
1 parent a87571f commit 456632d

File tree

7 files changed

+83
-79
lines changed

7 files changed

+83
-79
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ cpu.out
7676
/public/css
7777
/public/fonts
7878
/public/img/webpack
79+
/public/assets/js
80+
/public/assets/css
81+
/public/assets/fonts
82+
/public/assets/img/webpack
7983
/vendor
8084
/web_src/fomantic/node_modules
8185
/web_src/fomantic/build/*

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ FOMANTIC_WORK_DIR := web_src/fomantic
116116

117117
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
118118
WEBPACK_CONFIGS := webpack.config.js
119-
WEBPACK_DEST := public/js/index.js public/css/index.css
120-
WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack
119+
WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
120+
WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts public/assets/img/webpack
121121

122122
BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
123123
BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
124124

125125
GENERATED_GO_DEST := modules/charset/invisible_gen.go modules/charset/ambiguous_gen.go
126126

127-
SVG_DEST_DIR := public/img/svg
127+
SVG_DEST_DIR := public/assets/img/svg
128128

129129
AIR_TMP_DIR := .air
130130

‎build/generate-svg.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ async function processFile(file, {prefix, fullName} = {}) {
4444
],
4545
});
4646

47-
await writeFile(fileURLToPath(new URL(`../public/img/svg/${name}.svg`, import.meta.url)), data);
47+
await writeFile(fileURLToPath(new URL(`../public/assets/img/svg/${name}.svg`, import.meta.url)), data);
4848
}
4949

5050
function processFiles(pattern, opts) {
@@ -53,13 +53,13 @@ function processFiles(pattern, opts) {
5353

5454
async function main() {
5555
try {
56-
await mkdir(fileURLToPath(new URL('../public/img/svg', import.meta.url)), {recursive: true});
56+
await mkdir(fileURLToPath(new URL('../public/assets/img/svg', import.meta.url)), {recursive: true});
5757
} catch {}
5858

5959
await Promise.all([
6060
...processFiles('node_modules/@primer/octicons/build/svg/*-16.svg', {prefix: 'octicon'}),
6161
...processFiles('web_src/svg/*.svg'),
62-
...processFiles('public/img/gitea.svg', {fullName: 'gitea-gitea'}),
62+
...processFiles('public/assets/img/gitea.svg', {fullName: 'gitea-gitea'}),
6363
]);
6464
}
6565

‎modules/public/public.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func setWellKnownContentType(w http.ResponseWriter, file string) {
7373

7474
func handleRequest(w http.ResponseWriter, req *http.Request, fs http.FileSystem, file string) bool {
7575
// actually, fs (http.FileSystem) is designed to be a safe interface, relative paths won't bypass its parent directory, it's also fine to do a clean here
76-
f, err := fs.Open(util.PathJoinRelX(file))
76+
f, err := fs.Open(util.PathJoinRelX("assets", file))
7777
if err != nil {
7878
if os.IsNotExist(err) {
7979
return false

‎modules/svg/svg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const defaultSize = 16
2727

2828
// Init discovers SVGs and populates the `SVGs` variable
2929
func Init() error {
30-
files, err := public.AssetFS().ListFiles("img/svg")
30+
files, err := public.AssetFS().ListFiles("assets/img/svg")
3131
if err != nil {
3232
return err
3333
}
@@ -38,7 +38,7 @@ func Init() error {
3838
if path.Ext(file) != ".svg" {
3939
continue
4040
}
41-
bs, err := public.AssetFS().ReadFile("img/svg", file)
41+
bs, err := public.AssetFS().ReadFile("assets/img/svg", file)
4242
if err != nil {
4343
log.Error("Failed to read SVG file %s: %v", file, err)
4444
} else {

‎web_src/js/svg.js

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
import {h} from 'vue';
2-
import giteaDoubleChevronLeft from '../../public/img/svg/gitea-double-chevron-left.svg';
3-
import giteaDoubleChevronRight from '../../public/img/svg/gitea-double-chevron-right.svg';
4-
import giteaEmptyCheckbox from '../../public/img/svg/gitea-empty-checkbox.svg';
5-
import giteaExclamation from '../../public/img/svg/gitea-exclamation.svg';
6-
import octiconArchive from '../../public/img/svg/octicon-archive.svg';
7-
import octiconArrowSwitch from '../../public/img/svg/octicon-arrow-switch.svg';
8-
import octiconBlocked from '../../public/img/svg/octicon-blocked.svg';
9-
import octiconBold from '../../public/img/svg/octicon-bold.svg';
10-
import octiconCheck from '../../public/img/svg/octicon-check.svg';
11-
import octiconCheckbox from '../../public/img/svg/octicon-checkbox.svg';
12-
import octiconCheckCircleFill from '../../public/img/svg/octicon-check-circle-fill.svg';
13-
import octiconChevronDown from '../../public/img/svg/octicon-chevron-down.svg';
14-
import octiconChevronLeft from '../../public/img/svg/octicon-chevron-left.svg';
15-
import octiconChevronRight from '../../public/img/svg/octicon-chevron-right.svg';
16-
import octiconClock from '../../public/img/svg/octicon-clock.svg';
17-
import octiconCode from '../../public/img/svg/octicon-code.svg';
18-
import octiconColumns from '../../public/img/svg/octicon-columns.svg';
19-
import octiconCopy from '../../public/img/svg/octicon-copy.svg';
20-
import octiconDiffAdded from '../../public/img/svg/octicon-diff-added.svg';
21-
import octiconDiffModified from '../../public/img/svg/octicon-diff-modified.svg';
22-
import octiconDiffRemoved from '../../public/img/svg/octicon-diff-removed.svg';
23-
import octiconDiffRenamed from '../../public/img/svg/octicon-diff-renamed.svg';
24-
import octiconDotFill from '../../public/img/svg/octicon-dot-fill.svg';
25-
import octiconDownload from '../../public/img/svg/octicon-download.svg';
26-
import octiconEye from '../../public/img/svg/octicon-eye.svg';
27-
import octiconFile from '../../public/img/svg/octicon-file.svg';
28-
import octiconFileDirectoryFill from '../../public/img/svg/octicon-file-directory-fill.svg';
29-
import octiconFilter from '../../public/img/svg/octicon-filter.svg';
30-
import octiconGear from '../../public/img/svg/octicon-gear.svg';
31-
import octiconGitBranch from '../../public/img/svg/octicon-git-branch.svg';
32-
import octiconGitMerge from '../../public/img/svg/octicon-git-merge.svg';
33-
import octiconGitPullRequest from '../../public/img/svg/octicon-git-pull-request.svg';
34-
import octiconHeading from '../../public/img/svg/octicon-heading.svg';
35-
import octiconHorizontalRule from '../../public/img/svg/octicon-horizontal-rule.svg';
36-
import octiconImage from '../../public/img/svg/octicon-image.svg';
37-
import octiconIssueClosed from '../../public/img/svg/octicon-issue-closed.svg';
38-
import octiconIssueOpened from '../../public/img/svg/octicon-issue-opened.svg';
39-
import octiconItalic from '../../public/img/svg/octicon-italic.svg';
40-
import octiconKebabHorizontal from '../../public/img/svg/octicon-kebab-horizontal.svg';
41-
import octiconLink from '../../public/img/svg/octicon-link.svg';
42-
import octiconListOrdered from '../../public/img/svg/octicon-list-ordered.svg';
43-
import octiconListUnordered from '../../public/img/svg/octicon-list-unordered.svg';
44-
import octiconLock from '../../public/img/svg/octicon-lock.svg';
45-
import octiconMeter from '../../public/img/svg/octicon-meter.svg';
46-
import octiconMilestone from '../../public/img/svg/octicon-milestone.svg';
47-
import octiconMirror from '../../public/img/svg/octicon-mirror.svg';
48-
import octiconOrganization from '../../public/img/svg/octicon-organization.svg';
49-
import octiconPlay from '../../public/img/svg/octicon-play.svg';
50-
import octiconPlus from '../../public/img/svg/octicon-plus.svg';
51-
import octiconProject from '../../public/img/svg/octicon-project.svg';
52-
import octiconQuote from '../../public/img/svg/octicon-quote.svg';
53-
import octiconRepo from '../../public/img/svg/octicon-repo.svg';
54-
import octiconRepoForked from '../../public/img/svg/octicon-repo-forked.svg';
55-
import octiconRepoTemplate from '../../public/img/svg/octicon-repo-template.svg';
56-
import octiconRss from '../../public/img/svg/octicon-rss.svg';
57-
import octiconScreenFull from '../../public/img/svg/octicon-screen-full.svg';
58-
import octiconSearch from '../../public/img/svg/octicon-search.svg';
59-
import octiconSidebarCollapse from '../../public/img/svg/octicon-sidebar-collapse.svg';
60-
import octiconSidebarExpand from '../../public/img/svg/octicon-sidebar-expand.svg';
61-
import octiconSkip from '../../public/img/svg/octicon-skip.svg';
62-
import octiconStar from '../../public/img/svg/octicon-star.svg';
63-
import octiconStrikethrough from '../../public/img/svg/octicon-strikethrough.svg';
64-
import octiconSync from '../../public/img/svg/octicon-sync.svg';
65-
import octiconTable from '../../public/img/svg/octicon-table.svg';
66-
import octiconTag from '../../public/img/svg/octicon-tag.svg';
67-
import octiconTriangleDown from '../../public/img/svg/octicon-triangle-down.svg';
68-
import octiconX from '../../public/img/svg/octicon-x.svg';
69-
import octiconXCircleFill from '../../public/img/svg/octicon-x-circle-fill.svg';
2+
import giteaDoubleChevronLeft from '../../public/assets/img/svg/gitea-double-chevron-left.svg';
3+
import giteaDoubleChevronRight from '../../public/assets/img/svg/gitea-double-chevron-right.svg';
4+
import giteaEmptyCheckbox from '../../public/assets/img/svg/gitea-empty-checkbox.svg';
5+
import giteaExclamation from '../../public/assets/img/svg/gitea-exclamation.svg';
6+
import octiconArchive from '../../public/assets/img/svg/octicon-archive.svg';
7+
import octiconArrowSwitch from '../../public/assets/img/svg/octicon-arrow-switch.svg';
8+
import octiconBlocked from '../../public/assets/img/svg/octicon-blocked.svg';
9+
import octiconBold from '../../public/assets/img/svg/octicon-bold.svg';
10+
import octiconCheck from '../../public/assets/img/svg/octicon-check.svg';
11+
import octiconCheckbox from '../../public/assets/img/svg/octicon-checkbox.svg';
12+
import octiconCheckCircleFill from '../../public/assets/img/svg/octicon-check-circle-fill.svg';
13+
import octiconChevronDown from '../../public/assets/img/svg/octicon-chevron-down.svg';
14+
import octiconChevronLeft from '../../public/assets/img/svg/octicon-chevron-left.svg';
15+
import octiconChevronRight from '../../public/assets/img/svg/octicon-chevron-right.svg';
16+
import octiconClock from '../../public/assets/img/svg/octicon-clock.svg';
17+
import octiconCode from '../../public/assets/img/svg/octicon-code.svg';
18+
import octiconColumns from '../../public/assets/img/svg/octicon-columns.svg';
19+
import octiconCopy from '../../public/assets/img/svg/octicon-copy.svg';
20+
import octiconDiffAdded from '../../public/assets/img/svg/octicon-diff-added.svg';
21+
import octiconDiffModified from '../../public/assets/img/svg/octicon-diff-modified.svg';
22+
import octiconDiffRemoved from '../../public/assets/img/svg/octicon-diff-removed.svg';
23+
import octiconDiffRenamed from '../../public/assets/img/svg/octicon-diff-renamed.svg';
24+
import octiconDotFill from '../../public/assets/img/svg/octicon-dot-fill.svg';
25+
import octiconDownload from '../../public/assets/img/svg/octicon-download.svg';
26+
import octiconEye from '../../public/assets/img/svg/octicon-eye.svg';
27+
import octiconFile from '../../public/assets/img/svg/octicon-file.svg';
28+
import octiconFileDirectoryFill from '../../public/assets/img/svg/octicon-file-directory-fill.svg';
29+
import octiconFilter from '../../public/assets/img/svg/octicon-filter.svg';
30+
import octiconGear from '../../public/assets/img/svg/octicon-gear.svg';
31+
import octiconGitBranch from '../../public/assets/img/svg/octicon-git-branch.svg';
32+
import octiconGitMerge from '../../public/assets/img/svg/octicon-git-merge.svg';
33+
import octiconGitPullRequest from '../../public/assets/img/svg/octicon-git-pull-request.svg';
34+
import octiconHeading from '../../public/assets/img/svg/octicon-heading.svg';
35+
import octiconHorizontalRule from '../../public/assets/img/svg/octicon-horizontal-rule.svg';
36+
import octiconImage from '../../public/assets/img/svg/octicon-image.svg';
37+
import octiconIssueClosed from '../../public/assets/img/svg/octicon-issue-closed.svg';
38+
import octiconIssueOpened from '../../public/assets/img/svg/octicon-issue-opened.svg';
39+
import octiconItalic from '../../public/assets/img/svg/octicon-italic.svg';
40+
import octiconKebabHorizontal from '../../public/assets/img/svg/octicon-kebab-horizontal.svg';
41+
import octiconLink from '../../public/assets/img/svg/octicon-link.svg';
42+
import octiconListOrdered from '../../public/assets/img/svg/octicon-list-ordered.svg';
43+
import octiconListUnordered from '../../public/assets/img/svg/octicon-list-unordered.svg';
44+
import octiconLock from '../../public/assets/img/svg/octicon-lock.svg';
45+
import octiconMeter from '../../public/assets/img/svg/octicon-meter.svg';
46+
import octiconMilestone from '../../public/assets/img/svg/octicon-milestone.svg';
47+
import octiconMirror from '../../public/assets/img/svg/octicon-mirror.svg';
48+
import octiconOrganization from '../../public/assets/img/svg/octicon-organization.svg';
49+
import octiconPlay from '../../public/assets/img/svg/octicon-play.svg';
50+
import octiconPlus from '../../public/assets/img/svg/octicon-plus.svg';
51+
import octiconProject from '../../public/assets/img/svg/octicon-project.svg';
52+
import octiconQuote from '../../public/assets/img/svg/octicon-quote.svg';
53+
import octiconRepo from '../../public/assets/img/svg/octicon-repo.svg';
54+
import octiconRepoForked from '../../public/assets/img/svg/octicon-repo-forked.svg';
55+
import octiconRepoTemplate from '../../public/assets/img/svg/octicon-repo-template.svg';
56+
import octiconRss from '../../public/assets/img/svg/octicon-rss.svg';
57+
import octiconScreenFull from '../../public/assets/img/svg/octicon-screen-full.svg';
58+
import octiconSearch from '../../public/assets/img/svg/octicon-search.svg';
59+
import octiconSidebarCollapse from '../../public/assets/img/svg/octicon-sidebar-collapse.svg';
60+
import octiconSidebarExpand from '../../public/assets/img/svg/octicon-sidebar-expand.svg';
61+
import octiconSkip from '../../public/assets/img/svg/octicon-skip.svg';
62+
import octiconStar from '../../public/assets/img/svg/octicon-star.svg';
63+
import octiconStrikethrough from '../../public/assets/img/svg/octicon-strikethrough.svg';
64+
import octiconSync from '../../public/assets/img/svg/octicon-sync.svg';
65+
import octiconTable from '../../public/assets/img/svg/octicon-table.svg';
66+
import octiconTag from '../../public/assets/img/svg/octicon-tag.svg';
67+
import octiconTriangleDown from '../../public/assets/img/svg/octicon-triangle-down.svg';
68+
import octiconX from '../../public/assets/img/svg/octicon-x.svg';
69+
import octiconXCircleFill from '../../public/assets/img/svg/octicon-x-circle-fill.svg';
7070

7171
const svgs = {
7272
'gitea-double-chevron-left': giteaDoubleChevronLeft,

‎webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default {
8484
},
8585
devtool: false,
8686
output: {
87-
path: fileURLToPath(new URL('public', import.meta.url)),
87+
path: fileURLToPath(new URL('public/assets', import.meta.url)),
8888
filename: () => 'js/[name].js',
8989
chunkFilename: ({chunk}) => {
9090
const language = (/monaco.*languages?_.+?_(.+?)_/.exec(chunk.id) || [])[1];
@@ -147,7 +147,7 @@ export default {
147147
},
148148
{
149149
test: /\.svg$/,
150-
include: fileURLToPath(new URL('public/img/svg', import.meta.url)),
150+
include: fileURLToPath(new URL('public/assets/img/svg', import.meta.url)),
151151
type: 'asset/source',
152152
},
153153
{

0 commit comments

Comments
 (0)