Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
5d8417a
Create test_commit.md
hhzzff Aug 5, 2025
f034481
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
125d4a4
Merge pull request #1 from hhzzff/01-HTML&CSS
hhzzff Aug 5, 2025
47125f6
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
84705e1
Delete PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
b0dc8fd
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
d3b1980
Delete .vscode/PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
6d75503
Create homework.md
hhzzff Aug 5, 2025
a4cd5d2
Merge pull request #2 from hhzzff/01-HTML&CSS
hhzzff Aug 5, 2025
d416094
Update README.md
hhzzff Aug 5, 2025
7906d55
Delete .github/PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
06bbb15
Create simple.md
hhzzff Aug 5, 2025
45d534b
Merge pull request #3 from hhzzff/01-HTML&CSS
hhzzff Aug 5, 2025
d4dc5b5
Update README.md
hhzzff Aug 5, 2025
e2561a3
Delete .github/PULL_REQUEST_TEMPLATE/simple.md
hhzzff Aug 5, 2025
00a8b53
Update and rename homework.md to pull_request_template.md
hhzzff Aug 5, 2025
ac2a930
Merge pull request #4 from hhzzff/01-HTML&CSS
hhzzff Aug 5, 2025
a145ad9
Delete frontend/public/test_commit.md
hhzzff Aug 5, 2025
d642e0f
Merge pull request #10 from hhzzff/main
hhzzff Aug 5, 2025
3d55d32
Rename .github/PULL_REQUEST_TEMPLATE/pull_request_template.md to .git…
hhzzff Aug 5, 2025
a26610c
Merge pull request #11 from hhzzff/main
hhzzff Aug 5, 2025
774b881
fix(06): resolve docker image name
FranGuam Aug 6, 2025
9f61602
fix
FranGuam Aug 6, 2025
ee6b0e7
fix
FranGuam Aug 6, 2025
9a24949
ci(Mergify): configuration update
hhzzff Aug 8, 2025
71ca119
Merge pull request #14 from eesast/mergify/hhzzff/config-update
hhzzff Aug 8, 2025
a630808
ci(Mergify): configuration update
hhzzff Aug 8, 2025
853dd83
Merge pull request #15 from eesast/mergify/hhzzff/config-update
hhzzff Aug 8, 2025
3401eaf
Update README.md: add homework tutorial
hhzzff Aug 9, 2025
830a7f3
Update README.md
hhzzff Aug 10, 2025
58061e3
Update README.md
hhzzff Aug 14, 2025
c51f01b
homework1 submitted
Aug 30, 2025
d063e35
homework1 commited
Aug 30, 2025
db123fd
feat(02): basic JS grammar
FranGuam Aug 1, 2024
071a941
feat(02): dynamic content
FranGuam Aug 1, 2024
5cb56f0
feat(02): dynamic elements
FranGuam Aug 1, 2024
2ef9459
feat(02): interact with the internet
FranGuam Aug 1, 2024
ba94544
feat(02): imports & exports
FranGuam Aug 1, 2024
f499ad5
chore(02): tutorial
FranGuam Aug 1, 2024
bba714e
feat(03): the blueprint
FranGuam Aug 3, 2024
89dd78b
feat(03): SQL to create tables & items
FranGuam Aug 3, 2024
9fb4a1b
feat(03): Hasura as middleware
FranGuam Aug 3, 2024
373dac5
feat(03): GraphQL queries & mutations
FranGuam Aug 3, 2024
91fe22c
feat(03): graphql-codegen
FranGuam Aug 3, 2024
7a72974
chore(03): tutorial
FranGuam Aug 3, 2024
bd7f10c
fix(03): return user.uuid
FranGuam Aug 3, 2024
fac9147
chore(03): update totorial
FranGuam Aug 7, 2024
b4480d7
feat(04): Hello World from Express
FranGuam Aug 3, 2024
3760a5e
feat(04): request & response
FranGuam Aug 7, 2024
23916a6
feat(04): user system
FranGuam Aug 7, 2024
a6aaa0f
feat(04): handle files
FranGuam Aug 7, 2024
c039f86
feat(04): email service
FranGuam Aug 7, 2024
dc6d79d
chore(04): tutorial
FranGuam Aug 7, 2024
0c406d9
feat(05): Hello World from React
FranGuam Aug 20, 2024
35ce2c0
feat(05): JSX elements
FranGuam Aug 20, 2024
7885600
feat(05): React Components
FranGuam Aug 20, 2024
b6690df
feat(05): brick and mortar
FranGuam Aug 20, 2024
1799a04
feat(05): LoginPage
FranGuam Aug 20, 2024
7d171ee
feat(05): MainPanel
FranGuam Aug 20, 2024
6a6eaf5
feat(05): ChatBox & FileShare
FranGuam Aug 20, 2024
e100b85
feat(05): UX improvements
FranGuam Aug 21, 2024
9a702d3
fix(05): use `HashRouter` to resolve paths
FranGuam Aug 22, 2024
d92e325
chore(05): tutorial
FranGuam Aug 26, 2024
0c79988
feat(06): frontend on Github Pages
FranGuam Aug 22, 2024
cd4e094
feat(06): build backend as docker
FranGuam Aug 22, 2024
5d367e9
feat(06): above the cloud
FranGuam Aug 22, 2024
a771ae3
feat(06): upgrade to https
FranGuam Aug 22, 2024
16bd3fc
feat(06): desktop application via electron
FranGuam Aug 28, 2024
9296e6b
chore(06): tutorial
FranGuam Aug 28, 2024
2dbe480
Create test_commit.md
hhzzff Aug 5, 2025
6196ca5
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
8cb701c
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
8d910ec
Delete PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
fbfc7f1
Create PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
1502730
Delete .vscode/PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
147b3a9
Create homework.md
hhzzff Aug 5, 2025
4641e35
Update README.md
hhzzff Aug 5, 2025
7fff232
Delete .github/PULL_REQUEST_TEMPLATE.md
hhzzff Aug 5, 2025
3c6a1a9
Create simple.md
hhzzff Aug 5, 2025
c9714f0
Update README.md
hhzzff Aug 5, 2025
d762925
Delete .github/PULL_REQUEST_TEMPLATE/simple.md
hhzzff Aug 5, 2025
016edc9
Update and rename homework.md to pull_request_template.md
hhzzff Aug 5, 2025
526b37c
Delete frontend/public/test_commit.md
hhzzff Aug 5, 2025
28cbb14
Rename .github/PULL_REQUEST_TEMPLATE/pull_request_template.md to .git…
hhzzff Aug 5, 2025
5dd55ea
fix(06): resolve docker image name
FranGuam Aug 6, 2025
fbbf4f1
fix
FranGuam Aug 6, 2025
b950310
fix
FranGuam Aug 6, 2025
7b671e7
ci(Mergify): configuration update
hhzzff Aug 8, 2025
b834855
ci(Mergify): configuration update
hhzzff Aug 8, 2025
5e5b504
Update README.md: add homework tutorial
hhzzff Aug 9, 2025
1bd757f
Update README.md
hhzzff Aug 10, 2025
8c3b327
Update README.md
hhzzff Aug 14, 2025
a621d30
Merge branch 'main' of https://github.com/Rosalind-Bell/demoweb
Aug 30, 2025
0b0088f
homework4 committed
Sep 3, 2025
a2a44bb
homework4 committed
Sep 3, 2025
88f48d5
04 merged to main
Sep 3, 2025
2940e56
homework5 committed
Sep 4, 2025
cabedfc
Add backend workflow
Sep 4, 2025
c1fbd09
Update package.json
Rosalind-Bell Sep 5, 2025
0438152
Update package.json
Rosalind-Bell Sep 5, 2025
74ba492
Update package.json
Rosalind-Bell Sep 5, 2025
a1a5613
Update package.json
Rosalind-Bell Sep 5, 2025
389cde4
Update package.json
Rosalind-Bell Sep 5, 2025
3c29c12
Update user.ts
Rosalind-Bell Sep 5, 2025
03375fb
Update index.tsx
Rosalind-Bell Sep 5, 2025
70e0806
0
Sep 18, 2025
2e80a7b
111
Sep 19, 2025
a86e5bb
111
Sep 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### 2025暑培-网站作业提交
#### 基本信息
- **姓名**:
- **班级**:
- **学号**:

#### 提交说明

- [ ] 已阅读并理解本次作业要求
4 changes: 2 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### 前端(Github Pages)

在你复刻的仓库中,进入设置标签页(https://github.com/<username>/web-workshop/settings),点击左边栏的 Pages,在 Build and deployment 下方的 Source,选择 Github Actions。意思是通过自定义的 action 来部署静态 Github Pages(与之相对的是根据仓库中的 markdown 文件自动部署)
在你复刻的仓库中,进入设置标签页(https://github.com/[username]/web-workshop/settings),点击左边栏的 Pages,在 Build and deployment 下方的 Source,选择 Github Actions。意思是通过自定义的 action 来部署静态 Github Pages(与之相对的是根据仓库中的 markdown 文件自动部署)

### 后端(Docker)

Expand All @@ -11,4 +11,4 @@
3. 在 Github 上复刻仓库的设置页,点击左边栏的 Secrets and variables -> Actions,添加一个 Secret(即密钥,加密防护)和两个 Variables(即变量,明文显示)如下:
- [Secret] `DOCKERHUB_TOKEN`,值为之前复制的个人访问 Token
- [Variable] `DOCKERHUB_USERNAME`,值为你的 Docker Hub 账号名
- [Variable] `DOCKER_TAG`,值为你的 Docker 容器标识名,形如`<username>/<repo-name>:latest`,其中`username`为 Docker Hub 账号名和 Github 账户名(如果不同名,请修改`backend.yml`定义两个变量分别表示),`repo-name`任意,不需要与仓库同名
- [Variable] `DOCKER_TAG`,值为你的 Docker 容器标识名,形如`<repo-name>:latest`,其中`repo-name`任意,不需要与仓库同名
9 changes: 7 additions & 2 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,16 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Downcase GitHub username
run: echo "USERNAME_LC=${USERNAME@L}" >> $GITHUB_ENV
env:
USERNAME: ${{ github.repository_owner }}

- name: Build and push docker image
uses: docker/build-push-action@v6
with:
context: ./backend
push: true
tags: |
ghcr.io/${{ vars.DOCKER_TAG }}
${{ vars.DOCKER_TAG }}
ghcr.io/${{ env.USERNAME_LC }}/${{ vars.DOCKER_TAG }}
${{ vars.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_TAG }}
9 changes: 9 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pull_request_rules:
- name: 🏷️ Label homework
description: Label a homework with 'homework' label by detecting keyword
conditions:
- body~=作业提交
actions:
label:
add:
- homework
59 changes: 58 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,61 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
}
"C_Cpp_Runner.cCompilerPath": "gcc",
"C_Cpp_Runner.cppCompilerPath": "g++",
"C_Cpp_Runner.debuggerPath": "gdb",
"C_Cpp_Runner.cStandard": "",
"C_Cpp_Runner.cppStandard": "",
"C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat",
"C_Cpp_Runner.useMsvc": false,
"C_Cpp_Runner.warnings": [
"-Wall",
"-Wextra",
"-Wpedantic",
"-Wshadow",
"-Wformat=2",
"-Wcast-align",
"-Wconversion",
"-Wsign-conversion",
"-Wnull-dereference"
],
"C_Cpp_Runner.msvcWarnings": [
"/W4",
"/permissive-",
"/w14242",
"/w14287",
"/w14296",
"/w14311",
"/w14826",
"/w44062",
"/w44242",
"/w14905",
"/w14906",
"/w14263",
"/w44265",
"/w14928"
],
"C_Cpp_Runner.enableWarnings": true,
"C_Cpp_Runner.warningsAsError": false,
"C_Cpp_Runner.compilerArgs": [],
"C_Cpp_Runner.linkerArgs": [],
"C_Cpp_Runner.includePaths": [],
"C_Cpp_Runner.includeSearch": [
"*",
"**/*"
],
"C_Cpp_Runner.excludeSearch": [
"**/build",
"**/build/**",
"**/.*",
"**/.*/**",
"**/.vscode",
"**/.vscode/**"
],
"C_Cpp_Runner.useAddressSanitizer": false,
"C_Cpp_Runner.useUndefinedSanitizer": false,
"C_Cpp_Runner.useLeakSanitizer": false,
"C_Cpp_Runner.showCompilationTime": false,
"C_Cpp_Runner.useLinkTimeOptimization": false,
"C_Cpp_Runner.msvcSecureNoWarnings": false
}
40 changes: 40 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,43 @@ git clone <先前复制的仓库URI>
```bash
git push --all
```

### 作业提交
每一讲的作业提交采用如下流程:
- 本地修改对应分支
- 提交修改到对应分支
- 向本仓库对应分支提交PR
- 关联PR到对应Issue
- 查看作业批改结果
##### 本地修改对应分支
fork本仓库所有分支后,根据[Issue](https://github.com/eesast/web-workshop/issues)对应讲作业要求,在本地切换到对应分支进行修改
```
git checkout "01-HTML&CSS"
```
##### 提交修改到对应分支
完成修改后,将改动提交到本地并推送到云端 Fork 仓库
```
git push origin "01-HTML&CSS"
```
##### 向本仓库对应分支提交PR
打开在 GitHub 上 Fork 的仓库页面后,切换到刚刚推送的 对应分支(如 lesson1)

点击 "Compare & pull request" 按钮,并在 PR 创建页面填写相关信息
##### 关联PR到对应Issue
在PR模板填写界面,需手动关联PR到对应Issue

你可以在PR正文中手动关联对应Issue,方法是添加#ISSUE-NUMBER到正文后。例如,需要链接的Issue对应的id是4,则添加一行#4

你也可以在PR编辑界面点击右上方的'Reference',选择需要链接的PR,最终效果与上述方法相同
<img width="837" height="369" alt="image" src="https://github.com/user-attachments/assets/1b7ac4eb-ae95-426e-b17c-cc0f1ce1e66d" />

[示例PR](https://github.com/eesast/web-workshop/pull/12)

关联完成后,提交PR,则作业提交完毕
##### 查看作业批改结果
作业由讲师批改后,对应 PR 会被打上标签:
- accepted ✅:作业通过,PR 会被关闭。
- require revision 🔄:需要修改,PR 保持 open 状态。


若需修改,按 PR 下方的评论提示进行更改,然后重复 步骤 2 → 步骤 3 提交更新。
Loading