Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update webapp menu layout and doc #1682

Merged
merged 4 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[![QQ](https://img.shields.io/badge/QQ-236915833-orange)](https://jq.qq.com/?_wv=1027&k=aVIVB2K9)
[![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)

**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) Global | [hertzbeat.com](https://hertzbeat.com) China**
**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)**


## 🎡 <font color="green">Introduction</font>
Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)


**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) 全球网络 | [hertzbeat.com](https://hertzbeat.com) 中国网络**
**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)**


## 🎡 <font color="green">介绍</font>
Expand Down
2 changes: 1 addition & 1 deletion home/docs/introduce.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ slug: /
[![QQ](https://img.shields.io/badge/QQ-236915833-orange)](https://jq.qq.com/?_wv=1027&k=aVIVB2K9)
[![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)

**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) Global | [hertzbeat.com](https://hertzbeat.com) China**
**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)**

## 🎡 <font color="green">Introduction</font>

Expand Down
10 changes: 0 additions & 10 deletions home/sidebars.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,9 @@
"label": "quickstart",
"items": [
"introduce",
{
"type": "link",
"label": "Cloud Service",
"href": "https://console.tancloud.cn"
},
"start/quickstart",
"start/docker-deploy",
"start/package-deploy",
{
"type": "link",
"label": "Install via HuaweiCloud",
"href": "https://marketplace.huaweicloud.com/contents/0477015c-ad63-4522-a308-816861769f0a#productid=OFFI863735781612109824"
},
"start/rainbond-deploy",
{
"type": "link",
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/app/layout/basic/basic.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import { CONSTANTS } from '../../shared/constants';
</div>
<div nz-menu-item routerLink="/setting/tags">
<i nz-icon nzType="tag" class="mr-sm"></i>
<span style="margin-left: 4px">{{ 'menu.extras.tags' | i18n }}</span>
<span style="margin-left: 4px">{{ 'menu.advanced.tags' | i18n }}</span>
</div>
<div nz-menu-item>
<header-i18n></header-i18n>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/app/routes/routes-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const routes: Routes = [
{
path: 'status',
component: LayoutBlankComponent,
children: [{ path: '', component: StatusPublicComponent, data: { titleI18n: 'menu.extras.status' } }]
children: [{ path: '', component: StatusPublicComponent, data: { titleI18n: 'menu.advanced.status' } }]
},
// passport
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-help-massage-show
[help_massage_content]="'collector.help' | i18n"
[guild_link]="'collector.help.link' | i18n"
[module_name]="'menu.extras.collector'"
[module_name]="'menu.advanced.collector'"
[icon_name]="'cluster'"
></app-help-massage-show>
<nz-divider></nz-divider>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-help-massage-show
[help_massage_content]="'define.help' | i18n"
[guild_link]="'define.help.link' | i18n"
[module_name]="'menu.extras.define'"
[module_name]="'menu.advanced.define'"
[icon_name]="'code'"
></app-help-massage-show>
<nz-divider></nz-divider>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/app/routes/setting/setting-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const routes: Routes = [
{ path: 'tags', component: SettingTagsComponent },
{ path: 'collector', component: CollectorComponent },
{ path: 'status', component: StatusComponent },
{ path: 'define', component: DefineComponent, data: { titleI18n: 'menu.extras.define' } },
{ path: 'define', component: DefineComponent, data: { titleI18n: 'menu.advanced.define' } },
{
path: 'settings',
component: SettingsComponent,
Expand Down
6 changes: 3 additions & 3 deletions web-app/src/app/routes/setting/status/status.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-help-massage-show
[help_massage_content]="'status.help' | i18n"
[guild_link]="'status.help.link' | i18n"
[module_name]="'menu.extras.status'"
[module_name]="'menu.advanced.status'"
[icon_name]="'mobile'"
></app-help-massage-show>
<nz-divider></nz-divider>
Expand Down Expand Up @@ -134,7 +134,7 @@
<button *ngIf="statusOrg?.id != undefined && statusOrg?.name != undefined" nz-button nzType="primary">
<a routerLink="/status" target="_blank">
<i nz-icon nzType="link" nzTheme="outline"></i>
{{ statusOrg.name + ' ' + ('menu.extras.status' | i18n) }}
{{ statusOrg.name + ' ' + ('menu.advanced.status' | i18n) }}
</a>
</button>
</div>
Expand Down Expand Up @@ -222,7 +222,7 @@
<button *ngIf="statusOrg?.id != undefined && statusOrg?.name != undefined" nz-button nzType="primary">
<a routerLink="/status" target="_blank">
<i nz-icon nzType="link" nzTheme="outline"></i>
{{ statusOrg.name + ' ' + ('menu.extras.status' | i18n) }}
{{ statusOrg.name + ' ' + ('menu.advanced.status' | i18n) }}
</a>
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/app/routes/setting/tags/tags.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-help-massage-show
[help_massage_content]="'tag.help' | i18n"
[guild_link]="'tag.help.link' | i18n"
[module_name]="'menu.extras.tags'"
[module_name]="'menu.advanced.tags'"
[icon_name]="'tags'"
></app-help-massage-show>
<nz-divider></nz-divider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class StatusPublicComponent implements OnInit {
switchMap((message: Message<StatusPageOrg>) => {
if (message.code === 0) {
this.statusOrg = message.data;
this.titleService.setTitle(`${this.statusOrg.name} ${this.i18nSvc.fanyi('menu.extras.status')}`);
this.titleService.setTitle(`${this.statusOrg.name} ${this.i18nSvc.fanyi('menu.advanced.status')}`);
} else {
this.statusOrg = new StatusPageOrg();
console.log(message.msg);
Expand Down
22 changes: 15 additions & 7 deletions web-app/src/assets/app-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,39 +154,47 @@
]
},
{
"text": "More",
"i18n": "menu.extras",
"text": "Advanced",
"i18n": "menu.advanced",
"group": true,
"hideInBreadcrumb": true,
"children": [
{
"text": "status",
"i18n": "menu.extras.status",
"i18n": "menu.advanced.status",
"icon": "anticon-mobile",
"link": "/setting/status",
"badgeDot": true,
"badge": 1
},
{
"text": "collector",
"i18n": "menu.extras.collector",
"i18n": "menu.advanced.collector",
"icon": "anticon-cluster",
"link": "/setting/collector"
},
{
"text": "tags",
"i18n": "menu.extras.tags",
"i18n": "menu.advanced.tags",
"icon": "anticon-tags",
"link": "/setting/tags"
},
{
"text": "define",
"i18n": "menu.extras.define",
"i18n": "menu.advanced.define",
"icon": "anticon-code",
"link": "/setting/define",
"badgeDot": true,
"badge": 1
},
}
]
},
{
"text": "More",
"i18n": "menu.extras",
"group": true,
"hideInBreadcrumb": true,
"children": [
{
"text": "settings",
"i18n": "menu.extras.settings",
Expand Down
11 changes: 7 additions & 4 deletions web-app/src/assets/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@
"silence": "Alarm Silence",
"dispatch": "Notification"
},
"extras": {
"": "More",
"advanced": {
"": "Advanced",
"collector": "Collector Cluster",
"tags": "Tags Manage",
"define": "Monitor Template",
"status": "Status Page"
},
"extras": {
"": "More",
"help": "Help Center",
"setting": "Setting",
"settings": "Settings",
"about": "About",
"status": "Status Page"
"about": "About"
},
"more": "More"
},
Expand Down
11 changes: 7 additions & 4 deletions web-app/src/assets/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@
"setting": "阈值规则",
"dispatch": "消息通知"
},
"extras": {
"": "更多",
"advanced": {
"": "高级",
"collector": "采集集群",
"tags": "标签管理",
"define": "监控模版",
"status": "状态页面"
},
"extras": {
"": "更多",
"help": "帮助中心",
"setting": "设置",
"settings": "系统设置",
"about": "关于",
"status": "状态页面"
"about": "关于"
},
"more": "更多"
},
Expand Down
11 changes: 7 additions & 4 deletions web-app/src/assets/i18n/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@
"silence": "告警靜默",
"dispatch": "消息通知"
},
"extras": {
"": "更多",
"advanced": {
"": "高级",
"collector": "採集集群",
"tags": "標簽管理",
"define": "監控模版",
"status": "狀態頁面"
},
"extras": {
"": "更多",
"help": "幫助中心",
"setting": "設置",
"settings": "系統設置",
"about": "關於",
"status": "狀態頁面"
"about": "關於"
},
"more": "更多"
},
Expand Down
Loading