Merge branch 'release/2.5.0'

character_template.json

@@ -0,0 +1,113 @@
+{
+    "character_computed": {
+        "display": {
+            "name": "String",
+            "avatar": "String",
+            "hit_points": "Integer",
+            "armor_class": "Integer",
+            "level": "Integer",
+            "proficiency": "Integer",
+            "initiative": "Integer",
+            "speed": {
+                "walking": "Integer"
+            }
+        },
+        "sheet": {
+            "abilities": {
+                "strength": "Integer",
+                "dexterity": "Integer",
+                "constitution": "Integer",
+                "intelligence": "Integer",
+                "wisdom": "Integer",
+                "charisma": "Integer"
+            },
+            "classes": {
+                "main": {
+                    "class": "String",
+                    "subclass": "String",
+                    "level": "Integer",
+                    "spells_known": "Integer",
+                    "cantrips_known": "Integer",
+                    "spell_save_dc": "Integer",
+                    "spell_attack_modifier": "Integer"
+                },
+                "subclass_id": {
+
+                }
+            },
+            "spell_slots": {
+                "1": "Integer",
+                "2": "Integer"
+            },
+            "saving_throws": {
+                "strength": "Integer"
+            },
+            "skills": {
+                "history": "Integer"
+            },
+            "senses": {
+                "perception": "Integer",
+                "investigation": "Integer",
+                "insight": "Integer"
+            },
+            "defenses": {
+                "resistant": "Boolean"
+            }
+        }
+    },
+    "character_base": {
+        "general": {
+            "control": "String",
+            "player_name": "String",
+            "character_name": "String",
+            "avatar": "String",
+            "advancement": "Milestone/Experience",
+            "hit_point_type": "fixed/rolled"
+        },
+        "race": {
+            "race_name": "String",
+            "race_description": "String"
+        },
+        "class": {
+            "experience": "Integer",
+            "classes": [
+                {
+                    "main": "Boolean",
+                    "name": "Barbarian",
+                    "level": "Integer",
+                    "hit_dice": "Integer",
+                    "rolled_hit_points": {
+                        "2": "Integer"
+                    },
+                    "spell_casting_ability": "String",
+                    "speed": {
+                        "walking": {
+                            "base": "Integer"
+                        }
+                    },
+                    "armor_class": {
+                        "base": "Integer",
+                        "dexterity": "Boolean"
+                    }
+                }
+            ]
+        },
+        "abilities": {
+            "strength": "Integer",
+            "dexterity": "Integer",
+            "constitution": "Integer",
+            "intelligence": "Integer",
+            "wisdom": "Integer",
+            "charisma": "Integer"
+        },
+        "modifiers": [
+            {
+                "type": "Bonus/Set Score/proficiency/expertise",
+                "name": "String",
+                "value": "Integer",
+                "ref": "ability.strength",
+                "origin": "race"
+            }
+        ]
+    }
+}

firebase-rules.json

@@ -108,7 +108,7 @@
         }
       }
     },
-    "characters_computed": {
+    "characters": {
       "$uid": {
         "$characterId": {
           	".write": "
@@ -117,18 +117,15 @@
        			"
         }, 
         ".read": true
-      },
-      ".read": true
+      }
     },
-    "characters_base": {
+    "search_characters": {
+      ".read": true,
       "$uid": {
-        "$characterId": {
-          	".write": "
-              $uid === auth.uid || 
-              root.child('character_control').child(auth.uid).child($characterId).child('user').val() === $uid
-       			"
-        }, 
-        ".read": true
+        ".write": "$uid === auth.uid",
+        "results": {
+          ".indexOn": ["character_name"]
+        }
       }
     },
     "character_control": {
@@ -414,6 +411,9 @@
               "name": {
                 ".validate": "newData.isString() && newData.val().length <= 50"
               },
+              "key": {
+                ".validate": "newData.isString() && newData.val().length <= 50"
+              },
               "$other": { ".validate": false }
             }
           },

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.4.0",
+  "version": "2.5.0",
   "name": "harmless_key",
   "description": "A Dungeons and Dragons Combat Tracker",
   "productName": "Harmless Key",
@@ -29,8 +29,10 @@
     "helmet": "^5.0.2",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
+    "marked": "^4.0.16",
     "morgan": "^1.10.0",
     "quasar": "^1.0.0",
+    "sanitize-html": "^2.7.0",
     "vee-validate": "^3.4.14",
     "vue-analytics": "^5.22.1",
     "vue-cookies": "^1.7.4",
@@ -46,6 +48,7 @@
   },
   "devDependencies": {
     "@quasar/app": "^2.3.0",
+    "@types/sanitize-html": "^2.6.2",
     "babel-eslint": "^10.0.1",
     "eslint": "^7.21.0",
     "eslint-config-prettier": "^8.1.0",

quasar.conf.js

@@ -54,7 +54,7 @@ module.exports = function (/* ctx */) {
       scssLoaderOptions: {
         additionalData: '@import "src/css/variables.scss";'
       },
-
+      vueCompiler: true,
       transpile: true,
 
       // Add dependencies for transpiling with Babel (Array of string/regex)

src/App.vue

@@ -26,7 +26,7 @@
 					v-shortkey="['esc']" @shortkey="hideSlide()"
 					class="hide" 
 				>
-					<i aria-hidden="true" class="far fa-chevron-double-right"></i> <span class="neutral-2 ml-2 d-none d-sm-inline">[esc]</span>
+					<i aria-hidden="true" class="far fa-chevron-double-right" /> <span class="neutral-2 ml-2 d-none d-sm-inline">[esc]</span>
 					<q-tooltip anchor="bottom middle" self="center middle">
 						Hide [esc]
 					</q-tooltip>