Merge branch 'master' of github.com:threefoldtech/threefold_connect

threefoldtech · Feb 26, 2021 · 5891e4a · 5891e4a
2 parents ac951dc + eceea37
commit 5891e4a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ testing_deploy:
     - echo "Deploying ThreeFold Connect for testing"
     - docker rm -f 3botlogin || true
     - docker pull jimber/3botlogin:testing-$CI_COMMIT_TAG
-    - docker run -d -it --network=jimber_proxy_net --name 3botlogin -v /opt/3botlogin/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db jimber/3botlogin:testing-$CI_COMMIT_TAG
+    - docker run -d -it --restart=unless-stopped --network=jimber_proxy_net --name 3botlogin -v /opt/3botlogin/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db jimber/3botlogin:testing-$CI_COMMIT_TAG
 
 staging_build:
   only:
@@ -50,7 +50,7 @@ staging_deploy:
     - echo "Deploying ThreeFold Connect for staging"
     - docker rm -f 3botlogin || true
     - docker pull jimber/3botlogin:staging-$CI_COMMIT_TAG
-    - docker run -d -it --network=jimber_proxy_net --name 3botlogin -v /opt/3botlogin/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db -v /opt/3botlogin/config.ini:/usr/share/nginx/backend/config.ini jimber/3botlogin:staging-$CI_COMMIT_TAG
+    - docker run -d -it --restart=unless-stopped --network=jimber_proxy_net --name 3botlogin -v /opt/3botlogin/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db -v /opt/3botlogin/config.ini:/usr/share/nginx/backend/config.ini jimber/3botlogin:staging-$CI_COMMIT_TAG
 
 production_build:
   only:
@@ -78,4 +78,4 @@ production_deploy:
     - echo "Deploying ThreeFold Connect for production"
     - docker rm -f 3botlogin
     - docker pull jimber/3botlogin:production-$CI_COMMIT_TAG
-    - docker run -d -it --name 3botlogin -v /opt/3botlogin/db/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db -v /opt/3botlogin/config.ini:/usr/share/nginx/backend/config.ini --network=3proxynet jimber/3botlogin:production-$CI_COMMIT_TAG
+    - docker run -d -it --restart=unless-stopped --name 3botlogin -v /opt/3botlogin/db/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db -v /opt/3botlogin/config.ini:/usr/share/nginx/backend/config.ini --network=3proxynet jimber/3botlogin:production-$CI_COMMIT_TAG
diff --git a/wizard/src/App.vue b/wizard/src/App.vue
@@ -103,21 +103,21 @@
               <i style="font-size: 49px">JOURNEY</i>
             </h1>
             <v-btn @click="finish" color="#57BE8E" dark elevation="0">GET STARTED</v-btn>
-            <v-checkbox
-              v-model="acceptedTT"
-              style="width: 70vw; font-size: 11px; color:red;" color="red" background-color="green">
-              <template v-slot:label>
-                <div  :class="{'red--text':getStartedClicked}">
-                   I agree to Threefold’s
-                </div>
-              </template>
-            </v-checkbox>
-             <button
-                    style="text-decoration: underline"
-                    @click="showDisclaimer = true"
+                <v-checkbox
+                  v-model="acceptedTT"
+                  style="width: 70vw; font-size: 11px; color:red; padding-left:2rem"
                   >
-                    Terms and conditions
-                  </button>
+                  <template v-slot:label>
+                    <div  :class="{'red--text':getStartedClicked && !acceptedTT, 'black--text':!getStartedClicked || !acceptedTT}" class="mr-3">
+                      I agree to Threefold’s <br><button
+                      style="text-decoration: underline; display:inline-block; margin-top: 1rem"
+                      @click.stop.prevent="showDisclaimer = true"
+                    >
+                      Terms and conditions
+                    </button>
+                    </div>
+                  </template>
+                </v-checkbox>
             <div class="spacer"></div>
           </div>
         </v-carousel-item>