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

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

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

@@ -23,72 +23,7 @@
</button>
</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>
<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>