Merge pull request #32 from GeniJaho/Some-Trello-cards,-to-improve-ta…

…gnames-and-add-some-more Some trello cards, to improve tagnames and add some more
GeniJaho · Jan 15, 2024 · 8afcb78 · 8afcb78
2 parents eacdf1c + 7c5000f
commit 8afcb78
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/database/seeders/ItemSeeder.php b/database/seeders/ItemSeeder.php
@@ -73,11 +73,11 @@ public function run(): void
             'Box (Pizza)',
             'Bra',
             'Bread',
+            'Building Insulation',
+            'Bullet',
             'Bullet (Casing)',
             'Buoy',
-            'Butt (Cigar)',
-            'Butt (Cigarette)',
-            'Cable Tie',
+            'Cable Tie/Tie Wrap',
             'Can',
             'Can (Aerosol)',
             'Can (Alcohol)',
@@ -101,22 +101,23 @@ public function run(): void
             'Can (state: shattered, deposit: Yes)',
             'Can (Water)',
             'Can (Wine)',
-            'Cap (Bottle)',
-            'Cap (Joint Tube)',
-            'Cap (Nitrous Canister)',
+            'Cap (Joint Tube Cap)',
+            'Cap (Nitrous Canister Cap)',
             'Cassette Tape',
             'Cd',
+            'Cigar Butt',
             'Cigarette Butt',
             'Cigarette Filter',
             'Clothes Hanger',
-            'Clothespin',
+            'Clothes pin',
             'Clothing',
             'Coaster',
             'Coffeepad',
             'Comb',
             'Condom',
             'Confetti',
             'Confetti Cannon',
+            'Container',
             'Container (Antifreeze)',
             'Container (Cleaning Supplies)',
             'Container (Medication)',
@@ -135,6 +136,10 @@ public function run(): void
             'Cup (Soda)',
             'Cup (Yoghurt)',
             'Cutlery',
+            'Cutlery (Fork)',
+            'Cutlery (Knife)',
+            'Cutlery (Spoon)',
+            'Cutlery (Spork)',
             'De-Icer',
             'Deodorant',
             'Diaper',
@@ -147,6 +152,7 @@ public function run(): void
             'Drink Carton (Wine)',
             'Drink Pouch',
             'Drone',
+            'Drug Test',
             'Drug Test (DrugWipe)',
             'Duck Decoy',
             'Ear Plug',
@@ -159,11 +165,11 @@ public function run(): void
             'Fireworks (Knetterbal)',
             'Flyer',
             'Food',
-            'Fork',
             'Fruit',
             'Fruit (Apple)',
             'Fruit (Banana)',
             'Gas Tank',
+            'Gel',
             'Gel (Carbo Gel)',
             'Gel (Energy Gel)',
             'Glass',
@@ -244,6 +250,8 @@ public function run(): void
             'Part of something (Vape Pen)',
             'Pellet (Airsoft)',
             'Pen',
+            'Pen (ballpoint)',
+            'Pen (marker)',
             'Pencap',
             'Pencil',
             'Phone',
@@ -282,10 +290,10 @@ public function run(): void
             'Snus',
             'Sock',
             'Sponge',
-            'Spoon',
             'Spray Can',
             'Spray Can (Cockpitspray)',
             'Spray Can (Paint)',
+            'Stick',
             'Stick (Icelolly)',
             'Stick (Lollipop)',
             'Sticker',
@@ -295,14 +303,15 @@ public function run(): void
             'Styrofoam',
             'Syringe',
             'Tampon',
+            'Tape',
             'Tape (Caution)',
             'Tape (Electrical)',
             'Tape (Flagging)',
             'Teabag',
+            'Ticket',
             'Ticket (Bus)',
             'Ticket (Parking)',
             'Ticket (Train)',
-            'Tie Wrap',
             'Tile',
             'Tire',
             'Tissue',
@@ -318,6 +327,7 @@ public function run(): void
             'Tray (for Cups)',
             'Tyre',
             'Umbrella',
+            'Unidentified',
             'Vape Oil',
             'Vape Pen',
             'Wallet',

diff --git a/database/seeders/TagSeeder.php b/database/seeders/TagSeeder.php
@@ -38,30 +38,16 @@ private function getEvents(): array
             'BeforeAndAfter',
             'BeforeAndAfter_After',
             'BeforeAndAfter_Before',
-            'Canuary',
             'Canuary2024',
-            'Cleanup4Sarah',
             'Cleanup4Sarah2024',
             'CornishSplicedTreasureHunt-SpecialFind',
-            'CornishSplicedTreasureHunt-item-01',
-            'CornishSplicedTreasureHunt-item-02',
-            'CornishSplicedTreasureHunt-item-03',
-            'CornishSplicedTreasureHunt-item-04',
-            'CornishSplicedTreasureHunt-item-05',
-            'CornishSplicedTreasureHunt-item-06',
-            'CornishSplicedTreasureHunt-item-07',
-            'CornishSplicedTreasureHunt-item-08',
-            'CornishSplicedTreasureHunt-item-09',
-            'CornishSplicedTreasureHunt-item-10',
-            'CornishSplicedTreasureHunt-item-bonus',
             'CornishSplicedTreasureHunt2024-01',
             'CornishSplicedTreasureHunt2024-02',
             'CornishSplicedTreasureHunt2024-03',
             'CornishSplicedTreasureHunt2024-04',
             'CornishSplicedTreasureHunt2024-05',
             'CornishSplicedTreasureHunt2024-06',
             'OTHER (For an Event that is not in the picklist)',
-            'PeukMeuk',
             'PeukMeuk2024',
             'RedBullLitter',
             'ShowYourImpact',
@@ -70,9 +56,7 @@ private function getEvents(): array
             'ShowYourImpact_DeZwerfafvalRuimers',
             'ShowYourImpact_ZaanseZwerfvuilEstafette',
             'ShowYourImpact_ZwerfieRotterdam',
-            'WorldCleanupDay',
             'WorldCleanupDay2024',
-            'Zaandewandel',
             'Zaandewandel2024',
         ];
     }
@@ -107,6 +91,7 @@ private function getMaterials(): array
             'Plexyglass',
             'Styrofoam',
             'Textile',
+            'Unknown',
             'Wood',
         ];
     }
@@ -146,6 +131,7 @@ private function getBrands(): array
             'Alaska',
             'Alaskan',
             'Albert Heijn',
+            'Aldi',
             'Alesto',
             'Alex Meijer',
             'Alfa',