From f6bf3c723e486dca0338aad17f517d40cb6ef183 Mon Sep 17 00:00:00 2001 From: colorfulberry Date: Thu, 28 May 2020 15:55:24 +0800 Subject: [PATCH 01/37] feat: add base dataset list --- .../templates/repo/datasets/dataset_list.tmpl | 81 ++++++++++ custom/templates/repo/datasets/index.tmpl | 31 ++++ custom/templates/repo/header.tmpl | 153 ++++++++++++++++++ routers/repo/dataset.go | 96 +++++++++++ routers/routes/routes.go | 3 + templates/repo/datasets/dataset_list.tmpl | 0 templates/repo/datasets/index.tmpl | 0 web_src/less/_dataset.less | 14 ++ 8 files changed, 378 insertions(+) create mode 100644 custom/templates/repo/datasets/dataset_list.tmpl create mode 100644 custom/templates/repo/datasets/index.tmpl create mode 100644 custom/templates/repo/header.tmpl create mode 100644 routers/repo/dataset.go create mode 100644 templates/repo/datasets/dataset_list.tmpl create mode 100644 templates/repo/datasets/index.tmpl diff --git a/custom/templates/repo/datasets/dataset_list.tmpl b/custom/templates/repo/datasets/dataset_list.tmpl new file mode 100644 index 000000000..0dc7b8791 --- /dev/null +++ b/custom/templates/repo/datasets/dataset_list.tmpl @@ -0,0 +1,81 @@ +
+
+
+
+ 深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
+
+
+
+
+ 深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
+
+
+
+
+ 深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
diff --git a/custom/templates/repo/datasets/index.tmpl b/custom/templates/repo/datasets/index.tmpl new file mode 100644 index 000000000..e6404f548 --- /dev/null +++ b/custom/templates/repo/datasets/index.tmpl @@ -0,0 +1,31 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+ {{template "base/alert" .}} + +
+
+ {{template "repo/datasets/dataset_list"}} +
+ {{template "base/paginate" .}} +
+
+{{template "base/footer" .}} diff --git a/custom/templates/repo/header.tmpl b/custom/templates/repo/header.tmpl new file mode 100644 index 000000000..2ba9b31c8 --- /dev/null +++ b/custom/templates/repo/header.tmpl @@ -0,0 +1,153 @@ +
+{{with .Repository}} +
+
+ + {{if not .IsBeingCreated}} +
+
+ {{$.CsrfTokenHtml}} +
+ + + {{.NumWatches}} + +
+
+
+ {{$.CsrfTokenHtml}} +
+ + + {{.NumStars}} + +
+
+ {{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}} + + {{end}} +
+ {{end}} +
+
+{{end}} +
+ {{if not .Repository.IsBeingCreated}} + + {{end}} +
+
+
diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go new file mode 100644 index 000000000..0d2f93a91 --- /dev/null +++ b/routers/repo/dataset.go @@ -0,0 +1,96 @@ +package repo + +import ( + "errors" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "github.com/unknwon/com" +) + +const ( + tplIndex base.TplName = "repo/datasets/index" +) + +func DatasetIndex(ctx *context.Context) { + ctx.Data["PageIsDataset"] = true + // ctx.Data["Title"] = ctx.Tr("dataset.show_dataset") + + // user := ctx.User + // dataset, err := models.GetOwnerDatasetByID(ctx.ParamsInt64((":id")), user) + // if err != nil { + // ctx.NotFound("GetDataset", err) + // return + // } + + // err = models.GeDatasetAttachments(dataset) + // if err != nil { + // ctx.ServerError("GetDatasetAttachments", err) + // return + // } + + // isOwner := (ctx.User != nil && dataset.UserID == user.ID) + + // ctx.Data["dataset"] = dataset + // ctx.Data["IsOwner"] = isOwner + + ctx.HTML(200, tplIndex) +} + +func EditDatasetPost(ctx *context.Context, form auth.EditDatasetForm) { + ctx.Data["Title"] = ctx.Tr("dataset.edit_dataset") + + rel, err := models.GetDatasetByID(ctx.ParamsInt64(":id")) + if err != nil { + ctx.ServerError("GetDataset", err) + return + } + isOwner := (ctx.User != nil && rel.UserID == ctx.User.ID) + if !isOwner { + ctx.NotFound("403", errors.New("not owner")) + return + } + ctx.Data["ID"] = rel.ID + ctx.Data["title"] = rel.Title + ctx.Data["description"] = rel.Description + ctx.Data["category"] = rel.Category + ctx.Data["task"] = rel.Task + ctx.Data["license"] = rel.License + ctx.Data["private"] = rel.IsPrivate() + + if ctx.HasError() { + ctx.HTML(200, tplCreate) + return + } + + var attachmentUUIDs []string + if setting.Attachment.Enabled { + attachmentUUIDs = form.Files + } + + status := models.DatasetStatusPublic + if form.Private { + status = models.DatasetStatusPrivate + } + + rel.Title = form.Title + rel.Status = status + rel.Description = form.Description + rel.Category = form.Category + rel.Task = form.Task + rel.License = form.License + if err = models.UpdateDataset(models.DefaultDBContext(), rel); err != nil { + log.Error("%v", err) + } + + if err = models.AddDatasetAttachments(rel.ID, attachmentUUIDs); err != nil { + log.Error("%v", err) + } + log.Trace("Dataset updated: %d", rel.ID) + + ctx.Redirect(setting.AppSubURL + "/datasets/" + com.ToStr(rel.ID)) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index f7d2f1d1e..ac3077995 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -762,6 +762,9 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/status", reqRepoIssuesOrPullsWriter, repo.UpdateIssueStatus) m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation) }, context.RepoMustNotBeArchived()) + m.Group("/datasets", func() { + m.Get("", repo.DatasetIndex) + }, context.RepoMustNotBeArchived()) m.Group("/comments/:id", func() { m.Post("", repo.UpdateCommentContent) m.Post("/delete", repo.DeleteComment) diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl new file mode 100644 index 000000000..e69de29bb diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl new file mode 100644 index 000000000..e69de29bb diff --git a/web_src/less/_dataset.less b/web_src/less/_dataset.less index e804e3d46..1c3f7ca26 100644 --- a/web_src/less/_dataset.less +++ b/web_src/less/_dataset.less @@ -136,6 +136,20 @@ } } } + .item { + padding-top: 15px; + padding-bottom: 10px; + border-bottom: 1px dashed #aaaaaa; + } + .ui.grid>.row { + align-items: center; + } + .title { + color: #444444; + font-size: 16px; + font-weight: bold; + margin: 0 6px; + } } .ui.dataset.list { .item { From de910e42d633b07310b3c9cc2aac35c7e5f25686 Mon Sep 17 00:00:00 2001 From: colorfulberry Date: Thu, 28 May 2020 16:17:43 +0800 Subject: [PATCH 02/37] feat: add form for the ui --- .../templates/repo/datasets/dataset_list.tmpl | 81 ------------------- custom/templates/repo/datasets/index.tmpl | 31 ------- templates/repo/datasets/dataset.tmpl | 9 +++ templates/repo/datasets/dataset_list.tmpl | 81 +++++++++++++++++++ templates/repo/datasets/index.tmpl | 37 +++++++++ 5 files changed, 127 insertions(+), 112 deletions(-) delete mode 100644 custom/templates/repo/datasets/dataset_list.tmpl delete mode 100644 custom/templates/repo/datasets/index.tmpl create mode 100644 templates/repo/datasets/dataset.tmpl diff --git a/custom/templates/repo/datasets/dataset_list.tmpl b/custom/templates/repo/datasets/dataset_list.tmpl deleted file mode 100644 index 0dc7b8791..000000000 --- a/custom/templates/repo/datasets/dataset_list.tmpl +++ /dev/null @@ -1,81 +0,0 @@ -
-
-
-
- 深度学习数据集视频1.1.0 -
-
-
- 12GB -
- -
- berry5 天前创建 -
- -
-
- -
- -
-
-
- 删除 -
-
-
-
-
-
-
- 深度学习数据集视频1.1.0 -
-
-
- 12GB -
- -
- berry5 天前创建 -
- -
-
- -
- -
-
-
- 删除 -
-
-
-
-
-
-
- 深度学习数据集视频1.1.0 -
-
-
- 12GB -
- -
- berry5 天前创建 -
- -
-
- -
- -
-
-
- 删除 -
-
-
diff --git a/custom/templates/repo/datasets/index.tmpl b/custom/templates/repo/datasets/index.tmpl deleted file mode 100644 index e6404f548..000000000 --- a/custom/templates/repo/datasets/index.tmpl +++ /dev/null @@ -1,31 +0,0 @@ -{{template "base/head" .}} -
- {{template "repo/header" .}} -
- {{template "base/alert" .}} - -
-
- {{template "repo/datasets/dataset_list"}} -
- {{template "base/paginate" .}} -
-
-{{template "base/footer" .}} diff --git a/templates/repo/datasets/dataset.tmpl b/templates/repo/datasets/dataset.tmpl new file mode 100644 index 000000000..89aa9b427 --- /dev/null +++ b/templates/repo/datasets/dataset.tmpl @@ -0,0 +1,9 @@ +
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index e69de29bb..2d671e1be 100644 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -0,0 +1,81 @@ +
+
+
+
+ {{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
+
+
+
+
+ {{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
+
+
+
+
+ {{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0 +
+
+
+ 12GB +
+ +
+ berry5 天前创建 +
+ +
+
+ +
+ +
+
+
+ 删除 +
+
+
\ No newline at end of file diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index e69de29bb..c88e7e50c 100644 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -0,0 +1,37 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+ {{template "base/alert" .}} + +
+
+ {{template "repo/datasets/dataset_list" .}} +
+
+
+
+ {{template "repo/datasets/dataset" .}} +
+
+
+
+
+{{template "base/footer" .}} From 6d6516d29aeb06ce25641f5d1ec4632177eece68 Mon Sep 17 00:00:00 2001 From: colorfulberry Date: Thu, 28 May 2020 18:54:04 +0800 Subject: [PATCH 03/37] feat: add right set for the data --- templates/repo/datasets/dataset.tmpl | 3 +- templates/repo/datasets/dataset_list.tmpl | 12 ++--- templates/repo/datasets/index.tmpl | 27 +++++++--- templates/repo/datasets/right_side.tmpl | 65 +++++++++++++++++++++++ 4 files changed, 91 insertions(+), 16 deletions(-) create mode 100644 templates/repo/datasets/right_side.tmpl diff --git a/templates/repo/datasets/dataset.tmpl b/templates/repo/datasets/dataset.tmpl index 89aa9b427..5661e9b19 100644 --- a/templates/repo/datasets/dataset.tmpl +++ b/templates/repo/datasets/dataset.tmpl @@ -5,5 +5,4 @@
-
- \ No newline at end of file + diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 2d671e1be..35d1c684a 100644 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -1,6 +1,6 @@
-
+
{{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0
@@ -13,7 +13,7 @@ berry5 天前创建
-
+
@@ -27,7 +27,7 @@
-
+
{{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0
@@ -40,7 +40,7 @@ berry5 天前创建
-
+
@@ -54,7 +54,7 @@
-
+
{{svg "octicon-file-directory" 16}}深度学习数据集视频1.1.0
@@ -67,7 +67,7 @@ berry5 天前创建
-
+
diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index c88e7e50c..4afe13083 100644 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -22,16 +22,27 @@
-
- {{template "repo/datasets/dataset_list" .}} -
-
-
-
- {{template "repo/datasets/dataset" .}} -
+
+
+
+
+ {{template "repo/datasets/dataset_list" .}} +
+
+
+
+ {{template "repo/datasets/dataset" .}} +
+
+
+
+
+ {{template "repo/datasets/right_side" .}} +
+ +
{{template "base/footer" .}} diff --git a/templates/repo/datasets/right_side.tmpl b/templates/repo/datasets/right_side.tmpl new file mode 100644 index 000000000..1ec0b734b --- /dev/null +++ b/templates/repo/datasets/right_side.tmpl @@ -0,0 +1,65 @@ +
+
+ 数据集设置 +
+
+ +
+ {{.i18n.Tr "repo.issues.new.no_milestone"}} +
+ {{if .dataset.Category}} + {{$.i18n.Tr (printf "dataset.category.%s" .dataset.Category)}} + {{end}} +
+
+
+ +
+ {{.i18n.Tr "repo.issues.new.no_milestone"}} + +
+
+ +
+ {{.i18n.Tr "repo.issues.new.no_milestone"}} +
+ {{if .dataset.License}} + {{.dataset.License}} + {{end}} +
+
+
\ No newline at end of file From d8dcc06f9c6cc51a68db66e185954670eeaf7da8 Mon Sep 17 00:00:00 2001 From: colorfulberry Date: Fri, 29 May 2020 10:25:03 +0800 Subject: [PATCH 04/37] feat: improve the pages for js --- templates/repo/datasets/index.tmpl | 67 +++++++++++++++++++++--------- web_src/js/index.js | 12 ++++++ 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 4afe13083..b24c4abca 100644 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -1,30 +1,61 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}} -
- {{template "base/alert" .}} -
+
+ {{template "base/alert" .}} +
-

{{.i18n.Tr "datasets"}}

+

{{.i18n.Tr "datasets"}}

+
+ No Description +
+
+ + +
+
{{template "repo/datasets/dataset_list" .}}
@@ -41,8 +72,6 @@
- - -
+
{{template "base/footer" .}} diff --git a/web_src/js/index.js b/web_src/js/index.js index c6f90d7ab..63d04699c 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1086,6 +1086,18 @@ async function initRepository() { initReactionSelector(); } + // Datasets + if ($('.repository.dataset-list.view').length > 0) { + const editContentToggle = function () { + $('#dataset-content').toggle(); + $('#dataset-content-edit').toggle(); + $('#dataset-content input').focus(); + return false; + }; + $('#dataset-edit').on('click', editContentToggle); + $('#cancel').on('click', editContentToggle); + } + // Diff if ($('.repository.diff').length > 0) { $('.diff-counter').each(function () { From 99afa87a042d692e5f5dbea659c876dcf0633a6a Mon Sep 17 00:00:00 2001 From: colorfulberry Date: Fri, 29 May 2020 11:08:14 +0800 Subject: [PATCH 05/37] add the html support for the js --- templates/repo/datasets/index.tmpl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index b24c4abca..25c08c735 100644 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -1,18 +1,19 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+ + {{.CsrfTokenHtml}} {{template "base/alert" .}}
-

{{.i18n.Tr "datasets"}}

+

{{.dataset.Title}}

- No Description + {{.dataset.Description}}
@@ -20,11 +21,11 @@