From 986b7484299ced2870668a7a065d92cd9e418546 Mon Sep 17 00:00:00 2001 From: Shawn Lim Date: Mon, 28 Sep 2020 12:44:33 +0800 Subject: [PATCH 1/7] Fix broken links --- .github/CONTRIBUTING.md | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 00000000..234359c9 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,48 @@ +## Content Editors + +Please reach out to any of the developers on [Gold Card Community](https://goldcardcommunity.slack.com/) on slack `#website` channel. We will give you access to a CMS to edit content / create new posts. + +If you are comfortable with git, then you can go to `content` folder and edit the pages. Afterwards, raise a Pull Request (see below). + +## Developers + +1. Feel free to contribute code by raising a [Pull Request](https://github.com/taiwangoldcard/website/pulls). Keep your code change as light as possible, with [atomic commits](https://coderwall.com/p/jmqp0a/why-and-how-i-craft-atomic-commits-in-git) so the whole thing is easier to review. + +2. Alternatively, use the [issues](https://github.com/taiwangoldcard/website/issues) page to raise ideas / suggestions. + +### Code structure + +- Content: `content/` -- Most copy should be edited here. +- HTML: `themes/compose/layout/` -- is where you want to modify the layout +- JS: `themes/compose/assets/js/` -- is where you want to modify or add new JS functionality +- CSS: `themes/compose/assets/sass/` -- is where is the styles are. `hugo` will automatically translates it to CSS + +- Output: `docs/` is the "build" folder, where GitHub look at to show the [Taiwan Gold Card](https://taiwangoldcard.com/) website + +### Tests + +We have frontend tests (with cypress) to check if the website still works properly before being available on the website. All tests are ran automatically via [github workflows](./workflows/tests.yml) when you push a commit. You can see them [here](https://dashboard.cypress.io/projects/rtyzr7/runs). Each test has a video attached to it. + +If you need to run the tests locally: + +1. First, install node / npm. This is required for the test executable. You may use [Node Version Manager](https://github.com/nvm-sh/nvm): + +``` +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash +``` + +2. At this repo's root, perform `npm install`. This will install `cypress`, the automated test runner. + +3. Run the application `npm start`. + +4. Run the tests `npm test`. + +5. (Optional) To debug tests, you can `./node_modules/cypress/bin/cypress open` to view the interactive UI and select the tests to run: + +![Cypress Tests UI](../tests-ui.png) + +### Deploy changes + +When you push to master (or merge a Pull Request), a [github action workflow](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions) will be automatically called, and deploy your changes to the website. + +You can see how it works in the [deploy workflow](./workflows/deploy.yml) From 37f259462ba4a9eba90a1751651c9a54b05fa729 Mon Sep 17 00:00:00 2001 From: Shawn Lim Date: Mon, 28 Sep 2020 12:49:41 +0800 Subject: [PATCH 2/7] Add section for communication channel --- .github/CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 234359c9..0c46a349 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,8 +1,12 @@ +## Communication + +We use [slack](https://goldcardcommunity.slack.com/) for talking about all `#website` matters. + ## Content Editors -Please reach out to any of the developers on [Gold Card Community](https://goldcardcommunity.slack.com/) on slack `#website` channel. We will give you access to a CMS to edit content / create new posts. +Please join the slack channel above. We will give you access to a CMS to edit content / create new posts. -If you are comfortable with git, then you can go to `content` folder and edit the pages. Afterwards, raise a Pull Request (see below). +If you are comfortable with git, then you can go to [`content` ](https://github.com/taiwangoldcard/website/tree/master/content) folder and edit the pages. Afterwards, raise a Pull Request (see below). ## Developers From 8c8ead647d298f2ca4a2e034560b8c0166b9f1fb Mon Sep 17 00:00:00 2001 From: Shawn Lim Date: Mon, 28 Sep 2020 12:55:40 +0800 Subject: [PATCH 3/7] Add flow for content editors --- .github/CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0c46a349..7d7235de 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,15 @@ We use [slack](https://goldcardcommunity.slack.com/) for talking about all `#web Please join the slack channel above. We will give you access to a CMS to edit content / create new posts. -If you are comfortable with git, then you can go to [`content` ](https://github.com/taiwangoldcard/website/tree/master/content) folder and edit the pages. Afterwards, raise a Pull Request (see below). +The [flow](https://github.com/taiwangoldcard/website/issues/46#issuecomment-695207432) is like this: + +1. Create / Edit content on the CMS +2. Save +3. CMS will automatically help you request for approval. See this [example](https://github.com/taiwangoldcard/website/pull/139) +4. Someone will approve and publish your changes +5. See your new content live on https://taiwangoldcard.com + +Alternatively, if you are already comfortable with git, then you can go to [`content` ](https://github.com/taiwangoldcard/website/tree/master/content) folder and edit the pages. Afterwards, raise a Pull Request (see below). ## Developers From d833722511537b2c2adf778c6f059bb120da4cd6 Mon Sep 17 00:00:00 2001 From: Eric Khun Date: Tue, 29 Sep 2020 02:31:37 +0000 Subject: [PATCH 4/7] news item: 1000th one --- content/news.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/news.md b/content/news.md index 4aa77e9b..d8132031 100644 --- a/content/news.md +++ b/content/news.md @@ -1,4 +1,7 @@ ## Gold Card News + + +- [President Tsai meets Gold Card Holders, and welcome the 1000th one](https://english.president.gov.tw/NEWS/6047) - [Proposed updates to Foreign Talent Act (Chinese)](https://foreigntalentact.ndc.gov.tw/News_Content.aspx?n=88EDAE1D4C3C77D7&s=C788C1DD74906B8A) - [Goldcard day trip to Yilan](https://www.facebook.com/ndc.gov.tw/videos/vb.1498697833731586/3438579999588602/) - [Goldcard holder: Chelsea Davis film festival](https://www.facebook.com/events/670223513845439) From dbe63be94889532467f9b506222077e6c889afae Mon Sep 17 00:00:00 2001 From: Eric Khun Date: Tue, 29 Sep 2020 02:38:27 +0000 Subject: [PATCH 5/7] typo --- content/news.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/news.md b/content/news.md index d8132031..9e1b18a5 100644 --- a/content/news.md +++ b/content/news.md @@ -1,7 +1,7 @@ ## Gold Card News -- [President Tsai meets Gold Card Holders, and welcome the 1000th one](https://english.president.gov.tw/NEWS/6047) +- [President Tsai meets Gold Card Holders, and welcomes the 1000th](https://english.president.gov.tw/NEWS/6047) - [Proposed updates to Foreign Talent Act (Chinese)](https://foreigntalentact.ndc.gov.tw/News_Content.aspx?n=88EDAE1D4C3C77D7&s=C788C1DD74906B8A) - [Goldcard day trip to Yilan](https://www.facebook.com/ndc.gov.tw/videos/vb.1498697833731586/3438579999588602/) - [Goldcard holder: Chelsea Davis film festival](https://www.facebook.com/events/670223513845439) From 42f1a35ba1630bac1ed99bfcc65f3a39ca39c175 Mon Sep 17 00:00:00 2001 From: Eric Khun Date: Tue, 29 Sep 2020 02:39:57 +0000 Subject: [PATCH 6/7] cleanup --- content/news.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/news.md b/content/news.md index 9e1b18a5..14ced545 100644 --- a/content/news.md +++ b/content/news.md @@ -1,6 +1,4 @@ ## Gold Card News - - - [President Tsai meets Gold Card Holders, and welcomes the 1000th](https://english.president.gov.tw/NEWS/6047) - [Proposed updates to Foreign Talent Act (Chinese)](https://foreigntalentact.ndc.gov.tw/News_Content.aspx?n=88EDAE1D4C3C77D7&s=C788C1DD74906B8A) - [Goldcard day trip to Yilan](https://www.facebook.com/ndc.gov.tw/videos/vb.1498697833731586/3438579999588602/) From 11ca6ff04264d85f4c77886396e10462a1c2a5de Mon Sep 17 00:00:00 2001 From: "@taiwan-bot" Date: Tue, 29 Sep 2020 02:41:48 +0000 Subject: [PATCH 7/7] =?UTF-8?q?Deploy=2009/29/2020=2002:41=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/404.html | 2 +- docs/about/index.html | 6 +- docs/amp/about/index.html | 4 +- .../after-passing-skill-assessment/index.html | 6 +- .../after-submitting-application/index.html | 6 +- .../application-faq/application/index.html | 6 +- .../application-faq/qualifications/index.html | 6 +- .../what-is-taiwan-gold-card/index.html | 6 +- docs/amp/community/index.html | 4 +- .../goldcard-holders-faq/at-work/index.html | 6 +- .../goldcard-holders-faq/family/index.html | 6 +- .../health-insurance/index.html | 6 +- .../life-in-taiwan/index.html | 6 +- .../migration-pathways/index.html | 6 +- docs/amp/goldcard-holders-faq/tax/index.html | 6 +- .../goldcard-holders-faq/validity/index.html | 6 +- docs/amp/index.html | 1 + docs/amp/news/index.html | 9 +-- docs/amp/terms/index.html | 4 +- .../after-passing-skill-assessment/index.html | 8 +-- .../after-submitting-application/index.html | 8 +-- docs/application-faq/application/index.html | 8 +-- docs/application-faq/index.html | 2 +- .../application-faq/qualifications/index.html | 8 +-- .../what-is-taiwan-gold-card/index.html | 8 +-- docs/community/index.html | 6 +- docs/goldcard-holders-faq/at-work/index.html | 8 +-- docs/goldcard-holders-faq/family/index.html | 8 +-- .../health-insurance/index.html | 8 +-- docs/goldcard-holders-faq/index.html | 2 +- .../life-in-taiwan/index.html | 8 +-- .../migration-pathways/index.html | 8 +-- docs/goldcard-holders-faq/tax/index.html | 8 +-- docs/goldcard-holders-faq/validity/index.html | 8 +-- docs/index.html | 3 +- docs/index.xml | 2 +- ...171e4c9d5fb07dfd673188be8a4d64b1a9f87a.js} | 2 +- docs/news/index.html | 11 +-- docs/sitemap.xml | 72 +++++++++---------- docs/terms/index.html | 6 +- 40 files changed, 154 insertions(+), 150 deletions(-) rename docs/js/{bundle.min.3ce949016f6b6d59daf2c5aaf5b09291cea50663e8bdd455195de86393d78fcf3ff9949a1277b63f0c850917a2d33ba017df77c6327ad9838795f2d765bb7a78.js => bundle.min.19e555a2336b11d192dc051501bacf9b633a6fbfcc6248879dd19ca0187801762a8fa80d3746420039a9a6a891171e4c9d5fb07dfd673188be8a4d64b1a9f87a.js} (84%) diff --git a/docs/404.html b/docs/404.html index b64692dc..da75bc93 100644 --- a/docs/404.html +++ b/docs/404.html @@ -127,7 +127,7 @@

Not found

- + diff --git a/docs/about/index.html b/docs/about/index.html index 84596e79..659b3381 100644 --- a/docs/about/index.html +++ b/docs/about/index.html @@ -24,10 +24,10 @@ - + - + @@ -169,7 +169,7 @@

About this site

- + diff --git a/docs/amp/about/index.html b/docs/amp/about/index.html index 501af22b..f35b7307 100644 --- a/docs/amp/about/index.html +++ b/docs/amp/about/index.html @@ -25,10 +25,10 @@ - + - + diff --git a/docs/amp/application-faq/after-passing-skill-assessment/index.html b/docs/amp/application-faq/after-passing-skill-assessment/index.html index 76619715..7cc6e076 100644 --- a/docs/amp/application-faq/after-passing-skill-assessment/index.html +++ b/docs/amp/application-faq/after-passing-skill-assessment/index.html @@ -29,14 +29,14 @@ If you are overseas, you should visit the nearest Taiwanese diplomatic post If you are in Taiwan, you must visit the Bureau of Consular Affairs You will also need to take a copy of the “Passport Submission Notice”, which is found in the “Download” menu after logging in to the portal." /> - + - + @@ -898,7 +898,7 @@

Card Collection

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/application-faq/after-submitting-application/index.html b/docs/amp/application-faq/after-submitting-application/index.html index 968dac44..bec0f341 100644 --- a/docs/amp/application-faq/after-submitting-application/index.html +++ b/docs/amp/application-faq/after-submitting-application/index.html @@ -29,14 +29,14 @@ click “Online Payment” and select “Permit Payment”, then follow the steps. Fees are non-refundable, even if your application is unsuccessful." /> - + - + @@ -912,7 +912,7 @@

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020 diff --git a/docs/amp/application-faq/application/index.html b/docs/amp/application-faq/application/index.html index 5ee04cc5..8e6b9478 100644 --- a/docs/amp/application-faq/application/index.html +++ b/docs/amp/application-faq/application/index.html @@ -26,11 +26,11 @@ Digital copy of your passport Digital copy of your passport photo Your previous Taiwanese visa and residence permit (if any) Dates of any times you worked in Taiwan Digital copies of all documents needed to support your application ⓘ All digital copies need to be <1MB in size in image or PDF format." /> - + - + @@ -916,7 +916,7 @@

Who can I talk to about this?

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/application-faq/qualifications/index.html b/docs/amp/application-faq/qualifications/index.html index 14500d98..bf2dfbfe 100644 --- a/docs/amp/application-faq/qualifications/index.html +++ b/docs/amp/application-faq/qualifications/index.html @@ -27,10 +27,10 @@ - + - + @@ -860,7 +860,7 @@

Is there an age restriction?

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/application-faq/what-is-taiwan-gold-card/index.html b/docs/amp/application-faq/what-is-taiwan-gold-card/index.html index 6fbb7e42..28e6de4c 100644 --- a/docs/amp/application-faq/what-is-taiwan-gold-card/index.html +++ b/docs/amp/application-faq/what-is-taiwan-gold-card/index.html @@ -25,10 +25,10 @@ - + - + @@ -866,7 +866,7 @@

Do you
- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/community/index.html b/docs/amp/community/index.html index 36c4fb46..bedd8a88 100644 --- a/docs/amp/community/index.html +++ b/docs/amp/community/index.html @@ -25,10 +25,10 @@ - + - + diff --git a/docs/amp/goldcard-holders-faq/at-work/index.html b/docs/amp/goldcard-holders-faq/at-work/index.html index c3c03fe4..e3a2a323 100644 --- a/docs/amp/goldcard-holders-faq/at-work/index.html +++ b/docs/amp/goldcard-holders-faq/at-work/index.html @@ -26,11 +26,11 @@ What happens if I lose my job? You may simply find a new job. Your Gold Card is not sponsored by your employer and will not be affected by a change of job." /> - + - + @@ -909,7 +909,7 @@

Can I just not work at all?

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/goldcard-holders-faq/family/index.html b/docs/amp/goldcard-holders-faq/family/index.html index 5817da0f..c38965ff 100644 --- a/docs/amp/goldcard-holders-faq/family/index.html +++ b/docs/amp/goldcard-holders-faq/family/index.html @@ -27,12 +27,12 @@ What happens if I get married to a Taiwanese citizen while on a Gold Card?" /> - + - + @@ -857,7 +857,7 @@

Can my parents or grandpar
- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/goldcard-holders-faq/health-insurance/index.html b/docs/amp/goldcard-holders-faq/health-insurance/index.html index cf3510da..3f8f2bd0 100644 --- a/docs/amp/goldcard-holders-faq/health-insurance/index.html +++ b/docs/amp/goldcard-holders-faq/health-insurance/index.html @@ -27,10 +27,10 @@ - + - + @@ -895,7 +895,7 @@

How are NHI premiums managed?

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/goldcard-holders-faq/life-in-taiwan/index.html b/docs/amp/goldcard-holders-faq/life-in-taiwan/index.html index 7e6a7bbb..fd78be29 100644 --- a/docs/amp/goldcard-holders-faq/life-in-taiwan/index.html +++ b/docs/amp/goldcard-holders-faq/life-in-taiwan/index.html @@ -25,10 +25,10 @@ - + - + @@ -906,7 +906,7 @@

- Last Updated: September 27, 2020 + Last Updated: September 29, 2020

diff --git a/docs/amp/goldcard-holders-faq/migration-pathways/index.html b/docs/amp/goldcard-holders-faq/migration-pathways/index.html index 1aa0b424..7d4a43b6 100644 --- a/docs/amp/goldcard-holders-faq/migration-pathways/index.html +++ b/docs/amp/goldcard-holders-faq/migration-pathways/index.html @@ -26,11 +26,11 @@ Consider also if the program doesn’t change." /> - + - + @@ -880,7 +880,7 @@

How do I gain permanent res
- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/goldcard-holders-faq/tax/index.html b/docs/amp/goldcard-holders-faq/tax/index.html index 4a4fd2e3..9a69dd28 100644 --- a/docs/amp/goldcard-holders-faq/tax/index.html +++ b/docs/amp/goldcard-holders-faq/tax/index.html @@ -26,11 +26,11 @@ How do I apply for the tax relief for Foreign Special Professionals? As a Gold Card holder working in Taiwan for the first time, for the portion of your salary over NT $3 million, half of it can be excluded from your effective income for your first three years of residence." /> - + - + @@ -902,7 +902,7 @@

My salary i
- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/goldcard-holders-faq/validity/index.html b/docs/amp/goldcard-holders-faq/validity/index.html index cc7fa203..9a8bd193 100644 --- a/docs/amp/goldcard-holders-faq/validity/index.html +++ b/docs/amp/goldcard-holders-faq/validity/index.html @@ -26,11 +26,11 @@ Can I renew my gold card? No. There is no renewal capability for a Gold Card. You must complete the same application process you went through for your first card for all subsequent cards." /> - + - + @@ -844,7 +844,7 @@

When does the gold card’s
- Last Updated: September 27, 2020 + Last Updated: September 29, 2020
diff --git a/docs/amp/index.html b/docs/amp/index.html index ecd7fa39..98fac42d 100644 --- a/docs/amp/index.html +++ b/docs/amp/index.html @@ -830,6 +830,7 @@

Already a Gold Card Holder?

Gold Card News

    +
  • President Tsai meets Gold Card Holders, and welcomes the 1000th
  • Proposed updates to Foreign Talent Act (Chinese)
  • Goldcard day trip to Yilan
  • Goldcard holder: Chelsea Davis film festival
    • diff --git a/docs/amp/news/index.html b/docs/amp/news/index.html index acce85c1..ead55e30 100644 --- a/docs/amp/news/index.html +++ b/docs/amp/news/index.html @@ -22,21 +22,21 @@ Taiwan Gold Card - Taiwan Foreign Talent Community - + - + - + - +