From 9a44b14fb33f1c4031779097ca1bd603b2fcb6b6 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Thu, 15 Jul 2021 16:33:01 +0800 Subject: [PATCH] updated for designer --- app/Http/Controllers/TemplatesController.php | 342 +++++++++--------- .../teamstore/TeamStoreController.php | 17 +- app/Http/routes.php | 34 +- app/Models/TemplatesModel.php | 9 +- app/Models/teamstore/TeamStoreModel.php | 14 +- public/assets/css/merchbay/styles.css | 44 ++- public/images/merchbay-black.png | Bin 0 -> 12633 bytes public/images/merchbay-white.png | Bin 0 -> 12436 bytes .../views/designer/design_preview.blade.php | 8 +- resources/views/layout/navbar.blade.php | 2 +- resources/views/merchbay/index.blade.php | 31 +- resources/views/merchbay/navbar.blade.php | 3 +- resources/views/merchbay/templates.blade.php | 47 +++ .../teamstore-sublayouts/stores.blade.php | 67 +--- resources/views/user-layouts/footer.blade.php | 2 +- resources/views/user-layouts/index.blade.php | 2 +- 16 files changed, 309 insertions(+), 313 deletions(-) create mode 100644 public/images/merchbay-black.png create mode 100644 public/images/merchbay-white.png create mode 100644 resources/views/merchbay/templates.blade.php diff --git a/app/Http/Controllers/TemplatesController.php b/app/Http/Controllers/TemplatesController.php index 85706b6..8eaf3a0 100755 --- a/app/Http/Controllers/TemplatesController.php +++ b/app/Http/Controllers/TemplatesController.php @@ -1,4 +1,6 @@ -selectTemplate($q); $templatePathsData = $m->selectTemplatePaths($q); // plain svg for visualizer - $templateTypes = $m->selectTemplateTypes(); - $sportsList = $m1->getSportsName(); + $templateTypes = $m->selectTemplateTypes(); + $sportsList = $m1->getSportsName(); $printPatternList = $m2->selectAllPrintTemplate($q); - + return view('sub_pages.edit_template')->with('templatedata', $templateData)->with('templatepath', $templatePathsData)->with('sportsname', $sportsList)->with('templatetype', $templateTypes)->with('printpattern', $printPatternList); } - + public function getTemplates(Request $request) { @@ -40,23 +43,23 @@ class TemplatesController extends Controller { // /public/images/sports-thumbnails - if(!empty($data)){ + if (!empty($data)) { foreach ($data as $row) { - ?> -
-
-

TemplateName ?>

+?> +
+
+

TemplateName ?>

+
+
+ Thumbnail ?>" alt="Sports" height="400px;" class="img img-responsive product-center" /> +
+ TemplateCode . "/" ?>" class="btn btn-primary btn-block"> Edit
-
- Thumbnail ?>" alt="Sports" height="400px;" class="img img-responsive product-center" /> -
- TemplateCode . "/" ?>" class="btn btn-primary btn-block"> Edit -
-
-
- +
+ alert("No available Template/s"); '; @@ -71,26 +74,26 @@ class TemplatesController extends Controller { public function getTemplateTypes() { //if(Request::ajax()){ - $m = new TemplatesModel; - $data = $m->selectTemplateTypes(); - ?> - - - TemplateType.'">'.$row->TemplateType.''; - } - ?> - selectTemplateTypes(); + ?> + + + TemplateType . '">' . $row->TemplateType . ''; + } + ?> +selectTemplateLastId(); - echo $templateCode = "TEMP-" . str_pad($data->Id + 1, 5,'0',STR_PAD_LEFT); + $m = new TemplatesModel; + $data = $m->selectTemplateLastId(); + echo $templateCode = "TEMP-" . str_pad($data->Id + 1, 5, '0', STR_PAD_LEFT); } public function saveNewTemplates(Request $request) @@ -106,124 +109,129 @@ class TemplatesController extends Controller { $getSkins = $post['getSkins']; $tempateImage = $post['tempateImage']; - $rawName = date('Ymd') . "-" . time().'-'.$request->file('tempateImage')->getClientOriginalName(); + $rawName = date('Ymd') . "-" . time() . '-' . $request->file('tempateImage')->getClientOriginalName(); $imageExt = $request->file('tempateImage')->getClientOriginalExtension(); - $custom_file_name = str_replace(' ','-',strtolower($rawName)); + $custom_file_name = str_replace(' ', '-', strtolower($rawName)); $custom_file_name = preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name); - $NewImageName = $custom_file_name.'.'.$imageExt; + $NewImageName = $custom_file_name . '.' . $imageExt; $thumbnail = "images/templates/thumbnail/" . $NewImageName; $data = array( - 'SportsId' => $sportName, - 'TemplateCode' => $templateCode, - 'Thumbnail' => $thumbnail, - 'TemplateName' => $templateName, - 'TemplateType' => $templateType, - 'Trim' => $numberOfTrims, - 'PatternId' => $getSkins, - 'IsActive' => 'TRUE' - ); + 'SportsId' => $sportName, + 'TemplateCode' => $templateCode, + 'Thumbnail' => $thumbnail, + 'TemplateName' => $templateName, + 'TemplateType' => $templateType, + 'Trim' => $numberOfTrims, + 'PatternId' => $getSkins, + 'IsActive' => 'TRUE' + ); $i = $m->insertNewTempalte($data); - if($i){ + if ($i) { $request->file('tempateImage')->move( - base_path() . '/public/images/templates/thumbnail', $NewImageName + base_path() . '/public/images/templates/thumbnail', + $NewImageName ); //for front jersey - if(!empty($request->file('svgJerseyFront')->getClientOriginalName())){ - + if (!empty($request->file('svgJerseyFront')->getClientOriginalName())) { + $svgName = $request->file('svgJerseyFront')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; //var_dump($svgThumbnail); $Templatedata = array( - 'TemplateCode' => $templateCode, - 'Type' => 'Jersey', - 'Side' => 'Front', - 'Path' => $svgThumbnail, - 'IsActive' => 'TRUE' - ); + 'TemplateCode' => $templateCode, + 'Type' => 'Jersey', + 'Side' => 'Front', + 'Path' => $svgThumbnail, + 'IsActive' => 'TRUE' + ); $i = $m->insertTempaltePaths($Templatedata); - if($i){ + if ($i) { $request->file('svgJerseyFront')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - if(!empty($request->file('svgJerseyBack')->getClientOriginalName())){ - + if (!empty($request->file('svgJerseyBack')->getClientOriginalName())) { + $svgName = $request->file('svgJerseyBack')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'TemplateCode' => $templateCode, - 'Type' => 'Jersey', - 'Side' => 'Back', - 'Path' => $svgThumbnail, - 'IsActive' => 'TRUE' - ); + 'TemplateCode' => $templateCode, + 'Type' => 'Jersey', + 'Side' => 'Back', + 'Path' => $svgThumbnail, + 'IsActive' => 'TRUE' + ); $i = $m->insertTempaltePaths($Templatedata); - if($i){ + if ($i) { $request->file('svgJerseyBack')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - if(!empty($request->file('svgShortRight')->getClientOriginalName())){ - + if (!empty($request->file('svgShortRight')->getClientOriginalName())) { + $svgName = $request->file('svgShortRight')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'TemplateCode' => $templateCode, - 'Type' => 'Shorts', - 'Side' => 'Right', - 'Path' => $svgThumbnail, - 'IsActive' => 'TRUE' - ); + 'TemplateCode' => $templateCode, + 'Type' => 'Shorts', + 'Side' => 'Right', + 'Path' => $svgThumbnail, + 'IsActive' => 'TRUE' + ); $i = $m->insertTempaltePaths($Templatedata); - if($i){ + if ($i) { $request->file('svgShortRight')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - if(!empty($request->file('svgShortLeft')->getClientOriginalName())){ - + if (!empty($request->file('svgShortLeft')->getClientOriginalName())) { + $svgName = $request->file('svgShortLeft')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'TemplateCode' => $templateCode, - 'Type' => 'Shorts', - 'Side' => 'Left', - 'Path' => $svgThumbnail, - 'IsActive' => 'TRUE' - ); + 'TemplateCode' => $templateCode, + 'Type' => 'Shorts', + 'Side' => 'Left', + 'Path' => $svgThumbnail, + 'IsActive' => 'TRUE' + ); $i = $m->insertTempaltePaths($Templatedata); - if($i){ + if ($i) { $request->file('svgShortLeft')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - + echo '

Success!

Sports is successfully added.
'; - }else{ + } else { echo '

Error!

@@ -249,123 +257,122 @@ class TemplatesController extends Controller { $getSkins = $post['getSkins']; if (array_key_exists('tempateImage', $post)) { - + $tempateImage = $post['tempateImage']; - $rawName = date('Ymd') . "-" . time().'-'.$request->file('tempateImage')->getClientOriginalName(); + $rawName = date('Ymd') . "-" . time() . '-' . $request->file('tempateImage')->getClientOriginalName(); $imageExt = $request->file('tempateImage')->getClientOriginalExtension(); - $custom_file_name = str_replace(' ','-',strtolower($rawName)); + $custom_file_name = str_replace(' ', '-', strtolower($rawName)); $custom_file_name = preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name); - $NewImageName = $custom_file_name.'.'.$imageExt; + $NewImageName = $custom_file_name . '.' . $imageExt; $thumbnail = "images/templates/thumbnail/" . $NewImageName; $data = array( - 'SportsId' => trim($sportName), - 'TemplateCode' => $templateCode, - 'Thumbnail' => $thumbnail, - 'TemplateName' => $templateName, - 'TemplateType' => trim($templateType), - 'Trim' => $numberOfTrims, - 'PatternId' => $getSkins - ); - - $request->file('tempateImage')->move( - base_path() . '/public/images/templates/thumbnail', $NewImageName + 'SportsId' => trim($sportName), + 'TemplateCode' => $templateCode, + 'Thumbnail' => $thumbnail, + 'TemplateName' => $templateName, + 'TemplateType' => trim($templateType), + 'Trim' => $numberOfTrims, + 'PatternId' => $getSkins ); - }else{ + $request->file('tempateImage')->move( + base_path() . '/public/images/templates/thumbnail', + $NewImageName + ); + } else { $data = array( - 'SportsId' => trim($sportName), - 'TemplateCode' => $templateCode, - //'Thumbnail' => $thumbnail, - 'TemplateName' => $templateName, - 'TemplateType' => trim($templateType), - 'Trim' => $numberOfTrims, - 'PatternId' => $getSkins - ); - + 'SportsId' => trim($sportName), + 'TemplateCode' => $templateCode, + //'Thumbnail' => $thumbnail, + 'TemplateName' => $templateName, + 'TemplateType' => trim($templateType), + 'Trim' => $numberOfTrims, + 'PatternId' => $getSkins + ); } - + $i = $m->updateNewTemplate($data, $templateCode); - - - - if (array_key_exists('svgJerseyFront', $post)) { - //echo 'meron jerset front'; - - $svgName = $request->file('svgJerseyFront')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + //echo 'meron jerset front'; - $Templatedata = array( - 'Type' => 'Jersey', - 'Side' => 'Front', - 'Path' => $svgThumbnail - ); + $svgName = $request->file('svgJerseyFront')->getClientOriginalName(); + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; - $i = $m->updateTemplatePaths($Templatedata, $post['id_svgJerseyFront']); - if($i){ - $request->file('svgJerseyFront')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName - ); - //echo 'image move success'; - } + $Templatedata = array( + 'Type' => 'Jersey', + 'Side' => 'Front', + 'Path' => $svgThumbnail + ); + + $i = $m->updateTemplatePaths($Templatedata, $post['id_svgJerseyFront']); + if ($i) { + $request->file('svgJerseyFront')->move( + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName + ); + //echo 'image move success'; + } } if (array_key_exists('svgJerseyBack', $post)) { - - $svgName = $request->file('svgJerseyBack')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + + $svgName = $request->file('svgJerseyBack')->getClientOriginalName(); + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'Type' => 'Jersey', - 'Side' => 'Back', - 'Path' => $svgThumbnail - ); + 'Type' => 'Jersey', + 'Side' => 'Back', + 'Path' => $svgThumbnail + ); $i = $m->updateTemplatePaths($Templatedata, $post['id_svgJerseyBack']); - if($i){ + if ($i) { $request->file('svgJerseyBack')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - + if (array_key_exists('svgShortRight', $post)) { $svgName = $request->file('svgShortRight')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'Type' => 'Shorts', - 'Side' => 'Right', - 'Path' => $svgThumbnail - ); + 'Type' => 'Shorts', + 'Side' => 'Right', + 'Path' => $svgThumbnail + ); $i = $m->updateTemplatePaths($Templatedata, $post['id_svgShortRight']); - if($i){ + if ($i) { $request->file('svgShortRight')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } - + if (array_key_exists('svgShortLeft', $post)) { - $svgName = $request->file('svgShortLeft')->getClientOriginalName(); - $svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName; + $svgName = $request->file('svgShortLeft')->getClientOriginalName(); + $svgThumbnail = "uniform-templates/" . $templateCode . "/DISPLAY/" . $svgName; $Templatedata = array( - 'Type' => 'Shorts', - 'Side' => 'Left', - 'Path' => $svgThumbnail - ); + 'Type' => 'Shorts', + 'Side' => 'Left', + 'Path' => $svgThumbnail + ); $i = $m->updateTemplatePaths($Templatedata, $post['id_svgShortLeft']); - if($i){ + if ($i) { $request->file('svgShortLeft')->move( - base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName + base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY', + $svgName ); } } @@ -376,5 +383,4 @@ class TemplatesController extends Controller { Template is successfully updated.
'; } - } diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 18e0dd5..71e06d5 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -13,7 +13,7 @@ use App\Models\user\UserModel; // use Mail; use Illuminate\Support\Facades\Mail; use Analytics; - +use App\Models\TemplatesModel; class TeamStoreController extends Controller { @@ -129,7 +129,7 @@ class TeamStoreController extends Controller $m = new TeamStoreModel; $q = $request->input('q'); $sort = $request->input('s'); - + if (isset($q) && isset($sort)) { if ($sort == "latest") { @@ -793,7 +793,16 @@ class TeamStoreController extends Controller }); } - public function contact(){ + public function contact() + { return view('contact'); } -} + + public function selectTemplates() + { + $m = new TemplatesModel; + $data = $m->selectAllTemplate(); + return view('merchbay.templates') + ->with('row', $data); + } +} \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index ae983a1..a62cf96 100755 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -23,7 +23,7 @@ Route::controllers([ ]); -Route::get('/', 'MainController@index'); +// Route::get('/', 'MainController@index'); Route::get('/sportslist', 'MainController@sports'); Route::get('/sports/{url}', 'MainController@templatesCat'); Route::get('/sports/{url}/{id}', 'MainController@templatesByCategory'); @@ -56,22 +56,22 @@ Route::post('/designer/a/save-roster', 'designer\DesignerController@saveRoster') //END CUSTOMIZER DISPLAY -// Route::post('/designer/a/gradient-append', 'designer\DesignerController@gradientAppend'); -// Route::post('/designer/a/set-pattern', 'designer\DesignerController@setPattern'); -// Route::post('/designer/a/set-trim-pattern', 'designer\DesignerController@setTrimPattern'); -// Route::post('/designer/a/get-template-default-colors', 'designer\DesignerController@getTemplateDefaultColors'); -// Route::post('/designer/a/get-font-display', 'designer\DesignerController@getFontDisplay'); -// Route::post('/designer/a/get-cliparts', 'designer\DesignerController@getCliparts'); -// Route::post('/designer/a/clipart-properties', 'designer\DesignerController@clipartProperties'); -// Route::post('/designer/a/save-design', 'designer\DesignerController@saveDesign'); -// Route::post('/designer/edit/a/edit-gradient-append', 'designer\DesignerController@editGradientAppend'); -// Route::post('/designer/edit/a/edit-pattern-properties', 'designer\DesignerController@editPatternProperties'); -// Route::post('/designer/edit/a/edit-set-pattern', 'designer\DesignerController@editSetPattern'); -// Route::get('/designer/a/tab-clipart-content', 'designer\DesignerController@tabClipartContent'); -// Route::post('/designer/a/save-design-details', 'designer\DesignerController@saveDesignDetails'); +Route::post('/designer/a/gradient-append', 'designer\DesignerController@gradientAppend'); +Route::post('/designer/a/set-pattern', 'designer\DesignerController@setPattern'); +Route::post('/designer/a/set-trim-pattern', 'designer\DesignerController@setTrimPattern'); +Route::post('/designer/a/get-template-default-colors', 'designer\DesignerController@getTemplateDefaultColors'); +Route::post('/designer/a/get-font-display', 'designer\DesignerController@getFontDisplay'); +Route::post('/designer/a/get-cliparts', 'designer\DesignerController@getCliparts'); +Route::post('/designer/a/clipart-properties', 'designer\DesignerController@clipartProperties'); +Route::post('/designer/a/save-design', 'designer\DesignerController@saveDesign'); +Route::post('/designer/edit/a/edit-gradient-append', 'designer\DesignerController@editGradientAppend'); +Route::post('/designer/edit/a/edit-pattern-properties', 'designer\DesignerController@editPatternProperties'); +Route::post('/designer/edit/a/edit-set-pattern', 'designer\DesignerController@editSetPattern'); +Route::get('/designer/a/tab-clipart-content', 'designer\DesignerController@tabClipartContent'); +Route::post('/designer/a/save-design-details', 'designer\DesignerController@saveDesignDetails'); // teamstore -Route::get('/', 'teamstore\TeamStoreController@login'); // old +// Route::get('/', 'teamstore\TeamStoreController@login'); // old Route::get('/', 'teamstore\TeamStoreController@storelist'); // old @@ -84,6 +84,10 @@ Route::post('/teamstore/q/add-to-cart', 'teamstore\TeamStoreController@addToCart Route::get('/teamstore/q/clearsession', 'teamstore\TeamStoreController@clearSession'); Route::post('/teamstore/q/add-voucher', 'teamstore\TeamStoreController@addVoucher'); Route::post('/teamstore/q/add-new-row', 'teamstore\TeamStoreController@addNewRow'); +Route::post('/teamstore/q/add-new-row', 'teamstore\TeamStoreController@addNewRow'); + +Route::get('/templates', 'teamstore\TeamStoreController@selectTemplates'); + // }); Route::post('/teamstore/checkpassword', 'teamstore\TeamStoreController@checkTeamStorePassword'); diff --git a/app/Models/TemplatesModel.php b/app/Models/TemplatesModel.php index 493de74..e30574c 100755 --- a/app/Models/TemplatesModel.php +++ b/app/Models/TemplatesModel.php @@ -1,7 +1,7 @@ where('IsActive', '=', 'TRUE') + ->get(); + return $i; + } } \ No newline at end of file diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 4202208..c1960b3 100755 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -18,7 +18,7 @@ class TeamStoreModel extends Model { { $i = DB::table('teamstore_products') ->where($field, $teamstoreId) - ->orderBy('Ordering', 'ASC') + // ->orderBy('Ordering', 'ASC') ->orderBy('Ordering', 'ASC')->get(); return $i; } @@ -224,7 +224,17 @@ class TeamStoreModel extends Model { $i = DB::table('teamstores') ->where("IsActive", "true") ->orderby($field, $value) - ->paginate(16); + ->paginate(12); + return $i; + } + + + function selectFeaturedProduct(){ + + $i = DB::table('teamstore_products') + ->where("IsActive", "true") + // ->orderby($field, $value) + ->paginate(12); return $i; } diff --git a/public/assets/css/merchbay/styles.css b/public/assets/css/merchbay/styles.css index 63948d9..e020a85 100755 --- a/public/assets/css/merchbay/styles.css +++ b/public/assets/css/merchbay/styles.css @@ -2,7 +2,7 @@ html, body { width: 100%; height: 100%; - font-family: 'Montserrat', sans-serif !important; + font-family: "Montserrat", sans-serif !important; background-color: #f5f5f6; font-size: 0.9rem; } @@ -15,6 +15,10 @@ body { font-weight: 900; } +.navbar-brand > img { + height: 28px !important; +} + .btn-white-outline { color: #ffffff; border-color: #ffffff; @@ -80,7 +84,7 @@ body { } .added-or::before { - content: 'or'; + content: "or"; position: absolute; display: inline-block; padding: 5px; @@ -119,12 +123,12 @@ li.footer-menu-item { } li.footer-menu-item::after { - content: ' |'; + content: " |"; /* margin: 0px 10px 0px 10px; */ } li.footer-menu-item:last-child::after { - content: ''; + content: ""; /* margin: 0 10px; */ } @@ -160,7 +164,7 @@ li.footer-menu-item a:hover { bottom: 0; margin: auto; /* padding: 5px; */ - box-shadow: 0 .125rem .25rem rgba(0,0,0,.075); + box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075); } .product-image img { @@ -188,7 +192,7 @@ li.footer-menu-item a:hover { margin: -5px 0px; } -.product-price-display div{ +.product-price-display div { font-size: 1.5rem; font-weight: 600; color: #9a9a9a; @@ -261,38 +265,38 @@ a.btn-white-outline.nuxt-link-exact-active { color: #000; } -.product-price > .previous-price{ +.product-price > .previous-price { margin-right: 10px; } -.product-price > .current-price{ +.product-price > .current-price { color: #e01414; font-size: 1.1rem; } -.breadcrumb-item a{ +.breadcrumb-item a { color: #9a9a9a !important; text-decoration: none; font-weight: 500; } -.breadcrumb-item.active{ +.breadcrumb-item.active { color: #9a9a9a !important; } -.breadcrumb-item+.breadcrumb-item::before{ +.breadcrumb-item + .breadcrumb-item::before { color: #9a9a9a !important; } -.adbg{ +.adbg { background-color: #bdc6c5; } -span.designer-text{ +span.designer-text { color: #b90a0c; } -.product-active-thumbnail{ +.product-active-thumbnail { height: 400px; } @@ -343,7 +347,7 @@ span.designer-text{ .nav-item { padding-left: 1rem; padding-right: 1rem; - padding-top: .8rem; + padding-top: 0.8rem; } .store-logo img { /* max-height: 100%; */ @@ -353,7 +357,7 @@ span.designer-text{ /* width: 1; */ } - .store-name{ + .store-name { text-align: center; } @@ -365,22 +369,22 @@ span.designer-text{ text-align: left; } - .product-active-thumbnail{ + .product-active-thumbnail { height: 345px; } - .btn-white-outline{ + .btn-white-outline { color: #000000; border-color: #000000; } - .btn-white-outline:hover{ + .btn-white-outline:hover { color: #ffffff; border-color: #000000; background-color: #000000; } - .bi.bi-cart-fill{ + .bi.bi-cart-fill { color: #000000; } } diff --git a/public/images/merchbay-black.png b/public/images/merchbay-black.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0a59cd820140591b6a9f4a9e361df4b44aede6 GIT binary patch literal 12633 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 DYIPFI literal 0 HcmV?d00001 diff --git a/public/images/merchbay-white.png b/public/images/merchbay-white.png new file mode 100644 index 0000000000000000000000000000000000000000..bac43deb1178b0a4168df5065f7e46daad871171 GIT binary patch literal 12436 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 ZAL?Efm0hq=WBk7XLw#d($?*$U{|7ASzFGhP literal 0 HcmV?d00001 diff --git a/resources/views/designer/design_preview.blade.php b/resources/views/designer/design_preview.blade.php index 91a8b24..f162b3d 100755 --- a/resources/views/designer/design_preview.blade.php +++ b/resources/views/designer/design_preview.blade.php @@ -349,16 +349,16 @@ if(template_format == "png"){ if(port == 5952){ - gen_url = ip+":"+port+"/ap/{{ $client_design_array[0]->DesignCode }}"; + gen_url = ip+":"+port+"/merchbay/ap/{{ $client_design_array[0]->DesignCode }}"; }else{ - gen_url = ip+":"+port+"/mask/{{ $client_design_array[0]->DesignCode }}"; + gen_url = ip+":"+port+"/merchbay/mask/{{ $client_design_array[0]->DesignCode }}"; } }else{ if(port == 5953){ - gen_url = ip+":"+port+"/classic-mask/{{ $client_design_array[0]->DesignCode }}"; + gen_url = ip+":"+port+"/merchbay/classic-mask/{{ $client_design_array[0]->DesignCode }}"; }else{ - gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; + gen_url = ip+":"+port+"/merchbay/tb/{{ $client_design_array[0]->DesignCode }}"; } } diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php index ea44974..709fc13 100755 --- a/resources/views/layout/navbar.blade.php +++ b/resources/views/layout/navbar.blade.php @@ -8,7 +8,7 @@ - + {{-- JAC Printing & Graphics Co. --}}
diff --git a/resources/views/merchbay/index.blade.php b/resources/views/merchbay/index.blade.php index 48a998c..d9f8772 100755 --- a/resources/views/merchbay/index.blade.php +++ b/resources/views/merchbay/index.blade.php @@ -28,39 +28,12 @@
... - {{-- --}} -
... - {{-- --}} -
... - {{-- --}} -
- +
diff --git a/resources/views/merchbay/navbar.blade.php b/resources/views/merchbay/navbar.blade.php index 4c5f260..e890735 100755 --- a/resources/views/merchbay/navbar.blade.php +++ b/resources/views/merchbay/navbar.blade.php @@ -1,7 +1,8 @@