Skip to content

Commit

Permalink
[infra] Add deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
as3810t committed Sep 10, 2023
1 parent d69fbb9 commit 9157d9b
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
@@ -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/
80 changes: 0 additions & 80 deletions .github/workflows/build-docker.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
60 changes: 30 additions & 30 deletions src/js/dialogs/sandbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -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). ',
Expand All @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}],
Expand All @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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/)를 번역한 것입니다.',
'아래 데모를 먼저 보셔도 좋습니다.',
'',
'<https://pcottle.github.io/learnGitBranching/?demo&locale=ko>'
'<https://ftsrg-softeng.github.io/learnGitBranching/?demo&locale=ko>'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}, {
Expand Down Expand Up @@ -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)'
]
}
}],
Expand All @@ -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). ',
Expand Down Expand Up @@ -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)'
]
}
}],
Expand All @@ -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.',
Expand Down Expand Up @@ -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). ',
Expand Down Expand Up @@ -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 ",
Expand Down
1 change: 1 addition & 0 deletions src/style/font-awesome.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit 9157d9b

Please sign in to comment.