diff --git a/index.html b/index.html index 7b1aa3b..c330881 100644 --- a/index.html +++ b/index.html @@ -2,9 +2,9 @@ - + - CYBER-1 + CYBER
diff --git a/public/images/logo.svg b/public/images/logo.svg new file mode 100644 index 0000000..add8db8 --- /dev/null +++ b/public/images/logo.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..d11faf1 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index b240ae7..20e72dc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,10 @@ + \ No newline at end of file diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index f060793..0757040 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -2,6 +2,7 @@ @@ -67,9 +68,11 @@ const toggleMobileMenu = () => { } // 判定 -const isMobile = ref(window.innerWidth < 910) +const windowWidth = ref(window.innerWidth); +const isMobile = ref(window.innerWidth < 1100) const handleResize = () => { - isMobile.value = window.innerWidth < 910 + windowWidth.value = window.innerWidth; + isMobile.value = window.innerWidth < 1100 if (!isMobile.value) { showMobileMenu.value = false // 桌面端时关闭移动菜单 } @@ -126,6 +129,7 @@ const toggleTheme = () => { .theme-dark .hamburger-icon, .theme-dark .hamburger-icon::before, +.theme-dark .hamburger-icon::before, .theme-dark .hamburger-icon::after { background: #0ff; } @@ -194,9 +198,12 @@ const toggleTheme = () => { } .nav-center { - flex: 1; + white-space: nowrap; display: flex; justify-content: center; + position: absolute; + left: 50%; + transform: translateX(-50%); } .nav-items { diff --git a/src/components/PagingController.vue b/src/components/PagingController.vue new file mode 100644 index 0000000..a7f6424 --- /dev/null +++ b/src/components/PagingController.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/pages/About.vue b/src/pages/About.vue index 306605e..8c5fd75 100644 --- a/src/pages/About.vue +++ b/src/pages/About.vue @@ -3,19 +3,20 @@ import {onMounted, onUnmounted, ref} from 'vue'; import MarkdownViewer from '../components/mdRenderer.vue'; import api from "../utils/axios.js"; import swal from "../utils/sweetalert.js"; +import PagingController from "../components/PagingController.vue"; const messages = ref([]); const pageLoading = ref(false); -const amount = ref(null); +const amount = ref(1); const currentPage = ref(1); async function refreshLog(page, size) { page = page || 1; size = size || 5; const res = await api.get(`/getweblog?PAGE=${page}&PAGESIZE=${size}`); - if (! res.data) { + if (!res.data) { swal.tip('error', '加载失败, 刷新重试') return; } @@ -47,18 +48,9 @@ onMounted(async () => {
正在加载...
- -
-
-
1
- ... -
{{ index }} -
- ... -
{{ amount }}
+
+
@@ -68,29 +60,34 @@ onMounted(async () => { .container { display: flex; flex-direction: column; + align-items: center; width: 100%; height: calc(100vh - 60px); overflow-y: auto; color: white; } + .theme-light .container { color: black; } + .log-container { margin: 20px 0; display: flex; flex-direction: column; align-content: center; background: #212121; - width: calc(100% - 40px); + width: 80%; height: auto; padding: 20px; gap: 15px; border-radius: 15px; } + .theme-light .log-container { background: #efefef; } + .log-bar { background: black; width: calc(100% - 20px); @@ -98,9 +95,11 @@ onMounted(async () => { border-radius: 15px; transition: opacity 0.2s ease; } + .theme-light .log-bar { background: white; } + .paging-container { display: flex; flex-direction: row; diff --git a/src/pages/Blog_home.vue b/src/pages/Blog_home.vue index 9cd5218..40dad2d 100644 --- a/src/pages/Blog_home.vue +++ b/src/pages/Blog_home.vue @@ -172,6 +172,7 @@ const filterBlogs = () => { flex-wrap: wrap; /* 允许标签换行 */ gap: 10px; justify-content: center; /* 使标签居中 */ + padding: 0 200px; } .tags span { @@ -199,7 +200,8 @@ const filterBlogs = () => { flex-wrap: wrap; justify-content: center; gap: 20px; - width: 100%; + width: calc(100% - 400px); + padding: 0 200px; } .theme-light .tags span.active { diff --git a/src/pages/Login.vue b/src/pages/Login.vue index ceb0e17..2a944e7 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -172,8 +172,8 @@ const handleRegister = async () => { 整体页面布局 ========================================== */ .auth-page { + width: 100%; min-height: calc(100vh - 60px); - margin-top: 60px; display: flex; align-items: center; justify-content: center; diff --git a/src/pages/accountPages/Account.vue b/src/pages/accountPages/Account.vue index fab9d67..3b4b4d2 100644 --- a/src/pages/accountPages/Account.vue +++ b/src/pages/accountPages/Account.vue @@ -37,9 +37,11 @@ onMounted(() => { 草稿箱
  • - 管理员: 上传日志 + 管理: 上传日志 +
    • +
  • + 超管: 管理用户
    • -
  • 用户信息
    • @@ -65,6 +67,7 @@ onMounted(() => { .account-container { display: flex; flex-wrap: inherit; + width: 100%; height: calc(100vh - 60px); overflow-x: hidden; transition: background-color 0.3s, color 0.3s; @@ -103,14 +106,15 @@ onMounted(() => { } .content { - flex-grow: 1; - padding: 20px 0; - overflow-y: scroll; + flex: 1; + width: 100%; + overflow-y: auto; transition: background-color 0.3s, color 0.3s; } /* 右侧用户信息部分 */ .user-info { + flex-grow: 0; width: 280px; margin-left: 20px; display: flex; @@ -136,7 +140,6 @@ onMounted(() => { .user-info { background-color: #2e2e2e; - border-radius: 20px; padding: 20px; margin-left: 0; box-shadow: 0 10px 20px rgba(0, 0, 0, 0.3); @@ -210,9 +213,6 @@ onMounted(() => { margin: 2px 0; } - .content { - padding: 10px; - } .user-info { width: 100%; diff --git a/src/pages/accountPages/Account_admin_userManage.vue b/src/pages/accountPages/Account_admin_userManage.vue new file mode 100644 index 0000000..d2bff9d --- /dev/null +++ b/src/pages/accountPages/Account_admin_userManage.vue @@ -0,0 +1,224 @@ + + + + + \ No newline at end of file diff --git a/src/pages/accountPages/Account_draft.vue b/src/pages/accountPages/Account_draft.vue index 7f05fe8..f6712f1 100644 --- a/src/pages/accountPages/Account_draft.vue +++ b/src/pages/accountPages/Account_draft.vue @@ -42,6 +42,7 @@ function createNewDraft() { +} + \ No newline at end of file diff --git a/src/pages/demoPages/messageBoard/Board_page.vue b/src/pages/demoPages/messageBoard/Board_page.vue index ee20a98..4bc7f8c 100644 --- a/src/pages/demoPages/messageBoard/Board_page.vue +++ b/src/pages/demoPages/messageBoard/Board_page.vue @@ -6,6 +6,7 @@ import api from "../../../utils/axios.js"; import store from "../../../store/index.js"; import swal from "../../../utils/sweetalert.js"; import AuthService from "../../../../services/auth.js"; +import PagingController from "../../../components/PagingController.vue"; const messages = ref(store.state.demosLocal.board?.messages || []); const amount = ref(store.state.demosLocal.board?.amount || 0); @@ -147,16 +148,7 @@ onBeforeUnmount(() => {
    正在加载...
    -
    -
    1
    - ... -
    {{ index }} -
    - ... -
    {{ amount }}
    -
    +
    @@ -194,10 +186,10 @@ onBeforeUnmount(() => { display: flex; flex-direction: column; gap: 20px; - width: 90%; + width: calc(80%); height: auto; padding: 20px; - margin-bottom: 150px; + margin: 0 auto 150px; border-radius: 15px; background: rgba(128, 128, 128, 0.06); border: cyan solid 1px; diff --git a/src/router/index.js b/src/router/index.js index 602726b..fb653b4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,13 +11,14 @@ import Account_setting from "../pages/accountPages/Account_setting.vue"; import Account_draft from "../pages/accountPages/Account_draft.vue"; import Account_userInfo from "../pages/accountPages/Account_userInfo.vue"; import Account_admin_uploadLog from "../pages/accountPages/Account_admin_uploadLog.vue"; +import Account_admin_userManage from "../pages/accountPages/Account_admin_userManage.vue"; import Projects from "../pages/Projects_home.vue"; import Demos_home from "../pages/Demos_home.vue"; import Board_page from "../pages/demoPages/messageBoard/Board_page.vue"; import Tools_home from "../pages/Tools_home.vue"; import GpaCalculator_page from "../pages/toolPages/gpaCalculator/gpaCalculator_page.vue"; import About from "../pages/About.vue"; -import Test from "../pages/Editor.vue"; +import Editor from "../pages/Editor.vue"; const routes = [ { @@ -65,12 +66,13 @@ const routes = [ {path: 'draft', component: Account_draft}, {path: 'setting', component: Account_setting}, {path: '', component: Account_userInfo}, - {path: 'upload-log', component: Account_admin_uploadLog} + {path: 'upload-log', component: Account_admin_uploadLog}, + {path: 'user-management', component: Account_admin_userManage} ] }, { - path: '/test_page', - name: 'Test', - component: Test + path: '/editor', + name: 'Editor', + component: Editor }, ]; diff --git a/src/store/index.js b/src/store/index.js index 5023b2b..df81829 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -78,6 +78,7 @@ const store = createStore({ } }, isAdmin: state => state.userInfo.role_id >= 2, + isSuperAdmin: state => state.userInfo.role_id >= 3, }, plugins: [ createPersistedStatePlugin({ diff --git a/src/style.css b/src/style.css index 1b4fd9b..82852cd 100644 --- a/src/style.css +++ b/src/style.css @@ -30,8 +30,7 @@ a:hover { /* 通用容器 */ .container { - width: 90%; - max-width: 1200px; + width: 100%; margin: 0 auto; }