webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated for designer

Browse Source
This commit is contained in:
franknstayn
2021-07-15 16:33:01 +08:00
parent cbf708428c
commit 9a44b14fb3
16 changed files with 309 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/TemplatesController.php
View File

@@ -1,4 +1,6 @@
<?php namespace App\Http\Controllers;
<?php
namespace App\Http\Controllers;
use App\Http\Requests;
use App\Http\Controllers\Controller;
@@ -8,7 +10,8 @@ use App\Models\TemplatesModel;
use App\Models\SportsModel;
use App\Models\PrintPatternModel;
class TemplatesController extends Controller {
class TemplatesController extends Controller
{
public function displayTemplates()
{
@@ -44,7 +47,7 @@ class TemplatesController extends Controller {
foreach ($data as $row) {
?>
<div class="col-md-4 col-sm-4 col-xs-6">
<div style="" class="text-center">
<div class="text-center">
<h3><?php echo $row->TemplateName ?></h3>
</div>
<div class="sports-border">
@@ -130,7 +133,8 @@ class TemplatesController extends Controller {
if ($i) {
$request->file('tempateImage')->move(
base_path() . '/public/images/templates/thumbnail', $NewImageName
base_path() . '/public/images/templates/thumbnail',
$NewImageName
);
//for front jersey
@@ -150,7 +154,8 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if ($i) {
$request->file('svgJerseyFront')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -171,7 +176,8 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if ($i) {
$request->file('svgJerseyBack')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -192,7 +198,8 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if ($i) {
$request->file('svgShortRight')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -213,7 +220,8 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if ($i) {
$request->file('svgShortLeft')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -271,9 +279,9 @@ class TemplatesController extends Controller {
);
$request->file('tempateImage')->move(
base_path() . '/public/images/templates/thumbnail', $NewImageName
base_path() . '/public/images/templates/thumbnail',
$NewImageName
);
} else {
$data = array(
@@ -285,15 +293,10 @@ class TemplatesController extends Controller {
'Trim' => $numberOfTrims,
'PatternId' => $getSkins
);
}
$i = $m->updateNewTemplate($data, $templateCode);
if (array_key_exists('svgJerseyFront', $post)) {
//echo 'meron jerset front';
@@ -309,7 +312,8 @@ class TemplatesController extends Controller {
$i = $m->updateTemplatePaths($Templatedata, $post['id_svgJerseyFront']);
if ($i) {
$request->file('svgJerseyFront')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
//echo 'image move success';
}
@@ -329,7 +333,8 @@ class TemplatesController extends Controller {
if ($i) {
$request->file('svgJerseyBack')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -347,7 +352,8 @@ class TemplatesController extends Controller {
$i = $m->updateTemplatePaths($Templatedata, $post['id_svgShortRight']);
if ($i) {
$request->file('svgShortRight')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
base_path() . '/public/images/uniform-templates/' . $templateCode . '/DISPLAY',
$svgName
);
}
}
@@ -365,7 +371,8 @@ class TemplatesController extends Controller {
$i = $m->updateTemplatePaths($Templatedata, $post['id_svgShortLeft']);
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.
</div>';
}
}

13
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -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
{
@@ -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);
}
}

34
app/Http/routes.php
View File

@@ -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');

9
app/Models/TemplatesModel.php
View File

@@ -1,7 +1,7 @@
<?php namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use DB;
use Illuminate\Support\Facades\DB;
class TemplatesModel extends Model {
@@ -57,4 +57,11 @@ class TemplatesModel extends Model {
return $i;
}
function selectAllTemplate(){
$i = DB::table('templates')
->where('IsActive', '=', 'TRUE')
->get();
return $i;
}
}

14
app/Models/teamstore/TeamStoreModel.php
View File

@@ -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;
}

16
public/assets/css/merchbay/styles.css vendored
View File

@@ -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 {
@@ -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%; */

BIN
public/images/merchbay-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/images/merchbay-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

8
resources/views/designer/design_preview.blade.php
View File

@@ -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 }}";
}
}

2
resources/views/layout/navbar.blade.php
View File

@@ -8,7 +8,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ url('/') }}">
<img src="{{asset('public/images/logo.png')}}" />
<img src="{{asset('public/images/merchbay-black.png')}}" style="height: 28px" />
{{-- <small>JAC Printing & Graphics Co.</small> --}}
</a>
</div>

31
resources/views/merchbay/index.blade.php
View File

@@ -28,39 +28,12 @@
<div class="carousel-inner">
<div class="carousel-item active" data-bs-interval="10000">
<img src="https://crewsportswear.app:5955/WIPCAPS.jpg" class="d-block w-100" alt="...">
{{-- <v-lazy-image
src="https://crewsportswear.app:5955/WIPCAPS.jpg"
class="d-block w-100"
alt="..."
/> --}}
<!-- <div class="carousel-caption d-none d-md-block">
<h5>First slide label</h5>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div> -->
</div>
<div class="carousel-item" data-bs-interval="10000">
<img src="https://crewsportswear.app:5955/NINONG.jpg" class="d-block w-100" alt="...">
{{-- <v-lazy-image
src="https://crewsportswear.app:5955/NINONG.jpg"
class="d-block w-100"
alt="..."
/> --}}
<!-- <div class="carousel-caption d-none d-md-block">
<h5>Second slide label</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div> -->
</div>
<div class="carousel-item" data-bs-interval="10000">
<img src="https://crewsportswear.app:5955/DRIVE.jpg" class="d-block w-100" alt="...">
{{-- <v-lazy-image
src="https://crewsportswear.app:5955/DRIVE.jpg"
class="d-block w-100"
alt="..."
/> --}}
<!-- <div class="carousel-caption d-none d-md-block">
<h5>Third slide label</h5>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
</div> -->
</div>
</div>
<a
@@ -118,9 +91,9 @@
</div>
</div>
<div class="col-lg-3 added-or">
<button type="submit" class="btn btn-black mb-3 w-100">
<a href="{{ url('templates') }}" type="submit" class="btn btn-black mb-3 w-100">
Design your own
</button>
</a>
</div>
</form>
</div>

3
resources/views/merchbay/navbar.blade.php
View File

@@ -1,7 +1,8 @@
<nav class="navbar navbar-expand-lg bg-black">
<div class="container">
<a class="navbar-brand text-white" href="/">
<span>M</span>erchbay
{{-- <span>M</span>erchbay --}}
<img src="{{asset('/public/images/merchbay-white.png')}}" class="img-fluid" alt="logo">
</a>
<button
class="navbar-toggler"

47
resources/views/merchbay/templates.blade.php Normal file
View File

@@ -0,0 +1,47 @@
@extends('merchbay_main')
@section('main-content')
<div class="wrapper pb-5">
<div class="main__content">
<div class="container">
{{-- breadcrumbs --}}
<div class="row">
<div class="col-lg-12">
<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">Templates</li>
</ol>
</nav>
</div>
</div>
</div>
<div class="row">
@if(!empty($row ))
@foreach ($row as $r)
<div class="col-margin-bottom col-lg-3 col-md-3 col-sm-4 col-xs-6">
<div class="thumb-border" style="border:1px solid #e2e2e2; padding: 5px;">
<a href="{{ url('/designer') }}/{{ md5($r->TemplateCode) }}">
<img src="{{ config('site_config.uploads') . $r->Thumbnail}}" alt="{{ $r->TemplateName }}" class="img-fluid" />
</a>
<div class="text-center" style="border-top: 1px solid #e2e2e2; padding: 10px;">
<h5 class="sports-title">{{ $r->TemplateName }}</h5>
</div>
</div>
</div>
@endforeach
@else
<div class="col-md-12 col-sm-12 col-xs-12">
<h3 class="no-record no-record">No Record Found.</h3>
</div>
@endif
</div>
</div>
</div>
</div>
@endsection

65
resources/views/teamstore-sublayouts/stores.blade.php
View File

@@ -24,71 +24,6 @@
</div>
</div> --}}
</div>
{{-- <div class="container">
<div class="row">
<form class="form-horizontal" role="search" id="frm_search_store">
<div class="col-lg-7">
<div class="form-group">
<div class="col-sm-12">
<label>Seach Store</label>
<div class="input-group">
<input type="text" class="form-control" placeholder="Search Store" value="{{ $keyword }}" name="q">
<div class="input-group-btn">
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-5">
<div class="form-group">
<label class="col-sm-7 control-label hidden-xs">&nbsp;</label>
<div class="col-sm-5">
<label>Sort by:</label>
<select class="form-control" name="s" id="select_sort_stores">
<option @if($filter == "al-asc") selected @endif value="al-asc">Store Name A &rarr; Z</option>
<option @if($filter == "al-desc") selected @endif value="al-desc">Store Name Z &rarr; A</option>
<option @if($filter == "latest") selected @endif value="latest">Newest &rarr; Oldest</option>
<option @if($filter == "oldest") selected @endif value="oldest">Oldest &rarr; Newest</option>
</select>
</div>
</div>
</div>
</form>
<div class="clearfix"></div>
</div>
<div class="row" id="slider-thumbs">
<ul class="hide-bullets">
@foreach ($stores_array as $store)
<li class="li-custom col-lg-3 col-md-3 col-sm-4 col-xs-12">
<div style="border: 1px solid #dddddd; padding: 5px;">
@if($store->Password != null )
<a class="thumbnail password-protected" href="#" data-store-id="{{ $store->Id }}" data-store-url="{{ $store->StoreUrl }}">
<img class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store->ImageFolder . '/' . $store->StoreLogo }}">
</a>
<h4 style="border-top: 1px solid #dddddd; padding: 10px; font-size: 16px; font-weight: bold; text-transform: uppercase;" class="text-center">{{ $store->StoreName }} <i class="fa fa-lock" title="This store is password protected."></i></h4>
@else
<a class="thumbnail" href="{{ url('teamstore') . '/' . $store->StoreUrl }}">
<img class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/' . $store->ImageFolder . '/' . $store->StoreLogo }}">
</a>
<h4 style="border-top: 1px solid #dddddd; padding: 10px; font-size: 16px; font-weight: bold; text-transform: uppercase;" class="text-center">{{ $store->StoreName }}</h4>
@endif
</div>
</li>
@endforeach
</ul>
</div>
<div class="row">
<div class="col-sm-12">
<div class="text-center">
{!! $stores_array->render() !!}
</div>
</div>
</div>
</div> --}}
<!-- /container -->
<div id="team-store-login" class="modal fade" role="dialog">
<div class="modal-dialog">

2
resources/views/user-layouts/footer.blade.php
View File

@@ -4,5 +4,5 @@
Version 1.0
</div>
<!-- Default to the left -->
<strong>Copyright © <?php echo date('Y') ?> <a href="http://crewsportswear.com">crewsportswear.com</a>.</strong> All rights reserved.
<strong>Copyright © <?php echo date('Y') ?> <a href="https://merchbay.com">merchbay.com</a>.</strong> All rights reserved.
</footer>

2
resources/views/user-layouts/index.blade.php
View File

@@ -137,7 +137,7 @@
@else
<div class="text-center" id="homepage-logo">
<img src="{{asset('/public/images/logo.png')}}" style="height: 200px;" class="img img-responsive" />
<img src="{{asset('/public/images/merchbay-black.png')}}" style="width: 50%" class="img img-responsive" />
</div>
@endif
</section>