82 Commits

Author SHA1 Message Date
Frank John Begornia
ab0d370225 Remove commented-out sales chart section from user dashboard
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m0s
2025-12-31 02:20:31 +08:00
Frank John Begornia
ee7b52feb2 Update AppServiceProvider to force HTTPS and configure APP_URL in app.php
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m1s
2025-12-31 02:10:31 +08:00
Frank John Begornia
4cb77e9312 Remove '/public' prefix from asset paths for consistency across views
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m4s
2025-12-31 02:04:33 +08:00
Frank John Begornia
43e66c7ac4 Refactor asset paths to remove '/public' prefix for consistency across views
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 1m57s
2025-12-31 01:53:42 +08:00
Frank John Begornia
685a49cf57 Remove unnecessary environment setup and optimization steps from Dockerfile
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m13s
2025-12-31 01:24:12 +08:00
Frank John Begornia
f6617f6d70 Fix Traefik certresolver value in production Docker Compose configuration
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m5s
2025-12-31 01:10:07 +08:00
Frank John Begornia
7c6108e0a7 Update production environment URLs and Traefik rules for dev-crew.crewsportswear.app
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m9s
2025-12-31 00:56:31 +08:00
Frank John Begornia
b8aa48a0bb Update deployment directory path in workflow configuration
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m14s
2025-12-31 00:33:22 +08:00
Frank John Begornia
8fc0b1076a Add Docker and deployment configurations for development and production environments
Some checks failed
Deploy Production (crewsportswear.com) / deploy (push) Failing after 5m18s
2025-12-31 00:23:44 +08:00
franknstayn
71e1fca6fe updated 2023-08-24 21:55:06 +08:00
franknstayn
8dc23e4e67 exempt sf spartans tax 2021-12-23 18:08:57 +08:00
franknstayn
729d0e72e6 added voucher validation 2021-12-03 18:00:27 +08:00
franknstayn
0b8856d3a0 update store item view 2021-11-26 19:31:40 +08:00
franknstayn
6aa0587a69 update store item view 2021-11-26 19:29:59 +08:00
franknstayn
08c274f5bd updated checkout flow 2021-11-03 21:30:42 +08:00
franknstayn
148df27117 update navbar 2021-09-25 18:32:49 +08:00
franknstayn
e552037e2c update navbar 2021-09-25 18:30:03 +08:00
franknstayn
7011b28542 update navbar 2021-09-25 18:28:40 +08:00
franknstayn
2ac9cb6420 update navbar 2021-09-25 18:20:22 +08:00
franknstayn
9c403b7207 update creds 2021-09-15 20:48:31 +08:00
franknstayn
11960d6bad update email creds 2021-09-15 20:41:07 +08:00
franknstayn
25f80cb16f update email creds 2021-09-15 20:20:31 +08:00
franknstayn
72773a517a update email 2021-09-15 20:02:51 +08:00
franknstayn
d1f5d38480 update description label 2021-09-07 19:41:04 +08:00
franknstayn
f5f1693f55 update store please read text 2021-09-03 21:35:45 +08:00
franknstayn
39165cc7f9 update store please read text 2021-09-03 21:35:24 +08:00
franknstayn
20b4e06ee7 updated delete function for delete item 2021-07-17 15:32:49 +08:00
Frank John Begornia
18e11ac3d0 added shipping fee for dgs 2021-03-20 14:36:46 +08:00
Frank John Begornia
0013b2a025 fixed reports date range 2021-02-08 04:07:29 +08:00
Frank John Begornia
acf9c2e931 updated apis 2021-02-04 19:45:27 +08:00
Frank John Begornia
c144810352 update reports display 2021-01-23 19:52:17 +08:00
Frank John Begornia
b1ed52f7a6 update report 2021-01-23 19:49:15 +08:00
Frank John Begornia
70b250a64e fixed order report 2020-12-19 19:49:03 +08:00
Frank John Begornia
1eb7e6632f fixed order report 2020-12-19 19:46:36 +08:00
Frank John Begornia
98e7652e6b added status 2020-12-12 19:53:30 +08:00
Frank John Begornia
852593ecfb added new api 2020-12-11 21:47:36 +08:00
Frank John Begornia
43de35a66c added order status 2020-11-28 18:13:43 +08:00
Frank John Begornia
ad57e218af change image url 2020-11-27 16:24:57 +08:00
Frank John Begornia
d2a20c4831 added api for tracking 2020-11-27 02:43:26 +08:00
franknstayn
36ad67a37a added bucket hat sizes 2020-11-26 12:32:29 -06:00
franknstayn
6c55194c9a edit please read on lasc store 2020-11-17 18:50:50 +08:00
franknstayn
77ee1b9ccc update crewsportswear 2020-10-24 21:27:04 +08:00
franknstayn
6cc68cd56b added announcement 2020-10-17 23:16:25 +08:00
franknstayn
3e328b83a4 added 0 2020-10-17 23:14:52 +08:00
franknstayn
d82832043c added announcement 2020-10-17 22:17:25 +08:00
franknstayn
da89856e95 added stat 2020-09-29 19:40:42 +08:00
franknstayn
bf88584dcd update 2020-09-29 01:05:01 -05:00
franknstayn
3eb4078d19 update payment details record 2020-08-10 23:20:55 +08:00
franknstayn
5918eded8c add shipping cost 2020-08-10 22:41:40 +08:00
franknstayn
02361ca64e updates 2020-08-09 13:21:41 -05:00
franknstayn
1ca40ce1d7 updates 2020-08-01 03:06:48 -05:00
franknstayn
59e52125f7 fix teamstore password 2020-07-11 19:31:35 +08:00
franknstayn
bb139cb0df updated 2020-07-11 02:57:12 -05:00
franknstayn
bca94e54cc added new form for store item 2020-03-19 22:37:08 +08:00
franknstayn
e57209bc64 update 3_14_2020 2020-03-14 01:17:24 -05:00
franknstayn
5eeefa5587 fix tax exemption 2020-02-28 21:07:05 +08:00
franknstayn
80094cfdf0 Merge branch 'master' of github.com:franknstayn/crewsportswear
Conflicts:
	app/Http/Controllers/paypal/PaypalController.php
2020-02-28 07:02:30 -06:00
franknstayn
587819be9a exempt jjed phl intax 2020-02-28 06:58:41 -06:00
franknstayn
67b52fcc1a Merge branch 'master' of https://github.com/franknstayn/crewsportswear 2020-02-28 20:54:33 +08:00
franknstayn
f7b402fe7a exempt nlp in tax 2020-02-28 20:53:29 +08:00
franknstayn
8408695473 uncomment RewriteRule 2020-02-25 12:29:23 +08:00
franknstayn
99f89a968b removed JAC 2020-02-25 12:21:10 +08:00
franknstayn
3f96f82090 add jac 2020-02-25 12:06:28 +08:00
franknstayn
942af1f0a8 added contact us page 2020-02-25 11:53:26 +08:00
franknstayn
4610fb526b changed sizes display 2020-02-08 20:37:02 +08:00
franknstayn
c29936f6b9 Merge pull request #9 from franknstayn/additional_form
Additional form
2020-02-08 16:40:18 +08:00
franknstayn
7c12b0e2bf add form in user page 2020-02-07 01:14:27 +08:00
franknstayn
a5dab36a14 additional forms 2020-02-07 01:10:31 +08:00
franknstayn
55f135f66c Merge pull request #8 from franknstayn/local_dev
added delete function on store item
2020-01-25 20:12:43 +08:00
franknstayn
6631690f93 Merge branch 'master' of github.com:franknstayn/crewsportswear 2020-01-25 04:47:06 -06:00
franknstayn
dd26b1dd4b added user for tax exemption 2020-01-25 04:45:58 -06:00
franknstayn
155bc2ce53 Merge pull request #7 from franknstayn/local_dev
Local dev
2020-01-25 18:43:25 +08:00
franknstayn
ef81f0bf25 Merge branch 'local_dev' of github.com:franknstayn/crewsportswear 2020-01-10 07:32:59 -06:00
franknstayn
bf078c82bf Merge pull request #6 from franknstayn/local_dev
rename number to name
2019-12-04 18:49:08 +08:00
franknstayn
2e29677b90 Merge pull request #5 from franknstayn/local_dev
Local dev
2019-12-04 18:44:41 +08:00
franknstayn
03ea4e84a2 Merge pull request #4 from franknstayn/local_dev
added "size" column on download report in csv and excel
2019-11-15 21:05:31 +08:00
franknstayn
3f8c116293 Merge pull request #3 from franknstayn/local_dev
Local dev
2019-11-14 19:45:29 +08:00
franknstayn
9bf1a888a6 Merge branch 'master' of github.com:franknstayn/crewsportswear 2019-11-11 04:44:45 -06:00
franknstayn
542f2c64e0 update from live 11_11_2019 2019-11-11 04:44:08 -06:00
franknstayn
1d4c9a5445 Merge pull request #2 from franknstayn/local_dev
added column in store order reports in store owner
2019-11-11 18:42:11 +08:00
franknstayn
3698312664 fixed broken link on cart page. 2019-11-06 07:26:02 -06:00
franknstayn
a9145ea484 Merge pull request #1 from franknstayn/local_dev
Local dev by frank
2019-11-06 20:29:09 +08:00
20 changed files with 52 additions and 316 deletions

View File

@@ -1,6 +0,0 @@
# Local Development MinIO Configuration
# Copy to .env.local and update with your MinIO credentials
# MinIO credentials (get from your production server)
MINIO_KEY=your_minio_root_user
MINIO_SECRET=your_minio_root_password

View File

@@ -1,21 +0,0 @@
# MinIO S3 Storage Configuration
# Add these to your production .env file
# MinIO Endpoint (internal Docker network)
MINIO_ENDPOINT=http://crew-minio-prod:9000
# MinIO Credentials (get from /var/www/apps/minio-storage/.env)
MINIO_KEY=your_minio_root_user
MINIO_SECRET=your_minio_root_password
# Bucket name
MINIO_BUCKET=crewsportswear
# Region (required for S3 compatibility)
MINIO_REGION=us-east-1
# Use path-style endpoint (required for MinIO)
MINIO_USE_PATH_STYLE=true
# Public URL for accessing files (use your actual domain)
MINIO_URL=https://minio.crewsportswear.app

View File

@@ -1,126 +0,0 @@
# Laravel 5.0 → 11 Upgrade Progress
## Current State (Baseline)
- **Laravel Version**: 5.0.*
- **PHP Version**: 5.6.40 (container), 7.0 (production Dockerfile)
- **Database**: MySQL via PDO
- **Branch**: feature/laravel-upgrade
## Dependencies Audit
### Core Dependencies
-`laravel/framework`: 5.0.* → Need to upgrade incrementally
-`webpatser/laravel-uuid`: ^2.0 → Compatible through Laravel 8
- ⚠️ `netshell/paypal`: dev-master → May need replacement (outdated)
- ⚠️ `guzzlehttp/guzzle`: ~5.0 → Need to upgrade to ^7.0
-`google/recaptcha`: ~1.1 → Still maintained
- ⚠️ `spatie/laravel-analytics`: ^1.4 → Need to upgrade to ^5.0
-`league/flysystem-sftp`: ^1.0 → Upgrade to ^3.0 for Laravel 9+
-`aws/aws-sdk-php`: ~3.0 → Compatible
### Custom Middleware Found
- `CheckTeamStorePassword` - Custom team store authentication
- `IsAdmin` - Admin role check
- `IsUser` - Normal user role check
- `isAuthorized` - Custom authorization
- `Cors` - CORS handling
### Custom Code Patterns Detected
-`app/helpers.php` - Auto-loaded helper functions (minio_url, minio_image_url)
- ✅ Routes in `app/Http/routes.php` (Laravel 5.0 pattern)
- ⚠️ Controllers echoing HTML directly (needs refactoring)
- ⚠️ Boolean stored as strings ("TRUE"/"FALSE" in database)
## Upgrade Path
### Phase 1: Laravel 5.0 → 5.1 (Week 1)
- [ ] Update composer.json
- [ ] Test route compatibility
- [ ] Verify middleware still works
- [ ] Test authentication flow
### Phase 2: Laravel 5.1 → 5.5 LTS (Week 2)
- [ ] Move routes to `routes/web.php`
- [ ] Update exception handler
- [ ] Test all database queries
- [ ] Update validation rules
### Phase 3: PHP 7.0 → 7.4 & Laravel 5.5 → 6.x (Week 3)
- [ ] Update Dockerfile to PHP 7.4
- [ ] Remove mcrypt dependencies (if any encrypted data)
- [ ] Add string/array helpers package
- [ ] Test file uploads
### Phase 4: Laravel 6.x → 8.x (Week 4)
- [ ] Update factory syntax
- [ ] Test rate limiting
- [ ] Verify queue jobs
### Phase 5: PHP 8.0 & Laravel 8.x → 9.x (Week 5)
- [ ] Update Dockerfile to PHP 8.0
- [ ] Update Flysystem to v3 (affects MinIO config)
- [ ] Test query builder changes
### Phase 6: Laravel 9.x → 10.x (Week 6)
- [ ] Update to PHP 8.1
- [ ] Add type declarations where needed
- [ ] Test invokable validation rules
### Phase 7: Laravel 10.x → 11.x (Week 7)
- [ ] Update to PHP 8.2
- [ ] Test new application skeleton
- [ ] Verify all functionality
## Breaking Changes to Watch
### Database
- Boolean fields stored as strings ("TRUE"/"FALSE") - Need migration
- Direct DB facade usage throughout codebase
### Routes
- Controller array syntax in routes will be removed
- Need to update to standard controller@method or invokable
### Middleware
- Middleware signature changes in later versions
- CSRF token handling updates
### Views
- Blade syntax mostly compatible
- PHP in controllers (<?php echo) needs refactoring
### External Services
- PayPal integration (netshell/paypal) may need complete rewrite
- Google Analytics package needs major upgrade
- Screenshot Node.js service should remain compatible
## Rollback Plan
- Keep master branch untouched
- Tag current state: `git tag v5.0-baseline`
- Can revert entire branch if needed
- Parallel testing environment on port 8090
## Testing Checklist (After Each Upgrade)
- [ ] Homepage loads
- [ ] User registration/login works
- [ ] Sports category pages render
- [ ] Designer tool loads
- [ ] Pattern/clipart selection works
- [ ] Cart functionality
- [ ] Team store pages
- [ ] PayPal checkout flow
- [ ] Admin panel access
- [ ] Image serving from MinIO
- [ ] Screenshot generation service
- [ ] File uploads work
## Notes
- Current Composer version 1.x - may need to use `composer self-update --1` during transition
- AWS SDK already at 3.0, compatible with all Laravel versions
- Helper functions (minio_url) should remain compatible
- Fabric.js designer tool is front-end only, won't be affected
## Completed Steps
1. ✅ Created feature branch
2. ✅ Documented current state
3. ⏳ Ready to start first upgrade

View File

@@ -31,7 +31,7 @@ class MainController extends Controller {
foreach ($fetchData as $row) {
?>
<div class="col-md-3 col-sm-6 col-xs-12 list-sport">
<a href="<?php echo url('sports') . "/" . $row->URL; ?>"><img src="<?php echo minio_url('uploads/images/sports-thumbnails/' . $row->Thumbnail); ?>" alt="" class="img img-responsive product-center" /></a>
<a href="<?php echo url('sports') . "/" . $row->URL; ?>"><img src="<?php echo config('site_config.uploads') . 'sports-thumbnails/' . $row->Thumbnail; ?>" alt="" class="img img-responsive product-center" /></a>
<h3 class="text-center sports-title"><?php echo $row->SportsName ?></h3>
</div>
<?php

View File

@@ -367,11 +367,14 @@ class DesignerController extends Controller {
?>
<div class="form-group col-md-3">
<div class="thumbnail clipart-thumnail">
<a href="#" class="img-clipart" data-link="<?php echo $row->SVGFilename; ?>"><img src="<?php echo minio_url('uploads/images/cliparts/') . $row->SVGFilename; ?>" width="100%"></a>
<a href="#" class="img-clipart" data-link="<?php echo $row->SVGFilename; ?>"><img src="<?php echo config('site_config.uploads') . 'cliparts/'. $row->SVGFilename; ?>" width="100%"></a>
</div>
</div>
<?php
}
}
public function clipartProperties(Request $request)
@@ -826,9 +829,8 @@ class DesignerController extends Controller {
}
$arr = array(
'small' => minio_url('uploads/images') . $small ,
'large' => minio_url('uploads/images') . $large
'small' => config('site_config.uploads') . $small ,
'large' => config('site_config.uploads') . $large
);
return json_encode($arr);

View File

@@ -1,33 +0,0 @@
<?php
if (!function_exists('minio_url')) {
/**
* Generate MinIO URL for a file
*
* @param string $path File path relative to bucket
* @return string Full MinIO URL
*/
function minio_url($path)
{
$bucket = env('MINIO_BUCKET', 'crewsportswear');
$baseUrl = env('MINIO_URL', 'https://minio.crewsportswear.app');
// Remove leading slash if present
$path = ltrim($path, '/');
return $baseUrl . '/' . $bucket . '/' . $path;
}
}
if (!function_exists('minio_image_url')) {
/**
* Generate MinIO URL for an image in uploads/images/
*
* @param string $filename Image filename
* @return string Full MinIO URL
*/
function minio_image_url($filename)
{
return minio_url('uploads/images/' . $filename);
}
}

View File

@@ -11,8 +11,7 @@
"guzzlehttp/guzzle": "~5.0",
"google/recaptcha": "~1.1",
"spatie/laravel-analytics": "^1.4",
"league/flysystem-sftp": "^1.0",
"aws/aws-sdk-php": "~3.0"
"league/flysystem-sftp": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
@@ -25,10 +24,7 @@
],
"psr-4": {
"App\\": "app/"
},
"files": [
"app/helpers.php"
]
}
},
"autoload-dev": {
"classmap": [

View File

@@ -86,18 +86,6 @@ return [
'driver' => 'local',
'root' => '/var/www/html/uploads/images',
],
'minio' => [
'driver' => 's3',
'key' => env('MINIO_KEY'),
'secret' => env('MINIO_SECRET'),
'region' => env('MINIO_REGION', 'us-east-1'),
'bucket' => env('MINIO_BUCKET', 'crewsportswear'),
'endpoint' => env('MINIO_ENDPOINT'),
'use_path_style_endpoint' => env('MINIO_USE_PATH_STYLE', true),
'url' => env('MINIO_URL', 'https://minio.crewsportswear.app'),
],
],
];
];

View File

@@ -48,14 +48,6 @@ services:
- ANALYTICS_SITE_ID=
- ANALYTICS_CLIENT_ID=
- ANALYTICS_SERVICE_EMAIL=
# MinIO S3 Storage (connect to production MinIO for testing)
- MINIO_ENDPOINT=https://minio.crewsportswear.app
- MINIO_KEY=${MINIO_KEY:-minioadmin}
- MINIO_SECRET=${MINIO_SECRET:-minioadmin}
- MINIO_BUCKET=crewsportswear
- MINIO_REGION=us-east-1
- MINIO_USE_PATH_STYLE=false
- MINIO_URL=https://minio.crewsportswear.app
volumes:
- ./:/var/www/html
- ./storage:/var/www/html/storage

View File

@@ -6,7 +6,7 @@ services:
environment:
- APP_ENV=${APP_ENV:-production}
- APP_DEBUG=${APP_DEBUG:-false}
- APP_URL=${APP_URL:-https://crewsportswear.com}
- APP_URL=${APP_URL:-https://dev-crew.crewsportswear.app}
- DB_CONNECTION=mysql
- DB_HOST=${DB_HOST}
- DB_PORT=${DB_PORT:-3306}
@@ -33,17 +33,17 @@ services:
- ./public/uploads:/var/www/html/public/uploads
labels:
- "traefik.enable=true"
# Production environment (crewsportswear.com) - Uses paid SSL certificate
- "traefik.http.routers.crewsportswear-prod.rule=Host(`crewsportswear.com`)"
# Production environment (dev-crew.crewsportswear.app) - Uses Let's Encrypt
- "traefik.http.routers.crewsportswear-prod.rule=Host(`dev-crew.crewsportswear.app`)"
- "traefik.http.routers.crewsportswear-prod.entrypoints=websecure"
- "traefik.http.routers.crewsportswear-prod.tls=true"
- "traefik.http.routers.crewsportswear-prod.tls.certresolver=le"
- "traefik.http.services.crewsportswear-prod.loadbalancer.server.port=80"
# HTTP to HTTPS redirect
- "traefik.http.routers.crewsportswear-prod-http.rule=Host(`crewsportswear.com`)"
- "traefik.http.routers.crewsportswear-prod-http.rule=Host(`dev-crew.crewsportswear.app`)"
- "traefik.http.routers.crewsportswear-prod-http.entrypoints=web"
- "traefik.http.routers.crewsportswear-prod-http.middlewares=https-redirect"
- "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
networks:
- traefik-public
- crew-app-net

View File

@@ -1,79 +1,23 @@
# Crew Sportswear
## Laravel PHP Framework
A custom sportswear and apparel e-commerce platform built with Laravel.
[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
[![Total Downloads](https://poser.pugx.org/laravel/framework/downloads.svg)](https://packagist.org/packages/laravel/framework)
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
## Production URL
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching.
https://crewsportswear.com
Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
## Requirements
## Official Documentation
- Docker & Docker Compose
- PHP 7.4+
- MySQL 5.7+
- Composer
- Node.js & NPM
Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs).
## Installation
## Contributing
1. Clone the repository
2. Copy `.env.example` to `.env` and configure your environment variables
3. Install PHP dependencies:
```bash
composer install
```
4. Install Node dependencies:
```bash
npm install
```
5. Generate application key:
```bash
php artisan key:generate
```
6. Run migrations:
```bash
php artisan migrate
```
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
## Docker Deployment
### License
### Local Development
```bash
docker-compose -f docker-compose.local.yml up -d
```
### Development Environment
```bash
docker-compose -f docker-compose.dev.yml up -d
```
### Production Environment
```bash
docker-compose -f docker-compose.prod.yml up -d
```
The production environment uses Traefik as a reverse proxy with paid SSL certificate for crewsportswear.com.
## Features
- Custom sportswear design interface
- Product catalog and management
- Order processing and tracking
- User authentication and profiles
- Analytics integration
- Email notifications
- reCAPTCHA integration
## Environment Variables
Key environment variables (see `.env.example` for full list):
- `APP_ENV` - Application environment (local, development, production)
- `APP_URL` - Application URL
- `DB_*` - Database configuration
- `MAIL_*` - Mail server configuration
- `ANALYTICS_*` - Google Analytics configuration
- `CAPTCHA_*` - reCAPTCHA keys
## License
Proprietary - All rights reserved
The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

View File

@@ -446,7 +446,7 @@
@foreach ($pattern_arrays as $i => $val)
<div class="item @if ($i == 0) active @endif">
<div class="btn-group patternBox ">
<button type="button" data-pattern-path="{{ $val[0]->SVGPath }}" class="patternThumbs btn" data-id="{{ $val[0]->PatternId }}" style="background-image:url('{{ minio_url('uploads/images/' . $val[0]->PatternThumbnail) }}'); background-size:cover; background-repeat: no-repeat;" @if ($i == 0) disabled @endif> @if ($i == 0) <i class="fa fa-2 fa-check" aria-hidden="true"></i> @endif</button>
<button type="button" data-pattern-path="{{ $val[0]->SVGPath }}" class="patternThumbs btn" data-id="{{ $val[0]->PatternId }}" style="background-image:url('{{ config('site_config.uploads') }}{{ $val[0]->PatternThumbnail }}'); background-size:cover; background-repeat: no-repeat;" @if ($i == 0) disabled @endif> @if ($i == 0) <i class="fa fa-2 fa-check" aria-hidden="true"></i> @endif</button>
</div>
</div>
@endforeach
@@ -546,7 +546,7 @@
@foreach ($pattern_arrays as $r => $val)
<div class="item @if ($r == 0) active @endif">
<div class="btn-group patternBox ">
<button type="button" data-pattern-path="{{ $val[0]->SVGPath }}" class="patternTrimThumbs patternTrim{{ $i }} btn" data-id="{{ $val[0]->PatternId }}" data-trim="{{ $i }}" style="background-image:url('{{ minio_url('uploads/images/' . $val[0]->PatternThumbnail) }}'); background-size:cover; background-repeat: no-repeat;" @if ($r == 0) disabled @endif> @if ($r == 0) <i class="fa fa-2 fa-check" aria-hidden="true"></i> @endif</button>
<button type="button" data-pattern-path="{{ $val[0]->SVGPath }}" class="patternTrimThumbs patternTrim{{ $i }} btn" data-id="{{ $val[0]->PatternId }}" data-trim="{{ $i }}" style="background-image:url('{{ config('site_config.uploads') }}{{ $val[0]->PatternThumbnail }}'); background-size:cover; background-repeat: no-repeat;" @if ($r == 0) disabled @endif> @if ($r == 0) <i class="fa fa-2 fa-check" aria-hidden="true"></i> @endif</button>
</div>
</div>
@endforeach
@@ -1306,7 +1306,7 @@
var patternSVGPath = $(this).attr('data-pattern-path');
var patternPath = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + patternSVGPath;
var patternPath = "{{ config('site_config.uploads') }}" + 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 = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + patternSVGPath;
var patternPath = "{{ config('site_config.uploads') }}" + 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 = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + pathLocation;
var tempPath = "{{ config('site_config.uploads') }}" + 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 = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/" + pathLocation;
var tempPath = "{{ config('site_config.uploads') }}" + 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: <br><img src="{{ minio_url('uploads/images/text-shapes-logo/curve-logo.png') }}" height="30px">');
$('#teamname_text_shape').html('Text Shape: <br><img src="{{ config('site_config.uploads') }}text-shapes-logo/curve-logo.png" height="30px">');
}else if(obj.effect == "arc"){
$('#teamname_text_shape').html('Text Shape: <br><img src="{{ minio_url('uploads/images/text-shapes-logo/arch-logo.png') }}" height="30px">');
$('#teamname_text_shape').html('Text Shape: <br><img src="{{ config('site_config.uploads') }}text-shapes-logo/arch-logo.png" height="30px">');
}else{
$('#teamname_text_shape').html('Add text Shape');
}
@@ -3345,7 +3345,7 @@
function loadSVGClipart(dataUrl){
var k = 0;
var arrayPathId = [];
var svgUrl = "{{ env('MINIO_URL', 'https://minio.crewsportswear.app') }}/{{ env('MINIO_BUCKET', 'crewsportswear') }}/uploads/images/cliparts/" + dataUrl;
var svgUrl = "{{ config('site_config.uploads') }}cliparts/" + dataUrl;
fabric.loadSVGFromURL(svgUrl, function(objects, options) {
var clipart = fabric.util.groupSVGElements(objects, options );
clipart.set({

View File

@@ -122,13 +122,13 @@
</div>
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<a @if($getSubtotal <= 0 ) disabled @endif href="{{ url('getCheckout') }}" class="btn btn-primary btn-block" style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;" ><img src="{{asset('/images/paypal1.png')}}" class="img img-responsive" style="height:30px;"></a><br>
<a @if($getSubtotal <= 0 ) disabled @endif href="{{ url('getCheckout') }}" class="btn btn-primary btn-block" style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;" ><img src="{{asset('/public/images/paypal1.png')}}" class="img img-responsive" style="height:30px;"></a><br>
<a href="{{ url('teamstore') . '/' . $store_array[0]->StoreUrl }}" class="btn btn-default btn-block" type="submit">Continue Shopping</a>
</div>
</div>
<div class="col-md-8 col-md-pull-4">
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<h4><img height="30px" class="store-logo" src="{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo) }}"> {{ $store_array[0]->StoreName }}</h4>
<h4><img height="30px" class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}"> {{ $store_array[0]->StoreName }}</h4>
</div>
@foreach($item_group as $item)
@if($item->VoucherId == null)

View File

@@ -19,7 +19,7 @@
<div class="col-md-3 col-sm-6 col-xs-12 list-sport">
<div class="thumb-border">
<a href="{{ url() }}/{{ Request::path() }}/{{ $r->Id }}">
<img src="{{ minio_url('uploads/images/sports-category/' . $r->Thumbnail) }}" alt="{{ $r->Category }}" class="image" />
<img src="{{ config('site_config.uploads') . 'sports-category/' . $r->Thumbnail }}" alt="{{ $r->Category }}" class="image" />
</a>
</div>
<div class="text-center">

View File

@@ -24,7 +24,7 @@
<div class="thumb-border" style="border:1px solid #e2e2e2; padding: 5px;">
<a href="{{ url('/designer') }}/{{ md5($r->TemplateCode) }}">
<img src="{{ minio_url('uploads/images/' . $r->Thumbnail) }}" alt="" class="image" />
<img src="{{ config('site_config.uploads') . $r->Thumbnail}}" alt="" class="image" />
</a>
<!-- <div class="overlay">
<div class="text" style="font-family:Academic M54;"><a href="">{{$r->TemplateName}}</a></div>

View File

@@ -86,9 +86,9 @@
padding-top: 20px;
padding-bottom: 20px;
@if($store_array[0]->StoreBanner == null)
background-image: url("{{ minio_url('uploads/images/teamstore/store-banner-dark.png') }}");
background-image: url("{{ config('site_config.uploads') . 'teamstore/store-banner-dark.png' }}");
@else
background-image: url("{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner) }}");
background-image: url("{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner }}");
@endif
background-color: #f3f3f3;
background-position: center;

View File

@@ -82,12 +82,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="{{ minio_url('uploads/images/teamstore/' . $store->ImageFolder . '/' . $store->StoreLogo) }}">
<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="{{ minio_url('uploads/images/teamstore/' . $store->ImageFolder . '/' . $store->StoreLogo) }}">
<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

View File

@@ -18,7 +18,7 @@
<!-- Control Sidebar Toggle Button -->
<li class="user user-menu">
<a href="#">
<img src="{{ minio_url('uploads/images/user/default-user.png') }}" class="user-image" alt="User Image">
<img src="{{ config('site_config.uploads') . 'user/default-user.png' }}" class="user-image" alt="User Image">
<span class="hidden-xs">{{ Auth::user()->username }}</span>
</a>
</li>

View File

@@ -4,7 +4,7 @@
<!-- Sidebar user panel -->
<div class="user-panel">
<div class="pull-left image">
<img src="{{ minio_url('uploads/images/user/default-user.png') }}" class="img-circle" alt="User Image">
<img src="{{ config('site_config.uploads') . 'user/default-user.png' }}" class="img-circle" alt="User Image">
</div>
<div class="pull-left info">
<p>{{ Auth::user()->name }}</p>

View File

@@ -63,8 +63,8 @@
<div class="col-sm-8">
<p>Store Logo Preview:</p>
<div class="store-logo-holder">
<a href="{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo) }}?v={{ time() }}" class="img_store_logo_href" data-toggle="lightbox">
<img class="img_store_logo_img" id="img_store_logo" src="{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo) }}?v={{ time() }}" style="max-width: 100%; max-height: 100%; ">
<a href="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}?v={{ time() }}" class="img_store_logo_href" data-toggle="lightbox">
<img class="img_store_logo_img" id="img_store_logo" src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}?v={{ time() }}" style="max-width: 100%; max-height: 100%; ">
</a>
</div>
</div>
@@ -82,8 +82,8 @@
<div class="col-sm-8">
<p>Store Banner Preview:</p>
<div class="store-banner-holder">
<a href="{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner) }}?v={{ time() }}" class="img_store_banner_href" data-toggle="lightbox">
<img class="img_store_banner_img" id="img_store_banner" src="{{ minio_url('uploads/images/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner) }}?v={{ time() }}" style="max-width: 100%; max-height: 100%;">
<a href="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner }}?v={{ time() }}" class="img_store_banner_href" data-toggle="lightbox">
<img class="img_store_banner_img" id="img_store_banner" src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreBanner }}?v={{ time() }}" style="max-width: 100%; max-height: 100%;">
</a>
</div>
</div>