Merge pull request #8 from ourworld-tsc/development

Adding new changes to master

.github/workflows/tf_update_dev.yml

@@ -1,4 +1,4 @@
-name: www2.ourphone.ourworld.tf
+name: www2.ourphone.tf
 on:
   push:
     branches: [ development ]
@@ -8,10 +8,10 @@ jobs:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
-    - name: pushing latest change on www2.ourphone.ourworld.tf
+    - name: pushing latest change on www2.ourphone.tf
       uses: appleboy/ssh-action@master
       with:
-        host: www2.ourphone.ourworld.tf
+        host: www2.ourphone.tf
         username: webuser
         key: ${{ secrets.TF_SECRET }}
         port: 34022
@@ -20,5 +20,5 @@ jobs:
           git log -1
           git restore .
           git pull
-          sed -i "s/https:\/\/ourphone.ourworld.tf/https:\/\/www2.ourphone.ourworld.tf/g" config.toml
+          sed -i "s/https:\/\/ourphone.tf/https:\/\/www2.ourphone.tf/g" config.toml
           ./build.sh

.github/workflows/tf_update_prod.yml

@@ -1,4 +1,4 @@
-name: ourphone.ourworld.tf
+name: ourphone.tf
 on:
   push:
     branches: [ master ]
@@ -8,10 +8,10 @@ jobs:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
-    - name: pushing latest change on ourphone.ourworld.tf
+    - name: pushing latest change on ourphone.tf
       uses: appleboy/ssh-action@master
       with:
-        host: ourphone.ourworld.tf
+        host: ourphone.tf
         username: webuser
         key: ${{ secrets.TF_SECRET }}
         port: 34022
@@ -20,5 +20,5 @@ jobs:
           git log -1
           git restore .
           git pull
-          sed -i "s/https:\/\/www2.ourphone.ourworld.tf/https:\/\/ourphone.ourworld.tf/g" config.toml
+          sed -i "s/https:\/\/ourphone.tf/https:\/\/ourphone.tf/g" config.toml
           ./build.sh

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://ourphone.ourworld.tf/"
+base_url = "https://ourphone.tf/"
 # Change this to your own URL! Please note this variable **must** be uncommented.
 
 title = "OurPhone"

content/buynow/index.md

@@ -27,7 +27,7 @@ weight: 2
 
 ![image](./img/phone1.png)
 
-<button>[Pre-Order](https://docs.google.com/forms/d/e/1FAIpQLSecdYeQZnEZTCFaJDR0JUIdDqRcLLGwYQGZZf3e8h1rtmDTSg/viewform)</button>
+<button>[Pre-Order](https://forms.gle/G2qoLLDAsGLdjNgX6)</button>
 
 Pre-order **OurPhone&trade;** and become one of the firsts to unlock a secured digital future.
 
@@ -35,7 +35,7 @@ Pre-order **OurPhone&trade;** and become one of the firsts to unlock a secured d
 
 ![image](./img/crowdfund1.png)
 
-<button>[Crowdfund](https://docs.google.com/forms/d/e/1FAIpQLSecdYeQZnEZTCFaJDR0JUIdDqRcLLGwYQGZZf3e8h1rtmDTSg/viewform)</button>
+<button>[Crowdfund](https://forms.gle/G2qoLLDAsGLdjNgX6)</button>
 
 Learn more about how to purchase **OurPhone&trade;** Company's shares, and become a co-owner of **OurPhone&trade;** Company.