npm - @dcrackel/hematournamentui - Versions diffs - 1.0.145 → 1.0.147 - Mend

@dcrackel/hematournamentui 1.0.145 → 1.0.147

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/src/mocks/tournamentMock.js CHANGED Viewed

@@ -1,205 +1,242 @@
 const mockTournaments = [
   {
     "TournamentId": 3,
-    "Name": "Tournament Test",
-    "StartDate": "2023-09-09",
-    "EndDate": "2023-09-10",
-    "Description": "combat with the joy of spending time with furry feline friends! This event celebrates the art of Historical European Martial Arts (HEMA) while offering a purrfect opportunity to interact with adorable cats, some of whom are looking for their forever homes. Whether you're a seasoned swordsman or new to the sport, Cats & Swords promises an unforgettable day of exciting bouts, heartwarming moments, and the chance to adopt a loving companion. Come for the swords, stay for the cats, and leave with memories (and maybe a new furry friend) that will last a lifetime.",
+    "Name": "Fetchfecht",
+    "StartDate": "2024-05-05",
+    "EndDate": "2024-05-09",
+    "Description": "Cats and Swords, fence then play with adorable cats",
     "ClubId": 1,
     "AddressId": 1,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test Location",
-        "Address1": "123 Anywhere",
-        "City": "Delaware",
-        "State": "OH",
-        "Zip": 43015,
-        "Coordinates": "40.2828592,-83.1118049"
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": null,
+    "CreatedByPersonId": null,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Test Location",
+      "Address1": "123 Anywhere",
+      "City": "Delaware",
+      "State": "OH",
+      "Zip": 43015,
+      "Coordinates": "40.2828592,-83.1118049"
+    },
+    "PrimaryContact": null,
+    "CreatedByPerson": null,
+    "Images": [
+      {
+        "ImageId": 1,
+        "URL": "https://i.ytimg.com/vi/ieQglgIMfao/maxresdefault.jpg",
+        "AltText": "This is alt text"
       }
     ],
-    "SocialMedia": [
+    "Tag": [
       {
-        "Label": null,
-        "Link": "https://thisisatest.com"
+        "TagName": "Saber"
       },
       {
-        "Label": null,
-        "Link": "http://second-link.com"
-      }
-    ],
-    "images": [
-      {
-        "URL": "https://localhost/uploads/3.png",
-        "AltText": "This is alt text"
+        "TagName": "Longsword"
       }
-    ],
-    "tags": [
-      "Longsword",
-      "Saber"
     ]
   },
   {
     "TournamentId": 4,
-    "Name": "Test Tournament",
+    "Name": "Sword Cat",
     "StartDate": "2023-12-30",
     "EndDate": "2023-12-31",
-    "Description": "<p>asdfasdfa ajhasd;likjfh;jkh asdlkjha;fdslkh ;asd;lkjfha;lksdhf ;alksh;lkjha;sdolfkjh;'asdklj f'as'lkj as'ldkj' asdkjlasd'fklja'dkljf sad'</p>",
+    "Description": "This is a sword tournament of super fun ness",
     "ClubId": 1,
     "AddressId": 2,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test One",
-        "Address1": "2000 Nutter Farm Lane, Delaware, OH",
-        "City": null,
-        "State": null,
-        "Zip": null,
-        "Coordinates": "40.2824683,-83.02237459999999"
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": null,
+    "CreatedByPersonId": null,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Another Place",
+      "Address1": "15 Any Street",
+      "City": "Delaware",
+      "State": "Oh",
+      "Zip": 43015,
+      "Coordinates": "40.2824683,-83.02237459999999"
+    },
+    "PrimaryContact": null,
+    "CreatedByPerson": null,
+    "Images": [
+      {
+        "ImageId": 2,
+        "URL": "https://image.spreadshirtmedia.com/image-server/v1/compositions/T347A2PA4306PT17X38Y57D1036640135W17431H22866/views/1,width=550,height=550,appearanceId=2,backgroundColor=000000,noPt=true/cat-fencing-girl-longsword-sword-fencer-cute-cool-womens-t-shirt.jpg",
+        "AltText": "alt text"
       }
     ],
-    "SocialMedia": [],
-    "images": [
+    "Tag": [
       {
-        "URL": "https://node.ferrotas.com:5000/uploads/t-450.png",
-        "AltText": "alt text"
+        "TagName": "Longsword"
       }
-    ],
-    "tags": [
-      "Longsword"
     ]
   },
   {
     "TournamentId": 5,
-    "Name": "test tournament",
+    "Name": "Cats & Swords!",
     "StartDate": "2023-12-31",
     "EndDate": "2024-01-01",
-    "Description": "<p>This is a test</p>",
+    "Description": "combat with the joy of spending time with furry feline friends! This event celebrates the art of Historical European Martial Arts (HEMA) while offering a purrfect opportunity to interact with adorable cats, some of whom are looking for their forever homes. Whether you're a seasoned swordsman or new to the sport, Cats & Swords promises an unforgettable day of exciting bouts, heartwarming moments, and the chance to adopt a loving companion. Come for the swords, stay for the cats, and leave with memories (and maybe a new furry friend) that will last a lifetime.",
     "ClubId": 1,
     "AddressId": 3,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test Two",
-        "Address1": "2000 Nutter Farm Lane",
-        "City": "Delaware",
-        "State": "OH",
-        "Zip": null,
-        "Coordinates": "40.2824683,-83.02237459999999"
-      }
-    ],
-    "SocialMedia": [
-      {
-        "Label": "",
-        "Link": "https://thisisatest.com"
-      }
-    ],
-    "images": [
-      {
-        "URL": "https://node.ferrotas.com:5000/uploads/t-196.png",
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": 1,
+    "CreatedByPersonId": 1,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Nutter Time Hotel",
+      "Address1": "2000 Nutter Farm Lane",
+      "City": "Delaware",
+      "State": "OH",
+      "Zip": 43015,
+      "Coordinates": "40.2824683,-83.02237459999999"
+    },
+    "PrimaryContact": {
+      "PersonId": 1,
+      "DisplayName": "Dave Smith",
+      "Pronouns": null,
+      "FirstName": "Dave",
+      "LastName": "Smith",
+      "Birthday": null,
+      "ClubId": 4,
+      "ShowData": true
+    },
+    "CreatedByPerson": {
+      "PersonId": 1,
+      "DisplayName": "Dave Smith",
+      "Pronouns": null,
+      "FirstName": "Dave",
+      "LastName": "Smith",
+      "Birthday": null,
+      "ClubId": 4,
+      "ShowData": true
+    },
+    "Images": [
+      {
+        "ImageId": 3,
+        "URL": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTtxO6k-C-9LYcukGvSD-3rZlsuDIu9mXfNoS4MuxHeyA&s",
         "AltText": "more alt text"
       }
     ],
-    "tags": []
+    "Tag": []
   },
   {
-    "TournamentId": 5,
-    "Name": "Lasers, swords, and cats",
+    "TournamentId": 6,
+    "Name": "FelineFecht",
     "StartDate": "2023-12-31",
     "EndDate": "2024-01-01",
-    "Description": "<p>This is a test</p>",
+    "Description": "Test your metal here!",
     "ClubId": 1,
-    "AddressId": 3,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test Two",
-        "Address1": "2000 Nutter Farm Lane",
-        "City": "Delaware",
-        "State": "OH",
-        "Zip": null,
-        "Coordinates": "40.2824683,-83.02237459999999"
-      }
-    ],
-    "SocialMedia": [
-      {
-        "Label": "",
-        "Link": "https://thisisatest.com"
-      }
-    ],
-    "images": [
-      {
-        "URL": "https://node.ferrotas.com:5000/uploads/t-196.png",
-        "AltText": "more alt text"
+    "AddressId": 4,
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": null,
+    "CreatedByPersonId": null,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Williams Place",
+      "Address1": "123 West William Street",
+      "City": "Delaware",
+      "State": "OH",
+      "Zip": 43015,
+      "Coordinates": "40.2987907,-83.0725873"
+    },
+    "PrimaryContact": null,
+    "CreatedByPerson": null,
+    "Images": [
+      {
+        "ImageId": 4,
+        "URL": "https://ih1.redbubble.net/image.4657842394.6345/flat,750x,075,f-pad,750x1000,f8f8f8.u3.jpg",
+        "AltText": "alt text"
       }
     ],
-    "tags": []
+    "Tag": []
   },
   {
-    "TournamentId": 6,
-    "Name": "Catmageddon",
+    "TournamentId": 7,
+    "Name": "Swords a coming",
     "StartDate": "2023-12-31",
     "EndDate": "2024-01-01",
-    "Description": "<p>This is a test</p>",
+    "Description": "Swords and more swords",
     "ClubId": 1,
-    "AddressId": 3,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test Two",
-        "Address1": "2000 Nutter Farm Lane",
-        "City": "Delaware",
-        "State": "OH",
-        "Zip": null,
-        "Coordinates": "40.2824683,-83.02237459999999"
-      }
-    ],
-    "SocialMedia": [
-      {
-        "Label": "",
-        "Link": "https://thisisatest.com"
-      }
-    ],
-    "images": [
-      {
-        "URL": "https://node.ferrotas.com:5000/uploads/t-196.png",
-        "AltText": "more alt text"
-      }
-    ],
-    "tags": []
+    "AddressId": 2,
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": null,
+    "CreatedByPersonId": null,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Another Place",
+      "Address1": "15 Any Street",
+      "City": "Delaware",
+      "State": "Oh",
+      "Zip": 43015,
+      "Coordinates": "40.2824683,-83.02237459999999"
+    },
+    "PrimaryContact": null,
+    "CreatedByPerson": null,
+    "Images": [
+      {
+        "ImageId": 5,
+        "URL": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRG8z6ZGh7NP46JgZAY1uRXR6znJizLhBIa-w&s",
+        "AltText": "text"
+      }
+    ],
+    "Tag": []
   },
   {
-    "TournamentId": 7,
-    "Name": "Cats and Swords",
+    "TournamentId": 8,
+    "Name": "Swordathon",
     "StartDate": "2023-12-31",
     "EndDate": "2024-01-01",
-    "Description": "<p>This is a test</p>",
+    "Description": "Super fun swords",
     "ClubId": 1,
-    "AddressId": 3,
-    "Club.Name": "Test Club",
-    "Address": [
-      {
-        "Name": "Test Two",
-        "Address1": "2000 Nutter Farm Lane",
-        "City": "Delaware",
-        "State": "OH",
-        "Zip": null,
-        "Coordinates": "40.2824683,-83.02237459999999"
-      }
-    ],
-    "SocialMedia": [
-      {
-        "Label": "",
-        "Link": "https://thisisatest.com"
-      }
-    ],
-    "images": [
-      {
-        "URL": "https://node.ferrotas.com:5000/uploads/t-196.png",
-        "AltText": "more alt text"
-      }
-    ],
-    "tags": []
+    "AddressId": 1,
+    "Visibility": null,
+    "HostedOnM2": true,
+    "PrimaryContactId": null,
+    "CreatedByPersonId": null,
+    "Club": {
+      "ClubId": 1,
+      "Name": "Acme Fencing Club"
+    },
+    "Address": {
+      "Name": "Test Location",
+      "Address1": "123 Anywhere",
+      "City": "Delaware",
+      "State": "OH",
+      "Zip": 43015,
+      "Coordinates": "40.2828592,-83.1118049"
+    },
+    "PrimaryContact": null,
+    "CreatedByPerson": null,
+    "Images": [
+      {
+        "ImageId": 6,
+        "URL": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ7Rgb6Yjgcr8M-kfPWaNnuQiyj3LscU6M8fQ&s",
+        "AltText": "text"
+      }
+    ],
+    "Tag": []
   }
 ];

package/src/stories/Atoms/RadioGroup/BaseRadioGroup.vue CHANGED Viewed

@@ -11,7 +11,7 @@
         tabindex="0"
         @keydown.enter.prevent="selectItem(index)"
     >
-      <i :class="[selectedIndex === index ? 'fa-circle-dot text-quaternary ' : 'fa-circle ' ]" class="fa-regular pr-4 pt-2" ></i>
+      <i :class="[selectedIndex === index ? 'fa-circle-dot text-quaternary ' : 'fa-circle ' ]" class="fa-regular pr-4 pt-2"></i>
       <div class="flex flex-col">
         <p :class="[selectedIndex === index ? 'text-quaternary ' : '' ]" class="font-bold text-sm">{{ item.label }}</p>
         <p :class="[selectedIndex === index ? 'text-quaternary ' : '' ]" class="text-sm">{{ item.description }}</p>
@@ -32,12 +32,21 @@ export default {
       type: Array,
       required: true,
     },
+    value: {
+      type: String,
+      required: false,
+    }
   },
   data() {
     return {
-      selectedIndex: null,
+      selectedIndex: this.items.findIndex(item => item.value === this.value)
     };
   },
+  watch: {
+    value(newValue) {
+      this.selectedIndex = this.items.findIndex(item => item.value === newValue);
+    }
+  },
   methods: {
     selectItem(index) {
       this.selectedIndex = index;

package/src/stories/Molecules/Cards/Detail/TournamentCardDetail.vue CHANGED Viewed

@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col w-full pt-4 pb-3 px-3" @click="handleCardClick">
-    <BaseText :text="detail.Name" color="primary" size="xl" weight="semi-bold" />
-    <BaseText :text="detail.Address && detail.Address[0].Name" color="primary" size="sm" weight="normal" />
+    <BaseText :text="tournamentName" color="primary" size="xl" weight="semi-bold" />
+    <BaseText :text="address" color="primary" size="sm" weight="normal" />
     <div class="mt-4 flex flex-col">
       <div class="mt-4 flex flex-col h-20" >
         <span v-html="formattedDescription"></span>
@@ -32,25 +32,7 @@ export default {
   props: {
     detail: {
       type: Object,
-      required: true,
-      default: () => ({
-        TournamentId: null,
-        Name: '',
-        StartDate: '',
-        EndDate: '',
-        Description: '',
-        Address: [{
-          Name: '',
-          Address1: '',
-          City: '',
-          State: '',
-          Zip: null,
-          Coordinates: ''
-        }],
-        SocialMedia: [],
-        images: [],
-        tags: []
-      })
+      required: true
     }
   },
   data() {
@@ -67,6 +49,12 @@ export default {
     },
     isTruncated() {
       return this.detail.Description.length > 64;
+    },
+    address() {
+      return this.detail.Address && this.detail.Address.Name
+    },
+    tournamentName() {
+      return this.detail.Name;
     }
   },
   methods: {

package/src/stories/Organisms/Cards/TournamentCard/TournamentCard.stories.js CHANGED Viewed

@@ -1,33 +1,12 @@
 import TournamentCard from './TournamentCard.vue';
+import mockTournaments from '../../../../mocks/tournamentMock.js';
 export default {
     title: 'Organisms/Cards/TournamentCard',
     component: TournamentCard,
     tags: ['autodocs'],
     args: {
-        detail: {
-            tournamentId: 1,
-            Name: 'Spring Open 2024',
-            StartDate: '2024-05-01',
-            EndDate: '2024-05-02',
-            Description: 'A prestigious HEMA tournament held in the spring.',
-            ClubId: 1,
-            AddressId: 1,
-            'Club.Name': 'HEMA Club',
-            Address: [{
-                Name: 'Tournament Venue',
-                Address1: '123 Fencing St.',
-                City: 'Springfield',
-                State: 'IL',
-                Zip: '62704',
-                Coordinates: '39.7817,-89.6501'
-            }],
-            SocialMedia: [],
-            images: [{
-                URL: 'https://www.adelaideswordacademy.com/uploads/1/0/7/0/10705704/published/longsword-k-fix.jpg?1609768554',
-            }],
-            tags: ['HEMA', 'Tournament', 'Spring'],
-        },
+        detail: mockTournaments[0],
     },
     argTypes: {
         detail: { control: 'object' },
@@ -36,54 +15,12 @@ export default {
 export const Default = {
     args: {
-        detail: {
-            tournamentId: 1,
-            Name: 'Spring Open 2024',
-            StartDate: '2024-05-01',
-            EndDate: '2024-05-02',
-            Description: 'A prestigious HEMA tournament held in the spring.',
-            ClubId: 1,
-            AddressId: 1,
-            'Club.Name': 'HEMA Club',
-            Address: [{
-                Name: 'Tournament Venue',
-                Address1: '123 Fencing St.',
-                City: 'Springfield',
-                State: 'IL',
-                Zip: '62704',
-                Coordinates: '39.7817,-89.6501'
-            }],
-            SocialMedia: [],
-            images: [{
-                URL: 'https://www.adelaideswordacademy.com/uploads/1/0/7/0/10705704/published/longsword-k-fix.jpg?1609768554',
-            }],
-            tags: ['HEMA', 'Tournament', 'Spring'],
-        },
+        detail: mockTournaments[4],
     }
 };
 export const WithoutImage = {
     args: {
-        detail: {
-            tournamentId: 2,
-            Name: 'Summer Duel 2024',
-            StartDate: '2024-07-15',
-            EndDate: '2024-07-16',
-            Description: 'A summer HEMA duel competition.',
-            ClubId: 2,
-            AddressId: 2,
-            'Club.Name': 'Summer Club',
-            Address: [{
-                Name: 'Summer Venue',
-                Address1: '456 Duel Ave.',
-                City: 'Summerfield',
-                State: 'TX',
-                Zip: '75001',
-                Coordinates: '32.7767,-96.7970'
-            }],
-            SocialMedia: [],
-            images: [],
-            tags: ['HEMA', 'Duel', 'Summer'],
-        },
+        detail: mockTournaments[1],
     }
 };

package/src/stories/Organisms/Cards/TournamentCard/TournamentCard.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
   <div class="rounded-xl w-72 shadow border border-dropdownSelect hover:border-bright">
-    <TournamentHeader :artwork="detail.images && detail.images.length > 0 ? detail.images[0].URL : ''" :tags="detail.tags" @click="listEvents" />
+    <TournamentHeader :artwork="getImage" :tags="detail.tags" @click="listEvents" />
     <TournamentDetail :detail="detail" @listEvents="listEvents" @edit="handleEditClick"/>
   </div>
 </template>
@@ -18,28 +18,12 @@ export default {
   props: {
     detail: {
       type: Object,
-      required: true,
-      default: () => ({
-        tournamentId: null,
-        Name: '',
-        StartDate: '',
-        EndDate: '',
-        Description: '',
-        ClubId: null,
-        AddressId: null,
-        'Club.Name': '',
-        Address: [{
-          Name: '',
-          Address1: '',
-          City: '',
-          State: '',
-          Zip: null,
-          Coordinates: ''
-        }],
-        SocialMedia: [],
-        images: [],
-        tags: []
-      })
+      required: true
+    }
+  },
+  computed: {
+    getImage() {
+      return this.detail.Images && this.detail.Images.length > 0 ? this.detail.Images[0].URL : ''
     }
   },
   methods: {

package/src/stories/Organisms/ComplexInputs/FindLocation/FindLocation.vue CHANGED Viewed

@@ -50,6 +50,10 @@ export default {
   name: 'FindLocation',
   components: {BaseText, BaseModal, AddressAutocomplete, BaseButton, BaseIcon, BaseInput},
   props: {
+    placeholder: {
+      type: String,
+      default: ''
+    },
     locations: {
       type: Array,
       required: true
@@ -74,7 +78,7 @@ export default {
       validAddress: false,
       showNewLocation: false,
       filteredLocations: this.locations,
-      inputValue: '',
+      inputValue: this.placeholder,
       showDropdown: false,
       showAddNew: false,
       debouncedTimeout: null