From 9ba3362fea185230e8786c94720de12569bc2a28 Mon Sep 17 00:00:00 2001 From: XiaoShu Yang <2024302111357@whu.edu.cn> Date: Tue, 31 Mar 2026 22:23:15 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/main.css | 53 +++- frontend/src/views/home/Home.vue | 409 +++++++++++++++++++++++++- frontend/src/views/login/Login.vue | 215 ++++++++++++-- frontend/src/views/login/Register.vue | 244 +++++++++++++-- frontend/vite.config.js | 6 + 5 files changed, 855 insertions(+), 72 deletions(-) diff --git a/frontend/src/styles/main.css b/frontend/src/styles/main.css index 9de88d5..e0274f3 100644 --- a/frontend/src/styles/main.css +++ b/frontend/src/styles/main.css @@ -9,5 +9,56 @@ body, #app { width: 100%; height: 100%; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; + font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Hiragino Sans GB', + 'Microsoft YaHei', 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #333; + background-color: #f7f8fa; +} + +:root { + --primary-green: #4caf50; + --primary-green-light: #e8f5e9; + --primary-blue: #42a5f5; + --primary-blue-light: #e3f2fd; + --primary-orange: #f5a623; + --gradient-orange: linear-gradient(135deg, #f7c948 0%, #f5a623 100%); + --gradient-orange-light: linear-gradient(135deg, #fbe9a0 0%, #f5c842 100%); + --bg-card: #ffffff; + --bg-page: #f7f8fa; + --text-primary: #1a1a1a; + --text-secondary: #666666; + --text-placeholder: #c0c0c0; + --border-light: #f0f0f0; + --shadow-card: 0 2px 12px rgba(0, 0, 0, 0.06); + --shadow-soft: 0 1px 6px rgba(0, 0, 0, 0.04); + --radius-lg: 16px; + --radius-md: 12px; + --radius-sm: 8px; + --radius-full: 9999px; +} + +input, button, textarea { + font-family: inherit; +} + +a { + text-decoration: none; + color: inherit; +} + +button { + border: none; + cursor: pointer; + background: none; +} + +ul, ol { + list-style: none; +} + +::-webkit-scrollbar { + width: 0; + height: 0; } diff --git a/frontend/src/views/home/Home.vue b/frontend/src/views/home/Home.vue index df049e7..7300bee 100644 --- a/frontend/src/views/home/Home.vue +++ b/frontend/src/views/home/Home.vue @@ -1,30 +1,415 @@ diff --git a/frontend/src/views/login/Login.vue b/frontend/src/views/login/Login.vue index 64ba85d..8e181a1 100644 --- a/frontend/src/views/login/Login.vue +++ b/frontend/src/views/login/Login.vue @@ -1,35 +1,80 @@ diff --git a/frontend/src/views/login/Register.vue b/frontend/src/views/login/Register.vue index dcbf736..4126748 100644 --- a/frontend/src/views/login/Register.vue +++ b/frontend/src/views/login/Register.vue @@ -1,39 +1,107 @@ diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 0a848c6..28f30f3 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,8 +1,14 @@ import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' +import { fileURLToPath, URL } from 'node:url' export default defineConfig({ plugins: [vue()], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, server: { proxy: { '/api': { -- 2.34.1 From 9d04a782e144fcc147473ea4ae8ea795ff61836c Mon Sep 17 00:00:00 2001 From: HeTianci Date: Wed, 1 Apr 2026 16:02:35 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-build.yml | 32 +++++++++++++++++++++++++++++ backend/README.md | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/backend-build.yml diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml new file mode 100644 index 0000000..207d590 --- /dev/null +++ b/.github/workflows/backend-build.yml @@ -0,0 +1,32 @@ +name: Backend CI + +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: 'maven' + + - name: Build with Maven + working-directory: backend + run: mvn clean package + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: studyingspace-backend + path: backend/target/*.jar diff --git a/backend/README.md b/backend/README.md index bfc8831..79cb230 100644 --- a/backend/README.md +++ b/backend/README.md @@ -132,7 +132,7 @@ Authorization: Bearer ``` ## 📝 开发计划 - +- [x] 登录注册功能 - [ ] 用户认证模块 - [ ] 每日打卡模块 - [ ] 笔记导入导出模块 -- 2.34.1 From f783b2e195272288640cef9608daa8c80e1cb068 Mon Sep 17 00:00:00 2001 From: HeTianci Date: Wed, 1 Apr 2026 16:09:01 +0800 Subject: [PATCH 03/27] Update CI workflow branches for testing --- .github/workflows/backend-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml index 207d590..60cd1a4 100644 --- a/.github/workflows/backend-build.yml +++ b/.github/workflows/backend-build.yml @@ -2,9 +2,9 @@ name: Backend CI on: push: - branches: [ main, master ] + branches: [ main, TEST ] pull_request: - branches: [ main, master ] + branches: [ main, TEST ] jobs: build: -- 2.34.1 From 27696a8c7135a97938388880e383648a9dcbdb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=B5=A9=E6=BA=90?= <2722623475@qq.com> Date: Wed, 1 Apr 2026 17:41:45 +0800 Subject: [PATCH 04/27] frontend_dhy --- frontend/index.html | 4 + frontend/package.json | 4 +- frontend/src/views/home/Home.vue | 523 +++++++++----------------- frontend/src/views/login/Login.vue | 388 +++++++++++++++---- frontend/src/views/login/Register.vue | 410 ++++++++++++-------- 5 files changed, 758 insertions(+), 571 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 8f2cb37..dd744f2 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -8,6 +8,10 @@
+ + + + diff --git a/frontend/package.json b/frontend/package.json index 8ef59a5..3cbc823 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,9 @@ "vue-router": "^4.2.5", "pinia": "^2.1.7", "axios": "^1.6.2", - "element-plus": "^2.4.4" + "element-plus": "^2.4.4", + "roughjs": "^4.5.0", + "gsap": "^3.12.0" }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.2", diff --git a/frontend/src/views/home/Home.vue b/frontend/src/views/home/Home.vue index 7300bee..f9831e7 100644 --- a/frontend/src/views/home/Home.vue +++ b/frontend/src/views/home/Home.vue @@ -1,415 +1,254 @@ -