Merge pull request #70 from shopperlabs/fix-products-associations

Fix products associations
shopperlabs · Oct 9, 2021 · 55861cc · 55861cc
2 parents 1aa1106 + b58a2f5
commit 55861cc
Show file tree

Hide file tree

Showing 20 changed files with 4,027 additions and 164 deletions.
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
     "php": "^8",
     "ext-intl": "*",
     "ext-json": "*",
+    "asantibanez/laravel-blade-sortable": "^1.3",
     "askedio/laravel-soft-cascade": "^8.1",
     "bacon/bacon-qr-code": "^2.0",
     "blade-ui-kit/blade-heroicons": "^1.2",

diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "lodash": "^4.17.13",
     "popper.js": "^1.16.0",
     "postcss": "^8.3.5",
+    "sortablejs": "^1.14.0",
     "tailwindcss": "^2.2.4"
   },
   "devDependencies": {

diff --git a/public/css/shopper.css b/public/css/shopper.css
@@ -3442,14 +3442,6 @@ select{
 	--tw-bg-opacity: 1;
 	background-color: rgba(30, 64, 175, var(--tw-bg-opacity));
 }
-.bg-green-500{
-	--tw-bg-opacity: 1;
-	background-color: rgba(16, 185, 129, var(--tw-bg-opacity));
-}
-.bg-blue-500{
-	--tw-bg-opacity: 1;
-	background-color: rgba(59, 130, 246, var(--tw-bg-opacity));
-}
 .bg-opacity-75{
 	--tw-bg-opacity: 0.75;
 }
@@ -5556,11 +5548,6 @@ select{
 	}
 
 
-	.md\:p-6{
-		padding: 1.5rem;
-	}
-
-
 	.md\:py-4{
 		padding-top: 1rem;
 		padding-bottom: 1rem;