diff --git a/apps/wordpress/versions/6.0.1/config.json b/apps/wordpress/versions/6.0.1/config.json index 28c4bfdbd..3b80651c0 100644 --- a/apps/wordpress/versions/6.0.1/config.json +++ b/apps/wordpress/versions/6.0.1/config.json @@ -35,7 +35,7 @@ }, { "type": "number", - "labelZh": "端口", + "labelZh": "应用端口", "labelEn": "Port", "required": true, "default": 8080, diff --git a/apps/wordpress/versions/6.0.2/config.json b/apps/wordpress/versions/6.0.2/config.json index 28c4bfdbd..3b80651c0 100644 --- a/apps/wordpress/versions/6.0.2/config.json +++ b/apps/wordpress/versions/6.0.2/config.json @@ -35,7 +35,7 @@ }, { "type": "number", - "labelZh": "端口", + "labelZh": "应用端口", "labelEn": "Port", "required": true, "default": 8080, diff --git a/cmd/server/nginx_conf/ssl.conf b/cmd/server/nginx_conf/ssl.conf index 95687972f..159d20c10 100644 --- a/cmd/server/nginx_conf/ssl.conf +++ b/cmd/server/nginx_conf/ssl.conf @@ -6,4 +6,4 @@ ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; ssl_session_timeout 10m; add_header Strict-Transport-Security "max-age=31536000"; -error_page 497 https://$host$request_uri; \ No newline at end of file +error_page 497 https://$host$request_uri; diff --git a/cmd/server/nginx_conf/website_default.conf b/cmd/server/nginx_conf/website_default.conf index ac1c39ed8..d73b00817 100644 --- a/cmd/server/nginx_conf/website_default.conf +++ b/cmd/server/nginx_conf/website_default.conf @@ -8,7 +8,6 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto https; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/frontend/src/components/app-layout/footer/index.scss b/frontend/src/components/app-layout/footer/index.scss index 1ed01f58f..7c1790ce5 100644 --- a/frontend/src/components/app-layout/footer/index.scss +++ b/frontend/src/components/app-layout/footer/index.scss @@ -1,5 +1,5 @@ .footer { - height: 30px; + height: 45px; background: #ffffff; border-top: 1px solid #e4e7ed; a { @@ -8,4 +8,10 @@ text-decoration: none; letter-spacing: 0.5px; } + span { + font-size: 14px; + color: #858585; + text-decoration: none; + letter-spacing: 0.5px; + } } diff --git a/frontend/src/components/app-layout/footer/index.vue b/frontend/src/components/app-layout/footer/index.vue index f67fe13e4..e0adf6890 100644 --- a/frontend/src/components/app-layout/footer/index.vue +++ b/frontend/src/components/app-layout/footer/index.vue @@ -2,11 +2,25 @@
-
- 2023 © 1Panel By 飞致云. +
+
+ 杭州飞致云信息科技有限公司 +
+
+ Version V1 +
diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue index 2749a94ab..a36cd42c7 100644 --- a/frontend/src/components/app-status/index.vue +++ b/frontend/src/components/app-status/index.vue @@ -32,7 +32,14 @@ {{ $t('app.restart') }} - {{ $t('commons.button.set') }} + + {{ $t('commons.button.set') }} + diff --git a/frontend/src/components/back-button/index.vue b/frontend/src/components/back-button/index.vue index f153ca245..02a8efd1e 100644 --- a/frontend/src/components/back-button/index.vue +++ b/frontend/src/components/back-button/index.vue @@ -1,10 +1,17 @@ diff --git a/frontend/src/config/nprogress.ts b/frontend/src/config/nprogress.ts index 07088568c..a280ea121 100644 --- a/frontend/src/config/nprogress.ts +++ b/frontend/src/config/nprogress.ts @@ -2,10 +2,10 @@ import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; NProgress.configure({ - easing: 'ease', // 动画方式 - speed: 500, // 递增进度条的速度 - showSpinner: true, // 是否显示加载ico - trickleSpeed: 200, // 自动递增间隔 - minimum: 0.3, // 初始化时的最小百分比 + easing: 'ease', + speed: 300, + showSpinner: true, + trickleSpeed: 200, + minimum: 0.3, }); export default NProgress; diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index faa62f281..2a6c9a7db 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -35,6 +35,7 @@ export default { verify: '验证', saveAndEnable: '保存并启用', import: '导入', + search: '搜索', }, search: { timeStart: '开始时间', @@ -1003,6 +1004,10 @@ export default { defaulServer: '默认站点', noDefaulServer: '未设置', defaulServerHelper: '设置默认站点后,所有未绑定的域名和IP都被定向到默认站点\n可有效防止恶意解析', + websiteDeploymentHelper: '使用从 1Panel 部署的应用创建网站', + websiteStatictHelper: '在主机上创建网站目录', + websiteProxyHelper: + '代理已有服务,例如本机已安装使用 8080 端口的 halo 服务，那么代理地址为 http://127.0.0.1:8080', }, nginx: { serverNamesHashBucketSizeHelper: '服务器名字的hash表大小', diff --git a/frontend/src/layout/index.scss b/frontend/src/layout/index.scss index cc8f0f7e2..9e103be3a 100644 --- a/frontend/src/layout/index.scss +++ b/frontend/src/layout/index.scss @@ -14,11 +14,10 @@ } .el-main { box-sizing: border-box; - padding: 10px 13px; + padding: 20px 33px; - /* 防止切换出现横向滚动条 */ overflow-x: hidden; - // background-color: #f0f2f5; + background-color: #f4f4f4; // background: #f0f2f5; .main-box { box-sizing: border-box; diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue index 679df56c2..34768422a 100644 --- a/frontend/src/layout/index.vue +++ b/frontend/src/layout/index.vue @@ -12,15 +12,17 @@ - + +
- +
+ - + @@ -29,9 +31,9 @@ // import { computed } from 'vue'; import Menu from './layout-menu.vue'; import Header from './layout-header.vue'; -// import Footer from './layout-footer.vue'; +import Footer from './layout-footer.vue'; import View from './layout-view.vue'; -import Content from './layout-content.vue'; +// import Content from './layout-content.vue'; // import { GlobalStore } from '@/store'; // const globalStore = GlobalStore(); // const themeConfig = computed(() => globalStore.themeConfig); diff --git a/frontend/src/layout/layout-content.vue b/frontend/src/layout/layout-content.vue index 4f46f0497..ca13deabf 100644 --- a/frontend/src/layout/layout-content.vue +++ b/frontend/src/layout/layout-content.vue @@ -1,19 +1,10 @@ @@ -36,7 +57,7 @@ import FormButton from './form-button.vue'; defineOptions({ name: 'LayoutContent' }); // 组件名 const slots = useSlots(); const prop = defineProps({ - header: String, + title: String, backPath: String, backName: String, backTo: Object, @@ -53,13 +74,23 @@ const showBack = computed(() => { @use '@/styles/mixins.scss' as *; .content-container__header { +} + +.content-container__app { +} + +.content-container__search { + margin-top: 20px; +} + +.content-container__title { font-weight: 700; font-size: 18px; } .content-container__toolbar { - @include flex-row(space-between, center); - margin-bottom: 10px; + // @include flex-row(space-between, center); + margin-top: 30px; } .content-container_form { @@ -71,6 +102,10 @@ const showBack = computed(() => { } } +.content-container__main { + margin-top: 20px; +} + .el-divider--horizontal { display: block; height: 1px; diff --git a/frontend/src/layout/layout-view.vue b/frontend/src/layout/layout-view.vue index 41185670c..4e5e4bcac 100644 --- a/frontend/src/layout/layout-view.vue +++ b/frontend/src/layout/layout-view.vue @@ -1,5 +1,5 @@