diff --git a/.github/settings.yml b/.github/settings.yml index 185cc34d4..3a962be50 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,3 +1,3 @@ repository: description: An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git! - homepage: https://pcottle.github.io/learnGitBranching/ + homepage: https://ftsrg-softeng.github.io/learnGitBranching/ diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml deleted file mode 100644 index 0f3f2f74b..000000000 --- a/.github/workflows/build-docker.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Docker - learnGitBranching image - -on: - workflow_dispatch: - push: - branches: - - main # Trigger CI on main branch - - bmcclure/main - paths: - - '**/*' - - '.github/workflows/build-docker.yml' - pull_request: - branches: - - main # Trigger gated pipeline on PR to main - - bmcclure/main - paths: - - '**/*' - - '.github/workflows/build-docker.yml' - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push-image: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - tags: | - type=ref,event=pr - type=ref,event=branch - type=sha,format=long - type=raw,value=latest - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build Docker image (non main branch) - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - if: github.ref != 'refs/heads/bmcclure/main' - with: - context: . - load: true - push: false - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - name: Build and push Docker image (main branch) - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - if: github.ref == 'refs/heads/bmcclure/main' - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - id: lowercaseImageName - uses: ASzc/change-string-case-action@v2 - with: - string: ${{ env.IMAGE_NAME }} - - name: Save Docker Image archive to local filesystem - run: "docker save --output learnGitBranching.tar ${{env.REGISTRY}}/${{ steps.lowercaseImageName.outputs.lowercase }}" - - name: Upload application's Docker Image as pipeline artifact - uses: actions/upload-artifact@v2 - with: - path: learnGitBranching.tar - name: learnGitBranching.tar diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..6d10678dd --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,34 @@ +name: CI +on: + push: + branches: + - main +jobs: + publish-gh-pages: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v3 + + - name: Set Node.js 18.x + uses: actions/setup-node@v3 + with: + node-version: 18.x + + - name: Run install + uses: borales/actions-yarn@v4 + with: + cmd: install # will run `yarn install` command + - name: Install gulp + run: | + npm i -g gulp + - name: Build app + run: | + gulp build + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./build + force_orphan: true \ No newline at end of file diff --git a/package.json b/package.json index fe31bb249..158219830 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/pcottle/learnGitBranching" + "url": "https://github.com/ftsrg-softeng/learnGitBranching" }, "devDependencies": { "@babel/core": "^7.17.5", diff --git a/src/js/dialogs/sandbox.js b/src/js/dialogs/sandbox.js index 2cd3a720c..0e56d7fc5 100644 --- a/src/js/dialogs/sandbox.js +++ b/src/js/dialogs/sandbox.js @@ -18,7 +18,7 @@ exports.dialog = { '', 'PS: Want to go straight to a sandbox next time?', 'Try out ', - '[this special link](https://pcottle.github.io/learnGitBranching/?NODEMO)', + '[this special link](https://ftsrg-softeng.github.io/learnGitBranching/?NODEMO)', '', 'PPS: GitHub has started naming the default branch `main` instead of `master` ', 'to migrate away from biased terminology [(more details available here)](https://github.com/github/renaming). ', @@ -43,11 +43,11 @@ exports.dialog = { '', 'Si no viste la demo, mirala en esta dirección:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_AR&demo](https://pcottle.github.io/learnGitBranching/?locale=es_AR&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_AR&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_AR&demo)', '', '¿Querés dejar de ver este mensaje? Agregale `NODEMO` a la URL para dejar de verlo, como en este link:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_AR&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=es_AR&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_AR&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_AR&NODEMO)' ] } }, { @@ -99,11 +99,11 @@ exports.dialog = { '', 'Si no viste la demo, mirala en ésta dirección:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_MX&demo](https://pcottle.github.io/learnGitBranching/?locale=es_MX&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_MX&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_MX&demo)', '', '¿Harto de este mensaje? Agregale `NODEMO` a la URL para dejar de verlo, como en éste link:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_MX&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=es_MX&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_MX&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_MX&NODEMO)' ] } }, { @@ -155,11 +155,11 @@ exports.dialog = { '', 'Si no viste la demo, mírala en esta dirección:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_ES&demo](https://pcottle.github.io/learnGitBranching/?locale=es_ES&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_ES&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_ES&demo)', '', '¿Harto de este mensaje? Agrégale `NODEMO` a la URL para dejar de verlo, como en este link:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=es_ES&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=es_ES&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_ES&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=es_ES&NODEMO)' ] } }, { @@ -211,11 +211,11 @@ exports.dialog = { '', 'Se você ainda não viu o demo, veja aqui:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=pt_BR&demo](https://pcottle.github.io/learnGitBranching/?locale=pt_BR&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=pt_BR&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=pt_BR&demo)', '', 'Farto desta mensagem? Acrescente `NODEMO` ao endereço para se livrar dela, como no link abaixo:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=pt_BR&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=pt_BR&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=pt_BR&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=pt_BR&NODEMO)' ] } }, { @@ -267,11 +267,11 @@ exports.dialog = { '', 'Se aínda non viches a demo, olla aquí:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=gl&demo](https://pcottle.github.io/learnGitBranching/?locale=gl&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=gl&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=gl&demo)', '', '¿Farto destas mensaxes? Engade `NODEMO` á dirección para librarte dela, como no link de abaixo:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=gl&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=gl&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=gl&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=gl&NODEMO)' ] } }, { @@ -320,11 +320,11 @@ exports.dialog = { '', 'Falls du die Demonstration noch nicht gesehen hast, schau sie dir hier an:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=de_DE&demo](https://pcottle.github.io/learnGitBranching/?locale=de_DE&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=de_DE&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=de_DE&demo)', '', 'Genervt von diesem Fenster? Häng `NODEMO` an die URL um es los zu werden, so wie hier:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=de_DE&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=de_DE&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=de_DE&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=de_DE&NODEMO)' ] } }, { @@ -376,11 +376,11 @@ exports.dialog = { '', '簡単なデモを用意してあるので、もしよければこちらもご覧ください：', '', - '[https://pcottle.github.io/learnGitBranching/?locale=ja&demo](https://pcottle.github.io/learnGitBranching/?demo&locale=ja)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=ja&demo](https://ftsrg-softeng.github.io/learnGitBranching/?demo&locale=ja)', '', 'このダイアログ自体を省略するには、以下のようにURLの末尾にクエリストリング`NODEMO`を付加してアクセスしてください。', '', - '[https://pcottle.github.io/learnGitBranching/?locale=ja&NODEMO](https://pcottle.github.io/learnGitBranching/?NODEMO&locale=ja)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=ja&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?NODEMO&locale=ja)' ] } }, { @@ -438,7 +438,7 @@ exports.dialog = { '', '如果你还没看过演示，请[到此](?demo)查看。', '', - 'PS：想直接进入沙盒？ 在 URL 后头加上 `NODEMO` 就可以了，试一下[这个链接](https://pcottle.github.io/learnGitBranching/?locale=zh_CN&NODEMO)' + 'PS：想直接进入沙盒？ 在 URL 后头加上 `NODEMO` 就可以了，试一下[这个链接](https://ftsrg-softeng.github.io/learnGitBranching/?locale=zh_CN&NODEMO)' ] } }], @@ -455,11 +455,11 @@ exports.dialog = { '', '如果你還沒看過演示，請到此查看：', '', - '[https://pcottle.github.io/learnGitBranching/?locale=zh_TW&demo](https://pcottle.github.io/learnGitBranching/?locale=zh_TW&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=zh_TW&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=zh_TW&demo)', '', '厭煩這個對話視窗嗎？在 URL 後頭加上 `NODEMO` 就看不到它了，也可以直接點下邊這個連結：', '', - '[https://pcottle.github.io/learnGitBranching/?locale=zh_TW&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=zh_TW&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=zh_TW&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=zh_TW&NODEMO)' ] } }, { @@ -504,10 +504,10 @@ exports.dialog = { '탄탄히 잡게끔 도와드리기 위해 만들었습니다. 재밌게 사용해주시기를', '바라며, 무언가를 배워가신다면 더 기쁘겠습니다!', '', - '이 애플리케이션은 [Peter Cottle](https://github.io/pcottle)님의 [LearnGitBranching](https://pcottle.github.io/learnGitBranching/)를 번역한 것입니다.', + '이 애플리케이션은 [Peter Cottle](https://github.io/ftsrg-softeng)님의 [LearnGitBranching](https://ftsrg-softeng.github.io/learnGitBranching/)를 번역한 것입니다.', '아래 데모를 먼저 보셔도 좋습니다.', '', - '' + '' ] } }, { @@ -557,11 +557,11 @@ exports.dialog = { '', 'Si vous n\'avez pas vu la démo, vous pouvez le faire là :', '', - '[https://pcottle.github.io/learnGitBranching/?locale=fr_FR&demo](https://pcottle.github.io/learnGitBranching/?locale=fr_FR&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=fr_FR&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=fr_FR&demo)', '', 'Agacé par ce dialogue ? Ajoutez `NODEMO` à l\'URL pour le supprimer, en lien ci-dessous pour votre commodité :', '', - '[https://pcottle.github.io/learnGitBranching/?locale=fr_FR&NODEMO](https://pcottle.github.io/learnGitBranching/?locale=fr_FR&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=fr_FR&NODEMO](https://ftsrg-softeng.github.io/learnGitBranching/?locale=fr_FR&NODEMO)' ] } }, { @@ -613,11 +613,11 @@ exports.dialog = { '', 'Если ты не видел демонстрацию – посмотри её тут:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=ru_RU&demo](https://pcottle.github.io/learnGitBranching/?locale=ru_RU&demo)', + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=ru_RU&demo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=ru_RU&demo)', '', 'Достало это сообщение? Добавь `NODEMO` к адресу и навсегда забудь о нём, ниже ссылка для удобства:', '', - '[https://pcottle.github.io/learnGitBranching/?locale=ru_RU&NODEMO](?locale=ru_RU&NODEMO)' + '[https://ftsrg-softeng.github.io/learnGitBranching/?locale=ru_RU&NODEMO](?locale=ru_RU&NODEMO)' ] } }, { @@ -672,7 +672,7 @@ exports.dialog = { '', 'P.S. Хочеш перейти одразу до пісочниці наступного разу?', 'Спробуй ', - '[це спеціальне посилання.](https://pcottle.github.io/learnGitBranching/?locale=uk&NODEMO)' + '[це спеціальне посилання.](https://ftsrg-softeng.github.io/learnGitBranching/?locale=uk&NODEMO)' ] } }], @@ -694,7 +694,7 @@ exports.dialog = { '', 'Ghi chú: Nếu muốn trực tiếp vào hộp cát (sandbox) ở lần sau?', 'Hãy dùng', - '[đường link đặc biệt này của chúng tôi](https://pcottle.github.io/learnGitBranching/?locale=vi&NODEMO)', + '[đường link đặc biệt này của chúng tôi](https://ftsrg-softeng.github.io/learnGitBranching/?locale=vi&NODEMO)', '', 'Tái bút: GitHub đã đổi tên cho nhánh mặc định là `main` thay vì `master` ', 'nhằm tránh dùng thuật ngữ có xu hướng thiên vị [(xem chi tiết tại đây)](https://github.com/github/renaming). ', @@ -723,7 +723,7 @@ exports.dialog = { '', 'PS: Bi šel rad naslednjič naravnost v peskovnik?', 'Poizkusi s', - '[to posebno povezavo](https://pcottle.github.io/learnGitBranching/?locale=sl_SI&NODEMO)' + '[to posebno povezavo](https://ftsrg-softeng.github.io/learnGitBranching/?locale=sl_SI&NODEMO)' ] } }], @@ -743,7 +743,7 @@ exports.dialog = { '', 'Możesz zobaczyć wszystkie komendy wpisując `show commands` w terminalu.', '', - 'Chcesz następnym razem przejść prosto do trybu piaskownicy? Kilknij [tutaj](https://pcottle.github.io/learnGitBranching/?locale=pl&NODEMO)', + 'Chcesz następnym razem przejść prosto do trybu piaskownicy? Kilknij [tutaj](https://ftsrg-softeng.github.io/learnGitBranching/?locale=pl&NODEMO)', '', 'PS. GitHub zaczął nazywać domyślną gałąź `main` zamiast `master`, aby odejść od tendencyjnej terminologii. [(więcej informacji tutaj)](https://github.com/github/renaming)',, 'Zgodnie z tym ogólnobranżowym ruchem, zaktualizowaliśmy również "Learn Git Branching", by używać `main` zamiast `master` w naszych zadaniach.', @@ -771,7 +771,7 @@ exports.dialog = { '', 'பின்குறிப்பு: அடுத்தமுறை நேராக sandbox செல்ல வேண்டுமா?', 'அப்படியானால் பின் வரும் இணைப்பை பயன்பாடித்துக ', - '[this special link](https://pcottle.github.io/learnGitBranching/?locale=ta_IN&NODEMO)', + '[this special link](https://ftsrg-softeng.github.io/learnGitBranching/?locale=ta_IN&NODEMO)', '', 'பின்குறிப்பு: GitHub (பெரிய அளவில் பயன்பாட்டில் உள்ள இணையதலம்) `main` என்ற கிளையை `master`-க்கு பதில் ', 'முன்னிருப்பு கிளையாக பயன் படுத்த உள்ளது [more details available here](https://github.com/github/renaming). ', @@ -803,7 +803,7 @@ exports.dialog = { "", "PS: Preferisci andare direttamente al sandbox?", "Prova ", - "[questo link](https://pcottle.github.io/learnGitBranching/?NODEMO?locale=it_IT).", + "[questo link](https://ftsrg-softeng.github.io/learnGitBranching/?NODEMO?locale=it_IT).", "", "PPS: GitHub (e il settore in generale) sta modificando il nome del ramo di default in `main` invece che `master` ", "(leggi [qui per ulteriori dettagli](https://github.com/github/renaming)). Per adattarci a questo cambiamento ", diff --git a/src/style/font-awesome.css b/src/style/font-awesome.css index 57f6f1fe7..90d59a2c2 100644 --- a/src/style/font-awesome.css +++ b/src/style/font-awesome.css @@ -25,6 +25,7 @@ font-family: "FontAwesome"; src: url('../assets/font/fontawesome-webfont.eot'); src: url('../assets/font/fontawesome-webfont.eot?#iefix') format('eot'), url('../assets/font/fontawesome-webfont.woff') format('woff'), url('../assets/font/fontawesome-webfont.ttf') format('truetype'), url('../assets/font/fontawesome-webfont.svg#FontAwesome') format('svg'); + src: url('./assets/font/fontawesome-webfont.eot?#iefix') format('eot'), url('./assets/font/fontawesome-webfont.woff') format('woff'), url('./assets/font/fontawesome-webfont.ttf') format('truetype'), url('../assets/font/fontawesome-webfont.svg#FontAwesome') format('svg'); font-weight: normal; font-style: normal; } diff --git a/src/template.index.html b/src/template.index.html index d6404d07b..88595ef7d 100644 --- a/src/template.index.html +++ b/src/template.index.html @@ -9,8 +9,8 @@ - - + + @@ -455,7 +455,7 @@

- +