-
-
{{'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 7faa7e7df..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",
@@ -290,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",
diff --git a/src/ui_ng/src/i18n/lang/zh-lang.json b/src/ui_ng/src/i18n/lang/zh-lang.json
index efac765dc..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": "设为",
@@ -395,8 +395,8 @@
"TITLE": "统计",
"PRO_ITEM": "项目",
"REPO_ITEM": "镜像库",
- "INDEX_MY": "私有的",
- "INDEX_PUB": "公开的",
+ "INDEX_MY": "私有",
+ "INDEX_PUB": "公开",
"INDEX_TOTAL": "总计"
},
"SEARCH": {
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
+
+