diff --git a/app/Http/Controllers/designer/DesignerController.php b/app/Http/Controllers/designer/DesignerController.php
index f5bc510..8a540bf 100644
--- a/app/Http/Controllers/designer/DesignerController.php
+++ b/app/Http/Controllers/designer/DesignerController.php
@@ -367,11 +367,7 @@ class DesignerController extends Controller {
?>
- SVGFilename; ?>">
@@ -829,8 +825,8 @@ class DesignerController extends Controller {
}
$arr = array(
- 'small' => config('site_config.uploads') . $small ,
- 'large' => config('site_config.uploads') . $large
+ 'small' => minio_url('uploads/images/' . $small),
+ 'large' => minio_url('uploads/images/' . $large)
);
return json_encode($arr);
diff --git a/config/site_config.php b/config/site_config.php
index 56d7efa..0e51221 100644
--- a/config/site_config.php
+++ b/config/site_config.php
@@ -16,9 +16,9 @@ return [
// 'company_name' => env('COMPANY_NAME','Acme Inc'),
// 'company_email' => env('COMPANY_email','contact@acme.inc'),
- 'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'),
- 'images_url' => env('https://crewsportswear.app:5955', 'https://crewsportswear.app:5955'),
- 'uploads' => env('https://crewsportswear.com/uploads/images/', 'https://crewsportswear.com/uploads/images/'), // local
+ 'prod_private_server_ip' => env('PROD_PRIVATE', 'https://crewsportswear.app'),
+ 'images_url' => env('IMAGES_URL', 'https://crewsportswear.app:5955'),
+ 'uploads' => env('MINIO_URL', 'https://minio.crewsportswear.app') . '/' . env('MINIO_BUCKET', 'crewsportswear') . '/uploads/images/', // MinIO storage
];
\ No newline at end of file
diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php
index c002c20..b6b7a59 100644
--- a/resources/views/designer/designer.blade.php
+++ b/resources/views/designer/designer.blade.php
@@ -446,7 +446,7 @@
@foreach ($pattern_arrays as $i => $val)
-
+
@endforeach
@@ -546,7 +546,7 @@
@foreach ($pattern_arrays as $r => $val)
-
+
@endforeach
@@ -1306,7 +1306,7 @@
var patternSVGPath = $(this).attr('data-pattern-path');
- var patternPath = "{{ config('site_config.uploads') }}" + patternSVGPath;
+ var patternPath = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + patternSVGPath;
var SideAndPath = {!! json_encode($templatepaths_arrays) !!};
@@ -1383,7 +1383,7 @@
$(document).on('button click', '.patternTrimThumbs', function(){
var patternSVGPath = $(this).attr('data-pattern-path');
- var patternPath = "{{ config('site_config.uploads') }}" + patternSVGPath;
+ var patternPath = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + patternSVGPath;
var getTrimId = $(this).attr('data-trim');
var SideAndPath = {!! json_encode($templatepaths_arrays) !!};
@@ -1527,7 +1527,7 @@
var gradientIds = sideName+"_"+type+"_Gradients";
var gradientPrefix = sideName+"_"+type+"_";
- var tempPath = "{{ config('site_config.uploads') }}" + pathLocation;
+ var tempPath = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + pathLocation;
console.log(tempPath)
if(!document.getElementById(objectId))
return false;
@@ -1711,7 +1711,7 @@
var type = SideAndPath[i]['Type'];
var pathLocation = SideAndPath[i]['Path'];
var canvasName = "canvas_" + type + "_" + sideName;
- var tempPath = "{{ config('site_config.uploads') }}" + pathLocation;
+ var tempPath = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + pathLocation;
window['canvas_' + type + '_' + sideName] = new fabric.Canvas(canvasName);
var templateFormat = SideAndPath[i]['TemplateFormat'];
@@ -2043,9 +2043,9 @@
if(objType == "curvedText"){
if(obj.effect == "curved"){
- $('#teamname_text_shape').html('Text Shape:
');
+ $('#teamname_text_shape').html('Text Shape:
');
}else if(obj.effect == "arc"){
- $('#teamname_text_shape').html('Text Shape:
');
+ $('#teamname_text_shape').html('Text Shape:
');
}else{
$('#teamname_text_shape').html('Add text Shape');
}
@@ -3345,7 +3345,7 @@
function loadSVGClipart(dataUrl){
var k = 0;
var arrayPathId = [];
- var svgUrl = "{{ config('site_config.uploads') }}cliparts/" + dataUrl;
+ var svgUrl = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/uploads/images/cliparts/" + dataUrl;
fabric.loadSVGFromURL(svgUrl, function(objects, options) {
var clipart = fabric.util.groupSVGElements(objects, options );
clipart.set({
diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php
index f6099d7..2f280be 100644
--- a/resources/views/sublayouts/cart.blade.php
+++ b/resources/views/sublayouts/cart.blade.php
@@ -128,7 +128,7 @@
-
{{ $store_array[0]->StoreName }}
+
{{ $store_array[0]->StoreName }}
@foreach($item_group as $item)
@if($item->VoucherId == null)
diff --git a/resources/views/sublayouts/sports-styles.blade.php b/resources/views/sublayouts/sports-styles.blade.php
index cc46bf8..30c7b2c 100644
--- a/resources/views/sublayouts/sports-styles.blade.php
+++ b/resources/views/sublayouts/sports-styles.blade.php
@@ -24,7 +24,7 @@
-
+
diff --git a/resources/views/user-layouts/sidebar.blade.php b/resources/views/user-layouts/sidebar.blade.php
index 2ecbcf6..1008761 100644
--- a/resources/views/user-layouts/sidebar.blade.php
+++ b/resources/views/user-layouts/sidebar.blade.php
@@ -4,7 +4,7 @@
-
 . 'user/default-user.png' }})
+
{{ Auth::user()->name }}
diff --git a/resources/views/user-layouts/store_setting.blade.php b/resources/views/user-layouts/store_setting.blade.php
index 0024dff..d4be142 100644
--- a/resources/views/user-layouts/store_setting.blade.php
+++ b/resources/views/user-layouts/store_setting.blade.php
@@ -63,8 +63,8 @@
@@ -82,8 +82,8 @@