From 81288078d4b8f7036e45bd32e3234a73a4c36391 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sat, 1 Apr 2023 16:24:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=80=E5=8F=91=E4=B8=AD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/controller/BlogController.java | 2 +- .../blog/controller/SettingController.java | 2 +- .../blog/controller/UserController.java | 6 +- blog-frontend/src/App.vue | 80 ++--------------- blog-frontend/src/api/global-store.ts | 17 +++- blog-frontend/src/api/index.ts | 5 +- blog-frontend/src/api/types/index.ts | 1 - .../src/api/types/navigation-menu.ts | 6 -- .../src/components/FooterComponent.vue | 19 ++++ .../src/components/HeaderComponent.vue | 72 ++++++++++++++++ blog-frontend/src/components/HelloWorld.vue | 40 --------- blog-frontend/src/components/TheWelcome.vue | 86 ------------------- blog-frontend/src/components/WelcomeItem.vue | 86 ------------------- .../src/components/icons/IconCommunity.vue | 7 -- .../components/icons/IconDocumentation.vue | 7 -- .../src/components/icons/IconEcosystem.vue | 7 -- .../src/components/icons/IconSupport.vue | 7 -- .../src/components/icons/IconTooling.vue | 19 ---- .../components/manage/SiteManageComponent.vue | 15 ++++ blog-frontend/src/router/index.ts | 6 +- blog-frontend/src/utils/index.ts | 3 +- blog-frontend/src/views/ManagePaneView.vue | 21 +++++ blog-frontend/src/views/SettingsView.vue | 22 ----- 23 files changed, 163 insertions(+), 373 deletions(-) delete mode 100644 blog-frontend/src/api/types/index.ts delete mode 100644 blog-frontend/src/api/types/navigation-menu.ts create mode 100644 blog-frontend/src/components/FooterComponent.vue create mode 100644 blog-frontend/src/components/HeaderComponent.vue delete mode 100644 blog-frontend/src/components/HelloWorld.vue delete mode 100644 blog-frontend/src/components/TheWelcome.vue delete mode 100644 blog-frontend/src/components/WelcomeItem.vue delete mode 100644 blog-frontend/src/components/icons/IconCommunity.vue delete mode 100644 blog-frontend/src/components/icons/IconDocumentation.vue delete mode 100644 blog-frontend/src/components/icons/IconEcosystem.vue delete mode 100644 blog-frontend/src/components/icons/IconSupport.vue delete mode 100644 blog-frontend/src/components/icons/IconTooling.vue create mode 100644 blog-frontend/src/components/manage/SiteManageComponent.vue create mode 100644 blog-frontend/src/views/ManagePaneView.vue delete mode 100644 blog-frontend/src/views/SettingsView.vue diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java index 6d8ac7f..054a012 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java @@ -40,7 +40,7 @@ public class BlogController { @Parameter(description = "页码", example = "0") int page, @Parameter(description = "大小", example = "10") int size ) { - return blogService.getBlogInfoList(PageRequest.of(page, Math.max(size, 100))); + return blogService.getBlogInfoList(PageRequest.of(page, Math.min(size, 100))); } @PutMapping("/{blogID}/") diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java index 73a617c..9598d5e 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java @@ -37,7 +37,7 @@ public class SettingController { @Parameter(description = "页码", example = "0") int page, @Parameter(description = "大小", example = "10") int size ) { - return settingService.getSettingInfoList(PageRequest.of(page, Math.max(size, 100))); + return settingService.getSettingInfoList(PageRequest.of(page, Math.min(size, 100))); } @PutMapping(value = "/{id}/", consumes = MediaType.TEXT_PLAIN_VALUE) diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java index 191d952..519f285 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java @@ -61,7 +61,7 @@ public class UserController { @Parameter(description = "页码", example = "0") int page, @Parameter(description = "大小", example = "10") int size ) { - return userService.getAllUserInfo(PageRequest.of(page, Math.max(size, 100))); + return userService.getAllUserInfo(PageRequest.of(page, Math.min(size, 100))); } @GetMapping("/{userID}/") @@ -77,7 +77,7 @@ public class UserController { @Parameter(description = "页码", example = "0") int page, @Parameter(description = "大小", example = "10") int size ) { - return userService.getUserBlogList(userID, PageRequest.of(page, Math.max(size, 100))); + return userService.getUserBlogList(userID, PageRequest.of(page, Math.min(size, 100))); } @GetMapping("/{userID}/attach/") @@ -87,6 +87,6 @@ public class UserController { @Parameter(description = "页码", example = "0") int page, @Parameter(description = "大小", example = "10") int size ) { - return userService.getUserAttachList(userID, PageRequest.of(page, Math.max(size, 100))); + return userService.getUserAttachList(userID, PageRequest.of(page, Math.min(size, 100))); } } diff --git a/blog-frontend/src/App.vue b/blog-frontend/src/App.vue index 6547e98..2cbe318 100644 --- a/blog-frontend/src/App.vue +++ b/blog-frontend/src/App.vue @@ -1,92 +1,30 @@ diff --git a/blog-frontend/src/api/global-store.ts b/blog-frontend/src/api/global-store.ts index f3aaab1..be90438 100644 --- a/blog-frontend/src/api/global-store.ts +++ b/blog-frontend/src/api/global-store.ts @@ -1,5 +1,4 @@ import { reactive, ref } from "vue" -import type { NavigationMenu } from "@/api" import type { UserInfoResponseVO } from "@/swagger" export const globalStore = { @@ -8,5 +7,19 @@ export const globalStore = { export const siteSetting = { title: ref("网站标题"), - customNavigationMenu: ref>([]) + footer: ref(""), + customNavigationMenu: ref>() } + +export function load() { + globalStore.currentUserInfo.value = JSON.parse(window.localStorage.getItem("currentUserInfo") || "{}") + console.log("local storage user info: ", globalStore.currentUserInfo.value) +} + +export function save() { + window.localStorage.setItem("currentUserInfo", JSON.stringify(globalStore.currentUserInfo.value)) + console.log(window.localStorage) +} \ No newline at end of file diff --git a/blog-frontend/src/api/index.ts b/blog-frontend/src/api/index.ts index 7143ac1..f53cb8c 100644 --- a/blog-frontend/src/api/index.ts +++ b/blog-frontend/src/api/index.ts @@ -1,4 +1,3 @@ -export * from "./api" -export * from "./global-store" -export * from "./types" +export * from "./api.js" +export * from "./global-store.js" export * from "@/swagger" \ No newline at end of file diff --git a/blog-frontend/src/api/types/index.ts b/blog-frontend/src/api/types/index.ts deleted file mode 100644 index 25086a9..0000000 --- a/blog-frontend/src/api/types/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./navigation-menu" diff --git a/blog-frontend/src/api/types/navigation-menu.ts b/blog-frontend/src/api/types/navigation-menu.ts deleted file mode 100644 index 98777cc..0000000 --- a/blog-frontend/src/api/types/navigation-menu.ts +++ /dev/null @@ -1,6 +0,0 @@ -interface NavigationMenu { - url: string, - text: string -} - -export type { NavigationMenu } \ No newline at end of file diff --git a/blog-frontend/src/components/FooterComponent.vue b/blog-frontend/src/components/FooterComponent.vue new file mode 100644 index 0000000..8e5e00a --- /dev/null +++ b/blog-frontend/src/components/FooterComponent.vue @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/blog-frontend/src/components/HeaderComponent.vue b/blog-frontend/src/components/HeaderComponent.vue new file mode 100644 index 0000000..057eae8 --- /dev/null +++ b/blog-frontend/src/components/HeaderComponent.vue @@ -0,0 +1,72 @@ + + + + + + \ No newline at end of file diff --git a/blog-frontend/src/components/HelloWorld.vue b/blog-frontend/src/components/HelloWorld.vue deleted file mode 100644 index 23afedd..0000000 --- a/blog-frontend/src/components/HelloWorld.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/blog-frontend/src/components/TheWelcome.vue b/blog-frontend/src/components/TheWelcome.vue deleted file mode 100644 index a70765c..0000000 --- a/blog-frontend/src/components/TheWelcome.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/blog-frontend/src/components/WelcomeItem.vue b/blog-frontend/src/components/WelcomeItem.vue deleted file mode 100644 index ba0def3..0000000 --- a/blog-frontend/src/components/WelcomeItem.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/blog-frontend/src/components/icons/IconCommunity.vue b/blog-frontend/src/components/icons/IconCommunity.vue deleted file mode 100644 index 2dc8b05..0000000 --- a/blog-frontend/src/components/icons/IconCommunity.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/blog-frontend/src/components/icons/IconDocumentation.vue b/blog-frontend/src/components/icons/IconDocumentation.vue deleted file mode 100644 index 6d4791c..0000000 --- a/blog-frontend/src/components/icons/IconDocumentation.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/blog-frontend/src/components/icons/IconEcosystem.vue b/blog-frontend/src/components/icons/IconEcosystem.vue deleted file mode 100644 index c3a4f07..0000000 --- a/blog-frontend/src/components/icons/IconEcosystem.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/blog-frontend/src/components/icons/IconSupport.vue b/blog-frontend/src/components/icons/IconSupport.vue deleted file mode 100644 index 7452834..0000000 --- a/blog-frontend/src/components/icons/IconSupport.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/blog-frontend/src/components/icons/IconTooling.vue b/blog-frontend/src/components/icons/IconTooling.vue deleted file mode 100644 index 660598d..0000000 --- a/blog-frontend/src/components/icons/IconTooling.vue +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/blog-frontend/src/components/manage/SiteManageComponent.vue b/blog-frontend/src/components/manage/SiteManageComponent.vue new file mode 100644 index 0000000..e1e8e9d --- /dev/null +++ b/blog-frontend/src/components/manage/SiteManageComponent.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/blog-frontend/src/router/index.ts b/blog-frontend/src/router/index.ts index e647556..fe09315 100644 --- a/blog-frontend/src/router/index.ts +++ b/blog-frontend/src/router/index.ts @@ -24,9 +24,9 @@ const router = createRouter({ component: () => import('@/views/LoginView.vue') }, { - path: '/settings', - name: 'settings', - component: () => import('@/views/SettingsView.vue') + path: '/manage', + name: 'manage', + component: () => import('@/views/ManagePaneView.vue') } ] }) diff --git a/blog-frontend/src/utils/index.ts b/blog-frontend/src/utils/index.ts index 9f1993b..7904d1e 100644 --- a/blog-frontend/src/utils/index.ts +++ b/blog-frontend/src/utils/index.ts @@ -1,4 +1,4 @@ -import { api, globalStore } from "@/api"; +import { api, globalStore, save } from "@/api"; export function updateCurrentUserInfo() { @@ -11,5 +11,6 @@ export function updateCurrentUserInfo() { } else { console.error("ckeck current user info failed!") } + save() }) } \ No newline at end of file diff --git a/blog-frontend/src/views/ManagePaneView.vue b/blog-frontend/src/views/ManagePaneView.vue new file mode 100644 index 0000000..cb2795e --- /dev/null +++ b/blog-frontend/src/views/ManagePaneView.vue @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/blog-frontend/src/views/SettingsView.vue b/blog-frontend/src/views/SettingsView.vue deleted file mode 100644 index b3612ca..0000000 --- a/blog-frontend/src/views/SettingsView.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file