Merge pull request #418 from avored/dev

Dev to master
avored · Mar 16, 2020 · 3069e39 · 3069e39
2 parents 796f27f + bcb6e20
commit 3069e39
Show file tree

Hide file tree

Showing 97 changed files with 61,976 additions and 31,996 deletions.
diff --git a/app/Http/Controllers/Account/AddressController.php b/app/Http/Controllers/Account/AddressController.php
@@ -124,7 +124,6 @@ public function update(AddressRequest $request, Address $address)
      */
     public function destroy(Address $address)
     {
-        dd($address);
         $address->delete();
 
         return redirect()->route('account.address.index');

diff --git a/avored.webpack.mix.js b/avored.webpack.mix.js
@@ -17,8 +17,8 @@ mix.webpackConfig({
     }
 })
 
-mix.js('vendor/avored/framework/resources/js/app.js', 'public/avored-admin/js/app.js');
-mix.less('vendor/avored/framework/resources/less/app.less', 'public/avored-admin/css/app.css', {
+mix.js('packages/framework/resources/js/app.js', 'public/avored-admin/js/app.js');
+mix.less('packages/framework/resources/less/app.less', 'public/avored-admin/css/app.css', {
     javascriptEnabled: true,
     modifyVars: {
         'primary-color': '#E64448',

diff --git a/composer.json b/composer.json
@@ -34,7 +34,8 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "AvoRed\\Framework\\": "packages/framework/src/"
         },
         "classmap": [
             "database/seeds",

diff --git a/config/app.php b/config/app.php
@@ -174,6 +174,7 @@
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        //AvoRed\Graphql\GraphqlProvider::class,
 
     ],
 

diff --git a/modules/avored/demodata/assets/uploads/catalog/attributes/blue-attribute.png b/modules/avored/demodata/assets/uploads/catalog/attributes/blue-attribute.png
diff --git a/modules/avored/demodata/assets/uploads/catalog/attributes/red-attribute.jpg b/modules/avored/demodata/assets/uploads/catalog/attributes/red-attribute.jpg
diff --git a/modules/avored/demodata/assets/uploads/catalog/attributes/yellow-attribute.png b/modules/avored/demodata/assets/uploads/catalog/attributes/yellow-attribute.png
diff --git a/modules/avored/demodata/database/migrations/2017_03_29_000000_avored_demo_data_schema.php b/modules/avored/demodata/database/migrations/2017_03_29_000000_avored_demo_data_schema.php
@@ -38,11 +38,12 @@ public function up()
 
         $colorAttribute = Attribute::create(
             ['name' => 'Color',
-            'slug' => 'color']
+            'slug' => 'color',
+            'display_as' => 'IMAGE']
         );
-        $whiteOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'White']);
-        $blackOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'Black']);
-        $brownOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'Brown']);
+        $redOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'Red', 'path' => 'uploads/catalog/attributes/red-attribute.jpg']);
+        $blueOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'Blue', 'path' => 'uploads/catalog/attributes/blue-attribute.png']);
+        $yellowOption = $colorAttribute->dropdownOptions()->create(['display_text' => 'Yellow', 'path' => 'uploads/catalog/attributes/yellow-attribute.png']);
 
 
         $brandProperty = Property::create(

diff --git a/modules/avored/banner/package-lock.json → package-lock.json b/modules/avored/banner/package-lock.json → package-lock.json
diff --git a/package.json b/package.json
@@ -14,8 +14,10 @@
     },
     "devDependencies": {
         "ant-design-vue": "^1.3.13",
+        "apollo-boost": "^0.4.4",
         "axios": "^0.19",
         "cross-env": "^5.1",
+        "graphql": "^14.5.8",
         "laravel-mix": "^4.1.2",
         "less": "^3.9.0",
         "less-loader": "^5.0.0",
@@ -24,7 +26,17 @@
         "resolve-url-loader": "^2.3.1",
         "vddl": "^0.7.1",
         "vue": "^2.5.17",
+        "vue-apollo": "^3.0.0",
         "vue-quill-editor": "^3.0.6",
-        "vue-template-compiler": "^2.6.10"
+        "vue-router": "^3.1.3",
+        "vue-template-compiler": "^2.6.10",
+        "apollo-cache-inmemory": "^1.6.3",
+        "apollo-client": "^2.6.4",
+        "apollo-link": "^1.2.13",
+        "apollo-link-http": "^1.5.16",
+        "graphql-tag": "^2.10.1"
+    },
+    "dependencies": {
+        "vue-i18n": "^8.15.0"
     }
 }