simplify UX

rjkat · Jun 15, 2024 · f7a59c8 · f7a59c8
1 parent d365dc9
commit f7a59c8
Show file tree

Hide file tree

Showing 9 changed files with 13,656 additions and 21,465 deletions.
diff --git a/@confuzzle/confuz-parser/package-lock.json b/@confuzzle/confuz-parser/package-lock.json
diff --git a/@confuzzle/confuz-parser/package.json b/@confuzzle/confuz-parser/package.json
@@ -13,8 +13,8 @@
         "confuz-file-format"
     ],
     "dependencies": {
+        "dompurify": "^3.1.5",
         "enolib": "^0.8.2",
-        "enotype": "^0.3.0",
-        "sanitize-html": "^2.4.0"
+        "enotype": "^0.3.0"
     }
 }
diff --git a/@confuzzle/confuz-parser/parser.js b/@confuzzle/confuz-parser/parser.js
@@ -1,7 +1,11 @@
 const enolib = require('enolib');
 const enotype = require('enotype');
 const sample = require('./sample_crossword');
-const sanitizeHtml = require('sanitize-html');
+import DOMPurify from 'dompurify';
+
+function sanitizeHtml(html) {
+  return DOMPurify.sanitize(html);
+}
 
 const EMOJI_DICT = require('./words_to_emoji.js').EMOJI_DICT;
 

diff --git a/client/App.vue b/client/App.vue
@@ -44,7 +44,7 @@
                 </ul>
             </div>
         </template>
-        <p class="join-info-text">Discover publishers of .puz files at <a href="https://crosswordlinks.substack.com/about" target="_blank" rel="noopener">Daily Crossword Links<ui-icon style="font-size: 12pt;">open_in_new</ui-icon></a></p>
+        <p class="join-info-text">Discover publishers of .puz files at <a href="https://dailycrosswordlinks.com/" target="_blank" rel="noopener">Daily Crossword Links<ui-icon style="font-size: 12pt;">open_in_new</ui-icon></a></p>
     </ui-modal>
 
     <cfz-disconnected-modal
@@ -1025,7 +1025,7 @@ export default Vue.extend({
         if (mode == 'invite') {
             return 'Open for sharing';
         }
-        return 'Open for solving';
+        return 'Load puzzle';
     },
     requestedPath() {
         if (window.location.pathname != "/") {

diff --git a/client/components/CfzCrosswordClues.vue b/client/components/CfzCrosswordClues.vue
@@ -138,7 +138,11 @@
 
 <script>
 import Vue from "vue";
-const sanitizeHtml = require('sanitize-html');
+import DOMPurify from 'dompurify';
+
+function sanitizeHtml(html) {
+  return DOMPurify.sanitize(html);
+}
 
 import CfzClueList from './CfzClueList.vue'
 import CfzSolverList from './CfzSolverList.vue'

diff --git a/client/components/CfzHeaderToolbar.vue b/client/components/CfzHeaderToolbar.vue
@@ -1,9 +1,5 @@
 <template>
 <ui-toolbar type="colored" class="crossword-toolbar" :loading="sourceLoading" style="overflow: hidden;" removeNavIcon>
-    <table slot="brand" class="cfz-logo">
-        <td data-flat-number="?" style="vertical-align: middle;"
-         @click="$emit('logo-clicked')">C</td>
-    </table>
     <template v-slot="title">
         <div v-if="!sourceLoading" class="crossword-title">
             <span class="crossword-meta-name" v-responsive.class>{{metadata.name}}</span>
@@ -428,10 +424,6 @@ export default Vue.extend({
             options.push(this.opt.SAVE_PUZ);
             options.push(this.opt.SAVE_ENO);
         }
-
-        if (!this.state.colluding && !isMobile) {
-            options.push(this.opt.LINK_EXTERNAL);
-        }
         options.push(this.opt.ABOUT);
         return options;
     },

diff --git a/client/components/CfzLauncher.vue b/client/components/CfzLauncher.vue
@@ -189,42 +189,30 @@ export default Vue.extend({
       if (this.showLeave) {
         opt.push({
           text: "Leave",
-          color: "red",
+          // color: "red",
           icon: "no_meeting_room",
           tooltip: "Leave group session"
         });
-      } else {
         opt.push({
-          text: "Join",
-          color: "green",
-          icon: "meeting_room",
-          tooltip: "Join a group session"
+          text: "Invite",
+          color: "primary",
+          icon: "group_add",
+          tooltip: "Invite others to this session"
         });
-      }
-      if (!this.showLeave) {
+      } else {
         opt.push({
-          text: "Solve",
+          text: "Load Puzzle",
           color: "primary",
           icon: "extension",
-          tooltip: "Open and solve puzzles"
+          tooltip: "Open and solve a puzzle"
         });
       }
-
-      opt.push({
-        text: "Invite",
-        color: "accent",
-        icon: "group_add",
-        tooltip: this.showLeave ? "Invite others to this session" : "Start a group session"
-      });
-
-
-      
       return opt;
     }
   },
   methods: {
     optionClicked(option) {
-      if (option.text == 'Solve') {
+      if (option.text == 'Load Puzzle') {
         this.$emit('solve-clicked');
       } else if (option.text == 'Create') {
         this.$emit('edit-clicked');