From 3657afa5fc1b68b7890677926a8ceb91732cd52c Mon Sep 17 00:00:00 2001 From: JS Ng Date: Mon, 19 May 2025 03:47:24 +0000 Subject: [PATCH 1/8] add: NYJC-CSUL license v1.0 --- pages/LICENSE.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pages/LICENSE.md diff --git a/pages/LICENSE.md b/pages/LICENSE.md new file mode 100644 index 0000000..c04f149 --- /dev/null +++ b/pages/LICENSE.md @@ -0,0 +1,32 @@ +# NYJC Computing Student Use License (NYJC-CSUL) +**Version 1.0 – Effective 19/05/2025** +[Full license available at nyjc-computing.github.io/LICENSE](https://nyjc-computing.github.io/LICENSE) + +--- + +## 1. License Grant +NYJC Computing grants a **non-exclusive, non-transferable, limited-use license** to **current and former NYJC Computing students** to: +- Access, download, annotate, and integrate the Materials into personal study systems for **personal academic use only**. +- Share the Materials **non-commercially** with peers under the conditions below. + +## 2. Redistribution and Citation +Redistribution of the Materials to others (including juniors, classmates, or external parties) is **permitted only if ALL of the following conditions are met**: +- The **full license text is included** unchanged with the shared Materials. +- The Materials are shared **in their original, unmodified form** (no edits, cropping, reformatting, remixing, or excerpting). +- The source **“NYJC Computing” is clearly cited** wherever the Materials are shared or displayed. + +## 3. Prohibited Uses +Users must NOT: +- Sell, license, or commercially exploit the Materials or any derivative works. +- Modify or remix the Materials for redistribution. +- Share Materials with individuals who are not current or former NYJC Computing students without adhering to Section 2. +- Remove or alter any copyright or license notices. + +## 4. Ownership +All Materials remain the intellectual property of their respective creators and NYJC Computing. This license **does not transfer ownership or intellectual property rights**. + +## 5. Duration and Termination +This license is valid while you are a current or former NYJC Computing student. Breach of any term may result in access revocation or disciplinary action. + +## 6. Compliance +Users must adhere to NYJC’s academic integrity policies. Misuse or unauthorized redistribution may lead to sanctions. From 10c3ac9ebccb389d9e419e683ae6a826c4d452a7 Mon Sep 17 00:00:00 2001 From: JS Ng Date: Mon, 19 May 2025 03:51:50 +0000 Subject: [PATCH 2/8] fix: add Jekyll header --- pages/LICENSE.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pages/LICENSE.md b/pages/LICENSE.md index c04f149..a3ec203 100644 --- a/pages/LICENSE.md +++ b/pages/LICENSE.md @@ -1,3 +1,10 @@ +--- +title: NYJC Computing Student Use License (NYJC-CSUL) +permalink: "/LICENSE" +layout: page +style: assets/custom.css +--- + # NYJC Computing Student Use License (NYJC-CSUL) **Version 1.0 – Effective 19/05/2025** [Full license available at nyjc-computing.github.io/LICENSE](https://nyjc-computing.github.io/LICENSE) From dd78d101ca27bcd581c4a81171e6130837cc05ee Mon Sep 17 00:00:00 2001 From: JS Ng Date: Mon, 19 May 2025 03:53:38 +0000 Subject: [PATCH 3/8] fix: remove duplicate header --- pages/LICENSE.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/LICENSE.md b/pages/LICENSE.md index a3ec203..604e048 100644 --- a/pages/LICENSE.md +++ b/pages/LICENSE.md @@ -5,8 +5,6 @@ layout: page style: assets/custom.css --- -# NYJC Computing Student Use License (NYJC-CSUL) -**Version 1.0 – Effective 19/05/2025** [Full license available at nyjc-computing.github.io/LICENSE](https://nyjc-computing.github.io/LICENSE) --- From 37bbfb42785b639cab7ae43c7b09b580ed62279e Mon Sep 17 00:00:00 2001 From: JS Ng Date: Fri, 11 Jul 2025 18:05:40 +0800 Subject: [PATCH 4/8] Add 2026 UAS Calculator --- pages/free-resources.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages/free-resources.md b/pages/free-resources.md index b5caf6c..8050545 100644 --- a/pages/free-resources.md +++ b/pages/free-resources.md @@ -7,6 +7,12 @@ style: assets/custom.css These resources are created by us as part of our teaching content, and may be used for non-commercial purposes. If you do use them as-is with minor changes, please credit us with a link to the respective repositories so users can find the original source. +## 2026 UAS Calculator + +Can't figure out what UAS you will get? Trying to optimise your study strategy? Let our UAS Calculator help you out! + +[2026 UAS Calculator](/2026-uas-calculator) + ## Intro to Python These exercises for Python beginners are part of a guided lesson package for H2 Computing students, with a greater focus on picking up Python features quickly. From 33b70a789232e29f264a3146e7a82f2e5e7281ca Mon Sep 17 00:00:00 2001 From: JS Ng Date: Wed, 24 Sep 2025 17:36:28 +0800 Subject: [PATCH 5/8] feat: add reddit social link --- _data/social.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_data/social.yml b/_data/social.yml index a5f1917..0674fba 100644 --- a/_data/social.yml +++ b/_data/social.yml @@ -4,3 +4,6 @@ - title: GitHub url: https://github.com/nyjc-computing icon: fab fa-github +- title: Reddit + url: https://www.reddit.com/u/Legitimate_Fact9099/s/Yn4u8KSPt5 + icon: fab fa-reddit From 89795a3ab7aa16dabd6915ab84deb14032b95f57 Mon Sep 17 00:00:00 2001 From: JS Ng Date: Wed, 5 Nov 2025 07:33:36 +0000 Subject: [PATCH 6/8] dev: update to ruby 2.6.2 This is the current version of ruby provided in codespaces --- Gemfile | 8 ++++++++ Gemfile.lock | 35 ++++++++--------------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 7d4c7cd..7797a01 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,12 @@ source "https://rubygems.org" + +# Required from Ruby 3.4.0 +gem "base64" +gem "bigdecimal" + +# Required from Ruby 3.5.0 +gem "logger" + # Hello! This is where you manage which Jekyll version is used to run. # When you want to use a different version, change it below, save the # file and run `bundle install`. Run Jekyll with `bundle exec`, like so: diff --git a/Gemfile.lock b/Gemfile.lock index 189128b..1eab4ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,6 +3,8 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) + base64 (0.3.0) + bigdecimal (3.3.1) colorator (1.1.0) concurrent-ruby (1.3.4) csv (3.2.8) @@ -10,7 +12,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-gnu) forwardable-extended (2.6.0) http_parser.rb (0.8.0) i18n (1.14.6) @@ -47,6 +49,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) mercenary (0.3.6) monophase (0.1.0) jekyll (~> 3.9) @@ -71,37 +74,15 @@ GEM webrick (1.9.0) PLATFORMS - aarch64-linux - aarch64-linux-android - aarch64-linux-gnu - aarch64-linux-musl - aarch64-mingw-ucrt - arm-linux-androideabi - arm-linux-gnu - arm-linux-gnueabihf - arm-linux-musl - arm-linux-musleabihf - arm64-darwin - riscv64-linux-android - riscv64-linux-gnu - riscv64-linux-musl - ruby - x86-cygwin - x86-linux - x86-linux-android - x86-linux-gnu - x86-linux-musl - x86-mingw-ucrt - x86_64-cygwin - x86_64-darwin - x86_64-linux-android x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES + base64 + bigdecimal http_parser.rb (~> 0.6.0) jekyll (~> 3.9) jekyll-feed (~> 0.12) + logger monophase tzinfo (>= 1, < 3) tzinfo-data @@ -109,4 +90,4 @@ DEPENDENCIES webrick (~> 1.9) BUNDLED WITH - 2.5.11 + 2.6.2 From d72fb8efda6dc2f2ca2b07e21f4b5b87adc723c7 Mon Sep 17 00:00:00 2001 From: JS Ng Date: Wed, 5 Nov 2025 07:36:41 +0000 Subject: [PATCH 7/8] dev: remove dev branch from matrix this branch no longer exists --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 161691d..b476269 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - branches: [dev, content] # Add new branches here + branches: [content] # Add new branches here steps: - name: Checkout Main Branch uses: actions/checkout@v3 From 0a2c8b6949ae6db4300df52306966c3014ca8576 Mon Sep 17 00:00:00 2001 From: JS Ng Date: Wed, 5 Nov 2025 07:56:26 +0000 Subject: [PATCH 8/8] dev: fix syn-branch not syncing --- .github/workflows/sync-branches.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index b476269..2730d8e 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -27,13 +27,21 @@ jobs: - name: Sync with ${{ matrix.branch }} run: | TARGET_BRANCH="${{ matrix.branch }}" - git checkout $TARGET_BRANCH - git pull origin $TARGET_BRANCH || echo "No changes to pull for $TARGET_BRANCH" - git reset --hard origin/main - git merge --squash origin/main || echo "No changes to merge for $TARGET_BRANCH" - if [ -n "$(git status --porcelain)" ]; then - git commit -m "Squash merge changes from main into $TARGET_BRANCH" - git push origin $TARGET_BRANCH || echo "Failed to push $TARGET_BRANCH" + git fetch --all --prune + # Checkout the target branch and ensure it's up-to-date with origin + git checkout ${TARGET_BRANCH} + git pull --no-rebase origin ${TARGET_BRANCH} || true + + # Merge origin/main into the target branch (automatic merge). + # Use --no-ff to create an explicit merge commit when required and + # --no-edit to avoid interactive editor for the merge message. + if git merge --no-ff --no-edit origin/main; then + git push origin ${TARGET_BRANCH} + else + # On merge conflict, abort and push a backup branch so nothing is lost. + git merge --abort || true + BACKUP_BRANCH="backup/${TARGET_BRANCH}-merge-failed-$(date +%s)" + git push origin HEAD:refs/heads/${BACKUP_BRANCH} + echo "Merge failed. Backup pushed to ${BACKUP_BRANCH}. Exiting with failure." + exit 1 fi - git reset --hard main - git push origin $TARGET_BRANCH --force || echo "Failed to force push $TARGET_BRANCH"