Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1111 commits
Select commit Hold shift + click to select a range
19fb214
Merge pull request #125 from zgzgorg/all-contributors/add-floraxue
tslmy Nov 13, 2022
475c13e
A taste of of the redesign. (#120)
tslmy Nov 13, 2022
2eaf7fb
Fix navbar at the top.
Nov 19, 2022
5a732b4
Flexible width.
Nov 20, 2022
cf04837
Add required includes.
Nov 20, 2022
3a095c0
Merge pull request #128 from ckt624/newHeader
tslmy Nov 20, 2022
7c31841
Created test page to test design components (buttons)
floraxue Nov 12, 2022
df0d73b
Try using button class
floraxue Nov 12, 2022
be10cc6
add bootstrap to test
floraxue Nov 13, 2022
dfa0b5b
finish button class.
floraxue Nov 20, 2022
9669523
Removes unused mixin files and bootstrap full lib import.
floraxue Nov 20, 2022
05d26e2
Remove testing code.
floraxue Nov 20, 2022
9d4baad
Uncomment bootstrap whole lib import as it's needed for other tasks.
floraxue Nov 20, 2022
7a9c707
Merge pull request #130 from floraxue/button
tslmy Nov 20, 2022
5169112
Create tabs and sort (#126)
xubowenhaoren Nov 21, 2022
849985e
+ List of cards that supports content richer than one line; + "join u…
tslmy Nov 21, 2022
dca2df4
Improve header (#129)
ckt624 Nov 21, 2022
6b52e92
Remove galatour in header (#132)
ckt624 Nov 21, 2022
4de50cc
"Join Us" page: Add all remaining positions (#131)
tslmy Nov 21, 2022
529bb75
Add a page of useful links (#119)
mawenyuan1997 Nov 21, 2022
293e0a0
Added hero styles and testing elements in test.html. (#134)
floraxue Nov 21, 2022
47ee180
Modify List item on home page (#137)
mawenyuan1997 Dec 5, 2022
3d1ece7
Improve mobile header (#133)
ckt624 Dec 5, 2022
6839e05
Finish up cards for responsiveness. (#138)
tslmy Dec 5, 2022
139d821
Wendy wu move 2022 to past events (#139)
WendyWuZY Dec 5, 2022
f761004
Improve hamburger button and active status of dropdown items (#141)
ckt624 Dec 7, 2022
5de5041
Update homepage to new design. (#142)
floraxue Dec 7, 2022
b31ff95
Responsive hero for mobile devices (#143)
floraxue Dec 7, 2022
8f640c8
Make "friends" behave better in responsiveness
tslmy Dec 7, 2022
05d3997
Create Galatour page (#135)
ckt624 Dec 7, 2022
fcaede0
Create the gala page (#140)
xubowenhaoren Dec 7, 2022
52e7c73
docs: add ckt624 as a contributor for code (#145)
allcontributors[bot] Dec 7, 2022
686827d
Clean up galatour page
tslmy Dec 7, 2022
f17954a
Clean up singer page
tslmy Dec 7, 2022
6d5b5f5
Clean up gala page
tslmy Dec 7, 2022
598b29b
Clean up tour page
tslmy Dec 7, 2022
051b22d
singer page should use short hero
tslmy Dec 7, 2022
86dfae1
gala page should have background image on hero
tslmy Dec 7, 2022
7cd73a5
home page should have alternating grey backgrounds on strips, not lim…
tslmy Dec 7, 2022
4361e5c
run pre-commit hooks
tslmy Dec 7, 2022
eb79aa2
yunji programmes
tslmy Dec 7, 2022
431974c
banners should be responsive in the bootstrap way
tslmy Dec 7, 2022
39e8498
fix cards
tslmy Dec 7, 2022
b27d4b4
fix button on banner on /gala/
tslmy Dec 7, 2022
5f84e65
fix reponsiveness on banner on home
tslmy Dec 7, 2022
d5a7ce4
fix underlines
tslmy Dec 7, 2022
610966a
fix jumping active page button on navbar
tslmy Dec 7, 2022
75a58e3
remove y padding on mnavbar
tslmy Dec 7, 2022
f3cccf7
+ social buttons (SVGs)
tslmy Dec 7, 2022
2accecb
footer (#144)
MaggieRepo Dec 8, 2022
60c4b4b
standardize class names
tslmy Dec 8, 2022
a71673b
left of footer
tslmy Dec 8, 2022
3fe9afa
optimize SVG
tslmy Dec 8, 2022
a55f39b
+ envelope.svg
tslmy Dec 8, 2022
3b02728
simplify footer css a bit
tslmy Dec 8, 2022
0b07576
copyright
tslmy Dec 8, 2022
dfb7378
email signup
tslmy Dec 8, 2022
2510b46
footer icon size
tslmy Dec 8, 2022
cc9ff2a
prettify files
tslmy Dec 8, 2022
b5c6c93
Revert "prettify files"
tslmy Dec 8, 2022
cdaf898
footer lists
tslmy Dec 8, 2022
2368420
footer links
tslmy Dec 8, 2022
a8589ed
footer paddings
tslmy Dec 8, 2022
30a89b0
all links should be relative
tslmy Dec 8, 2022
4354498
more-programmes button
tslmy Dec 8, 2022
13dc0b3
navbar active button: increase
tslmy Dec 8, 2022
1c49da9
update pre-commit hooks
tslmy Dec 8, 2022
f927866
+ scss lint
tslmy Dec 8, 2022
3ed72f8
prettify CSS
tslmy Dec 8, 2022
8d85090
footer css
tslmy Dec 8, 2022
4b6b32f
minor css fixes
tslmy Dec 8, 2022
e3a4f7e
remove unused css rules
tslmy Dec 8, 2022
6945738
sizes in footer
tslmy Dec 8, 2022
20735ee
form size in footer
tslmy Dec 8, 2022
581d09e
fix form in footer
tslmy Dec 8, 2022
b2375a0
add some padding to form in footer
tslmy Dec 8, 2022
c7d0646
add sponsors on check out page & minor changes (#147)
WendyWuZY Dec 8, 2022
7a37867
minor-changes-1208 (#148)
WendyWuZY Dec 9, 2022
e28b2a3
wendy wu changes some images (#149)
WendyWuZY Dec 10, 2022
98a6af2
wnedy change home buy ticket info (#150)
WendyWuZY Dec 11, 2022
076ff8e
wendy made changes (#151)
WendyWuZY Dec 11, 2022
5ae6c6e
Optimize the mobile display of tabs (#152)
xubowenhaoren Dec 13, 2022
fe61191
wendy made an english page and added video (#154)
WendyWuZY Dec 16, 2022
7b4fb4b
quickfix: video width (#155)
WendyWuZY Dec 16, 2022
e887a9e
Sponsor content (#153)
mawenyuan1997 Dec 17, 2022
33176f1
Update sponsor for homepage (#156)
floraxue Dec 19, 2022
a8021fd
Sponsorship page (#146)
mawenyuan1997 Dec 19, 2022
5983b9d
Changes on English version & sponsors (#158)
WendyWuZY Dec 23, 2022
cbf5bb9
quickfix: 12.22 (#159)
WendyWuZY Dec 23, 2022
3b75431
Update use of SVGs.
tslmy Dec 27, 2022
0cdf6b5
Update EDS logo to use PNG.
tslmy Dec 27, 2022
5ef0f97
fixup! Update EDS logo to use PNG.
tslmy Dec 27, 2022
c241d46
update GA4 id
tslmy Dec 31, 2022
ffb1943
wendy made some image changes (#160)
WendyWuZY Dec 31, 2022
0723dbe
wendy's changes (#161)
WendyWuZY Jan 8, 2023
3641968
Update gala show list (#162)
xubowenhaoren Jan 10, 2023
69f8965
Gala show list fix: Disable the hide/show button. (#163)
xubowenhaoren Jan 10, 2023
b108e51
wendy made some small changes (#164)
WendyWuZY Jan 15, 2023
bdb2719
Add livestream buttons
tslmy Jan 21, 2023
12801a4
Change the style of lifestream buttons
tslmy Jan 21, 2023
fb8c3f4
fix homepage buttons (#167)
casteryh Jan 21, 2023
66c7dcd
Adding element of livestream (#168)
WendyWuZY Jan 21, 2023
29e1d66
live class (#169)
WendyWuZY Jan 21, 2023
2d61f56
+ in-the-news.md
tslmy Jan 25, 2023
3233de2
Sponsor advertising banner (#171)
zephyrich Apr 12, 2023
0abf2d9
Add Singing Contest info to home page and english home page (#172)
cc-anna Apr 20, 2023
e8c8468
upgrade ads text in sponsorship page (#173)
zephyrich Apr 25, 2023
adecc29
update sponsor contact link (#174)
zephyrich Apr 26, 2023
c39af4e
footer and join us page (#175)
MaggieRepo May 22, 2023
5f9d776
remove min-width which break mobile resposive view (#176)
zephyrich May 23, 2023
61cd12c
Update Singer page to 2023 (#177)
ckt624 Jun 21, 2023
0d4a5a4
Update singer page links (#179)
ckt624 Jun 26, 2023
10ab93e
Update singer pages per requirement (#180)
ckt624 Jun 28, 2023
921c79f
Update sponsors. (#181)
ckt624 Jul 7, 2023
bfe2832
change sponsor format. (#182)
ckt624 Jul 13, 2023
3e4710b
Update sponsorship.html (#185)
shiyinw Nov 12, 2023
ff5a7d0
Delete outdated sponsors-singer content from sponsorship.html (#186)
shiyinw Nov 13, 2023
ac4c0fa
updated to 2024 chunwan (#188)
leo-mlq Nov 13, 2023
044f18a
toggled nav links between chinese and english (#187)
leo-mlq Nov 13, 2023
b3be36f
Add button "招商手册" to sponsorship.html (#189)
shiyinw Nov 13, 2023
cdaddbb
Add button "赞助权益表" to sponsorship.html (#190)
shiyinw Nov 15, 2023
279f2c2
Nav menu (#191)
xxueewa Dec 10, 2023
6df7448
1214 home updates (#193)
leo-mlq Dec 21, 2023
08dce96
Updata gala page. (#192)
ckt624 Dec 21, 2023
2f56fcb
4-10 (#195)
xxueewa Dec 22, 2023
f295f25
add ticket link and friends.html (#196)
xxueewa Dec 22, 2023
a5b8643
added js to support youtube videos carousel (#194)
leo-mlq Dec 22, 2023
55dd020
updated _intro css to fix home bg image cropped in mobile view (#197)
leo-mlq Dec 30, 2023
c653459
Update all ticket links (#199)
xxueewa Jan 1, 2024
6f3e3b9
1222 gala updates (#198)
leo-mlq Jan 2, 2024
67f5652
11 sponsor updates (#200)
leo-mlq Jan 5, 2024
f0fdf56
0105 english faq (#201)
leo-mlq Jan 7, 2024
808cdaa
0106 sponsors update (#202)
leo-mlq Jan 7, 2024
55c6e91
url (#203)
xxueewa Jan 9, 2024
5e93d8b
0111 sponsors update (#204)
leo-mlq Jan 13, 2024
177925a
update spnsor img (#205)
leo-mlq Jan 16, 2024
2ba0bea
Add Steve Chen's 30s video ad to sponsorship.html (#206)
shiyinw Jan 23, 2024
8b77668
update (#207)
xxueewa May 14, 2024
00bf69a
Update singer.html (#208)
yaozgzg May 31, 2024
69f2e80
0530 singer update (#209)
leo-mlq May 31, 2024
f559680
0530 singer update (#210)
leo-mlq Jun 1, 2024
8a31514
changed gala info to singing contest in the english page (#211)
leo-mlq Jun 13, 2024
a9ebcad
add singers and sponsorships (#212)
xxueewa Jun 16, 2024
623d1c1
updated links and final info (#213)
leo-mlq Jun 21, 2024
5d22e79
add (#214)
xxueewa Jun 25, 2024
d7aafa0
updatebasedonrequriement (#215)
xxueewa Jul 10, 2024
66c9870
base map
johnqin130 Sep 3, 2024
1f4916f
Update galatour-map.html
johnqin130 Sep 3, 2024
9dd1d8b
support touch
johnqin130 Sep 3, 2024
a75372a
Update galatour-map.html
johnqin130 Sep 4, 2024
c8597b5
zhongqiu map
tian-li Sep 19, 2024
c7ee71f
stamp
johnqin130 Oct 5, 2024
0c20354
stamp2
johnqin130 Oct 5, 2024
b77fef9
message
johnqin130 Oct 5, 2024
f143f7b
style change
johnqin130 Oct 5, 2024
4c19732
tab 切换
tian-li Oct 6, 2024
989433e
更新图片路径
tian-li Oct 6, 2024
463ad1b
use booth as email
johnqin130 Oct 7, 2024
45c62de
Update stamp.html
johnqin130 Oct 7, 2024
5109bc1
Update stamp.html
johnqin130 Oct 7, 2024
4d1edd8
Merge remote-tracking branch 'origin/2024-zhongqiu-map'
johnqin130 Oct 7, 2024
f657e0e
Update stamp.html
johnqin130 Oct 7, 2024
f5a7258
打卡 (#216)
tian-li Oct 8, 2024
0d1bc25
Create 2024-fall-map
johnqin130 Oct 8, 2024
9b99671
Merge branch 'main' of https://github.com/zgzgorg/yj.zgzg.io
johnqin130 Oct 8, 2024
d9c36e0
Update 2024-fall-map
johnqin130 Oct 8, 2024
354bc16
Update stamp.html
johnqin130 Oct 8, 2024
9209ad7
update file name
johnqin130 Oct 8, 2024
864e86e
Update 2024-fall-map.md
johnqin130 Oct 8, 2024
14e47a5
update map (#217)
tian-li Oct 8, 2024
c6c7466
地图 10-9 更新 (#218)
tian-li Oct 10, 2024
3805c10
booth details (#219)
tian-li Oct 10, 2024
97c378e
update (#221)
tian-li Oct 15, 2024
ff5a004
update (#222)
tian-li Oct 16, 2024
da45afd
update (#223)
tian-li Oct 16, 2024
674ecdd
update (#224)
tian-li Oct 16, 2024
644b996
update (#225)
tian-li Oct 17, 2024
29bf9dc
Map update 10 17 (#226)
tian-li Oct 18, 2024
c4ef37d
update (#227)
tian-li Oct 18, 2024
d4f002c
fix qr (#228)
tian-li Oct 18, 2024
eb82c1e
update (#229)
tian-li Oct 18, 2024
42bca04
Update 2024-zhong-qiu-map.html (#230)
tian-li Oct 20, 2024
196ca8d
1115 25chunyan home update (#231)
leo-mlq Nov 16, 2024
f53cbdd
1218 gala updates (#232)
leo-mlq Jan 2, 2025
ca98fe0
update ticket info (#233)
leo-mlq Jan 6, 2025
ba45e58
0106 gala fixes (#234)
leo-mlq Jan 7, 2025
7aa9206
Updated gala sponsors and audience guide (#235)
leo-mlq Jan 28, 2025
f1b62ee
0129 gala stream (#236)
leo-mlq Jan 31, 2025
1f9a965
Remove home sponsors. (#237)
zysxqn Apr 6, 2025
6064dbd
Update Singer Page (#239)
zysxqn Apr 29, 2025
ae7413a
0428 singer25 home update (#238)
leo-mlq Apr 30, 2025
fa337f4
Update 2025 youth singers info (#240)
zysxqn May 5, 2025
1b57ca6
0505 home bg img fix missing (#241)
leo-mlq May 5, 2025
1a32b2b
Update Zeng Boxin Photo (#242)
zysxqn May 6, 2025
60da606
Update Zeng Boxin Bio Typo (#243)
zysxqn May 6, 2025
f6ea156
Fix Ella's Name (#244)
zysxqn May 6, 2025
49b1136
Fix a few singer errors (#245)
zysxqn May 9, 2025
8b74a3f
Replace a youth singer (#246)
zysxqn May 12, 2025
c7a09b9
0517 singer sponsors add (#247)
leo-mlq May 19, 2025
6fe8a57
Add Adult Singers Info (#248)
zysxqn May 19, 2025
a4bfc61
Fix an image link error (#249)
zysxqn May 19, 2025
c31f599
Create 2025-06-11-public-notice.md
xinbenlv Jun 11, 2025
b826fc7
Update 2025-06-11-public-notice.md
xinbenlv Jun 11, 2025
a140e44
Update and rename 2025-06-11-public-notice.md to 2025-06-10-board-not…
xinbenlv Jun 11, 2025
0398e55
Update 2025-06-10-board-notice.md
xinbenlv Jun 11, 2025
4eb4233
Delete pages/2025-06-10-board-notice.md
xinbenlv Jun 11, 2025
805f371
理事会公告:2025歌手赛决赛评委
xinbenlv Jun 18, 2025
346ad38
添加board folder
xinbenlv Jun 18, 2025
8ea2651
添加board folder
xinbenlv Jun 18, 2025
01b4d98
添加netlify 到readme
xinbenlv Jun 18, 2025
5c92a7f
移动到board文件夹
xinbenlv Jun 18, 2025
eb42f60
修复
xinbenlv Jun 18, 2025
26157f1
添加board folder
xinbenlv Jun 18, 2025
afc8e43
change layout
xinbenlv Jun 18, 2025
421708a
更新链接
xinbenlv Jun 18, 2025
4c90f7e
improve build
xinbenlv Jun 18, 2025
da8e825
Fix local run
xinbenlv Jun 19, 2025
13b0d0a
Fix logo
xinbenlv Jun 19, 2025
aab9ff8
Create 2025-06-22-notice
xinbenlv Jun 28, 2025
cbceb62
Update and rename 2025-06-22-notice to 2025-06-22-notice.md
xinbenlv Jun 28, 2025
4416993
Update 2025-06-22-notice.md
xinbenlv Jun 28, 2025
bbd9269
0708 links fix (#250)
leo-mlq Jul 9, 2025
c38e142
Update for 2025 fall
xinbenlv Jul 23, 2025
a3132e6
Update links
xinbenlv Jul 23, 2025
5c2e963
Update for 2025 fall
xinbenlv Jul 23, 2025
9f4802c
Update for 2025 fall, removing tickets
xinbenlv Jul 23, 2025
b266057
Update ybyf info (#252)
zysxqn Aug 6, 2025
c2250a4
Update go.md (#253)
Archicyr Aug 10, 2025
e58390e
Update 2025-06-22-notice.md
Archicyr Sep 6, 2025
afc796b
Update 2025-06-22-notice.md
Archicyr Sep 6, 2025
416c312
Update 2025-06-22-notice.md
Archicyr Sep 6, 2025
4f88850
Update 2025-fall-event-info.html
xinbenlv Sep 7, 2025
9aedb35
Update 2025-fall-event-info.html
xinbenlv Sep 7, 2025
52a57da
Update 2025-fall-event-info.html
xinbenlv Sep 8, 2025
b336efe
Add announce, and midterm honor for zgzg-2025f-yy
xinbenlv Sep 14, 2025
8de52f7
Fix build error
xinbenlv Sep 14, 2025
942853b
Improve formatting
xinbenlv Sep 14, 2025
ce4512f
Update ZGID
xinbenlv Oct 13, 2025
c88badc
Add brandkit link
xinbenlv Oct 13, 2025
6bc0aa4
Update tour info
xinbenlv Oct 14, 2025
cf5d900
Update for 2025 fall
xinbenlv Oct 14, 2025
df241e3
Update gala page (#260)
zysxqn Oct 28, 2025
9e55a5d
Add Fall Culture Fair Map
xinbenlv Oct 30, 2025
9ec9cec
Add waiver
xinbenlv Oct 31, 2025
0920faa
Add sponsor. (#261)
zhangjunhao0 Oct 31, 2025
5a907a5
Initial (#264)
zhangjunhao0 Dec 1, 2025
05903f9
New gala update. (#265)
zhangjunhao0 Dec 25, 2025
c2cabcf
Update event details in data.yml (#266)
zysxqn Dec 27, 2025
92ef8a3
Add the ticket sale info (#267)
zysxqn Jan 2, 2026
e5e6ac0
feat: add IRS W-9 Letter link to footer
xinbenlv Jan 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
64 changes: 64 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"commitConvention": "angular",
"contributors": [
{
"login": "tslmy",
"name": "Ming",
"avatar_url": "https://avatars.githubusercontent.com/u/594058?v=4",
"profile": "http://myli.page",
"contributions": [
"infra",
"test",
"code"
]
},
{
"login": "xubowenhaoren",
"name": "Bowen Xu",
"avatar_url": "https://avatars.githubusercontent.com/u/20229080?v=4",
"profile": "https://github.com/xubowenhaoren",
"contributions": [
"code"
]
},
{
"login": "rtq998916",
"name": "rtq998916",
"avatar_url": "https://avatars.githubusercontent.com/u/92650213?v=4",
"profile": "https://github.com/rtq998916",
"contributions": [
"code"
]
},
{
"login": "floraxue",
"name": "Flora Xue",
"avatar_url": "https://avatars.githubusercontent.com/u/5152856?v=4",
"profile": "http://floraxue.github.io",
"contributions": [
"code",
"review"
]
},
{
"login": "ckt624",
"name": "Kongtao Chen",
"avatar_url": "https://avatars.githubusercontent.com/u/13848196?v=4",
"profile": "https://github.com/ckt624",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "yj.zgzg.io",
"projectOwner": "zgzgorg"
}
17 changes: 17 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"google"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 12
},
"plugins": [
"@typescript-eslint"
],
"rules": {}
}
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '41 6 * * 5'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ Thumbs.db
.Spotlight-V100
.Trashes
.idea

# Intellij
.bundle
vendor
22 changes: 20 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# pre-commit autoupdate
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -15,9 +15,27 @@ repos:
- id: check-symlinks
- id: check-vcs-permalinks
- id: check-yaml
- id: pretty-format-json
args: ['--autofix']
- id: destroyed-symlinks
- id: detect-private-key
- id: end-of-file-fixer
exclude: _data/comedians.json
- id: trailing-whitespace
- id: mixed-line-ending
- repo: https://github.com/pre-commit/mirrors-eslint
rev: 'v8.29.0' # Use the sha / tag you want to point at
hooks:
- id: eslint
args: ['--fix']
exclude: assets/js/github.js
additional_dependencies:
- eslint@8.6.0
- eslint-config-google@0.7.1
- babel-eslint@10.1.0
- "@typescript-eslint/eslint-plugin"
- "@typescript-eslint/parser"
- eslint-loader@1.6.1
- repo: https://github.com/pre-commit/mirrors-scss-lint
rev: 'v0.59.0' # Use the sha / tag you want to point at
hooks:
- id: scss-lint
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.2
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ source "https://rubygems.org"
gem "jekyll", "~> 4.1"
gem "jekyll-environment-variables"
gem "jekyll-get-json", "~> 1.0"
gem "jekyll-sitemap"
gem "jekyll-sass-converter", "~> 2.2"
gem "sassc", "~> 2.4"

gem "webrick", "~> 1.7"
146 changes: 134 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,144 @@
# Website for the _Chinese Comedy at Silicon Valley_
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ggtkx/ggtkx.github.io/main.svg)](https://results.pre-commit.ci/latest/github/ggtkx/ggtkx.github.io/main)
# 《载歌在谷》志愿者社区官方网站
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c7624c6e88564a0988cb2a0dd82ebd85)](https://www.codacy.com/gh/zgzgorg/yj.zgzg.io/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=zgzgorg/yj.zgzg.io&amp;utm_campaign=Badge_Grade)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/zgzgorg/yj.zgzg.io/main.svg)](https://results.pre-commit.ci/latest/github/zgzgorg/yj.zgzg.io/main)
[![Netlify Status](https://api.netlify.com/api/v1/badges/6cee17f2-e6ed-45a0-bfb6-dd8234734ebf/deploy-status)](https://app.netlify.com/projects/zgzg-io/deploys)

The website is deployed to [GitHub pages](https://ggtkx.github.io/) and is served at [ggtkx.org](http://ggtkx.org/en/).
为《载歌在谷》志愿者社区,本代码库托管[其官方网站](https://zgzg.io/)的源代码。部署在 [Netlify](https://app.netlify.com/projects/zgzg-io/deploys) 上。

The Website is statically generated with [Jekyll](https://jekyllrb.com/). To serve it locally, run:
## 贡献指南

想要开发这个网站,需要用到以下工具:

### 在本地渲染该网站
本网站使用 [Jekyll](https://jekyllrb.com/) 渲染。安装 Jekyll 之后,您可以运行以下命令来在您的电脑上("本地")打开这个网站:

```shell
bundle exec jekyll serve
```

### Pre-commit hooks
本代码库使用 [pre-commit hooks](https://pre-commit.com/) 来自动化一些琐事。(请参见 `.pre-commit-config.yaml` 来熟悉一下都启用了哪些 hooks。)

Assuming you have `pre-commit` installed (perhaps via `brew install pre-commit`), after cloning this repo to your local machine, you need to execute this command in the root directory of this repo:

```shell
pre-commit install
```

One of the hooks use the [ESLint](https://eslint.org/) tool to check JavaScript files, including enforcing the [Google JavaScript Code Style](https://google.github.io/styleguide/jsguide.html). (See `.eslintrc.json` for the exact config.) As a [npm package](https://www.npmjs.com/), ESLint is installed via npm and specified in the `package.json`.

## 本代码库结构简介
根据您想要贡献的内容的类型划分,您可能想要专注于认识不同的部分。

### 如果你想要加入、更新内容
对于内容贡献者来说,最重要的几个文件夹是:
- `pages`:这里存放了每个页面的内容。每个页面都是一个单独的 Markdown 文本文档。在每个文件开头,有个符合 YAML 语法的区块,叫"[front matter](https://jekyllrb.com/docs/front-matter/)"",是会被 Jekyll 特殊处理的"元数据"(metadata)。元数据包括(显示在浏览器标签页卡片上的)标题、布局(layout)名称等。对于布局,大部分的页面都可以使用 `layout: page`(例如[《关于我们》](https://github.com/zgzgorg/yj.zgzg.io/blob/68c1e9f1d7072eda10a20c168512daa451b29a22/pages/about.md?plain=1#L3)、[《常见问题》](https://github.com/zgzgorg/yj.zgzg.io/blob/68c1e9f1d7072eda10a20c168512daa451b29a22/pages/faq.md?plain=1#L3))。
- `_data`:这里存放了任何需要被 enumerate ("枚举"/"罗列"/"用循环读出")出来的信息。每个文件都是一个 YAML 文件。例如:
- `data.yml`:定义了网站顶栏、底栏应该有哪些链接;我们有哪些伙伴社区、赞助商;春晚板块有哪些节目;歌手赛有哪些节目;云集板块有哪些栏目…… **这是最主要的、最杂的数据文件。** 当某个列表太大时,您也可以选择把它单独拆出来、成为一个单独的文件,就像下面两项这样👇
- `past-events.yml`:定义了[《往届回顾》](https://www.zgzg.io/past-events/)页面的内容。
- `trailer-images.yml`:罗列了一些春晚宣传片的拍摄花絮照片。

⚠️ **注意**:本代码库虽然包含一个 `images` 文件夹,但它仅应该被用来存放 svg 等源代码格式的图片。若需要存放 jpg、png 等二进制格式的图片,请使用我们自己的 Cloudinary 服务。

### 如果你想要开发网站功能
- `_layouts`:当朴素的 `layout: page` 难以满足您的表达需求时,您可以创建新的 layout,存放于这里。请参见下文"如何自由排版"一节。
- `_includes`:存放可复用的一些元件。复用可以发生在:
- 几页之间。例如:**赞助商列表**(`_includes/sponsor-section.html`)被复用于歌手赛、游园、春晚等页面底部。
- 一页之内。例如:**栏目卡片**(`_includes/programme.html`)被复用于首页。
- 其他可复用的元件之内。例如,上述**栏目卡片**也在**云集节目列表**(`_includes/programmes.html`)里被复用:
<img width="800" alt="image" src="https://user-images.githubusercontent.com/594058/194156682-19832792-da81-4f84-bcb7-a43cc2c3e5cf.png">
- `assets`:存放了一些脚本和样式表文件。
- `assets/css/style.scss`:许多仅对《载歌在谷》有意义的样式(与"对其他网站也有用"相对),都被存放到了这里。如春晚横幅:https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/assets/css/style.scss#L357-L364
- `assets/js/sidenotes.js`: is a pure-JavaScript plugin that puts `.footnotes` into `#sidebar`, aligning each piece of note at their corresponding superscript, developed by [@tslmy](https://github.com/tslmy).
- `_sass`:这里存放各种对其他网站也有复用意义的样式表。其实,本网站采用的即是他人制作的、现成的主题——由 [Robert Austin](https://github.com/zerostaticthemes) 制作的 [Serif](https://github.com/zerostaticthemes/jekyll-serif-theme)。

本网站托管于 [Netlify](https://www.netlify.com/) 之上,域名为 [zgzg.io](https://zgzg.io/)。请参见 [zgzg.link/site-notes](https://zgzg.link/site-notes) 更多信息,包括《载歌在谷》的所有网络服务资源、各代网站特点及制作背景等。(仅限内部访问。)

#### 如何自由地排版
当朴素的 `layout: page` 难以满足您的表达需求时,您可以创建新的 layout。

假设我们想做一个[《春晚》](https://www.zgzg.io/gala/)页面。通常,我们只需要创建一个 `pages/gala.md` 来提供内容。但是,假设这次我们想要做一些复杂的结构,如图所示:

![](https://user-images.githubusercontent.com/594058/194150455-816766bc-dd14-4b6f-9f59-4f2136b24fca.jpeg)

我们首先要做的是,在 `pages/gala.md` 的 front matter 上写明"请用一个叫 gala 的 layout 来渲染这个文档,而不是默认的叫 page 的那个 layout":

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/pages/gala.md?plain=1#L3

接下来,我们创建一个 `_layouts/gala.html` 文件。虽然这是一个 HTML 文档,但是我们依然可以写入 front matter。在它的 front matter 里,我们写"请把这个 layout 嵌套在叫 default 的那个 layout 里":

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/_layouts/gala.html#L1-L3

接下来的工作,就是常见的"写 HTML"了。其实,我们写的不会是纯粹的 HTML,而是一种叫 [Liquid](https://jekyllrb.com/docs/liquid/) 的"模板语言"(templating language)。模板语言提供一些高阶功能,比如引用一些模块。例如,在现今的 `_layouts/gala.html` 底部,我们就有引用两个模块:

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/_layouts/gala.html#L32-L33

这些模块存放于 `_includes/` 文件夹下。例如,上面引用的第一个模块,就在 `_includes/galalist.html`:

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/_includes/galalist.html#L1-L14

这个模块很好地体现了 Jekyll 里的"枚举"该怎么用。注意这一行:

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/_includes/galalist.html#L7

它说:"请在本网站(`site`)的 `data` 文件夹下,找到叫 `data` 的 YAML 文件,读取其中的 `galalist` 列表。对于其中每个项目(以 `pic` 指代),重复渲染下述内容"。这里所指的"下述内容",即是:

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/_includes/galalist.html#L8-L12

它说:

> 放置一个 `galalist-section` 类型的分区(**div**ision,`div`)。在里面放:
> * 一个图片(`img`),图片链接为 `pic.image`;
> * 在那之后放一个三级标题(`h3`),内容为 `pic.title`;
> * 最后,把 `pic.description` 直接放上去。

这里,`galalist-section` 和 `galalist-pic` 是用来排版的。它们所对应的 CSS 规则在这里:

https://github.com/zgzgorg/yj.zgzg.io/blob/d11235a52359996f299a1bdab37669251c10d21c/assets/css/style.scss#L184-L190

(⚠️**注意**:我们采用 [SCSS](https://sass-lang.com/) 作为"样式语言"(styling language)。它是 CSS 的一种超集(superset)。)

## 样式表编译器说明(Sass/SCSS)

本项目所有 SCSS 文件均由 Jekyll 内置的 Ruby Sass(sassc)编译。**请勿使用 Dart Sass 新语法**(如 `@use`、`@forward`、`color.adjust()` 等),只使用 `@import`、`lighten()` 等传统语法。

- 所有开发、预览、部署请务必使用:

```shell
bundle exec jekyll serve
```

- 团队依赖已在 Gemfile 中锁定,确保所有人编译结果一致。
- 如遇 Dart Sass 相关 warning,说明未用 bundle exec 或本地误装 Dart Sass CLI。

## LICENSE
The MIT License (MIT).

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tbody>
<tr>
<td align="center"><a href="http://myli.page"><img src="https://avatars.githubusercontent.com/u/594058?v=4?s=100" width="100px;" alt="Ming"/><br /><sub><b>Ming</b></sub></a><br /><a href="#infra-tslmy" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=tslmy" title="Tests">⚠️</a> <a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=tslmy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/xubowenhaoren"><img src="https://avatars.githubusercontent.com/u/20229080?v=4?s=100" width="100px;" alt="Bowen Xu"/><br /><sub><b>Bowen Xu</b></sub></a><br /><a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=xubowenhaoren" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/rtq998916"><img src="https://avatars.githubusercontent.com/u/92650213?v=4?s=100" width="100px;" alt="rtq998916"/><br /><sub><b>rtq998916</b></sub></a><br /><a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=rtq998916" title="Code">💻</a></td>
<td align="center"><a href="http://floraxue.github.io"><img src="https://avatars.githubusercontent.com/u/5152856?v=4?s=100" width="100px;" alt="Flora Xue"/><br /><sub><b>Flora Xue</b></sub></a><br /><a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=floraxue" title="Code">💻</a> <a href="https://github.com/zgzgorg/yj.zgzg.io/pulls?q=is%3Apr+reviewed-by%3Afloraxue" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/ckt624"><img src="https://avatars.githubusercontent.com/u/13848196?v=4?s=100" width="100px;" alt="Kongtao Chen"/><br /><sub><b>Kongtao Chen</b></sub></a><br /><a href="https://github.com/zgzgorg/yj.zgzg.io/commits?author=ckt624" title="Code">💻</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
<!-- prettier-ignore-end -->

Data organization:
- `_data/comedians.json` stores information about each comedian in this club. It is updated automatically to sync up with a Google Sheet.
- `_data/friends.yml` stores links to our friends.
- `_team/` contains Markdown documents for each member of the core team.
<!-- ALL-CONTRIBUTORS-LIST:END -->

Other technical details:
- `pull-sheet/` hosts the mechanism that updates `_data/comedians.json` from the roster.
- `sidenotes.js` is a pure-JavaScript plugin that puts `.footnotes` into `#sidebar`, aligning each piece of note at their corresponding superscript.
- This website uses the [Serif](https://github.com/zerostaticthemes/jekyll-serif-theme) theme by [Robert Austin](https://github.com/zerostaticthemes). See LICENSE.
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
Loading