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

fixed user dashboard for store owner (store settings, store reports)/ fixed login/register page/

Browse Source
This commit is contained in:
Frank John Begornia
2019-09-24 19:52:38 +08:00
parent 502b13e793
commit 83f0624f07
45 changed files with 17655 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,15 @@
}
</style>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-136108155-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-136108155-1');
</script>
</head>
<body>
@include('layout.navbar')

55
resources/views/designer/designer.blade.php
View File

@@ -197,6 +197,15 @@
}
</style>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-136108155-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-136108155-1');
</script>
</head>
<body>
<div class="navbar-holder">
@@ -267,6 +276,14 @@
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="512px" height="512px" style="position:absolute; top: 50%; left: 50%;"></canvas>
@endif
<!-- Hoodie -->
@if($template->Type == "Hoodie" && $template->Side == "Front" && $template->TemplateFormat == "svg")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:193px; margin-left: 0px;"></canvas>
@endif
@if($template->Type == "Hoodie" && $template->Side == "Back" && $template->TemplateFormat == "svg")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:171px; margin-left:0xp;"></canvas>
@endif
</div>
</div>
</div>
@@ -444,7 +461,8 @@
@else
<h4>Trim {{ $i }}</h4>
@endif
<!-- <h4 id="h4_Trim_{{ $i }}">Trim {{ $i }}</h4> -->
<ul class="nav nav-pills nav-stacked col-md-4">
<li class="active"><a href="#tab_trim_basecolor{{ $i }}" data-toggle="pill">Base Color</a></li>
<li><a href="#tab_trimpattern{{ $i }}" data-toggle="pill">Pattern</a></li>
@@ -852,8 +870,6 @@
function callbackFuncWithData(data){
console.log(data)
}
myCart();
$('#toTop').click(function() {
$('body,html').animate({scrollTop:0},800);
@@ -1009,7 +1025,9 @@
loadClipartContent();
var get_template_type = "{{ $template->Type }}";
if(get_template_type != "Shirts"){
// if((get_template_type != "Shirts") || (get_template_type != "Hoodie")){
if(get_template_type != "Hoodie" && get_template_type != "Shirts" ){
addDefaultTeamText();
addNameNumber();
}
@@ -1483,7 +1501,7 @@
var gradientPrefix = sideName+"_"+type+"_";
var tempPath = "{{ config('site_config.uploads') }}" + pathLocation;
// console.log(tempPath)
console.log(tempPath)
if(!document.getElementById(objectId))
return false;
@@ -1611,14 +1629,24 @@
xhr.setRequestHeader( 'X-Requested-With', 'XMLHttpRequest');
},
success: function(response) {
// console.log(response);
var objColor = jQuery.parseJSON(response);
for (var i = 0; i < objColor.length; i++){
for (var key in objColor[i]) {
if(key == "default_mainColor"){
$("#mainColor").spectrum("set", objColor[i][key]);
}else{
$("input#Trim_"+key+".trimColor").spectrum("set", objColor[i][key]);
if(objColor[i][key] != null){
console.log( objColor[i][key]);
// $().html()
}
// for(var k in objColor[i][']){
// }
colorPickerCustom();
}
}
@@ -3425,8 +3453,9 @@
var y = 0.2126*color._r + 0.7152*color._g + 0.0722*color._b;
// var c = y < 128 ? 'white' : 'black';
document.getElementById(mainColorId).setAttribute("fill", onMoveColor);
try{
document.getElementById(mainColorId).setAttribute("fill", onMoveColor);
if(y < 128){
document.getElementById(sideName+'_Grid_Lines_Path').setAttribute("stroke", "white");
@@ -4221,18 +4250,6 @@
});
}
//################### E N D C O L O R P A L E T T E S #######################//
function myCart(){
$.ajax({ //create an ajax request to load_page.php
type: "GET",
url: "{{url('cartcount')}}",
dataType: "html",
success: function(response){
$("#my-cart-count").html(response);
}
});
}
</script>
</body>