Additional updates to text, fixed welcome screen

IvanMathy · May 27, 2020 · 9ad3fb7 · 9ad3fb7
1 parent 9142002
commit 9ad3fb7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/client/public/index.html b/client/public/index.html
@@ -8,7 +8,7 @@
     <!-- SORRY FOR INCLUDING 2 ICON PACKS <3 -->
     <link rel="stylesheet" href="https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css">
     <script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js" integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ" crossorigin="anonymous"></script>
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>Cards Away From Humanity</title>
   </head>
   <body>
     <noscript>

diff --git a/client/src/App.vue b/client/src/App.vue
@@ -66,7 +66,8 @@ import { mapState } from "vuex";
     },
     disconnect(whyyyyy) {
       if (whyyyyy === "io server disconnect") {
-        alert("booted");
+        alert("Looks like you got disconnected. Did you open another tab?");
+        (this as App).error = true;
       } else {
         this.$buefy.toast.open({
           message: `Lost connection, trying again...`,

diff --git a/client/src/components/Welcome.vue b/client/src/components/Welcome.vue
@@ -53,8 +53,8 @@
               <b-button type="is-light" expanded icon-right="angle-down">Read More</b-button>
             </span>
           </template>
-          <p>This game is provided for free, for the duration of the current pandemic. When the stay at home order expires, this game will be taken offline and its code released on Github.</p>
-          <p>If you liked this game, consider buying a physical version of the original once we get out of this mess. In the meantime please stay home, wash your hands, support local businesses, and stay safe!</p>
+          <p>This game is provided for free, as a hosted demo of the open source version. You can find the code on Github.
+          If you liked this game, please consider buying a physical version of the original.</p>
         </b-collapse>
 
         <br />
@@ -107,10 +107,10 @@ export default class Welcome extends Vue {
   }
 
   next(accept: boolean) {
-    if(accept === true || this.username === "" || this.username === undefined) {
+    if(accept === true && (this.username === "" || this.username === undefined)) {
       this.accepted = true
       localStorage.setItem("accepted", String(true))
-    } else if(accept === false) {
+    } else if(accept === false && !(this.username === "" || this.username === undefined)) {
       this.buttonLoading = true
       this.authenticate()
     }

diff --git a/client/src/components/game/Game.vue b/client/src/components/game/Game.vue
@@ -44,7 +44,7 @@
     </div>
     <transition name="fade">
       <div class="join helvetica is-hidden-mobile" v-if="showRoomCode">
-        Join at
+        Join at<br />
         <span class="has-text-info">cafh.herokuapp.com</span>
         <br />with room code
         <br />

diff --git a/client/src/components/game/Invite.vue b/client/src/components/game/Invite.vue
@@ -37,7 +37,7 @@ import { mapState } from "vuex";
 })
 export default class Invite extends Vue {
   get url(this: any): string {
-    return `https://cafh.herokuapp.com/ Room Code: ${this.joinedRoom}`;
+    return `https://cafh.herokuapp.com/# Room Code: ${this.joinedRoom}`;
   }
 
   get canShare(): boolean {

diff --git a/client/src/components/meta/PrivacyPolicy.vue b/client/src/components/meta/PrivacyPolicy.vue
@@ -9,19 +9,19 @@
       <p>Some data such as your chosen display name is kept in memory for a short time to allow for session-recovery. This data gets deleted automatically after a short period of time. Your display name may also appear in private error or debug logs as part of normal server operation.</p>
       <p>Regardless of its origin, no individual data generated from the game's code will ever be used for commercial purposes or sold to a third party.</p>
       <p>
-        This game is hosted on Google App Engine. You can find their privacy policy at this url:
+        This game is hosted on Heroku by Salesforce. You can find their privacy policy at this url:
         <a
-          href="https://cloud.google.com/appengine/privacy_20080407"
+          href="https://www.salesforce.com/company/privacy/"
           target="_blank"
-        >https://cloud.google.com/appengine/privacy_20080407</a>
+        >https://www.salesforce.com/company/privacy/</a>
       </p>
-      <p>
+     <!-- <p>
         This game uses Google Analytics. You can find their privacy policy at this url:
         <a
           href="https://support.google.com/analytics/answer/6004245"
           target="_blank"
         >https://support.google.com/analytics/answer/6004245</a>
-      </p>
+      </p> -->
       <p>This privacy policy may get updated at any point, so please check it often in case it does. If you do not agree, please leave this game.</p>
     </b-message>
   </div>