v.1.0.6

siddharthSoftwareEngineer · Mar 20, 2023 · 575d7f4 · 575d7f4
1 parent 6765c47
commit 575d7f4
Show file tree

Hide file tree

Showing 140 changed files with 102 additions and 15 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.env.example b/.env.example
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/README.md b/README.md
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/Api/Product.php b/app/Http/Controllers/Api/Product.php
@@ -32,6 +32,7 @@ public function insert_product(Request $request)
                 if ($request->file('product_image')->isValid()) {
                     $file = $request->file('product_image');
                     $fileName = 'product/' . $file->getClientOriginalName();
+                    // dd($request->attribute);
                     $file->move(public_path('product/'), $file->getClientOriginalName());
                     $register = new Products();
                     $register->product_name = $request->product_name;
@@ -309,4 +310,27 @@ public function remove_product_from_cart(Request $request)
             ]);
         }
     }
+
+    public function get_single_product(Request $request)
+    {
+        try {
+            if ($request->validate(['product_id' => 'required'])) {
+                $product_info = Products::where(['id' => $request->product_id, 'trush_status' => 1])->get();
+                return response()->json([
+                    'status' => 200,
+                    'error' => false,
+                    'data' => $product_info
+                ]);
+            } else {
+                throw new Exception('Unavalable product');
+            }
+        } catch (Exception $e) {
+            return response()->json([
+                'status' => 400,
+                'error' => $e . '',
+                'message' => 'unavalable product',
+                'messages' => $e . ''
+            ]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Api/User_registration.php b/app/Http/Controllers/Api/User_registration.php
@@ -23,7 +23,6 @@ function vendor_register(Request $request)
                     $file = $request->file('shop_image');
                     $fileName = 'uploads/' . $file->getClientOriginalName();
                     $file->move(public_path('uploads/'), $file->getClientOriginalName());
-
                     $register = new Register();
                     $register->name = $request->Name;
                     $register->email = $request->Email;

diff --git a/app/Http/Controllers/Api/Vendor_attribute.php b/app/Http/Controllers/Api/Vendor_attribute.php
diff --git a/app/Http/Controllers/Api/Vendor_category.php b/app/Http/Controllers/Api/Vendor_category.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
diff --git a/app/Http/Controllers/Vendor/AddProduct.php b/app/Http/Controllers/Vendor/AddProduct.php
diff --git a/app/Http/Controllers/Vendor/RedirectSession.php b/app/Http/Controllers/Vendor/RedirectSession.php
@@ -103,6 +103,6 @@ public function add_to_cart()
     }
     public function about_product($id)
     {
-        return view('vendor/about_product')->with('prodcut_id',$id);
+        return view('vendor/about_product')->with('product_id',$id);
     }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
diff --git a/app/Http/Middleware/AuthLogin.php b/app/Http/Middleware/AuthLogin.php
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Models/Api/Attribute.php b/app/Models/Api/Attribute.php
diff --git a/app/Models/Api/Category.php b/app/Models/Api/Category.php
diff --git a/app/Models/Api/Products.php b/app/Models/Api/Products.php
diff --git a/app/Models/Api/Register.php b/app/Models/Api/Register.php
diff --git a/app/Models/Api/Relation_cat_product.php b/app/Models/Api/Relation_cat_product.php
diff --git a/app/Models/Api/Vendor_cart.php b/app/Models/Api/Vendor_cart.php
diff --git a/app/Models/User.php b/app/Models/User.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
diff --git a/bootstrap/app.php b/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
diff --git a/config/auth.php b/config/auth.php
diff --git a/config/broadcasting.php b/config/broadcasting.php
diff --git a/config/cache.php b/config/cache.php
diff --git a/config/cors.php b/config/cors.php
diff --git a/config/database.php b/config/database.php
diff --git a/config/filesystems.php b/config/filesystems.php
diff --git a/config/hashing.php b/config/hashing.php
diff --git a/config/logging.php b/config/logging.php
diff --git a/config/mail.php b/config/mail.php
diff --git a/config/passport.php b/config/passport.php
diff --git a/config/queue.php b/config/queue.php
diff --git a/config/sanctum.php b/config/sanctum.php
diff --git a/config/services.php b/config/services.php
diff --git a/config/session.php b/config/session.php
diff --git a/config/view.php b/config/view.php
diff --git a/database/.gitignore b/database/.gitignore
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
diff --git a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php
diff --git a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php
diff --git a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php
diff --git a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php
diff --git a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php
diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
diff --git a/database/migrations/2022_12_12_122844_create_user_table.php b/database/migrations/2022_12_12_122844_create_user_table.php
diff --git a/database/migrations/2023_02_02_112744_create_attribute_table.php b/database/migrations/2023_02_02_112744_create_attribute_table.php
diff --git a/database/migrations/2023_02_13_072237_create_category_table.php b/database/migrations/2023_02_13_072237_create_category_table.php
diff --git a/database/migrations/2023_02_24_080207_create_product_table.php b/database/migrations/2023_02_24_080207_create_product_table.php
diff --git a/database/migrations/2023_03_01_063200_create_relation_product_category_table.php b/database/migrations/2023_03_01_063200_create_relation_product_category_table.php
diff --git a/database/migrations/2023_03_01_140437_create_vendor_cart_table.php b/database/migrations/2023_03_01_140437_create_vendor_cart_table.php
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
diff --git a/package.json b/package.json
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/public/.htaccess b/public/.htaccess
diff --git a/public/css/sidebar.css b/public/css/sidebar.css
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.php b/public/index.php
diff --git a/public/product/Living_Room_with_Tile-min.jpg b/public/product/Living_Room_with_Tile-min.jpg
diff --git a/public/product/OFFFICE_FACING_OFFICES.jpg b/public/product/OFFFICE_FACING_OFFICES.jpg
diff --git a/public/product/OUTSIDE_FACING_OFFICE.jpg b/public/product/OUTSIDE_FACING_OFFICE.jpg
diff --git a/public/product/Pool_with_Seating_Area-min.jpg b/public/product/Pool_with_Seating_Area-min.jpg
diff --git a/public/product/Screenshot from 2022-12-29 15-33-43.png b/public/product/Screenshot from 2022-12-29 15-33-43.png
diff --git a/public/product/Spacious_Bedroom_D3mvL4J-min.jpg b/public/product/Spacious_Bedroom_D3mvL4J-min.jpg
diff --git a/public/product/image003.png b/public/product/image003.png
diff --git a/public/product/live_oaks_office-min.jpg b/public/product/live_oaks_office-min.jpg
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/public/uploads/Pool_with_Seating_Area-min.jpg b/public/uploads/Pool_with_Seating_Area-min.jpg
diff --git a/public/web_image/india-map.jpg b/public/web_image/india-map.jpg
diff --git a/public/web_image/right.png b/public/web_image/right.png
diff --git a/public/web_image/wrong.jpeg b/public/web_image/wrong.jpeg
diff --git a/resources/css/app.css b/resources/css/app.css
diff --git a/resources/js/app.js b/resources/js/app.js
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
diff --git a/resources/views/include/footer/footer.blade.php b/resources/views/include/footer/footer.blade.php
diff --git a/resources/views/include/header/header.blade.php b/resources/views/include/header/header.blade.php
diff --git a/resources/views/include/navbar/nav.blade.php b/resources/views/include/navbar/nav.blade.php
diff --git a/resources/views/include/sidebar/sidebar.blade.php b/resources/views/include/sidebar/sidebar.blade.php
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
diff --git a/resources/views/user/user_register.blade.php b/resources/views/user/user_register.blade.php
diff --git a/resources/views/vendor/about_product.blade.php b/resources/views/vendor/about_product.blade.php
@@ -1,5 +1,63 @@
 @include('../include/sidebar/sidebar')
+<div class="container">
+    <div class="row product-box">
 
-<div class="row cart-box">
+    </div>
+
+    <div class="row add-info">
+
+    </div>
 </div>
-@include('../include/footer/footer')
+@include('../include/footer/footer')
+
+<script>
+    $(window).on("load", function() {
+        let product_id = "{{$product_id}}";
+        $.ajax({
+            url: window.location.origin + '/api/get-single-product',
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                product_id: product_id
+            },
+            success: function(data) {
+                let attribute = JSON.parse(data.data[0].attribute);
+                console.log(attribute);
+
+                $('.product-box').append(`
+                <div class="col-md-6">
+            <div class="card my-5">
+                <div class="card-body">
+                    <img src="/${data.data[0].product_image}" height="200px" width="100%" alt="">
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="mx-5">
+                <h2 class="mt-5">${data.data[0].product_name}</h2>
+                <s>Rs.${data.data[0].regular_price}</s>
+                <span class="mx-4">Rs.${data.data[0].vendor_price}</span>
+                <div>
+                    <div>
+                        <label class="h6" for="">Quantity</label>
+                    </div>
+                    <div>
+                        <input min="1" value="1" class="text-center form-control w-50" type="number">
+                    </div>
+                    <div class="my-4">
+                        <button class="btn bg-custome text-white my-2">Add To Cart</button>
+                        <button class="btn bg-custome mx-lg-4 my-2 text-white">Process to Checkout</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+                `);
+                $('.add-info').append(`<div class="col-lg-10"> <div class="card"><h6 class="mx-4 my-2">Addition Information</h6><table class="cat-class"><tr><th scope="row">Category</th><td>${data.data[0].category}</td></tr>`);
+                Object.entries(attribute).forEach(([key, value]) => {
+                    $('.cat-class').append(`<tr> <th scope="row">${key}</th> <td>${value}</td> </tr> </table></div></div>`)
+                })
+
+            }
+        })
+    });
+</script>
diff --git a/resources/views/vendor/add_new_product.blade.php b/resources/views/vendor/add_new_product.blade.php
@@ -59,7 +59,7 @@
                     @foreach ($attribute as $attribute)
                     <div class="col-lg-5 mt-2 d-flex checkbox-block">
                         <input class="form-check-input selected-option" type="checkbox" value="{{$attribute->id}}" id="checkbox{{$attribute->id}}">
-                        <label class="form-check-label" for="checkbox">{{$attribute->attribute_name}}</label>
+                        <label class="form-check-label" value="{{$attribute->attribute_name}}" id="lable{{$attribute->id}}" for="checkbox">{{$attribute->attribute_name}}</label>
                     </div>
                     <div class="modal" id="exampleModal{{$attribute->id}}" tabindex="-1">
                         <div class="modal-dialog">
@@ -145,6 +145,7 @@
     $(document).ready(function() {
         $('.selected-option').change(function() {
             var id = jQuery(this).val();
+            let attribute_name = $('#lable' + id).attr('value');
             if ($(this).is(":checked")) {
                 let temp_arr = [];
                 $('#exampleModal' + id).modal('show');
@@ -164,11 +165,11 @@
                             temp_arr.splice(index, 1);
                         }
                     }
-                    attr_array['title' + id] = temp_arr;
+                    attr_array[attribute_name] = temp_arr.toString();
                 });
             } else {
                 $('.selected-checkbox' + id).prop('checked', false);
-                delete attr_array['title' + id];
+                delete attr_array[attribute_name];
             }
         });
 
@@ -193,13 +194,16 @@
         });
 
         $('#submit_form').click(function() {
-            const property_array = Object.values(attr_array);
-            const newArr = property_array.map(function(arr_list) {
-                attribute = attribute.concat(arr_list);
-            });
-            category_id=category_id.toString();
+            // const property_array = Object.values(attr_array);
+            // const newArr = property_array.map(function(arr_list) {
+            //     attribute = attribute.concat(arr_list);
+            // });
+            category_id = category_id.toString();
             category = category.toString();
-            attribute = attribute.toString();
+            // attribute = attribute.toString();
+            attribute = JSON.stringify(attr_array);
+            console.log(attr_array);
+
             let form = $('#product_form')[0];
             var formData = new FormData(form);
             let product_name = $('#productName').val();
@@ -212,7 +216,7 @@
             formData.append("session", session);
             formData.append("category", category);
             formData.append("attribute", attribute);
-            formData.append("category_id",category_id);
+            formData.append("category_id", category_id);
             $.ajax({
                 url: window.location.origin + '/api/add-new-product',
                 type: 'POST',

diff --git a/resources/views/vendor/add_to_cart.blade.php b/resources/views/vendor/add_to_cart.blade.php
diff --git a/resources/views/vendor/attributes.blade.php b/resources/views/vendor/attributes.blade.php
diff --git a/resources/views/vendor/category.blade.php b/resources/views/vendor/category.blade.php
diff --git a/resources/views/vendor/edit_attributes.blade.php b/resources/views/vendor/edit_attributes.blade.php
diff --git a/resources/views/vendor/edit_category.blade.php b/resources/views/vendor/edit_category.blade.php
diff --git a/resources/views/vendor/forget_password.blade.php b/resources/views/vendor/forget_password.blade.php
diff --git a/resources/views/vendor/home.blade.php b/resources/views/vendor/home.blade.php
diff --git a/resources/views/vendor/product_tresh.blade.php b/resources/views/vendor/product_tresh.blade.php
diff --git a/resources/views/vendor/vendor_all_product.blade.php b/resources/views/vendor/vendor_all_product.blade.php
diff --git a/resources/views/vendor/vendor_login.blade.php b/resources/views/vendor/vendor_login.blade.php
diff --git a/resources/views/vendor/vendor_register.blade.php b/resources/views/vendor/vendor_register.blade.php
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
diff --git a/routes/api.php b/routes/api.php
@@ -63,4 +63,6 @@
 
 Route::post('vendor-cart',[App\Http\Controllers\Api\Product::class,'vendor_cart_product']);
 
-Route::post('remove-cart',[App\Http\Controllers\Api\Product::class,'remove_product_from_cart']);
+Route::post('remove-cart',[App\Http\Controllers\Api\Product::class,'remove_product_from_cart']);
+
+Route::post('get-single-product',[App\Http\Controllers\Api\Product::class,'get_single_product']);
diff --git a/routes/channels.php b/routes/channels.php
diff --git a/routes/console.php b/routes/console.php
diff --git a/routes/web.php b/routes/web.php
diff --git a/server.php b/server.php
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
diff --git a/webpack.mix.js b/webpack.mix.js