+
@@ -120,10 +120,6 @@ const showBack = computed(() => {
margin-top: 20px;
}
-.main {
- margin-top: 20px;
-}
-
.prompt {
margin-top: 10px;
}
@@ -137,4 +133,8 @@ const showBack = computed(() => {
.main-box {
position: relative;
}
+
+.main-content {
+ margin-top: 20px;
+}
diff --git a/frontend/src/routers/modules/host.ts b/frontend/src/routers/modules/host.ts
index 8ca957b7d..16d2386f0 100644
--- a/frontend/src/routers/modules/host.ts
+++ b/frontend/src/routers/modules/host.ts
@@ -39,6 +39,25 @@ const hostRouter = {
requiresAuth: false,
},
},
+ {
+ path: '/hosts/firewall/port',
+ name: 'FirewallPort',
+ component: () => import('@/views/host/firewall/port/index.vue'),
+ meta: {
+ title: 'menu.firewall',
+ requiresAuth: false,
+ },
+ },
+ {
+ path: '/hosts/firewall/ip',
+ name: 'FirewallIP',
+ component: () => import('@/views/host/firewall/ip/index.vue'),
+ hidden: true,
+ meta: {
+ title: 'menu.toolbox',
+ requiresAuth: false,
+ },
+ },
],
};
diff --git a/frontend/src/routers/modules/website.ts b/frontend/src/routers/modules/website.ts
index 967aa2386..2e8a22aba 100644
--- a/frontend/src/routers/modules/website.ts
+++ b/frontend/src/routers/modules/website.ts
@@ -39,6 +39,15 @@ const webSiteRouter = {
requiresAuth: false,
},
},
+ {
+ path: '/websites/runtime/php',
+ name: 'Runtime',
+ component: () => import('@/views/website/runtime/index.vue'),
+ meta: {
+ title: 'menu.runtime',
+ requiresAuth: false,
+ },
+ },
],
};
diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.ts
index d4d480d36..04c54d6a5 100644
--- a/frontend/src/store/index.ts
+++ b/frontend/src/store/index.ts
@@ -20,6 +20,8 @@ export const GlobalStore = defineStore({
footer: true,
},
isFullScreen: false,
+ agreeLicense: false,
+ hasNewVersion: false,
}),
getters: {},
actions: {
@@ -45,6 +47,9 @@ export const GlobalStore = defineStore({
setThemeConfig(themeConfig: ThemeConfigProp) {
this.themeConfig = themeConfig;
},
+ setAgreeLicense(agree: boolean) {
+ this.agreeLicense = agree;
+ },
},
persist: piniaPersistConfig('GlobalState'),
});
diff --git a/frontend/src/store/interface/index.ts b/frontend/src/store/interface/index.ts
index 6edd1ae1b..44bf0bba6 100644
--- a/frontend/src/store/interface/index.ts
+++ b/frontend/src/store/interface/index.ts
@@ -16,6 +16,8 @@ export interface GlobalState {
// assemblySize: string; // small | default | large
themeConfig: ThemeConfigProp;
isFullScreen: boolean;
+ agreeLicense: boolean;
+ hasNewVersion: boolean;
}
export interface MenuState {
diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss
index 4d989c76b..98f62fcf9 100644
--- a/frontend/src/styles/common.scss
+++ b/frontend/src/styles/common.scss
@@ -179,9 +179,12 @@
top: 220px;
left: 45%;
transform: translate(-50%, -50%);
- width: 300px;
+ width: 400px;
text-align: center;
font-size: 14px;
+ .bt {
+ margin-top: -2px;
+ }
}
.table-button {
@@ -299,3 +302,25 @@
.table-link:hover {
opacity: 0.6;
}
+
+.app-warn {
+ text-align: center;
+ margin-top: 100px;
+ span:first-child {
+ color: #bbbfc4;
+ }
+
+ span:nth-child(2) {
+ color: $primary-color;
+ cursor: pointer;
+ }
+
+ span:nth-child(2):hover {
+ color: #74a4f3;
+ }
+
+ img {
+ width: 300px;
+ height: 300px;
+ }
+}
\ No newline at end of file
diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts
index e88c6a0f2..6ad3d8bcc 100644
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -167,6 +167,18 @@ export function checkIp(value: string): boolean {
}
}
+export function checkPort(value: string): boolean {
+ if (Number(value) <= 0) {
+ return true;
+ }
+ const reg = /^([0-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-5]{2}[0-3][0-5])$/;
+ if (!reg.test(value) && value !== '') {
+ return true;
+ } else {
+ return false;
+ }
+}
+
export function getProvider(provider: string): string {
switch (provider) {
case 'dnsAccount':
@@ -217,3 +229,7 @@ export function isJson(str: string) {
return false;
}
}
+
+export function toLowerCase(str: string) {
+ return str.toLowerCase();
+}
diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index 0b7ce3e7d..4e3d90790 100644
--- a/frontend/src/views/app-store/apps/index.vue
+++ b/frontend/src/views/app-store/apps/index.vue
@@ -75,8 +75,10 @@
+
## 安全说明
如果您在使用过程中发现任何安全问题，请通过以下方式直接联系我们：
-- 邮箱：support@fit2cloud.com
+- 邮箱：support@fit2cloud.com
- 电话：400-052-0755
## Star History
@@ -62,7 +63,7 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
## License
-Copyright (c) 2014-2023 飞致云 FIT2CLOUD, All rights reserved.
+Copyright (c) 2014-2023 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
Licensed under The GNU General Public License version 3 (GPLv3) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
diff --git a/README_EN.md b/README_EN.md
new file mode 100644
index 000000000..7f8b6733c
--- /dev/null
+++ b/README_EN.md
@@ -0,0 +1,72 @@
+[中文 README.md](README.md)
+
+ 