diff --git a/.github/workflows/Deploy CN.yml b/.github/workflows/Deploy CN.yml new file mode 100644 index 00000000..5fd67cfb --- /dev/null +++ b/.github/workflows/Deploy CN.yml @@ -0,0 +1,37 @@ +# . +name: 🚀 Deploy INFO-SYS +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] +jobs: + gh-win-cn-all-deploy: + name: 🎉 Deploy InfoSys to CN + runs-on: ubuntu-latest + steps: + - name: 🚚 Get latest code + uses: actions/checkout@v3 + + - name: 📂 Sync files + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 + with: + server: ${{ secrets.CN_FTP_SERVER }} + username: ${{ secrets.CN_FTP_USER }} + password: ${{ secrets.CN_FTP_PASSWORD }} + port: ${{ secrets.CN_FTP_PORT }} + local-dir: ./ + server-dir: /wwwroot/origin-cht.mycht.cn/ + # dry-run: true + # log-level: verbose + exclude: | + **/.git* + **/.git*/** + **/node_modules/** + document/** + download_statement/** + sample/** + **/logs/** + **/web.config + **/author/document/** + *.exe + *.docx diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml new file mode 100644 index 00000000..eec9b0a3 --- /dev/null +++ b/.github/workflows/Deploy.yml @@ -0,0 +1,94 @@ +name: 🚀 Deploy INFO-SYS + +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + +jobs: + gh-win-us-deploy: + name: 🎉 Deploy InfoSys to US + runs-on: ubuntu-latest + steps: + - name: 🚚 Get latest code + uses: actions/checkout@v3 + + - name: 📂 Sync files to CHT + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 + with: + server: ${{ secrets.US_FTP_SERVER }} + username: ${{ secrets.US_FTP_USER }} + password: ${{ secrets.US_FTP_PASSWORD }} + port: ${{ secrets.US_FTP_PORT }} + local-dir: ./ + server-dir: /information-system/ + # dry-run: true + exclude: | + **/.git* + **/.git*/** + **/node_modules/** + document/** + download_statement/** + sample/** + **/logs/** + **/web.config + **/author/document/** + *.exe + *.docx + .ftp-deploy-sync-state.json + - name: 📂 Sync files to CT + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 + with: + server: ${{ secrets.US_FTP_SERVER }} + username: ${{ secrets.US_FTP_USER }} + password: ${{ secrets.US_FTP_PASSWORD }} + port: ${{ secrets.US_FTP_PORT }} + local-dir: ./ + server-dir: /origin-ct.mycht.cn/ + # dry-run: true + exclude: | + **/.git* + **/.git*/** + **/node_modules/** + document/** + download_statement/** + sample/** + **/logs/** + **/web.config + **/author/document/** + *.exe + *.docx + .ftp-deploy-sync-state.json + + gh-win-cn-deploy: + needs: gh-win-us-deploy + name: 🎉 Deploy InfoSys to CN + runs-on: ubuntu-latest + steps: + - name: 🚚 Get latest code + uses: actions/checkout@v3 + + - name: 📂 Sync files to CHT + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 + with: + server: ${{ secrets.CN_FTP_SERVER }} + username: ${{ secrets.CN_FTP_USER }} + password: ${{ secrets.CN_FTP_PASSWORD }} + port: ${{ secrets.CN_FTP_PORT }} + local-dir: ./ + server-dir: /wwwroot/origin-cht.mycht.cn/ + # dry-run: true + # log-level: verbose + exclude: | + **/.git* + **/.git*/** + **/node_modules/** + document/** + download_statement/** + sample/** + **/logs/** + **/web.config + **/author/document/** + *.exe + *.docx + .ftp-deploy-sync-state.json diff --git a/.gitignore b/.gitignore index 87794a8c..a286a2b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .idea -.phpintel +.phpintel +.*.json.bak +.ftp-deploy-sync-state.json .svn/* */logs/log* /web.config @@ -14,3 +16,4 @@ /application/config/database.php + diff --git a/application/cache/.htaccess b/application/cache/.htaccess deleted file mode 100644 index 3418e55a..00000000 --- a/application/cache/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/application/cache/index.html b/application/cache/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/cache/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - \ No newline at end of file diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/ah-lantern-festival-gp-form.php index 219eece3..e45000b9 100644 --- a/application/views/mobile_first/ah-lantern-festival-gp-form.php +++ b/application/views/mobile_first/ah-lantern-festival-gp-form.php @@ -3,7 +3,7 @@

Book this trip now. Your 1:1 travel consultant will reply within 1 working day.

-
+

Traveler numbers for your group:

@@ -300,8 +300,8 @@
Please enter your phone number.

Video appointment

- - +

A USD 200 deposit is required for each adult/child over 8. Please let us know if you need a single room or if you're traveling with children under 8. Any additional costs will be added to your balance.

+ diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index b17b5890..576916ca 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -72,6 +72,43 @@
  • Destinations
    +
    +
    Middle East
    + +
    +
    +
    Southeast Asia
    + +
    +
    North Asia
    @@ -88,29 +125,13 @@ Mongolia
    • -
    -
    Southeast Asia
    +
    South America
    - +
    Central Asia
      @@ -119,27 +140,8 @@ and Central Asia
    -
    -
    Middle East
    - -
    -
    -
    South America
    - -
    + +
    diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index e528626f..37dd482d 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -84,13 +84,12 @@ height="0" width="0" style="display:none;visibility:hidden">