-
-
{{'STATISTICS.REPO_ITEM' | translate }}
+
+
+
+
+
+
+ {{'STATISTICS.PRO_ITEM' | translate }}
+
+
+ {{'STATISTICS.REPO_ITEM' | translate }}
+
+
+
+
+
+
+
+
Storage
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.css b/src/ui_ng/src/app/shared/statictics/statistics.component.css
index 51b62a853..f308d3377 100644
--- a/src/ui_ng/src/app/shared/statictics/statistics.component.css
+++ b/src/ui_ng/src/app/shared/statictics/statistics.component.css
@@ -1,30 +1,57 @@
.statistic-wrapper {
- padding: 12px;
- margin: 12px;
- text-align: center;
+ padding: 4px;
+ margin: 4px;
+ text-align: right;
vertical-align: middle;
- height: 72px;
- min-width: 108px;
- max-width: 216px;
+ height: 30px;
display: inline-block;
}
.statistic-data {
- font-size: 48px;
- font-weight: bolder;
- font-family: "Metropolis";
- line-height: 48px;
+ font-size: 16px;
+ font-weight: 900;
+ font-family: "semibold";
+ line-height: 16px;
}
.statistic-text {
- font-size: 24px;
- font-weight: 400;
- line-height: 24px;
+ font-size: 10px;
+ line-height: 10px;
text-transform: uppercase;
- font-family: "Metropolis";
+ font-family: "semibold";
+}
+
+.statistic-column-block {
+ display: inline-block;
+ text-align: right;
}
.statistic-column-title {
position: relative;
- top: 40%;
+ text-transform: uppercase;
+ font-size: 14px;
+}
+
+.statistic-column-title-pro {
+ top: -10px;
+}
+
+.statistic-column-title-repo {
+ top: 3px;
+}
+
+.statistic-item-divider {
+ height: 54px;
+ display: inline-block;
+ width: 1px;
+ background-color: #ccc;
+ opacity: 0.55;
+ margin-left: 4px;
+ margin-right: 12px;
+ position: relative;
+ top: 3px;
+}
+
+.statistic-block {
+ display: inline-block;
}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.html b/src/ui_ng/src/app/shared/statictics/statistics.component.html
index 642ed916a..2d98c617e 100644
--- a/src/ui_ng/src/app/shared/statictics/statistics.component.html
+++ b/src/ui_ng/src/app/shared/statictics/statistics.component.html
@@ -1,4 +1,4 @@
- {{data.number}}
- {{data.label}}
+ {{data}}
+ {{label}}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.ts b/src/ui_ng/src/app/shared/statictics/statistics.component.ts
index f1e5563fb..bcb028b61 100644
--- a/src/ui_ng/src/app/shared/statictics/statistics.component.ts
+++ b/src/ui_ng/src/app/shared/statictics/statistics.component.ts
@@ -7,5 +7,6 @@ import { Component, Input } from '@angular/core';
})
export class StatisticsComponent {
- @Input() data: any;
+ @Input() label: string;
+ @Input() data: number = 0;
}
\ No newline at end of file
diff --git a/src/ui_ng/src/i18n/lang/en-lang.json b/src/ui_ng/src/i18n/lang/en-lang.json
index f1c99ff45..d1efbb68b 100644
--- a/src/ui_ng/src/i18n/lang/en-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-lang.json
@@ -110,10 +110,10 @@
"PROJECT": {
"PROJECTS": "Projects",
"NAME": "Project Name",
+ "ROLE": "Role",
"PUBLIC_OR_PRIVATE": "Public",
"REPO_COUNT": "Repositories Count",
"CREATION_TIME": "Creation Time",
- "DESCRIPTION": "Description",
"PUBLIC": "Public",
"PRIVATE": "Private",
"MAKE": "Make",
@@ -132,7 +132,10 @@
"DELETION_TITLE": "Confirm project deletion",
"DELETION_SUMMARY": "Do you want to delete project {{param}}?",
"FILTER_PLACEHOLDER": "Filter Projects",
- "REPLICATION_RULE": "Replication Rule"
+ "REPLICATION_RULE": "Replication Rule",
+ "CREATED_SUCCESS": "Created project successfully.",
+ "DELETED_SUCCESS": "Deleted project successfully.",
+ "TOGGLED_SUCCESS": "Toggled project successfully."
},
"PROJECT_DETAIL": {
"REPOSITORIES": "Repositories",
@@ -159,7 +162,10 @@
"UNKNOWN_ERROR": "Unknown error occurred while adding member.",
"FILTER_PLACEHOLDER": "Filter Members",
"DELETION_TITLE": "Confirm project member deletion",
- "DELETION_SUMMARY": "Do you want to delete project member {{param}}?"
+ "DELETION_SUMMARY": "Do you want to delete project member {{param}}?",
+ "ADDED_SUCCESS": "Added member successfully.",
+ "DELETED_SUCCESS": "Deleted member successfully.",
+ "SWITCHED_SUCCESS": "Switched member role successfully."
},
"AUDIT_LOG": {
"USERNAME": "Username",
@@ -235,7 +241,12 @@
"TOGGLE_ENABLE_TITLE": "Enable Policy",
"CONFIRM_TOGGLE_ENABLE_POLICY": "After enabling the replication policy, all repositories under the project will be replicated to the destination registry. Please confirm to continue.",
"TOGGLE_DISABLE_TITLE": "Disable Policy",
- "CONFIRM_TOGGLE_DISABLE_POLICY": "After disabling the policy, all unfinished replication jobs of this policy will be stopped and canceled. Please confirm to continue."
+ "CONFIRM_TOGGLE_DISABLE_POLICY": "After disabling the policy, all unfinished replication jobs of this policy will be stopped and canceled. Please confirm to continue.",
+ "CREATED_SUCCESS": "Created policy successfully.",
+ "UPDATED_SUCCESS": "Updated policy successfully.",
+ "DELETED_SUCCESS": "Deleted policy successfully.",
+ "DELETED_FAILED": "Deleted policy failed.",
+ "TOGGLED_SUCCESS": "Toggled policy status successfully."
},
"DESTINATION": {
"NEW_ENDPOINT": "New Endpoint",
@@ -257,7 +268,11 @@
"INVALID_NAME": "Invalid destination name.",
"FAILED_TO_GET_TARGET": "Failed to get endpoint.",
"CREATION_TIME": "Creation Time",
- "ITEMS": "item(s)"
+ "ITEMS": "item(s)",
+ "CREATED_SUCCESS": "Created destination successfully.",
+ "UPDATED_SUCCESS": "Updated destination successfully.",
+ "DELETED_SUCCESS": "Deleted destination successfully.",
+ "DELETED_FAILED": "Deleted destination failed."
},
"REPOSITORY": {
"COPY_ID": "Copy ID",
@@ -275,7 +290,7 @@
"DELETION_SUMMARY_TAG": "Do you want to delete tag {{param}}?",
"DELETION_TITLE_TAG_DENIED": "Signed Tag can't be deleted",
"DELETION_SUMMARY_TAG_DENIED": "The tag must be removed from the Notary before it can be deleted. {{param}}",
- "FILTER_FOR_REPOSITORIES": "Filter for repositories",
+ "FILTER_FOR_REPOSITORIES": "Filter Repositories",
"TAG": "Tag",
"SIGNED": "Signed",
"AUTHOR": "Author",
@@ -286,7 +301,9 @@
"SHOW_DETAILS": "Show Details",
"REPOSITORIES": "Repositories",
"ITEMS": "item(s)",
- "POP_REPOS": "Popular Repositories"
+ "POP_REPOS": "Popular Repositories",
+ "DELETED_REPO_SUCCESS": "Deleted repository successfully.",
+ "DELETED_TAG_SUCCESS": "Deleted tag successfully."
},
"ALERT": {
"FORM_CHANGE_CONFIRMATION": "Some changes are not saved yet, do you really want to cancel?"
@@ -310,7 +327,7 @@
"EMAIL": "Email",
"SYSTEM": "System Settings",
"CONFIRM_TITLE": "Confirm to cancel",
- "CONFIRM_SUMMARY": "Some changes are not saved yet, do you really want to leave?",
+ "CONFIRM_SUMMARY": "Some changes are not saved yet, do you really want to discard?",
"SAVE_SUCCESS": "Configurations have been successfully saved",
"MAIL_SERVER": "Email Server",
"MAIL_SERVER_PORT": "Email Server Port",
@@ -386,7 +403,8 @@
"IN_PROGRESS": "Search...",
"BACK": "Back"
},
- "UNKNOWN_ERROR": "Some unknown errors HAVE occurred. Please try again later",
+ "UNKNOWN_ERROR": "Unknown errors have occurred. Please try again later",
"UNAUTHORIZED_ERROR": "Your session is invalid or has expired. You need to sign in to continue the operation",
- "FORBIDDEN_ERROR": "You are not allowed to perform this operation"
+ "FORBIDDEN_ERROR": "You are not allowed to perform this operation",
+ "GENERAL_ERROR": "Errors have occurred when performing service call: {{param}}"
}
\ No newline at end of file
diff --git a/src/ui_ng/src/i18n/lang/zh-lang.json b/src/ui_ng/src/i18n/lang/zh-lang.json
index bd2b0ef05..3250b2369 100644
--- a/src/ui_ng/src/i18n/lang/zh-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-lang.json
@@ -110,10 +110,10 @@
"PROJECT": {
"PROJECTS": "项目",
"NAME": "项目名称",
+ "ROLE": "角色",
"PUBLIC_OR_PRIVATE": "公开",
"REPO_COUNT": "镜像仓库数",
"CREATION_TIME": "创建时间",
- "DESCRIPTION": "描述",
"PUBLIC": "公开",
"PRIVATE": "私有",
"MAKE": "设为",
@@ -132,7 +132,10 @@
"DELETION_TITLE": "删除项目确认",
"DELETION_SUMMARY": "你确认删除项目 {{param}}？",
"FILTER_PLACEHOLDER": "过滤项目",
- "REPLICATION_RULE": "复制策略"
+ "REPLICATION_RULE": "复制策略",
+ "CREATED_SUCCESS": "创建项目成功。",
+ "DELETED_SUCCESS": "删除项目成功。",
+ "TOGGLED_SUCCESS": "切换状态成功。"
},
"PROJECT_DETAIL": {
"REPOSITORIES": "镜像仓库",
@@ -159,7 +162,10 @@
"UNKNOWN_ERROR": "添加成员时发生未知错误。",
"FILTER_PLACEHOLDER": "过滤成员",
"DELETION_TITLE": "删除项目成员确认",
- "DELETION_SUMMARY": "你确认删除项目成员 {{param}}?"
+ "DELETION_SUMMARY": "你确认删除项目成员 {{param}}?",
+ "ADDED_SUCCESS": "新增成员成功。",
+ "DELETED_SUCCESS": "删除成员成功",
+ "SWITCHED_SUCCESS": "切换角色成功"
},
"AUDIT_LOG": {
"USERNAME": "用户名",
@@ -235,7 +241,12 @@
"TOGGLE_ENABLE_TITLE": "启用策略",
"CONFIRM_TOGGLE_ENABLE_POLICY": "启用策略后，该项目下的所有镜像仓库将复制到目标实例。请确认继续。",
"TOGGLE_DISABLE_TITLE": "停用策略",
- "CONFIRM_TOGGLE_DISABLE_POLICY": "停用策略后，所有未完成的复制任务将被终止和取消。请确认继续。"
+ "CONFIRM_TOGGLE_DISABLE_POLICY": "停用策略后，所有未完成的复制任务将被终止和取消。请确认继续。",
+ "CREATED_SUCCESS": "创建复制策略成功。",
+ "UPDATED_SUCCESS": "更新复制策略成功。",
+ "DELETED_SUCCESS": "删除复制策略成功。",
+ "DELETED_FAILED": "删除复制策略失败。",
+ "TOGGLED_SUCCESS": "切换复制策略状态成功。"
},
"DESTINATION": {
"NEW_ENDPOINT": "新建目标",
@@ -257,7 +268,11 @@
"INVALID_NAME": "无效的目标名称。",
"FAILED_TO_GET_TARGET": "获取目标失败。",
"CREATION_TIME": "创建时间",
- "ITEMS": "条记录"
+ "ITEMS": "条记录",
+ "CREATED_SUCCESS": "创建目标成功。",
+ "UPDATED_SUCCESS": "更新目标成功。",
+ "DELETED_SUCCESS": "删除目标成功。",
+ "DELETED_FAILED": "删除目标失败。"
},
"REPOSITORY": {
"COPY_ID": "复制ID",
@@ -286,7 +301,9 @@
"SHOW_DETAILS": "显示详细",
"REPOSITORIES": "镜像仓库",
"ITEMS": "条记录",
- "POP_REPOS": "受欢迎的镜像库"
+ "POP_REPOS": "受欢迎的镜像库",
+ "DELETED_REPO_SUCCESS": "删除镜像仓库成功。",
+ "DELETED_TAG_SUCCESS": "删除镜像标签成功。"
},
"ALERT": {
"FORM_CHANGE_CONFIRMATION": "表单内容改变，确认取消?"
@@ -378,8 +395,8 @@
"TITLE": "统计",
"PRO_ITEM": "项目",
"REPO_ITEM": "镜像库",
- "INDEX_MY": "私有的",
- "INDEX_PUB": "公开的",
+ "INDEX_MY": "私有",
+ "INDEX_PUB": "公开",
"INDEX_TOTAL": "总计"
},
"SEARCH": {
@@ -388,5 +405,6 @@
},
"UNKNOWN_ERROR": "发生未知错误,请稍后再试",
"UNAUTHORIZED_ERROR": "会话无效或者已经过期, 请重新登录以继续",
- "FORBIDDEN_ERROR": "当前操作被禁止，请确认你有合法的权限"
+ "FORBIDDEN_ERROR": "当前操作被禁止，请确认你有合法的权限",
+ "GENERAL_ERROR": "调用后台服务时出现错误: {{param}}"
}
\ No newline at end of file
diff --git a/tests/startuptest.go b/tests/startuptest.go
deleted file mode 100644
index 5330b45b5..000000000
--- a/tests/startuptest.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Fetch prints the content found at a URL.
-package main
-
-import (
- "crypto/tls"
- "fmt"
- "io/ioutil"
- "net/http"
- "os"
- "strings"
- "time"
-)
-
-func main() {
- time.Sleep(60 * time.Second)
- tr := &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
- }
- var client = &http.Client{
- Timeout: time.Second * 30,
- Transport: tr,
- }
-
- for _, url := range os.Args[1:] {
-
- resp, err := client.Get(url)
- if err != nil {
- fmt.Fprintf(os.Stderr, "fetch: %v\n", err)
- os.Exit(1)
- }
- b, err := ioutil.ReadAll(resp.Body)
- resp.Body.Close()
- if err != nil {
- fmt.Fprintf(os.Stderr, "fetch: reading %s: %v\n", url, err)
- os.Exit(1)
- }
- // fmt.Printf("%s", b)
-
- if strings.Contains(string(b), "Harbor") {
- fmt.Printf("sucess!\n")
- } else {
- fmt.Println("the response does not contain \"Harbor\"!")
-
- fmt.Println(string(b))
- os.Exit(1)
- }
-
- }
-}
diff --git a/tests/startuptest.sh b/tests/startuptest.sh
new file mode 100755
index 000000000..7a41cd768
--- /dev/null
+++ b/tests/startuptest.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set +e
+
+TIMEOUT=12
+while [ $TIMEOUT -gt 0 ]; do
+ STATUS=$(curl --insecure -s -o /dev/null -w '%{http_code}' https://localhost/)
+ if [ $STATUS -eq 200 ]; then
+ break
+ fi
+ TIMEOUT=$(($TIMEOUT - 1))
+ sleep 5
+done
+
+if [ $TIMEOUT -eq 0 ]; then
+ echo "Harbor cannot reach within one minute."
+ exit 1
+fi
+
+curl --insecure -s -L -H "Accept: application/json" https://localhost/ | grep "Harbor" > /dev/null
+if [ $? -eq 0 ]; then
+ echo "Harbor is running success."
+else
+ echo "Harbor is running fail."
+ exit 1
+fi
+
+