114 Commits

Author SHA1 Message Date
Frank John Begornia
4d051276b1 feat: enhance navbar and privacy policy layout for improved user experience 2026-04-17 18:21:48 +08:00
a4456631fb Merge pull request 'feat: enhance team store page layout and styling for improved user experience' (#4) from feat/teamstore-page-enhancement into master
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m24s
Reviewed-on: #4
2026-04-17 10:01:20 +00:00
Frank John Begornia
391df3bb41 feat: enhance team store page layout and styling for improved user experience 2026-04-17 18:00:36 +08:00
cf3b4ea476 Merge pull request 'style: enhance authentication forms with improved layout and design' (#3) from feat/auth-forms into master
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m10s
Reviewed-on: #3
2026-04-17 06:19:50 +00:00
Frank John Begornia
04675dfd37 style: enhance authentication forms with improved layout and design 2026-04-17 14:18:31 +08:00
Frank John Begornia
a29bca1931 fix: update storage paths for team store logo and banner uploads to use 'uploads/images' directory
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m4s
2026-04-17 13:39:15 +08:00
Frank John Begornia
bc5da01735 fix: update storage paths for store logo and banner uploads to include 'upload/images'
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m4s
2026-04-17 13:33:31 +08:00
Frank John Begornia
914e276026 fix: migrate store logo/banner uploads from sftp to minio
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m6s
2026-04-17 13:24:40 +08:00
Frank John Begornia
2e44012b8c fix: pin psr/http-message ^1.0 and guzzlehttp/psr7 ^1.4 to fix PsrStream __toString incompatibility
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m18s
2026-04-17 13:13:42 +08:00
Frank John Begornia
0fe2e2bae6 fix: register minio custom driver using flysystem-aws-s3-v3 (Laravel 5.0 hardcodes v2)
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m5s
2026-04-17 13:03:37 +08:00
Frank John Begornia
c6518e81c9 feat: update Dockerfile and AppServiceProvider for PHP 7.2 compatibility and improved error handling
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 7m7s
2026-04-17 12:52:38 +08:00
Frank John Begornia
289e11f3c5 feat: add MinIO S3 storage configuration to docker-compose for improved file management
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m31s
2026-04-16 23:55:22 +08:00
8eef632ebb Merge pull request 'feat/hifive-filters' (#2) from feat/hifive-filters into master
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m33s
Reviewed-on: #2
2026-04-16 15:41:40 +00:00
ef88a6b69b Merge pull request 'Refactor image upload handling in UserController to use MinIO for improved storage management' (#1) from fix/upload-image into master
Some checks failed
Deploy Production (crewsportswear.com) / deploy (push) Has been cancelled
Reviewed-on: #1
2026-04-16 15:40:59 +00:00
Frank John Begornia
a410208c62 Refactor image upload handling in UserController to use MinIO for improved storage management 2026-04-16 23:40:09 +08:00
Frank John Begornia
d4a6028599 chore: remove SSH Keys Setup guide to enhance security practices 2026-04-16 23:21:45 +08:00
Frank John Begornia
4888f93eac feat(teamstore): add league/conference sub-sub-category pill filter (hi-five-franchise-store only) 2026-04-16 23:19:19 +08:00
Frank John Begornia
49921a26a9 Add centering guidelines script and update script references in designer view
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 3m7s
2026-04-02 03:33:19 +08:00
Frank John Begornia
3b6e0ec447 Refactor image handling in PrintPatternController and TemplatesController to use MinIO for improved storage management 2026-04-02 03:31:08 +08:00
Frank John Begornia
c16203110b Refactor image URLs to use MinIO storage for improved asset management
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m39s
2026-04-02 03:04:49 +08:00
Frank John Begornia
60fcf08cbc Enhance TestEmailController and view to include CSRF token and improve form security
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 1m51s
2026-02-26 23:12:00 +08:00
Frank John Begornia
701a433174 Update exception handling in Handler and TestEmailController for improved error reporting
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 1m51s
2026-02-26 22:58:28 +08:00
Frank John Begornia
47b354d8b7 Add TestEmailController and views for sending test emails
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m51s
2026-02-26 22:46:14 +08:00
Frank John Begornia
dfdb48920d Add SSH keys setup guide and update configurations for secure key management
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 4m31s
2026-02-23 02:01:12 +08:00
Frank John Begornia
3dac8ee685 Fix image path for PayPal button in cart view
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m1s
2026-01-07 01:42:43 +08:00
Frank John Begornia
09974721f3 Update DesignerController and site_config for MinIO integration and URL adjustments
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m23s
2026-01-07 01:28:47 +08:00
Frank John Begornia
8215ad8337 Refactor image URLs to use MinIO storage across various views and controllers
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m16s
2026-01-07 01:10:15 +08:00
Frank John Begornia
368ac50729 Add MinIO configuration and update image URLs in MainController
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 1m57s
2026-01-06 15:34:02 +08:00
Frank John Begornia
8f094ee89c Use MinIO for sports category images
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 1m56s
2026-01-06 15:27:17 +08:00
Frank John Begornia
0551cb078f Add MinIO S3 storage integration
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m9s
- Add minio disk configuration in filesystems.php
- Create helper functions for MinIO URLs (minio_url, minio_image_url)
- Update composer.json with AWS SDK (for future S3 support)
- Add MinIO env vars to docker-compose.local.yml
- Add .env examples for MinIO configuration
2026-01-06 15:20:15 +08:00
Frank John Begornia
26620fc043 Update README.md to reflect project details and installation instructions
All checks were successful
Deploy Production (crewsportswear.com) / deploy (push) Successful in 2m1s
2026-01-05 23:15:14 +08:00
Frank John Begornia
f10d6daa6f Update APP_URL and Traefik rules for production environment 2026-01-05 23:13:37 +08:00
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
73 changed files with 7485 additions and 1969 deletions

26
.env.local Normal file
View File

@@ -0,0 +1,26 @@
# Local Development Configuration
# Copy to .env.local and fill in your values.
# ── MinIO credentials ─────────────────────────────────────────────────────────
MINIO_KEY=your_minio_root_user
MINIO_SECRET=your_minio_root_password
# ── SSH tunnel (remote DB) ────────────────────────────────────────────────────
# Only needed when starting with --profile ssh-db.
# NOTE: no inline comments allowed after values — Docker reads them literally.
SSH_HOST=136.114.183.15
SSH_PORT=22
SSH_USER=webmaster
# Must be an absolute path — Docker Compose does NOT expand ~
SSH_KEY_PATH=/Users/webmaster/.ssh/id_ed25519_crew_webmaster
SSH_DB_REMOTE_HOST=127.0.0.1
SSH_DB_REMOTE_PORT=3306
# Tell the app to route DB traffic through the tunnel container:
DB_HOST=db-tunnel
DB_PORT=3306
DB_DATABASE=custom_designs
DB_USERNAME=root
DB_PASSWORD=VeryStrongRootPass2025!

View File

@@ -1,6 +1,26 @@
# Local Development MinIO Configuration
# Copy to .env.local and update with your MinIO credentials
# Local Development Configuration
# Copy to .env.local and fill in your values.
# MinIO credentials (get from your production server)
# ── MinIO credentials ─────────────────────────────────────────────────────────
MINIO_KEY=your_minio_root_user
MINIO_SECRET=your_minio_root_password
# ── SSH tunnel (remote DB) ────────────────────────────────────────────────────
# Only needed when starting with --profile ssh-db.
# IMPORTANT: no inline comments after values — Docker Compose reads them literally.
# IMPORTANT: SSH_KEY_PATH must be an absolute path — ~ is NOT expanded by Docker Compose.
#
SSH_HOST=your.server.ip.or.hostname
SSH_PORT=22
SSH_USER=root
SSH_KEY_PATH=/absolute/path/to/your/private/key
#
SSH_DB_REMOTE_HOST=127.0.0.1 # DB host as seen from the SSH server
SSH_DB_REMOTE_PORT=3306 # DB port as seen from the SSH server
#
# Tell the app to route DB traffic through the tunnel container:
DB_HOST=db-tunnel
DB_PORT=3306
DB_DATABASE=your_remote_db_name
DB_USERNAME=your_remote_db_user
DB_PASSWORD=your_remote_db_password

11
.gitignore vendored
View File

@@ -1,3 +1,14 @@
/vendor
/node_modules
.env
# SSH Keys - Never commit private keys
*.ppk
*.pem
*.key
id_rsa
id_dsa
id_ecdsa
id_ed25519
_key/
.ssh/

View File

@@ -1,30 +1,41 @@
# Use PHP 7.4 with Apache for Laravel 6.x
FROM php:7.4-apache
# Use PHP 7.2 with Apache (mcrypt available via PECL, compatible with Laravel 5.0)
FROM php:7.2-apache
# Redirect to archived Debian Buster repositories (EOL)
RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i '/buster-updates/d' /etc/apt/sources.list
# Install system dependencies
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --allow-unauthenticated \
git \
curl \
libpng-dev \
libonig-dev \
libxml2-dev \
libzip-dev \
libmcrypt-dev \
zip \
unzip \
libfreetype6-dev \
libjpeg62-turbo-dev \
openssh-client \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
libzip-dev \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd
# Install PHP extensions (mcrypt removed - not available in PHP 7.4)
RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath zip
# Install mcrypt via PECL (removed from core in PHP 7.2)
RUN pecl install mcrypt-1.0.4 && docker-php-ext-enable mcrypt
# Suppress E_DEPRECATED so PECL mcrypt functions don't trigger ErrorException in Laravel 5.0
RUN echo "error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT" > /usr/local/etc/php/conf.d/suppress-deprecated.ini
# Install PHP extensions
RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath tokenizer zip
# Enable Apache mod_rewrite
RUN a2enmod rewrite
# Install Composer (version 2.x for Laravel 6.x)
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
# Install Composer 2.2 (LTS version supporting PHP 7.2+)
COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer
# Set working directory
WORKDIR /var/www/html
@@ -47,17 +58,16 @@ RUN chown -R www-data:www-data /var/www/html \
# Create .env file if it doesn't exist
RUN if [ ! -f .env ]; then cp .env.example .env; fi
# Install PHP dependencies
# Note: composer install will be run via docker-entrypoint.sh or manually
# to avoid build-time network timeouts
# RUN composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader
# Install PHP dependencies (--no-plugins skips kylekatarnls/update-helper which is Composer 1 only)
RUN composer install --no-dev --no-interaction --prefer-dist --no-plugins
# Generate application key (will be done at runtime)
# RUN php artisan key:generate || true
# Generate application key
RUN php artisan key:generate || true
# Cache Laravel configuration and routes (will be done at runtime)
# RUN php artisan config:cache || true
# RUN php artisan route:cache || true
# Run Laravel 5.0 optimization
RUN php artisan clear-compiled && php artisan optimize
# Note: PHP 7.2 is compatible with Laravel 5.0 and yakpro-po obfuscation
# Configure Apache DocumentRoot to point to Laravel's public directory
ENV APACHE_DOCUMENT_ROOT=/var/www/html/public

17
Makefile Normal file
View File

@@ -0,0 +1,17 @@
COMPOSE_LOCAL = docker compose -f docker-compose.local.yml
# ── Local stack (local MariaDB) ───────────────────────────────────────────────
up:
$(COMPOSE_LOCAL) up --build
down:
$(COMPOSE_LOCAL) down
# ── Local stack with SSH tunnel to remote DB ──────────────────────────────────
up-ssh:
$(COMPOSE_LOCAL) --env-file .env.local --profile ssh-db up --build
down-ssh:
$(COMPOSE_LOCAL) --env-file .env.local --profile ssh-db down
.PHONY: up down up-ssh down-ssh

View File

@@ -1,175 +0,0 @@
# Laravel 5.0 → 11 Upgrade Progress
## Current State (Baseline)
- **Laravel Version**: 5.5.* (Phase 2 Complete)
- **PHP Version**: 7.0+ required (container ready)
- **Database**: MySQL via PDO
- **Branch**: feature/laravel-upgrade
## Completed Upgrades
### ✅ Phase 1: Laravel 5.0 → 5.1 (COMPLETE)
- ✅ Updated composer.json
- ✅ Basic route compatibility verified
- ✅ Middleware working
- ✅ Authentication flow tested
### ✅ Phase 2: Laravel 5.1 → 5.5 LTS (COMPLETE)
- ✅ Updated composer.json (Laravel 5.5.*, Guzzle ^6.3, PHPUnit ~6.0)
- ✅ Created `routes/web.php` with all web routes
- ✅ Created `routes/api.php` with API routes (moved from /api prefix)
- ✅ Expanded `Route::controllers()` to explicit route definitions
- ✅ Updated RouteServiceProvider to use mapWebRoutes() and mapApiRoutes()
- ✅ Updated Exception Handler with Laravel 5.5 patterns
- ⚠️ **Requires PHP 7.0+** - Local test needs Docker container
## 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 (needs Docker)
- ⏭️ Update validation rules (needs testing)
### 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
## How to Test the Upgrade
### Quick Test (Docker Required)
```bash
# Run the automated test script
./test-laravel-5.5.sh
```
### Manual Test
```bash
# Build and start container
docker compose -f docker-compose.local.yml up -d --build
# Check Laravel version
docker compose -f docker-compose.local.yml exec app php artisan --version
# List all routes (verify new structure)
docker compose -f docker-compose.local.yml exec app php artisan route:list
# Access the application
# http://localhost:8080
```
### Verify Key Changes
1. **Routes**: Check `routes/web.php` and `routes/api.php` exist
2. **API Prefix**: API routes now automatically prefixed with `/api`
3. **Authentication**: Login routes now use named routes (`login`, `register`)
4. **Middleware**: Web middleware auto-applied to routes/web.php
## 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 (`feature/laravel-upgrade`)
2. ✅ Documented current state and dependencies
3. ✅ Created baseline tag (`v5.0-baseline`) for rollback
4. ✅ Updated composer.json for Laravel 5.1
5. ✅ Updated Guzzle 5.0 → 6.0 (required for Laravel 5.1)
6. ⏳ Next: Build container and run composer update

View File

@@ -1,25 +1,17 @@
<?php
namespace App\Exceptions;
<?php namespace App\Exceptions;
use Exception;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler
{
class Handler extends ExceptionHandler {
/**
* A list of the exception types that are not reported.
* A list of the exception types that should not be reported.
*
* @var array
*/
protected $dontReport = [
\Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class,
'Symfony\Component\HttpKernel\Exception\HttpException'
];
/**
@@ -27,38 +19,30 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
* @param \Exception $e
* @return void
*/
public function report(Exception $exception)
public function report($e)
{
parent::report($exception);
if (!$e instanceof Exception) {
$e = new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
}
return parent::report($e);
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @param mixed $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
public function render($request, $e)
{
return parent::render($request, $exception);
if (!$e instanceof Exception) {
$e = new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
}
return parent::render($request, $e);
}
/**
* Convert an authentication exception into an unauthenticated response.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
* @return \Illuminate\Http\Response
*/
protected function unauthenticated($request, AuthenticationException $exception)
{
return $request->expectsJson()
? response()->json(['message' => 'Unauthenticated.'], 401)
: redirect()->guest(route('login'));
}
}

View File

@@ -1,32 +1,40 @@
<?php namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Auth\Registrar;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
class AuthController extends Controller {
/*
|--------------------------------------------------------------------------
| Login Controller
| Registration & Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application.
| This controller handles the registration of new users, as well as the
| authentication of existing users. By default, this controller uses
| a simple trait to add these behaviors. Why don't you explore it?
|
*/
use AuthenticatesUsers;
use AuthenticatesAndRegistersUsers;
protected $redirectTo = '/';
/**
* Create a new authentication controller instance.
*
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
* @return void
*/
public function __construct()
public function __construct(Guard $auth, Registrar $registrar)
{
$this->middleware('guest')->except('logout');
$this->auth = $auth;
$this->registrar = $registrar;
$this->middleware('guest', ['except' => 'getLogout']);
}
}

View File

@@ -1,68 +0,0 @@
<?php namespace App\Http\Controllers\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = '/';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
*/
protected function create(array $data)
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
}
}

View File

@@ -1,12 +1,11 @@
<?php namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesCommands;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
abstract class Controller extends BaseController {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use DispatchesCommands, ValidatesRequests;
}

View File

@@ -50,7 +50,7 @@ class MainController extends Controller {
$categoryids = array();
foreach($data as $row){
$categoryids[] = (string)$row->Category;
$categoryids[] = $row->Category;
}
$array_sports = $m->selectSportsByURL($url);

View File

@@ -5,6 +5,7 @@ use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request1;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use App\Models\PrintPatternModel;
use App\Models\SizesModel;
@@ -46,7 +47,7 @@ class PrintPatternController extends Controller {
$NewImageName = $templateSize.'.'.$imageExt;
$thumbnail = "uniform-templates/".$templatecode."/".$templateType."/SIZES/" . $NewImageName;
$thumbnail = "uploads/images/uniform-templates/".$templatecode."/".$templateType."/SIZES/" . $NewImageName;
$data = array(
'TemplateCode' => $templatecode,
@@ -58,9 +59,7 @@ class PrintPatternController extends Controller {
$i = $m->insertPrintPattern($data);
//var_dump($data);
if($i){
$r = $request->file('preview_print_template')->move(
base_path() . "/public/images/uniform-templates/".$templatecode."/".$templateType."/SIZES/", $NewImageName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templatecode.'/'.$templateType.'/SIZES/'.$NewImageName, file_get_contents($request->file('preview_print_template')->getRealPath()));
echo '<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-check"></i> Success!</h4>

View File

@@ -4,6 +4,7 @@ use App\Http\Requests;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use App\Models\TemplatesModel;
use App\Models\SportsModel;
use App\Models\PrintPatternModel;
@@ -48,7 +49,7 @@ class TemplatesController extends Controller {
<h3><?php echo $row->TemplateName ?></h3>
</div>
<div class="sports-border">
<a href=""><img src="<?php echo url('public') . "/" . $row->Thumbnail ?>" alt="Sports" height="400px;" class="img img-responsive product-center" /></a>
<a href=""><img src="<?php echo minio_url($row->Thumbnail) ?>" alt="Sports" height="400px;" class="img img-responsive product-center" /></a>
<div class="sport-edit-btn">
<a href="<?php echo url('admin/templates') . "/edit/" . $row->TemplateCode . "/" ?>" class="btn btn-primary btn-block"><i class="fa fa-edit"></i> Edit</a>
</div>
@@ -129,15 +130,13 @@ class TemplatesController extends Controller {
if($i){
$request->file('tempateImage')->move(
base_path() . '/public/images/templates/thumbnail', $NewImageName
);
Storage::disk('minio')->put('images/templates/thumbnail/' . $NewImageName, file_get_contents($request->file('tempateImage')->getRealPath()));
//for front jersey
if(!empty($request->file('svgJerseyFront')->getClientOriginalName())){
$svgName = $request->file('svgJerseyFront')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
//var_dump($svgThumbnail);
$Templatedata = array(
'TemplateCode' => $templateCode,
@@ -149,16 +148,14 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if($i){
$request->file('svgJerseyFront')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgJerseyFront')->getRealPath()));
}
}
if(!empty($request->file('svgJerseyBack')->getClientOriginalName())){
$svgName = $request->file('svgJerseyBack')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'TemplateCode' => $templateCode,
@@ -170,16 +167,14 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if($i){
$request->file('svgJerseyBack')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgJerseyBack')->getRealPath()));
}
}
if(!empty($request->file('svgShortRight')->getClientOriginalName())){
$svgName = $request->file('svgShortRight')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'TemplateCode' => $templateCode,
@@ -191,16 +186,14 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if($i){
$request->file('svgShortRight')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgShortRight')->getRealPath()));
}
}
if(!empty($request->file('svgShortLeft')->getClientOriginalName())){
$svgName = $request->file('svgShortLeft')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'TemplateCode' => $templateCode,
@@ -212,9 +205,7 @@ class TemplatesController extends Controller {
$i = $m->insertTempaltePaths($Templatedata);
if($i){
$request->file('svgShortLeft')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgShortLeft')->getRealPath()));
}
}
@@ -270,9 +261,7 @@ class TemplatesController extends Controller {
'PatternId' => $getSkins
);
$request->file('tempateImage')->move(
base_path() . '/public/images/templates/thumbnail', $NewImageName
);
Storage::disk('minio')->put('images/templates/thumbnail/' . $NewImageName, file_get_contents($request->file('tempateImage')->getRealPath()));
}else{
@@ -298,7 +287,7 @@ class TemplatesController extends Controller {
//echo 'meron jerset front';
$svgName = $request->file('svgJerseyFront')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'Type' => 'Jersey',
@@ -308,9 +297,7 @@ 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
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgJerseyFront')->getRealPath()));
//echo 'image move success';
}
}
@@ -318,7 +305,7 @@ class TemplatesController extends Controller {
if (array_key_exists('svgJerseyBack', $post)) {
$svgName = $request->file('svgJerseyBack')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'Type' => 'Jersey',
@@ -327,16 +314,13 @@ class TemplatesController extends Controller {
);
$i = $m->updateTemplatePaths($Templatedata, $post['id_svgJerseyBack']);
if($i){
$request->file('svgJerseyBack')->move(
base_path() . '/public/images/uniform-templates/'.$templateCode. '/DISPLAY' , $svgName
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgJerseyBack')->getRealPath()));
}
}
if (array_key_exists('svgShortRight', $post)) {
$svgName = $request->file('svgShortRight')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'Type' => 'Shorts',
@@ -346,15 +330,13 @@ 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
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgShortRight')->getRealPath()));
}
}
if (array_key_exists('svgShortLeft', $post)) {
$svgName = $request->file('svgShortLeft')->getClientOriginalName();
$svgThumbnail = "uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$svgThumbnail = "uploads/images/uniform-templates/".$templateCode."/DISPLAY/".$svgName;
$Templatedata = array(
'Type' => 'Shorts',
@@ -364,9 +346,7 @@ 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
);
Storage::disk('minio')->put('uploads/images/uniform-templates/'.$templateCode.'/DISPLAY/'.$svgName, file_get_contents($request->file('svgShortLeft')->getRealPath()));
}
}

View File

@@ -0,0 +1,46 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Mail;
class TestEmailController extends Controller
{
public function show()
{
return view('test-email', ['token' => csrf_token()]);
}
public function send(Request $request)
{
$this->validate($request, [
'recipient' => 'required|email',
]);
$recipient = $request->input('recipient');
$config = [
'driver' => config('mail.driver'),
'host' => config('mail.host'),
'port' => config('mail.port'),
'username' => config('mail.username'),
'encryption' => config('mail.encryption'),
];
try {
Mail::send('emails.test', ['config' => $config, 'recipient' => $recipient], function ($message) use ($recipient) {
$message->from('no-reply@crewsportswear.com', 'CREW Sportswear');
$message->to($recipient)->subject('CREW Sportswear — Test Email');
});
$status = 'success';
$message = 'Test email sent successfully to ' . $recipient . '.';
} catch (\Throwable $e) {
$status = 'danger';
$message = 'Failed to send email: ' . $e->getMessage();
}
return redirect()->back()->with('status', $status)->with('message', $message);
}
}

View File

@@ -591,7 +591,7 @@ class TeamStoreController extends Controller
//var_dump($items_group);
$grouped_item = $m->selectTeamStoreGroupByCartKey($cartKey);
if ($grouped_item) {
$defId = $grouped_item->StoreId;
$defId = $grouped_item[0]->StoreId;
} else {
$defId = 0;
}

View File

@@ -761,10 +761,7 @@ class UserController extends Controller
);
$u = $UserModel->insertNewProductThumbnails($thumbs);
// var_dump($thumbs);
Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); //live
//Storage::disk('localdir')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+'));
// var_dump($s);
Storage::disk('minio')->put('images/' . $thumbnail, file_get_contents($request->file('imgupload')[$i]->getRealPath()));
}
$prod_code = array('ProductCode' => $getYear . '-' . str_pad($id, 10, '0', STR_PAD_LEFT));
@@ -808,9 +805,7 @@ class UserController extends Controller
);
$u = $UserModel->insertNewProductThumbnails($thumbs);
Storage::disk('sftp')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+')); //live
//Storage::disk('localdir')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+'));
Storage::disk('minio')->put('images/' . $thumbnail, file_get_contents($request->file('upload_images')[$i]->getRealPath()));
}
@@ -826,9 +821,8 @@ class UserController extends Controller
$id = $request->thumb_id;
$UserModel = new UserModel;
$storagePath = Storage::disk('sftp')->getDriver()->getAdapter()->getPathPrefix();
if (file_exists($storagePath . $file)) {
unlink($storagePath . $file);
if (Storage::disk('minio')->exists('images/' . $file)) {
Storage::disk('minio')->delete('images/' . $file);
}
$i = $UserModel->deleteImageThumb('Id', $id);
@@ -973,11 +967,11 @@ class UserController extends Controller
// var_dump($res);
// if($res){
if ($request->file('store_logo') != null) {
Storage::disk('uploads')->put('/teamstore/' . $orig_store_url . '/' . $store_logo_name, fopen($request->file('store_logo'), 'r+'));
Storage::disk('minio')->put('uploads/images/teamstore/' . $orig_store_url . '/' . $store_logo_name, file_get_contents($request->file('store_logo')->getRealPath()));
}
if ($request->file('store_banner') != null) {
Storage::disk('uploads')->put('/teamstore/' . $orig_store_url . '/' . $store_banner_name, fopen($request->file('store_banner'), 'r+'));
Storage::disk('minio')->put('uploads/images/teamstore/' . $orig_store_url . '/' . $store_banner_name, file_get_contents($request->file('store_banner')->getRealPath()));
}
return response()->json(array(

View File

@@ -10,31 +10,12 @@ class Kernel extends HttpKernel {
* @var array
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
/**
* The application's route middleware groups.
*
* @var array
*/
protected $middlewareGroups = [
'web' => [
\Illuminate\Cookie\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
'api' => [
'throttle:60,1',
'bindings',
],
'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
'Illuminate\Cookie\Middleware\EncryptCookies',
'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
'Illuminate\Session\Middleware\StartSession',
'Illuminate\View\Middleware\ShareErrorsFromSession',
'App\Http\Middleware\VerifyCsrfToken',
];
/**
@@ -43,17 +24,14 @@ class Kernel extends HttpKernel {
* @var array
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'teamstoresession' => \App\Http\Middleware\CheckTeamStorePassword::class,
'admin' => \App\Http\Middleware\IsAdmin::class,
'normaluser' => \App\Http\Middleware\IsUser::class,
'isAuthorized' => \App\Http\Middleware\isAuthorized::class,
'cors' => \App\Http\Middleware\Cors::class,
'auth' => 'App\Http\Middleware\Authenticate',
'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
'teamstoresession' => 'App\Http\Middleware\CheckTeamStorePassword',
'admin' => '\App\Http\Middleware\IsAdmin',
'normaluser' => '\App\Http\Middleware\IsUser',
'isAuthorized' => '\App\Http\Middleware\isAuthorized',
'cors' => 'App\Http\Middleware\Cors',
];
}

View File

@@ -1,18 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
class TrimStrings extends Middleware
{
/**
* The names of the attributes that should not be trimmed.
*
* @var array
*/
protected $except = [
'password',
'password_confirmation',
];
}

View File

@@ -41,6 +41,10 @@ Route::get('cart', ['as' => 'cart', 'uses' => 'teamstore\TeamStoreController@car
Route::get('/checkout', 'teamstore\TeamStoreController@checkout');
Route::get('/mail', 'teamstore\TeamStoreController@mail');
// Test email page
Route::get('/test-email', 'TestEmailController@show');
Route::post('/test-email/send', 'TestEmailController@send');
Route::get('/designer/{templateid}', 'designer\DesignerController@index');
Route::get('/designer/preview/{designCode}', 'designer\DesignerController@getDesign');

View File

@@ -27,8 +27,8 @@ class MainModel extends Model {
function selectSportsId($url) //
{
$i = DB::table('sports')->where('URL', '=', $url)->first();
$id = $i->Id;
$i = DB::table('sports')->where('URL', '=', $url)->get();
$id = $i[0]->Id;
$k = DB::table('templates')->where('SportsId', '=', $id)
->where('IsActive','=', "TRUE")
@@ -146,8 +146,8 @@ class MainModel extends Model {
function selectTemplatesByCategory($url, $cat) //
{
$i = DB::table('sports')->where('URL', '=', $url)->first();
$id = $i->Id;
$i = DB::table('sports')->where('URL', '=', $url)->get();
$id = $i[0]->Id;
$k = DB::table('templates')->where('SportsId', '=', $id)
->where('Category','=', $cat)

View File

@@ -53,7 +53,7 @@ class TeamStoreModel extends Model {
$i = DB::table('cart_tmp')
->where('CartKey', $cartKey)
->groupby('CartKey')
->first();
->get();
return $i;
}

View File

@@ -4,6 +4,8 @@ use Illuminate\Support\ServiceProvider;
use Storage;
use League\Flysystem\Filesystem;
use League\Flysystem\Sftp\SftpAdapter;
use League\Flysystem\AwsS3v3\AwsS3Adapter as AwsS3v3Adapter;
use Aws\S3\S3Client;
class AppServiceProvider extends ServiceProvider {
@@ -27,6 +29,21 @@ class AppServiceProvider extends ServiceProvider {
Storage::extend('sftp', function ($app, $config) {
return new Filesystem(new SftpAdapter($config));
});
Storage::extend('minio', function ($app, $config) {
$client = new S3Client([
'credentials' => [
'key' => $config['key'],
'secret' => $config['secret'],
],
'region' => $config['region'],
'version' => 'latest',
'endpoint' => $config['endpoint'],
'use_path_style_endpoint' => filter_var($config['use_path_style_endpoint'] ?? true, FILTER_VALIDATE_BOOLEAN),
]);
$adapter = new AwsS3v3Adapter($client, $config['bucket']);
return new Filesystem($adapter);
});
}
/**
@@ -40,6 +57,10 @@ class AppServiceProvider extends ServiceProvider {
*/
public function register()
{
// Laravel's HandleExceptions sets error_reporting(-1) which causes PECL mcrypt
// deprecation notices to become ErrorExceptions. Override it here to suppress E_DEPRECATED.
error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
$this->app->bind(
'Illuminate\Contracts\Auth\Registrar',
'App\Services\Registrar'

View File

@@ -1,20 +1,24 @@
<?php
namespace App\Providers;
<?php namespace App\Providers;
use Illuminate\Bus\Dispatcher;
use Illuminate\Support\ServiceProvider;
class BusServiceProvider extends ServiceProvider
{
class BusServiceProvider extends ServiceProvider {
/**
* Bootstrap any application services.
*
* @param \Illuminate\Bus\Dispatcher $dispatcher
* @return void
*/
public function boot()
public function boot(Dispatcher $dispatcher)
{
// Command bus mapping removed in Laravel 5.5+
// Commands are now auto-discovered
$dispatcher->mapUsing(function($command)
{
return Dispatcher::simpleMapping(
$command, 'App\Commands', 'App\Handlers\Commands'
);
});
}
/**
@@ -26,4 +30,5 @@ class BusServiceProvider extends ServiceProvider
{
//
}
}

View File

@@ -19,11 +19,12 @@ class EventServiceProvider extends ServiceProvider {
/**
* Register any other events for your application.
*
* @param \Illuminate\Contracts\Events\Dispatcher $events
* @return void
*/
public function boot()
public function boot(DispatcherContract $events)
{
parent::boot();
parent::boot($events);
//
}

View File

@@ -1,14 +1,12 @@
<?php
<?php namespace App\Providers;
namespace App\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
class RouteServiceProvider extends ServiceProvider
{
class RouteServiceProvider extends ServiceProvider {
/**
* This namespace is applied to your controller routes.
* This namespace is applied to the controller routes in your routes file.
*
* In addition, it is set as the URL generator's root namespace.
*
@@ -19,51 +17,28 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
* @param \Illuminate\Routing\Router $router
* @return void
*/
public function boot()
public function boot(Router $router)
{
parent::boot();
parent::boot($router);
//
}
/**
* Define the routes for the application.
*
* @param \Illuminate\Routing\Router $router
* @return void
*/
public function map()
public function map(Router $router)
{
$this->mapApiRoutes();
$this->mapWebRoutes();
$router->group(['namespace' => $this->namespace], function($router)
{
require app_path('Http/routes.php');
});
}
/**
* Define the "web" routes for the application.
*
* These routes all receive session state, CSRF protection, etc.
*
* @return void
*/
protected function mapWebRoutes()
{
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
}
/**
* Define the "api" routes for the application.
*
* These routes are typically stateless.
*
* @return void
*/
protected function mapApiRoutes()
{
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
}
}

View File

@@ -1,16 +0,0 @@
<?php return array (
'nesbot/carbon' =>
array (
'providers' =>
array (
0 => 'Carbon\\Laravel\\ServiceProvider',
),
),
'webpatser/laravel-uuid' =>
array (
'aliases' =>
array (
'Uuid' => 'Webpatser\\Uuid\\Uuid',
),
),
);

View File

@@ -1,187 +0,0 @@
<?php return array (
'providers' =>
array (
0 => 'Illuminate\\Foundation\\Providers\\ArtisanServiceProvider',
1 => 'Illuminate\\Auth\\AuthServiceProvider',
2 => 'Illuminate\\Bus\\BusServiceProvider',
3 => 'Illuminate\\Cache\\CacheServiceProvider',
4 => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
5 => 'Illuminate\\Cookie\\CookieServiceProvider',
6 => 'Illuminate\\Database\\DatabaseServiceProvider',
7 => 'Illuminate\\Encryption\\EncryptionServiceProvider',
8 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
9 => 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider',
10 => 'Illuminate\\Hashing\\HashServiceProvider',
11 => 'Illuminate\\Mail\\MailServiceProvider',
12 => 'Illuminate\\Pagination\\PaginationServiceProvider',
13 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
14 => 'Illuminate\\Queue\\QueueServiceProvider',
15 => 'Illuminate\\Redis\\RedisServiceProvider',
16 => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
17 => 'Illuminate\\Session\\SessionServiceProvider',
18 => 'Illuminate\\Translation\\TranslationServiceProvider',
19 => 'Illuminate\\Validation\\ValidationServiceProvider',
20 => 'Illuminate\\View\\ViewServiceProvider',
21 => 'Carbon\\Laravel\\ServiceProvider',
22 => 'App\\Providers\\AppServiceProvider',
23 => 'App\\Providers\\BusServiceProvider',
24 => 'App\\Providers\\ConfigServiceProvider',
25 => 'App\\Providers\\EventServiceProvider',
26 => 'App\\Providers\\RouteServiceProvider',
27 => 'Netshell\\Paypal\\PaypalServiceProvider',
),
'eager' =>
array (
0 => 'Illuminate\\Auth\\AuthServiceProvider',
1 => 'Illuminate\\Cookie\\CookieServiceProvider',
2 => 'Illuminate\\Database\\DatabaseServiceProvider',
3 => 'Illuminate\\Encryption\\EncryptionServiceProvider',
4 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
5 => 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider',
6 => 'Illuminate\\Pagination\\PaginationServiceProvider',
7 => 'Illuminate\\Session\\SessionServiceProvider',
8 => 'Illuminate\\View\\ViewServiceProvider',
9 => 'Carbon\\Laravel\\ServiceProvider',
10 => 'App\\Providers\\AppServiceProvider',
11 => 'App\\Providers\\BusServiceProvider',
12 => 'App\\Providers\\ConfigServiceProvider',
13 => 'App\\Providers\\EventServiceProvider',
14 => 'App\\Providers\\RouteServiceProvider',
15 => 'Netshell\\Paypal\\PaypalServiceProvider',
),
'deferred' =>
array (
'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.clear-compiled' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.preset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.listen' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.restart' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.retry' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.work' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.route.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.route.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.route.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.seed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.storage.link' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.event.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.exception.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.factory.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.job.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.policy.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.provider.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.failed-table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.queue.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.request.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.resource.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.rule.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'command.vendor.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
'Illuminate\\Contracts\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
'swift.mailer' => 'Illuminate\\Mail\\MailServiceProvider',
'swift.transport' => 'Illuminate\\Mail\\MailServiceProvider',
'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.worker' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.listener' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider',
'redis' => 'Illuminate\\Redis\\RedisServiceProvider',
'redis.connection' => 'Illuminate\\Redis\\RedisServiceProvider',
'auth.password' => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
'auth.password.broker' => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
'translator' => 'Illuminate\\Translation\\TranslationServiceProvider',
'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
),
'when' =>
array (
'Illuminate\\Foundation\\Providers\\ArtisanServiceProvider' =>
array (
),
'Illuminate\\Bus\\BusServiceProvider' =>
array (
),
'Illuminate\\Cache\\CacheServiceProvider' =>
array (
),
'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' =>
array (
),
'Illuminate\\Hashing\\HashServiceProvider' =>
array (
),
'Illuminate\\Mail\\MailServiceProvider' =>
array (
),
'Illuminate\\Pipeline\\PipelineServiceProvider' =>
array (
),
'Illuminate\\Queue\\QueueServiceProvider' =>
array (
),
'Illuminate\\Redis\\RedisServiceProvider' =>
array (
),
'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' =>
array (
),
'Illuminate\\Translation\\TranslationServiceProvider' =>
array (
),
'Illuminate\\Validation\\ValidationServiceProvider' =>
array (
),
),
);

View File

@@ -5,24 +5,21 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.2",
"laravel/framework": "^6.0",
"laravel/helpers": "^1.1",
"laravel/tinker": "^2.0",
"webpatser/laravel-uuid": "^3.0",
"laravel/framework": "5.0.*",
"webpatser/laravel-uuid": "^2.0",
"netshell/paypal": "dev-master",
"guzzlehttp/guzzle": "^6.3",
"guzzlehttp/guzzle": "~5.0",
"google/recaptcha": "~1.1",
"spatie/laravel-analytics": "^3.0",
"spatie/laravel-analytics": "^1.4",
"league/flysystem-sftp": "^1.0",
"aws/aws-sdk-php": "~3.0"
"league/flysystem-aws-s3-v3": "~1.0",
"aws/aws-sdk-php": "~3.0",
"psr/http-message": "^1.0",
"guzzlehttp/psr7": "^1.4"
},
"require-dev": {
"facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^8.0"
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
},
"autoload": {
@@ -42,21 +39,20 @@
]
},
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
"php -r \"copy('.env.example', '.env');\"",
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist",
"allow-plugins": {
"kylekatarnls/update-helper": true
}
"preferred-install": "dist"
}
}

4556
composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -80,7 +80,7 @@ return [
'key' => env('APP_KEY', 'SomeRandomString'),
'cipher' => 'AES-256-CBC',
'cipher' => MCRYPT_RIJNDAEL_128,
/*
|--------------------------------------------------------------------------
@@ -118,7 +118,7 @@ return [
'Illuminate\Bus\BusServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
// 'Illuminate\Routing\ControllerServiceProvider', // Removed in Laravel 5.3+
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
@@ -153,7 +153,7 @@ return [
/*
* Google analytics
*/
// 'Spatie\LaravelAnalytics\LaravelAnalyticsServiceProvider', // Commented out - version 2.x needs reconfiguration
'Spatie\LaravelAnalytics\LaravelAnalyticsServiceProvider',
],

View File

@@ -4,59 +4,64 @@ return [
/*
|--------------------------------------------------------------------------
| Authentication Defaults
| Default Authentication Driver
|--------------------------------------------------------------------------
|
| This option controls the authentication driver that will be utilized.
| This driver manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application.
|
| Supported: "database", "eloquent"
|
*/
'defaults' => [
'guard' => 'web',
'passwords' => 'users',
],
/*
|--------------------------------------------------------------------------
| Authentication Guards
|--------------------------------------------------------------------------
*/
'guards' => [
'web' => [
'driver' => 'session',
'provider' => 'users',
],
'api' => [
'driver' => 'token',
'provider' => 'users',
'hash' => false,
],
],
/*
|--------------------------------------------------------------------------
| User Providers
|--------------------------------------------------------------------------
*/
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\User::class,
],
],
/*
|--------------------------------------------------------------------------
| Resetting Passwords
| Authentication Model
|--------------------------------------------------------------------------
|
| When using the "Eloquent" authentication driver, we need to know which
| Eloquent model should be used to retrieve your users. Of course, it
| is often just the "User" model but you may use whatever you like.
|
*/
'passwords' => [
'users' => [
'provider' => 'users',
'model' => 'App\User',
/*
|--------------------------------------------------------------------------
| Authentication Table
|--------------------------------------------------------------------------
|
| When using the "Database" authentication driver, we need to know which
| table should be used to retrieve your users. We have chosen a basic
| default value but you may easily change it to any table you like.
|
*/
'table' => 'users',
/*
|--------------------------------------------------------------------------
| Password Reset Settings
|--------------------------------------------------------------------------
|
| Here you may set the options for resetting passwords including the view
| that is your password reset e-mail. You can also set the name of the
| table that maintains all of the reset tokens for your application.
|
| The expire time is the number of minutes that the reset token should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/
'password' => [
'email' => 'emails.password',
'table' => 'password_resets',
'expire' => 60,
],
// 'expire' => 60,
],
];

View File

@@ -77,7 +77,7 @@ return [
'port' => 22,
'username' => 'root',
'password' => '',
'privateKey' => '/var/www/html/_key/instance2/root.ppk',
'privateKey' => '/var/keys/root.ppk',
'root' => '/var/www/html/images',
'timeout' => 10
],
@@ -88,7 +88,7 @@ return [
],
'minio' => [
'driver' => 's3',
'driver' => 'minio',
'key' => env('MINIO_KEY'),
'secret' => env('MINIO_SECRET'),
'region' => env('MINIO_REGION', 'us-east-1'),

View File

@@ -18,6 +18,7 @@ return [
'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'),
'images_url' => env('https://crewsportswear.app:5955', 'https://crewsportswear.app:5955'),
'minio_url' => env('MINIO_URL', 'https://minio.crewsportswear.app/crewsportswear'),
'uploads' => env('https://crewsportswear.com/uploads/images/', 'https://crewsportswear.com/uploads/images/'), // local

View File

@@ -1,32 +0,0 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddUserIdToSessionsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('sessions', function (Blueprint $table) {
$table->unsignedInteger('user_id')->nullable()->after('id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('sessions', function (Blueprint $table) {
$table->dropColumn('user_id');
});
}
}

View File

@@ -1,33 +0,0 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateSessionsTableForLaravel55 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('sessions', function (Blueprint $table) {
$table->string('ip_address', 45)->nullable()->after('user_id');
$table->text('user_agent')->nullable()->after('ip_address');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('sessions', function (Blueprint $table) {
$table->dropColumn(['ip_address', 'user_agent']);
});
}
}

View File

@@ -31,6 +31,7 @@ services:
volumes:
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
- /var/crew-keys:/var/keys:ro
labels:
- "traefik.enable=true"
# Development environment (dev.crewsportswear.app)

View File

@@ -1,3 +1,19 @@
# ─────────────────────────────────────────────────────────────────────────────
# Local development stack
#
# Default (local MariaDB):
# docker compose -f docker-compose.local.yml up --build
#
# Remote DB via SSH private-key tunnel:
# 1. Set SSH_HOST, SSH_USER, SSH_KEY_PATH, SSH_DB_REMOTE_HOST,
# SSH_DB_REMOTE_PORT (and DB_* creds) in .env.local
# 2. docker compose -f docker-compose.local.yml --profile ssh-db up --build
# The app will talk to db-tunnel (port 3306) instead of the local db.
#
# App: http://localhost:8082
# phpMyAdmin: http://localhost:8083
# ─────────────────────────────────────────────────────────────────────────────
services:
db:
image: mariadb:10.6
@@ -27,15 +43,9 @@ services:
environment:
- APP_ENV=local
- APP_DEBUG=true
- APP_KEY=base64:omrrKgpmHyPi61hoXrxtTwC/2tFkIsXUlb8UoKk3enk=
- APP_CIPHER=AES-256-CBC
- APP_URL=http://localhost:8082
- DB_CONNECTION=mysql
- DB_HOST=db
- DB_PORT=3307
- DB_DATABASE=crewsportswear
- DB_USERNAME=crewsportswear
- DB_PASSWORD=secret
- DB_PORT=${DB_PORT:-3306}
- PROD_PRIVATE=http://localhost:8082
- IMAGES_URL=http://localhost:8082
- UPLOAD_URL=http://localhost:8082/uploads/
@@ -58,15 +68,65 @@ services:
- MINIO_REGION=us-east-1
- MINIO_USE_PATH_STYLE=false
- MINIO_URL=https://minio.crewsportswear.app
# DB_HOST defaults to local container; set to db-tunnel in .env.local for SSH mode
- DB_HOST=${DB_HOST:-db}
- DB_DATABASE=${DB_DATABASE:-crewsportswear}
- DB_USERNAME=${DB_USERNAME:-crewsportswear}
- DB_PASSWORD=${DB_PASSWORD:-secret}
env_file:
- path: .env.local
required: false
volumes:
- ./:/var/www/html
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
# Keep the vendor/ directory from the image — prevents the bind-mount
# from wiping out the composer install done during docker build.
- vendor_local:/var/www/html/vendor
depends_on:
- db
networks:
- crewsportswear-local
# ── SSH tunnel to a remote database ────────────────────────────────────────
# Activated only with: --profile ssh-db
# Requires SSH_HOST, SSH_USER, SSH_KEY_PATH (and optionally SSH_PORT,
# SSH_DB_REMOTE_HOST, SSH_DB_REMOTE_PORT) set in .env.local.
db-tunnel:
profiles:
- ssh-db
image: alpine:3.19
container_name: crewsportswear_db_tunnel
restart: unless-stopped
environment:
- SSH_HOST=${SSH_HOST}
- SSH_PORT=${SSH_PORT:-22}
- SSH_USER=${SSH_USER:-root}
- SSH_DB_REMOTE_HOST=${SSH_DB_REMOTE_HOST:-127.0.0.1}
- SSH_DB_REMOTE_PORT=${SSH_DB_REMOTE_PORT:-3306}
volumes:
# Mount your private key read-only; path configured in .env.local
- ${SSH_KEY_PATH:-~/.ssh/id_rsa}:/ssh/id_rsa:ro
command:
- sh
- -c
- |
apk add --no-cache openssh-client
cp /ssh/id_rsa /tmp/id_rsa
chmod 600 /tmp/id_rsa
echo "Starting SSH tunnel to $$SSH_HOST..."
exec ssh -N \
-o StrictHostKeyChecking=no \
-o ServerAliveInterval=30 \
-o ServerAliveCountMax=3 \
-o ExitOnForwardFailure=yes \
-i /tmp/id_rsa \
-L "0.0.0.0:3306:$$SSH_DB_REMOTE_HOST:$$SSH_DB_REMOTE_PORT" \
-p "$$SSH_PORT" \
"$$SSH_USER@$$SSH_HOST"
networks:
- crewsportswear-local
phpmyadmin:
image: arm64v8/phpmyadmin
platform: linux/arm64
@@ -89,3 +149,4 @@ networks:
volumes:
db_data:
vendor_local:

View File

@@ -28,9 +28,18 @@ services:
- ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
- ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
- ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
# MinIO S3 Storage
- MINIO_ENDPOINT=${MINIO_ENDPOINT:-http://crew-minio-prod:9000}
- MINIO_KEY=${MINIO_KEY}
- MINIO_SECRET=${MINIO_SECRET}
- MINIO_BUCKET=${MINIO_BUCKET:-crewsportswear}
- MINIO_REGION=${MINIO_REGION:-us-east-1}
- MINIO_USE_PATH_STYLE=${MINIO_USE_PATH_STYLE:-true}
- MINIO_URL=${MINIO_URL:-https://minio.crewsportswear.app}
volumes:
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
- /var/crew-keys:/var/keys:ro
labels:
- "traefik.enable=true"
# Production environment (crewsportswear.com) - Uses paid SSL certificate

View File

@@ -13,5 +13,11 @@ mkdir -p bootstrap/cache
chown -R www-data:www-data storage bootstrap/cache
chmod -R 775 storage bootstrap/cache
# Install/update Composer dependencies if vendor is missing or composer.json changed
if [ ! -f vendor/autoload.php ]; then
echo "vendor/autoload.php not found — running composer install..."
composer install --no-interaction --prefer-dist
fi
# Execute the main command
exec "$@"

View File

@@ -0,0 +1,90 @@
/**
* Augments canvas by assigning to `onObjectMove` and `onAfterRender`.
* This kind of sucks because other code using those methods will stop functioning.
* Need to fix it by replacing callbacks with pub/sub kind of subscription model.
* (or maybe use existing fabric.util.fire/observe (if it won't be too slow))
*/
function initCenteringGuidelines(canvas) {
var canvasWidth = canvas.getWidth(),
canvasHeight = canvas.getHeight(),
canvasWidthCenter = canvasWidth / 2,
canvasHeightCenter = canvasHeight / 2,
canvasWidthCenterMap = { },
canvasHeightCenterMap = { },
centerLineMargin = 4,
centerLineColor = 'rgba(255,0,241,0.5)',
centerLineWidth = 1,
ctx = canvas.getSelectionContext(),
viewportTransform;
for (var i = canvasWidthCenter - centerLineMargin, len = canvasWidthCenter + centerLineMargin; i <= len; i++) {
canvasWidthCenterMap[Math.round(i)] = true;
}
for (var i = canvasHeightCenter - centerLineMargin, len = canvasHeightCenter + centerLineMargin; i <= len; i++) {
canvasHeightCenterMap[Math.round(i)] = true;
}
function showVerticalCenterLine() {
showCenterLine(canvasWidthCenter + 0.5, 0, canvasWidthCenter + 0.5, canvasHeight);
}
function showHorizontalCenterLine() {
showCenterLine(0, canvasHeightCenter + 0.5, canvasWidth, canvasHeightCenter + 0.5);
}
function showCenterLine(x1, y1, x2, y2) {
ctx.save();
ctx.strokeStyle = centerLineColor;
ctx.lineWidth = centerLineWidth;
ctx.beginPath();
ctx.moveTo(x1 * viewportTransform[0], y1 * viewportTransform[3]);
ctx.lineTo(x2 * viewportTransform[0], y2 * viewportTransform[3]);
ctx.stroke();
ctx.restore();
}
var afterRenderActions = [],
isInVerticalCenter,
isInHorizontalCenter;
canvas.on('mouse:down', function () {
viewportTransform = canvas.viewportTransform;
});
canvas.on('object:moving', function(e) {
var object = e.target,
objectCenter = object.getCenterPoint(),
transform = canvas._currentTransform;
if (!transform) return;
isInVerticalCenter = Math.round(objectCenter.x) in canvasWidthCenterMap,
isInHorizontalCenter = Math.round(objectCenter.y) in canvasHeightCenterMap;
if (isInHorizontalCenter || isInVerticalCenter) {
object.setPositionByOrigin(new fabric.Point((isInVerticalCenter ? canvasWidthCenter : objectCenter.x), (isInHorizontalCenter ? canvasHeightCenter : objectCenter.y)), 'center', 'center');
}
});
canvas.on('before:render', function() {
if (canvas.contextTop) {
canvas.clearContext(canvas.contextTop);
}
});
canvas.on('after:render', function() {
if (isInVerticalCenter) {
showVerticalCenterLine();
}
if (isInHorizontalCenter) {
showHorizontalCenterLine();
}
});
canvas.on('mouse:up', function() {
// clear these values, to stop drawing guidelines once mouse is up
isInVerticalCenter = isInHorizontalCenter = null;
canvas.renderAll();
});
}

View File

@@ -57,8 +57,8 @@
<ul class="nav navbar-nav navbar-right">
@if (Auth::guest())
<li><a href="{{ url('/login') }}">Login</a></li>
<li><a href="{{ url('/register') }}">Register</a></li>
<li><a href="{{ url('/auth/login') }}">Login</a></li>
<li><a href="{{ url('/auth/register') }}">Register</a></li>
@else
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ Auth::user()->username }} <span class="caret"></span></a>

View File

@@ -2,58 +2,168 @@
@section('content')
<style>
.error{
color: red;
html,
body {
height: 100%;
background: #ffffff;
margin: 0;
overflow: hidden;
}
.form-wrapper{
margin-top: 20%;
.navbar-custom {
display: block;
margin-bottom: 0;
}
.login-wrapper {
height: calc(100vh - 100px);
height: calc(100dvh - 100px);
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
padding: 16px;
}
.login-card {
width: 100%;
max-width: 380px;
background: #ffffff;
border: 1px solid #eceff3;
border-radius: 12px;
padding: 28px;
}
.login-title {
font-size: 24px;
font-weight: 600;
line-height: 1.2;
margin: 0 0 8px;
color: #111827;
}
.login-subtitle {
font-size: 14px;
margin: 0 0 24px;
color: #6b7280;
}
.login-card .form-group {
margin-bottom: 16px;
}
.login-card label {
display: block;
font-size: 13px;
font-weight: 500;
margin-bottom: 6px;
color: #374151;
}
.login-card .form-control {
height: 42px;
border-radius: 8px;
border: 1px solid #d1d5db;
background: #ffffff;
font-size: 14px;
padding: 0 12px;
box-shadow: none;
transition: border-color 0.2s, box-shadow 0.2s;
}
.login-card .form-control:focus {
border-color: #9ca3af;
box-shadow: 0 0 0 3px rgba(156, 163, 175, 0.2);
outline: none;
}
.login-remember-row {
display: flex;
align-items: center;
justify-content: space-between;
margin: 6px 0 18px;
}
.login-remember-row label {
margin: 0;
font-size: 13px;
font-weight: 400;
color: #4b5563;
}
.login-remember-row a {
font-size: 13px;
color: #4b5563;
text-decoration: none;
}
.login-remember-row a:hover {
color: #111827;
}
.btn-login {
width: 100%;
height: 44px;
border: 0;
border-radius: 8px;
background: #111827;
color: #ffffff;
font-size: 14px;
font-weight: 600;
transition: opacity 0.2s;
}
.btn-login:hover {
opacity: 0.92;
color: #ffffff;
}
.login-footer {
margin-top: 18px;
text-align: center;
font-size: 13px;
color: #6b7280;
}
.login-footer a {
color: #111827;
text-decoration: none;
font-weight: 500;
}
.login-footer a:hover {
text-decoration: underline;
}
#login-response-msg .alert {
border-radius: 8px;
font-size: 13px;
margin-bottom: 14px;
}
</style>
<div class="container">
<div class="col-md-4 col-md-offset-4">
<div class="form-wrapper">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="text-center">S I G N - I N</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<div class="login-wrapper">
<div class="login-card">
<h1 class="login-title">Sign in</h1>
<p class="login-subtitle">Welcome back. Please enter your details.</p>
<div id="login-response-msg"></div>
<form role="form" id="frm-login">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label for="username" class="control-label">Email Address</label>
<input type="email" class="form-control" name="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="example@gmail.com">
<span class="help-block"></span>
<label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" value="{{ old('email') }}" placeholder="you@example.com" title="Please enter your email address">
</div>
<div class="form-group">
<label for="password" class="control-label">Password</label>
<input type="password" class="form-control" name="password" placeholder="Password" title="Please enter your password">
<span class="help-block"></span>
<label for="password">Password</label>
<input type="password" class="form-control" name="password" id="password" placeholder="Enter your password" title="Please enter your password">
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="remember"> Remember login
</label>
<p class="help-block">(if this is a private computer)</p>
<div class="login-remember-row">
<label><input type="checkbox" name="remember"> Remember me</label>
<a href="{{ url('/password/email') }}">Forgot password?</a>
</div>
<button type="submit" id="btn-login" class="btn btn-success btn-block"><i class="fa fa-sign-in"></i> &nbsp; Sign in</button>
<a href="{{ url('/password/email') }}" class="btn btn-link btn-block">Forgot Your Password?</a>
<button type="submit" id="btn-login" class="btn-login">Sign in</button>
</form>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<hr />
<p class="text-center">Don't have an account? Register Now!</p>
<a href="{{ url('/register') }}" type="submit" id="btn-login" class="btn btn-primary btn-block">Register</a>
</div>
</div>
</div>
</div>
</div>
<p class="login-footer">Dont have an account? <a href="{{ url('/auth/register') }}">Create one</a></p>
</div>
</div>
@endsection

View File

@@ -2,23 +2,127 @@
@section('content')
<style>
.error{
color: red;
body {
background: #ffffff;
margin: 0;
}
.form-wrapper{
margin-top: 20%;
.navbar-custom {
margin-bottom: 0;
}
.auth-wrapper {
min-height: calc(100vh - 100px);
min-height: calc(100dvh - 100px);
display: flex;
align-items: center;
justify-content: center;
padding: 24px 16px;
box-sizing: border-box;
}
.auth-card {
width: 100%;
max-width: 380px;
background: #ffffff;
border: 1px solid #eceff3;
border-radius: 12px;
padding: 28px;
}
.auth-title {
font-size: 24px;
font-weight: 600;
line-height: 1.2;
margin: 0 0 8px;
color: #111827;
}
.auth-subtitle {
font-size: 14px;
margin: 0 0 20px;
color: #6b7280;
}
.auth-card .form-group {
margin-bottom: 14px;
}
.auth-card label {
display: block;
font-size: 13px;
font-weight: 500;
margin-bottom: 6px;
color: #374151;
}
.auth-card .form-control {
height: 42px;
border-radius: 8px;
border: 1px solid #d1d5db;
background: #ffffff;
font-size: 14px;
padding: 0 12px;
box-shadow: none;
transition: border-color 0.2s, box-shadow 0.2s;
}
.auth-card .form-control:focus {
border-color: #9ca3af;
box-shadow: 0 0 0 3px rgba(156, 163, 175, 0.2);
outline: none;
}
.btn-auth {
width: 100%;
height: 44px;
border: 0;
border-radius: 8px;
background: #111827;
color: #ffffff;
font-size: 14px;
font-weight: 600;
transition: opacity 0.2s;
}
.btn-auth:hover {
opacity: 0.92;
color: #ffffff;
}
.auth-footer {
margin-top: 16px;
text-align: center;
font-size: 13px;
color: #6b7280;
}
.auth-footer a {
color: #111827;
text-decoration: none;
font-weight: 500;
}
.auth-footer a:hover {
text-decoration: underline;
}
.auth-card .alert {
border-radius: 8px;
font-size: 13px;
}
.auth-card .alert ul {
padding-left: 18px;
margin-bottom: 0;
}
</style>
<div class="container">
<div class="col-md-4 col-md-offset-4">
<div class="form-wrapper">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="text-center">R E S E T &nbsp; P A S S W O R D</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<div class="auth-wrapper">
<div class="auth-card">
<h1 class="auth-title">Forgot password</h1>
<p class="auth-subtitle">Enter your email and well send you a reset link.</p>
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
@@ -35,21 +139,17 @@
</ul>
</div>
@endif
<form role="form" method="POST" action="{{ url('/password/email') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label for="username" class="control-label">Email Address</label>
<input type="email" class="form-control" name="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="example@gmail.com">
<span class="help-block"></span>
<label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="you@example.com">
</div>
<button type="submit" class="btn btn-default btn-block">Send Password Reset Link</button>
<button type="submit" class="btn-auth">Send reset link</button>
</form>
<br><br>
</div>
</div>
</div>
</div>
</div>
<p class="auth-footer"><a href="{{ url('/auth/login') }}">Back to sign in</a></p>
</div>
</div>
@endsection

View File

@@ -2,74 +2,194 @@
@section('content')
<style>
.error {
color: red;
body {
background: #ffffff;
margin: 0;
}
.navbar-custom {
margin-bottom: 0;
}
.auth-wrapper {
min-height: calc(100vh - 100px);
min-height: calc(100dvh - 100px);
display: flex;
align-items: flex-start;
justify-content: center;
padding: 24px 16px;
box-sizing: border-box;
}
.auth-card {
width: 100%;
max-width: 560px;
background: #ffffff;
border: 1px solid #eceff3;
border-radius: 12px;
padding: 28px;
}
.auth-title {
font-size: 24px;
font-weight: 600;
line-height: 1.2;
margin: 0 0 8px;
color: #111827;
}
.auth-subtitle {
font-size: 14px;
margin: 0 0 20px;
color: #6b7280;
}
.auth-section-title {
font-size: 12px;
font-weight: 600;
color: #6b7280;
text-transform: uppercase;
letter-spacing: 0.5px;
margin: 8px 0 12px;
}
.auth-card .form-group {
margin-bottom: 14px;
}
.auth-card label {
display: block;
font-size: 13px;
font-weight: 500;
margin-bottom: 6px;
color: #374151;
}
.auth-card .form-control {
height: 42px;
border-radius: 8px;
border: 1px solid #d1d5db;
background: #ffffff;
font-size: 14px;
padding: 0 12px;
box-shadow: none;
transition: border-color 0.2s, box-shadow 0.2s;
}
.auth-card .form-control:focus {
border-color: #9ca3af;
box-shadow: 0 0 0 3px rgba(156, 163, 175, 0.2);
outline: none;
}
.auth-card select.form-control {
padding-right: 28px;
}
.g-recaptcha {
width: 100%;
}
.auth-terms {
font-size: 13px;
color: #6b7280;
margin-bottom: 14px;
}
.auth-terms a {
color: #111827;
text-decoration: none;
}
.auth-terms a:hover {
text-decoration: underline;
}
.btn-register-modern {
width: 100%;
height: 44px;
border: 0;
border-radius: 8px;
background: #111827;
color: #ffffff;
font-size: 14px;
font-weight: 600;
transition: opacity 0.2s;
}
.btn-register-modern:hover {
opacity: 0.92;
color: #ffffff;
}
.auth-footer {
margin-top: 16px;
text-align: center;
font-size: 13px;
color: #6b7280;
}
.auth-footer a {
color: #111827;
text-decoration: none;
font-weight: 500;
}
.auth-footer a:hover {
text-decoration: underline;
}
#register-response-msg .alert {
border-radius: 8px;
font-size: 13px;
margin-bottom: 14px;
}
</style>
<div class="container">
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="form-wrapper">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="text-center">R E G I S T E R</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<div class="auth-wrapper">
<div class="auth-card">
<h1 class="auth-title">Create account</h1>
<p class="auth-subtitle">Fill in your details to get started.</p>
<div id="register-response-msg"></div>
<form role="form" id="frm-register">
<div class="form-group text-center">
<h5>Personal Information</h5>
</div>
<div class="auth-section-title">Personal Information</div>
<input type="hidden" name="redirect" value="{{ Request::get('redirectUrl') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label class="control-label">First name</label>
<label>First name</label>
<input type="text" class="form-control" name="firstname" placeholder="First name">
</div>
<div class="form-group">
<label class="control-label">Last name</label>
<label>Last name</label>
<input type="text" class="form-control" name="lastname" placeholder="Last name">
</div>
<!-- <div class="form-group">
<label class="control-label">Username</label>
<input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="Username">
</div> -->
<div class="form-group">
<label class="control-label">Email Address</label>
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="Email Address">
<label>Email Address</label>
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="you@example.com">
</div>
<div class="form-group">
<label class="control-label">Phone Number</label>
<label>Phone Number</label>
<input type="text" class="form-control" name="mobilenumber" placeholder="Phone Number">
</div>
<div class="form-group">
<label class="control-label">Password</label>
<label>Password</label>
<input type="password" class="form-control" name="password" id="password" required placeholder="Password">
</div>
<div class="form-group">
<label class="control-label">Confirm Password</label>
<label>Confirm Password</label>
<input type="password" class="form-control" name="password_confirmation" placeholder="Confirm Password" data-rule-equalTo="#password" required>
</div>
<div class="form-group text-center">
<h5>Address Information</h5>
</div>
<div class="auth-section-title">Address Information</div>
<div class="form-group">
<label class="control-label">Select Country</label>
<label>Select Country</label>
<select name="countryCode" id="select_country" class="form-control" onchange="selectCountry(this)">
<option value="">Select Country</option>
<option value="US">United States</option>
@@ -78,60 +198,46 @@
</div>
<div class="form-group">
<label class="control-label">State / Province</label>
<label></label>
<label>State / Province</label>
<select class="form-control" name="state" id="lst-states">
<option value="">Select State</option>
</select>
</div>
<div class="form-group">
<label class="control-label">City</label>
<label>City</label>
<select class="form-control" name="city" id="lst-cities">
<option value="">Select City</option>
</select>
</div>
<div class="form-group">
<label class="control-label">Address 1</label>
<label>Address 1</label>
<input type="text" class="form-control" name="address" placeholder="Address 1">
</div>
<div class="form-group">
<label class="control-label">Address 2</label>
<label>Address 2</label>
<input type="text" class="form-control" name="address2" placeholder="Address 2">
</div>
<div class="form-group">
<label class="control-label">Zip Code</label>
<label>Zip Code</label>
<input type="text" class="form-control" name="zipcode" placeholder="Please enter your zip code">
</div>
<div class="form-group">
<div class="g-recaptcha text-center" data-sitekey="{{ env('CAPTCHA_SITE_KEY') }}"></div>
</div>
<div class="form-group">
<p>By clicking Register, you agree to our <a href="#">Terms of Use</a> and that you have read our <a href="#">Privacy Policy</a>.</p>
</div>
<div class="form-group">
<button type="submit" id="btn-register" class="btn btn-primary btn-block">Register</button>
</div>
<p class="auth-terms">By clicking Register, you agree to our <a href="#">Terms of Use</a> and that you have read our <a href="#">Privacy Policy</a>.</p>
<div class="form-group">
<button type="submit" id="btn-register" class="btn-register-modern">Register</button>
</div>
</form>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<hr />
<p class="text-center">Have already an account?</p>
<a href="{{ url('/login') }}" type="submit" id="btn-login" class="btn btn-success btn-block">Login here</a>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="auth-footer">Already have an account? <a href="{{ url('/auth/login') }}">Sign in</a></p>
</div>
</div>
@endsection

View File

@@ -3,23 +3,127 @@
@section('content')
<style>
.error{
color: red;
body {
background: #ffffff;
margin: 0;
}
.form-wrapper{
margin-top: 20%;
.navbar-custom {
margin-bottom: 0;
}
.auth-wrapper {
min-height: calc(100vh - 100px);
min-height: calc(100dvh - 100px);
display: flex;
align-items: center;
justify-content: center;
padding: 24px 16px;
box-sizing: border-box;
}
.auth-card {
width: 100%;
max-width: 380px;
background: #ffffff;
border: 1px solid #eceff3;
border-radius: 12px;
padding: 28px;
}
.auth-title {
font-size: 24px;
font-weight: 600;
line-height: 1.2;
margin: 0 0 8px;
color: #111827;
}
.auth-subtitle {
font-size: 14px;
margin: 0 0 20px;
color: #6b7280;
}
.auth-card .form-group {
margin-bottom: 14px;
}
.auth-card label {
display: block;
font-size: 13px;
font-weight: 500;
margin-bottom: 6px;
color: #374151;
}
.auth-card .form-control {
height: 42px;
border-radius: 8px;
border: 1px solid #d1d5db;
background: #ffffff;
font-size: 14px;
padding: 0 12px;
box-shadow: none;
transition: border-color 0.2s, box-shadow 0.2s;
}
.auth-card .form-control:focus {
border-color: #9ca3af;
box-shadow: 0 0 0 3px rgba(156, 163, 175, 0.2);
outline: none;
}
.btn-auth {
width: 100%;
height: 44px;
border: 0;
border-radius: 8px;
background: #111827;
color: #ffffff;
font-size: 14px;
font-weight: 600;
transition: opacity 0.2s;
}
.btn-auth:hover {
opacity: 0.92;
color: #ffffff;
}
.auth-footer {
margin-top: 16px;
text-align: center;
font-size: 13px;
color: #6b7280;
}
.auth-footer a {
color: #111827;
text-decoration: none;
font-weight: 500;
}
.auth-footer a:hover {
text-decoration: underline;
}
.auth-card .alert {
border-radius: 8px;
font-size: 13px;
}
.auth-card .alert ul {
padding-left: 18px;
margin-bottom: 0;
}
</style>
<div class="container">
<div class="col-md-4 col-md-offset-4">
<div class="form-wrapper">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="text-center">R E S E T &nbsp; P A S S W O R D</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<div class="auth-wrapper">
<div class="auth-card">
<h1 class="auth-title">Reset password</h1>
<p class="auth-subtitle">Set a new password for your account.</p>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br>
@@ -30,33 +134,27 @@
</ul>
</div>
@endif
<form role="form" method="POST" action="{{ url('/password/reset') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group">
<label class="control-label">Email Address</label>
<input type="email" class="form-control" name="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="example@gmail.com">
<span class="help-block"></span>
<label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="you@example.com">
</div>
<div class="form-group">
<label class="control-label">Password</label>
<input type="password" class="form-control" name="password" placeholder="Password">
<span class="help-block"></span>
<label for="password">Password</label>
<input type="password" class="form-control" name="password" id="password" placeholder="New password">
</div>
<div class="form-group">
<label class="control-label">Confirm Password</label>
<input type="password" class="form-control" name="password_confirmation" placeholder="Confirm Password">
<span class="help-block"></span>
<label for="password_confirmation">Confirm Password</label>
<input type="password" class="form-control" name="password_confirmation" id="password_confirmation" placeholder="Confirm password">
</div>
<button type="submit" class="btn btn-default btn-block">Reset Password</button>
<button type="submit" class="btn-auth">Reset password</button>
</form>
<br><br>
</div>
</div>
</div>
</div>
</div>
<p class="auth-footer"><a href="{{ url('/auth/login') }}">Back to sign in</a></p>
</div>
</div>
@endsection

View File

@@ -886,8 +886,8 @@
<script src="{{asset('/designer/js/custom-script.js')}}"></script>
<script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
<script src="https://rawgit.com/fabricjs/fabric.js/master/lib/centering_guidelines.js"></script>
<script src="https://rawgit.com/fabricjs/fabric.js/master/lib/aligning_guidelines.js"></script>
<script src="{{asset('/designer/js/centering_guidelines.js')}}"></script>
<script src="{{asset('/designer/js/aligning_guidelines.js')}}"></script>
<script>
$(document).ready(function() {

View File

@@ -407,7 +407,7 @@
<td align="left" style="width: 180px;">
@foreach($img_thumb as $img)
@if($img->ProductId == $item->ProductId)
<img style="height: 200px; overflow: hidden; object-fit: contain;" src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
<img style="height: 200px; overflow: hidden; object-fit: contain;" src="{{ minio_url('images/' . $img->Image) }}">
@endif
@endforeach
</td>

View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Test Email CREW Sportswear</title>
</head>
<body style="font-family: Arial, sans-serif; color: #333; padding: 20px;">
<h2 style="color: #d9534f;">CREW Sportswear Test Email</h2>
<p>This is a test email to verify that the mail configuration is working correctly.</p>
<p>Sent to: <strong>{{ $recipient }}</strong></p>
<hr>
<p style="font-size: 12px; color: #777;">
<strong>Mail Config Used:</strong><br>
Driver: {{ $config['driver'] }}<br>
Host: {{ $config['host'] }}<br>
Port: {{ $config['port'] }}<br>
Username: {{ $config['username'] }}<br>
Encryption: {{ $config['encryption'] }}
</p>
<hr>
<p style="font-size: 12px; color: #aaa;">This is an automated test message from CREW Sportswear.</p>
</body>
</html>

View File

@@ -21,24 +21,22 @@
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right navbar-nav-custom">
@if (Request::segment(2) == "hi-five-sports-club" || Request::segment(2) == "hi-five-sports-zone")
<li style="font-size: 14px;"></li>
<li class="nav-item-main"></li>
@else
<li style="font-size: 14px;">
<a href="{{ url('teamstore') }}"><span style="text-transform:uppercase;">Team Store</span></a>
<li class="nav-item-main">
<a href="{{ url('teamstore') }}" class="nav-link-main"><span>Team Store</span></a>
</li>
@endif
<li style="font-size: 14px;">
<a href="{{ url('cart') }}"><span style="text-transform:uppercase;">My Cart</span> <i class="fa fa-shopping-cart"></i>
<li class="nav-item-main">
<a href="{{ url('cart') }}" class="nav-link-main"><span>My Cart</span> <i class="fa fa-shopping-cart"></i>
<span class="badge" id="my-cart-count">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
</a>
</li>
<li>
<a href="#" class="dropdown-toggle user-profile" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-bars" style="font-size: 21px;"></i></a>
<ul class="dropdown-menu">
<a href="#" class="dropdown-toggle user-profile nav-menu-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-bars"></i></a>
<ul class="dropdown-menu navbar-menu-dropdown">
@if (Auth::guest())
@if(Request::segment(1) == "designer")
@@ -50,10 +48,10 @@
</li>
@else
<li>
<a href="{{ url('/login') }}" title="Login">Sign in</a>
<a href="{{ url('/auth/login') }}" title="Login">Sign in</a>
</li>
<li>
<a href="{{ url('/register') }}" title="Register">Register</a>
<a href="{{ url('/auth/register') }}" title="Register">Register</a>
</li>
@endif
@@ -88,6 +86,155 @@
</nav>
<style>
.navbar-custom {
min-height: 78px;
background: #ffffff;
border: 0;
border-bottom: 1px solid #e5e7eb;
box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08);
margin-bottom: 18px;
}
.navbar-custom .container {
position: relative;
}
.navbar-brand {
height: 78px;
padding: 10px 0;
}
.navbar-brand>img {
height: 58px;
padding: 0;
width: auto;
}
.navbar-nav-custom > li > a.nav-link-main {
color: #1f2937 !important;
font-size: 13px;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.45px;
border-radius: 8px;
padding: 8px 12px;
margin-top: 0;
transition: background-color 0.2s, color 0.2s;
}
.navbar-nav-custom > li > a.nav-link-main:hover,
.navbar-nav-custom > li > a.nav-link-main:focus {
color: #111827 !important;
background: #f3f4f6 !important;
}
.nav-menu-toggle {
margin-top: 0 !important;
border: 1px solid #d1d5db;
border-radius: 8px;
width: 42px;
height: 42px;
display: flex !important;
align-items: center;
justify-content: center;
color: #374151 !important;
transition: background-color 0.2s, border-color 0.2s;
}
.nav-menu-toggle:hover,
.nav-menu-toggle:focus {
background: #f3f4f6 !important;
border-color: #9ca3af;
}
.nav-menu-toggle i {
font-size: 18px;
}
.navbar-menu-dropdown {
margin-top: 8px;
border: 1px solid #e5e7eb;
border-radius: 10px;
overflow: hidden;
box-shadow: 0 10px 24px rgba(15, 23, 42, 0.14);
}
.navbar-menu-dropdown > li > a {
padding: 10px 14px;
font-size: 13px;
}
.navbar-menu-dropdown > li > a:hover {
background: #f8fafc;
color: #111827;
}
.navbar-menu-dropdown .dropdown-header {
font-size: 12px;
font-weight: 700;
color: #334155;
padding: 10px 14px;
}
.badge {
font-size: 11px;
min-width: 24px;
height: 24px;
line-height: 24px;
border-radius: 999px;
background: #16a34a;
padding: 0 7px;
margin-left: 6px;
vertical-align: middle;
}
.navbar-toggle {
margin-top: 22px;
border: 1px solid #d1d5db;
}
.navbar-toggle .icon-bar {
background: #374151 !important;
}
@media (min-width: 768px) {
.navbar-nav-custom {
min-height: 78px;
display: flex;
align-items: center;
margin: 0;
}
.navbar-nav-custom > li {
float: none;
}
}
@media (max-width: 768px){
.navbar-default .navbar-collapse,
.navbar-default .navbar-form {
margin-top: 12px;
border-top: 1px solid #e5e7eb;
background: #ffffff;
border-radius: 10px;
padding: 8px;
}
.navbar-nav-custom > li > a.nav-link-main {
margin-top: 0;
}
.nav-menu-toggle {
margin-top: 0 !important;
}
}
@media (min-width: 768px){
.navbar-default .navbar-nav>li>a {
margin-top: 0;
}
}
#nav{
list-style:none;
margin-bottom:10px;
@@ -143,41 +290,8 @@
background:#3d4248;
}
.navbar-brand {
padding: 0px; /* firefox bug fix */
}
.navbar-brand>img {
height: 200%;
padding: 15px; /* firefox bug fix */
width: auto;
}
.navbar-custom{
min-height: 100px;
}
@media (max-width: 768px){
.navbar-default .navbar-collapse, .navbar-default .navbar-form{
margin-top: 50px;
}
}
@media (min-width: 768px){
.navbar-default .navbar-nav>li>a{
margin-top: 23px;
}
}
.badge{
font-size: 14px;
width:35px;
border-radius: 0px;
}
.navbar-default .navbar-nav>li>a:hover {
background-color: #777;
background-color: #f3f4f6;
}
.modal {
@@ -198,6 +312,158 @@
text-align: left;
vertical-align: middle;
}
#about_us_modal .modal-content {
border: 0;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 14px 34px rgba(0, 0, 0, 0.22);
}
#about_us_modal .modal-header {
background: #f8fafc;
border-bottom: 1px solid #e5e7eb;
padding: 16px 20px;
}
#about_us_modal .modal-title {
font-size: 20px;
font-weight: 700;
color: #111827;
}
.about-us-content {
color: #334155;
font-size: 14px;
line-height: 1.7;
}
.about-us-intro {
margin: 0 0 14px;
color: #475569;
}
.about-us-block {
border: 1px solid #e5e7eb;
border-radius: 10px;
padding: 14px;
margin-bottom: 12px;
background: #ffffff;
}
.about-us-block h5 {
margin: 0 0 8px;
font-size: 14px;
font-weight: 700;
color: #111827;
text-transform: uppercase;
letter-spacing: 0.3px;
}
.about-us-block p {
margin: 0;
}
.about-us-list {
margin: 0;
padding-left: 18px;
}
.about-us-list li {
margin-bottom: 6px;
}
#about_us_modal .modal-footer {
border-top: 1px solid #e5e7eb;
background: #f8fafc;
padding: 12px 20px;
}
@media (max-width: 767px) {
.about-us-block {
padding: 12px;
}
}
#contact_us_modal .modal-content {
border: 0;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 14px 34px rgba(0, 0, 0, 0.22);
}
#contact_us_modal .modal-header {
background: #f8fafc;
border-bottom: 1px solid #e5e7eb;
padding: 16px 20px;
}
#contact_us_modal .modal-title {
font-size: 20px;
font-weight: 700;
color: #111827;
}
#contact_us_modal .modal-body {
padding: 20px;
}
.contact-modal-subtitle {
margin: 0 0 16px;
font-size: 14px;
color: #6b7280;
}
.contact-card {
border: 1px solid #e5e7eb;
border-radius: 10px;
padding: 14px;
background: #fff;
min-height: 140px;
}
.contact-card-title {
margin: 0 0 10px;
font-size: 13px;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.4px;
color: #6b7280;
}
.contact-card-value {
margin: 0;
font-size: 15px;
line-height: 1.6;
color: #111827;
word-break: break-word;
}
.contact-card-value a {
color: #1d4ed8;
text-decoration: none;
}
.contact-card-value a:hover {
text-decoration: underline;
}
#contact_us_modal .modal-footer {
border-top: 1px solid #e5e7eb;
background: #f8fafc;
padding: 12px 20px;
}
@media (max-width: 767px) {
#contact_us_modal .modal-body {
padding: 16px;
}
.contact-card {
min-height: 0;
margin-bottom: 12px;
}
}
</style>
<!-- Privacy Modal -->
@@ -248,7 +514,31 @@
<h4 class="modal-title">About Us</h4>
</div>
<div class="modal-body">
<p>Coming soon.</p>
<div class="about-us-content">
<p class="about-us-intro">Crew Sportswear helps teams, schools, and organizations bring their identity to life through high-quality custom apparel and team store experiences.</p>
<div class="about-us-block">
<h5>Who We Are</h5>
<p>We are a team focused on custom uniforms, spirit wear, and branded gear built for athletes, students, and supporters. Our goal is to make ordering team apparel simple, consistent, and reliable.</p>
</div>
<div class="about-us-block">
<h5>What We Do</h5>
<ul class="about-us-list">
<li>Custom team uniforms and apparel across multiple sports</li>
<li>Print-on-demand production for flexible ordering and fulfillment</li>
<li>Design-your-own apparel with our online designer tool</li>
<li>Private or public online team stores for easy ordering</li>
<li>Batch and individual order workflows depending on program needs</li>
<li>Support for team branding, sizing, and product selection</li>
</ul>
</div>
<div class="about-us-block">
<h5>Our Commitment</h5>
<p>Were committed to clear communication, dependable production quality, and a smooth customer experience from store launch through fulfillment.</p>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -266,15 +556,28 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Contact Us</h4>
</div>
<div class="modal-body text-center">
<h1>Contact Us</h1>
<hr>
<h3>Email Address: <small><a href="#">customer-service@crewsportswear.com</a></small></h3>
<h3>Address: <small><a href="#">1281 Humbracht Circle
Suite J
Bartlett, Illinois
60103</a></small>
</h3>
<div class="modal-body">
<p class="contact-modal-subtitle">Were here to help. Reach out through any of the contact options below.</p>
<div class="row">
<div class="col-sm-6">
<div class="contact-card">
<h5 class="contact-card-title">Email Address</h5>
<p class="contact-card-value">
<a href="mailto:customer-service@crewsportswear.com">customer-service@crewsportswear.com</a>
</p>
</div>
</div>
<div class="col-sm-6">
<div class="contact-card">
<h5 class="contact-card-title">Address</h5>
<p class="contact-card-value">
1281 Humbracht Circle<br>
Suite J<br>
Bartlett, Illinois 60103
</p>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

View File

@@ -1,96 +1,171 @@
<div>
<div>Privacy Policy</div>
<br />
<div>Your privacy is important to us. It is Crew Sportswear's policy to respect your privacy regarding any information we may collect from you across our website, http://crewsportswear.com, and other sites we own and operate.</div>
<br />
<div>1. Information we collect</div>
<br />
<div>Log data</div>
<br />
<div>When you visit our website, our servers may automatically log the standard data provided by your web browser. It may include your computer&rsquo;s Internet Protocol (IP) address, your browser type and version, the pages you visit, the time and date of your visit, the time spent on each page, and other details.</div>
<br /><br />
<div>Personal information</div>
<br />
<div>We may ask for personal information, such as your:</div>
<br /><br />
<div>NameEmailSocial media profilesDate of birthPhone/mobile numberHome/Mailing addressWork addressPayment information</div>
<br />
<div>2. Legal bases for processing</div>
<br />
<div>We will process your personal information lawfully, fairly and in a transparent manner. We collect and process information about you only where we have legal bases for doing so.</div>
<div>&nbsp;</div>
<div>These legal bases depend on the services you use and how you use them, meaning we collect and use your information only where:</div>
<div>&nbsp;</div>
<br />
<div>&nbsp;&nbsp;&nbsp;&nbsp;it&rsquo;s necessary for the performance of a contract to which you are a party or to take steps at your request before entering into such a contract (for example, when we provide a service you request from us);</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;it satisfies a legitimate interest (which is not overridden by your data protection interests), such as for research and development, to market and promote our services, and to protect our legal rights and interests;</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;you give us consent to do so for a specific purpose (for example, you might consent to us sending you our newsletter); or</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;we need to process your data to comply with a legal obligation.</div>
<br />
<div>&nbsp;</div>
<div>Where you consent to our use of information about you for a specific purpose, you have the right to change your mind at any time (but this will not affect any processing that has already taken place).</div>
<div>&nbsp;</div>
<div>We don&rsquo;t keep personal information for longer than is necessary. While we retain this information, we will protect it within commercially acceptable means to prevent loss and theft, as well as unauthorised access, disclosure, copying, use or modification. That said, we advise that no method of electronic transmission or storage is 100% secure and cannot guarantee absolute data security. If necessary, we may retain your personal information for our compliance with a legal obligation or in order to protect your vital interests or the vital interests of another natural person.</div>
<br />
<div>3. Collection and use of information</div>
<br />
<div>We may collect, hold, use and disclose information for the following purposes and personal information will not be further processed in a manner that is incompatible with these purposes:</div>
<br /><br />
<div>to enable you to customise or personalise your experience of our website;to enable you to access and use our website, associated applications and associated social media platforms;to contact and communicate with you;for internal record keeping and administrative purposes;for analytics, market research and business development, including to operate and improve our website, associated applications and associated social media platforms;to run competitions and/or offer additional benefits to you;for advertising and marketing, including to send you promotional information about our products and services and information about third parties that we consider may be of interest to you; andto comply with our legal obligations and resolve any disputes that we may have.</div>
<br />
<div>4. Disclosure of personal information to third parties</div>
<br />
<div>We may disclose personal information to:</div>
<br /><br />
<div>third party service providers for the purpose of enabling them to provide their services, including (without limitation) IT service providers, data storage, hosting and server providers, ad networks, analytics, error loggers, debt collectors, maintenance or problem-solving providers, marketing or advertising providers, professional advisors and payment systems operators;our employees, contractors and/or related entities; andcredit reporting agencies, courts, tribunals and regulatory authorities, in the event you fail to pay for goods or services we have provided to you.</div>
<br />
<div>5. International transfers of personal information</div>
<br />
<div>The personal information we collect is stored and processed in United States, or where we or our partners, affiliates and third-party providers maintain facilities. By providing us with your personal information, you consent to the disclosure to these overseas third parties.</div>
<br />
<div>We will ensure that any transfer of personal information from countries in the European Economic Area (EEA) to countries outside the EEA will be protected by appropriate safeguards, for example by using standard data protection clauses approved by the European Commission, or the use of binding corporate rules or other legally accepted means.</div>
<br />
<div>Where we transfer personal information from a non-EEA country to another country, you acknowledge that third parties in other jurisdictions may not be subject to similar data protection laws to the ones in our jurisdiction. There are risks if any such third party engages in any act or practice that would contravene the data privacy laws in our jurisdiction and this might mean that you will not be able to seek redress under our jurisdiction&rsquo;s privacy laws.</div>
<br />
<div>6. Your rights and controlling your personal information</div>
<br />
<div>Choice and consent: By providing personal information to us, you consent to us collecting, holding, using and disclosing your personal information in accordance with this privacy policy. If you are under 16 years of age, you must have, and warrant to the extent permitted by law to us, that you have your parent or legal guardian&rsquo;s permission to access and use the website and they (your parents or guardian) have consented to you providing us with your personal information. You do not have to provide personal information to us, however, if you do not, it may affect your use of this website or the products and/or services offered on or through it.</div>
<br />
<div>Information from third parties: If we receive personal information about you from a third party, we will protect it as set out in this privacy policy. If you are a third party providing personal information about somebody else, you represent and warrant that you have such person&rsquo;s consent to provide the personal information to us.</div>
<br />
<div>Restrict: You may choose to restrict the collection or use of your personal information. If you have previously agreed to us using your personal information for direct marketing purposes, you may change your mind at any time by contacting us using the details below. If you ask us to restrict or limit how we process your personal information, we will let you know how the restriction affects your use of our website or products and services.</div>
<br />
<div>Access and data portability: You may request details of the personal information that we hold about you. You may request a copy of the personal information we hold about you. Where possible, we will provide this information in CSV format or other easily readable machine format. You may request that we erase the personal information we hold about you at any time. You may also request that we transfer this personal information to another third party.</div>
<br />
<div>Correction: If you believe that any information we hold about you is inaccurate, out of date, incomplete, irrelevant or misleading, please contact us using the details below. We will take reasonable steps to correct any information found to be inaccurate, incomplete, misleading or out of date.</div>
<br />
<div>Notification of data breaches: We will comply laws applicable to us in respect of any data breach.</div>
<br />
<div>Complaints: If you believe that we have breached a relevant data protection law and wish to make a complaint, please contact us using the details below and provide us with full details of the alleged breach. We will promptly investigate your complaint and respond to you, in writing, setting out the outcome of our investigation and the steps we will take to deal with your complaint. You also have the right to contact a regulatory body or data protection authority in relation to your complaint.</div>
<br />
<div>Unsubscribe: To unsubscribe from our e-mail database or opt-out of communications (including marketing communications), please contact us using the details below or opt-out using the opt-out facilities provided in the communication.</div>
<br />
<div>7. Cookies</div>
<br />
<div>We use &ldquo;cookies&rdquo; to collect information about you and your activity across our site. A cookie is a small piece of data that our website stores on your computer, and accesses each time you visit, so we can understand how you use our site. This helps us serve you content based on preferences you have specified. Please refer to our Cookie Policy for more information.</div>
<br />
<div>8. Business transfers</div>
<br />
<div>If we or our assets are acquired, or in the unlikely event that we go out of business or enter bankruptcy, we would include data among the assets transferred to any parties who acquire us. You acknowledge that such transfers may occur, and that any parties who acquire us may continue to use your personal information according to this policy.</div>
<br />
<div>9. Limits of our policy</div>
<br />
<div>Our website may link to external sites that are not operated by us. Please be aware that we have no control over the content and policies of those sites, and cannot accept responsibility or liability for their respective privacy practices.</div>
<br />
<div>10. Changes to this policy</div>
<br />
<div>At our discretion, we may change our privacy policy to reflect current acceptable practices. We will take reasonable steps to let users know about changes via our website. Your continued use of this site after any changes to this policy will be regarded as acceptance of our practices around privacy and personal information.</div>
<br />
<div>If we make a significant change to this privacy policy, for example changing a lawful basis on which we process your personal information, we will ask you to re-consent to the amended privacy policy.</div>
<br /><br />
<div>Crew Sportswear Data Controller</div>
<div>Angelo Garcia</div>
<div>angelo@crewsportswear.com</div>
<br /><br /><br />
<div>This policy is effective as of 23 February 2019.</div>
<style>
.privacy-policy {
color: #334155;
font-size: 14px;
line-height: 1.7;
}
.privacy-title {
margin: 0 0 6px;
font-size: 26px;
font-weight: 700;
color: #111827;
}
.privacy-intro {
margin: 0 0 18px;
color: #64748b;
}
.privacy-section {
background: #ffffff;
border: 1px solid #e5e7eb;
border-radius: 10px;
padding: 14px 16px;
margin-bottom: 12px;
}
.privacy-section h5 {
margin: 0 0 8px;
font-size: 15px;
font-weight: 700;
color: #111827;
}
.privacy-section p {
margin: 0 0 10px;
}
.privacy-section p:last-child {
margin-bottom: 0;
}
.privacy-section ul {
margin: 0 0 10px 18px;
padding: 0;
}
.privacy-section li {
margin-bottom: 5px;
}
.privacy-footnote {
margin-top: 12px;
border-top: 1px solid #e5e7eb;
padding-top: 12px;
font-size: 13px;
color: #6b7280;
}
.privacy-contact {
background: #f8fafc;
}
</style>
<div class="privacy-policy">
<h3 class="privacy-title">Privacy Policy</h3>
<p class="privacy-intro">Your privacy is important to us. It is Crew Sportswear's policy to respect your privacy regarding any information we may collect from you across our website, http://crewsportswear.com, and other sites we own and operate.</p>
<div class="privacy-section">
<h5>1. Information we collect</h5>
<p><strong>Log data:</strong> When you visit our website, our servers may automatically log the standard data provided by your web browser. It may include your computers Internet Protocol (IP) address, your browser type and version, the pages you visit, the time and date of your visit, the time spent on each page, and other details.</p>
<p><strong>Personal information:</strong> We may ask for personal information, such as your:</p>
<ul>
<li>Name</li>
<li>Email</li>
<li>Social media profiles</li>
<li>Date of birth</li>
<li>Phone/mobile number</li>
<li>Home/Mailing address</li>
<li>Work address</li>
<li>Payment information</li>
</ul>
</div>
<div class="privacy-section">
<h5>2. Legal bases for processing</h5>
<p>We will process your personal information lawfully, fairly and in a transparent manner. We collect and process information about you only where we have legal bases for doing so.</p>
<p>These legal bases depend on the services you use and how you use them, meaning we collect and use your information only where:</p>
<ul>
<li>its necessary for the performance of a contract to which you are a party or to take steps at your request before entering into such a contract;</li>
<li>it satisfies a legitimate interest (which is not overridden by your data protection interests), such as research and development, marketing and legal protection;</li>
<li>you give us consent to do so for a specific purpose; or</li>
<li>we need to process your data to comply with a legal obligation.</li>
</ul>
<p>Where you consent to our use of information about you for a specific purpose, you have the right to change your mind at any time (but this will not affect any processing that has already taken place).</p>
<p>We dont keep personal information for longer than is necessary. While we retain this information, we will protect it within commercially acceptable means to prevent loss and theft, as well as unauthorised access, disclosure, copying, use or modification. That said, we advise that no method of electronic transmission or storage is 100% secure and cannot guarantee absolute data security.</p>
</div>
<div class="privacy-section">
<h5>3. Collection and use of information</h5>
<p>We may collect, hold, use and disclose information for the following purposes and personal information will not be further processed in a manner that is incompatible with these purposes:</p>
<ul>
<li>to enable you to customise or personalise your experience of our website;</li>
<li>to enable you to access and use our website, associated applications and associated social media platforms;</li>
<li>to contact and communicate with you;</li>
<li>for internal record keeping and administrative purposes;</li>
<li>for analytics, market research and business development;</li>
<li>to run competitions and/or offer additional benefits;</li>
<li>for advertising and marketing communications; and</li>
<li>to comply with legal obligations and resolve disputes.</li>
</ul>
</div>
<div class="privacy-section">
<h5>4. Disclosure of personal information to third parties</h5>
<p>We may disclose personal information to:</p>
<ul>
<li>third party service providers (including IT, hosting, analytics, marketing, advisors, and payment providers);</li>
<li>our employees, contractors and/or related entities; and</li>
<li>credit reporting agencies, courts, tribunals and regulatory authorities where required.</li>
</ul>
</div>
<div class="privacy-section">
<h5>5. International transfers of personal information</h5>
<p>The personal information we collect is stored and processed in United States, or where we or our partners, affiliates and third-party providers maintain facilities. By providing us with your personal information, you consent to disclosure to these overseas third parties.</p>
<p>We will ensure that any transfer of personal information from countries in the European Economic Area (EEA) to countries outside the EEA is protected by appropriate safeguards.</p>
<p>Where we transfer personal information from a non-EEA country to another country, you acknowledge that third parties in other jurisdictions may not be subject to similar data protection laws.</p>
</div>
<div class="privacy-section">
<h5>6. Your rights and controlling your personal information</h5>
<p><strong>Choice and consent:</strong> By providing personal information to us, you consent to us collecting, holding, using and disclosing your personal information in accordance with this privacy policy.</p>
<p><strong>Information from third parties:</strong> If we receive personal information about you from a third party, we will protect it as set out in this privacy policy.</p>
<p><strong>Restrict:</strong> You may choose to restrict the collection or use of your personal information.</p>
<p><strong>Access and data portability:</strong> You may request details or a copy of the personal information we hold about you, and request transfer to another third party where possible.</p>
<p><strong>Correction:</strong> If you believe any information we hold is inaccurate or out of date, please contact us so we can correct it.</p>
<p><strong>Notification of data breaches:</strong> We will comply with laws applicable to us in respect of any data breach.</p>
<p><strong>Complaints:</strong> If you believe we have breached a relevant data protection law, please contact us with full details and we will promptly investigate.</p>
<p><strong>Unsubscribe:</strong> To unsubscribe from communications, contact us using the details below or use opt-out facilities provided in communications.</p>
</div>
<div class="privacy-section">
<h5>7. Cookies</h5>
<p>We use “cookies” to collect information about you and your activity across our site. A cookie is a small piece of data that our website stores on your computer and accesses each time you visit. Please refer to our Cookie Policy for more information.</p>
</div>
<div class="privacy-section">
<h5>8. Business transfers</h5>
<p>If we or our assets are acquired, or if we go out of business or enter bankruptcy, data may be transferred to parties who acquire us. Any acquiring parties may continue to use your personal information according to this policy.</p>
</div>
<div class="privacy-section">
<h5>9. Limits of our policy</h5>
<p>Our website may link to external sites that are not operated by us. We have no control over the content and policies of those sites and cannot accept responsibility or liability for their respective privacy practices.</p>
</div>
<div class="privacy-section">
<h5>10. Changes to this policy</h5>
<p>At our discretion, we may change our privacy policy to reflect current acceptable practices. We will take reasonable steps to let users know about changes via our website. Your continued use of this site after changes to this policy will be regarded as acceptance of our practices around privacy and personal information.</p>
<p>If we make a significant change to this privacy policy, such as changing a lawful basis on which we process your personal information, we will ask you to re-consent to the amended privacy policy.</p>
</div>
<div class="privacy-section privacy-contact">
<h5>Crew Sportswear Data Controller</h5>
<p>Angelo Garcia</p>
<p><a href="mailto:angelo@crewsportswear.com">angelo@crewsportswear.com</a></p>
</div>
<p class="privacy-footnote">This policy is effective as of 23 February 2019.</p>
</div>

View File

@@ -37,7 +37,7 @@
</div>
</div>
@if($row && count($row) > 0)
@if(count($row) > 0)
<div class="row">
<div class="col-md-4 col-md-push-8 order-summary" >
@@ -138,7 +138,7 @@
<div class="text-center">
@foreach($img_thumb as $img)
@if($img->ProductId == $item->ProductId)
<img class="previewImage" src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
<img class="previewImage" src="{{ minio_url('images/' . $img->Image) }}">
@endif
@endforeach
</div>

View File

@@ -64,7 +64,7 @@
<table class="table">
<tr>
<td rowspan="2" class="text-center"><img class="previewImage" src="http://{{ config('site_config.images_url') }}/{{ $item->Image }} "></td>
<td rowspan="2" class="text-center"><img class="previewImage" src="{{ minio_url('images/' . $item->Image) }}"></td>
<td colspan="5">
<h4>{{ $item->ProductName }} {{ $itemOrder }} <br>Price: ${{ $item->Price }}</h4>
</td>

View File

@@ -8,14 +8,8 @@
<div class="row">
<div class="col-md-12" >
<ul class="breadcrumb">
<li class=""><a href="{{ url('/') }}">Home</a></li>
<li class="active">
@if($array_sports && $array_sports->count() > 0)
{!! $array_sports->first()->SportsName !!}
@else
Category
@endif
</li>
<li class=""><a href="{{url()}}">Home</a></li>
<li class="active"> {{ $array_sports[0]->SportsName }} </li>
</ul>
</div>
</div>
@@ -24,12 +18,12 @@
@foreach ($row as $r)
<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 ?? 'default.png')) }}" alt="{{ $r->Category ?? 'Category' }}" class="image" />
<a href="{{ url() }}/{{ Request::path() }}/{{ $r->Id }}">
<img src="{{ minio_url('uploads/images/sports-category/' . $r->Thumbnail) }}" alt="{{ $r->Category }}" class="image" />
</a>
</div>
<div class="text-center">
<h3 class="sports-title">{{ $r->Category ?? 'Unknown' }}</h3>
<h3 class="sports-title">{{ $r->Category }}</h3>
</div>
</div>
@endforeach

View File

@@ -8,7 +8,7 @@
<div class="row">
<div class="col-md-12" >
<ul class="breadcrumb">
<li class=""><a href="{{url('/')}}">Home</a></li>
<li class=""><a href="{{url()}}">Home</a></li>
<li class=""><a href="{{url('sports')}}/{{ $cat }}" >{{ $cat }}</a></li>
<li class="active"> {{ $array_category[0]->Category }}</li>
</ul>

View File

@@ -7,14 +7,17 @@
@endif
<style>
body {
background: #f4f6f8;
}
h2 {
width: 100%;
margin: 0;
padding: 0;
text-align: center;
margin-top: 40px;
margin-bottom: 40px;
margin-top: 34px;
margin-bottom: 24px;
}
/* h2:after {
display: inline-block;
@@ -41,6 +44,15 @@
font-size: 12px;
margin-top: 5px;
}
.featured-title {
font-size: 24px;
font-weight: 700;
letter-spacing: 0.6px;
color: #111827;
text-transform: uppercase;
}
.price{
font-size: 25px;
margin: 0 auto;
@@ -51,19 +63,107 @@
border-bottom: 2px solid #4B8E4B;
}
.thumbnail{
/* opacity:0.70; */
-webkit-transition: all 0.5s;
transition: all 0.5s;
}
.thumbnail:hover{
opacity:1.00;
box-shadow: 0px 0px 10px #4bc6ff;
}
.line{
margin-bottom: 5px;
}
.thumbnail>img{
height:201.84px;
.products-grid {
margin-top: 6px;
}
.product-col {
margin-bottom: 22px;
}
.product-card {
height: 100%;
background: #ffffff;
border: 1px solid #e5e7eb;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
transition: transform 0.2s, box-shadow 0.2s, border-color 0.2s;
}
.product-card:hover {
transform: translateY(-2px);
border-color: #d1d5db;
box-shadow: 0 10px 24px rgba(2, 6, 23, 0.08);
}
.product-image-link {
display: flex;
align-items: center;
justify-content: center;
padding: 16px;
min-height: 240px;
background: #f8fafc;
border-bottom: 1px solid #e5e7eb;
}
.product-image {
width: auto;
max-width: 100%;
height: auto;
max-height: 202px;
object-fit: contain;
}
.product-card-body {
padding: 12px 14px 14px;
}
.product-name-holder {
margin: 0;
font-size: 14px;
font-weight: 700;
line-height: 1.35;
color: #111827;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.product-card-footer {
display: flex;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-top: 12px;
padding-top: 10px;
border-top: 1px solid #eef2f7;
}
.price {
margin: 0;
font-size: 22px;
line-height: 1;
font-weight: 700;
color: #111827;
}
.price small,
.price-currency {
font-size: 13px;
color: #6b7280;
font-weight: 600;
}
.btn-view-details {
border-radius: 8px;
min-height: 36px;
font-weight: 600;
font-size: 12px;
padding: 8px 12px;
letter-spacing: 0.2px;
}
.empty-state {
margin: 50px 0;
color: #6b7280;
font-size: 15px;
}
@media screen and (max-width: 770px) {
.right{
@@ -127,6 +227,164 @@
overflow: hidden;
text-overflow: ellipsis;
}
/* ── Category nav ──────────────────────────────────────────────────────── */
.cat-nav {
background: #ffffff;
border: 1px solid #e5e7eb;
border-radius: 12px;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
padding: 0;
margin-bottom: 24px;
overflow: visible;
}
.cat-nav ul {
list-style: none;
margin: 0;
padding: 0;
display: flex;
flex-wrap: wrap;
}
.cat-nav > ul > li {
position: relative;
}
.cat-nav > ul > li > a {
display: block;
padding: 14px 20px;
font-weight: 700;
font-size: 13px;
text-transform: uppercase;
color: #222;
text-decoration: none;
letter-spacing: .5px;
border-bottom: 3px solid transparent;
transition: border-color .2s, color .2s;
}
.cat-nav > ul > li > a:hover,
.cat-nav > ul > li > a.active {
color: #4B8E4B;
border-bottom-color: #4B8E4B;
}
/* sub-category dropdown */
.cat-nav .sub-menu {
display: none;
position: absolute;
top: 100%;
left: 0;
min-width: 200px;
background: #fff;
border: 1px solid #ddd;
border-top: 3px solid #4B8E4B;
box-shadow: 0 4px 12px rgba(0,0,0,.12);
z-index: 999;
list-style: none;
margin: 0;
padding: 6px 0;
}
.cat-nav > ul > li:hover .sub-menu {
display: block;
}
.cat-nav .sub-menu li a {
display: block;
padding: 9px 18px;
font-size: 13px;
color: #333;
text-decoration: none;
white-space: nowrap;
}
.cat-nav .sub-menu li a:hover,
.cat-nav .sub-menu li a.active {
background: #f0f9f0;
color: #4B8E4B;
}
.cat-count {
display: inline-block;
background: #ddd;
border-radius: 10px;
font-size: 11px;
padding: 1px 7px;
margin-left: 4px;
vertical-align: middle;
}
/* ── League / conference pill filter (sub-sub-category) ─────────────────── */
.league-filter {
display: flex;
flex-wrap: wrap;
gap: 8px;
padding: 10px 12px 14px;
margin-bottom: 18px;
border: 1px solid #e5e7eb;
border-radius: 12px;
background: #fff;
align-items: center;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
}
.league-filter .lf-label {
font-size: 11px;
font-weight: 700;
text-transform: uppercase;
color: #888;
letter-spacing: .5px;
margin-right: 4px;
white-space: nowrap;
}
.league-filter a {
display: inline-block;
padding: 5px 14px;
border-radius: 20px;
background: #f0f0f0;
color: #333;
font-size: 12px;
font-weight: 600;
text-decoration: none;
white-space: nowrap;
border: 1px solid #ddd;
transition: background .2s, color .2s, border-color .2s;
}
.league-filter a:hover {
background: #e0f2e0;
color: #4B8E4B;
border-color: #4B8E4B;
}
.league-filter a.active {
background: #4B8E4B;
color: #fff;
border-color: #4B8E4B;
}
@media screen and (max-width: 991px) {
.product-image-link {
min-height: 220px;
}
.btn-view-details {
padding: 7px 10px;
}
}
@media screen and (max-width: 767px) {
h2 {
margin-top: 24px;
margin-bottom: 16px;
}
.featured-title {
font-size: 20px;
}
.product-card-footer {
flex-direction: column;
align-items: stretch;
gap: 8px;
}
.btn-view-details {
width: 100%;
}
}
[v-cloak] { display: none; }
</style>
<div class="container">
@@ -147,19 +405,99 @@
</div>
<div class="row">
<div class="col-md-12">
<h2>FEATURED PRODUCTS</h2>
<h2 class="featured-title">Featured Products</h2>
</div>
</div>
<div class="row">
{{-- ── Vue category + product grid ─────────────────────────────────────── --}}
<script>
window._tsProducts = {!! json_encode(
collect($product_array)
->where('PrivacyStatus', 'public')
->map(function($p) use ($thumbnails) {
$thumbList = isset($thumbnails) ? $thumbnails : [];
$thumb = collect($thumbList)->filter(function($t) use ($p) {
return $t['product_id'] == $p->Id;
})->first();
return [
'id' => $p->Id,
'name' => $p->ProductName,
'price' => $p->ProductPrice,
'url' => $p->ProductURL,
'img' => $thumb ? $thumb['thumb'] : 'product-image-placeholder.png',
'folder'=> $thumb ? $thumb['folder'] : '',
];
})->values()->toArray(),
JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT
) !!};
window._tsStore = {
url : {!! json_encode($store_array[0]->StoreUrl, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) !!},
currency : {!! json_encode($store_array[0]->StoreCurrency, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) !!},
minoBase : {!! json_encode(rtrim(config('filesystems.disks.minio.url', ''), '/') . '/' . env('MINIO_BUCKET', 'crewsportswear') . '/', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) !!},
};
</script>
<div id="ts-app" v-cloak>
{{-- ── Category nav ── --}}
<nav class="cat-nav" v-if="categories.length > 0">
<ul>
<li>
<a href="#" :class="{active: activeCategory===null && activeSubCategory===null}"
@click.prevent="activeCategory=null; activeSubCategory=null">
All
<span class="cat-count">@{{ totalPublic }}</span>
</a>
</li>
<li v-for="cat in categories" :key="cat.name">
<a href="#"
:class="{active: activeCategory===cat.name}"
@click.prevent="selectCategory(cat.name)">
@{{ cat.name }}
<span class="cat-count">@{{ cat.count }}</span>
</a>
<ul class="sub-menu" v-if="cat.subs.length > 0">
<li v-for="sub in cat.subs" :key="sub.name">
<a href="#"
:class="{active: activeCategory===cat.name && activeSubCategory===sub.name}"
@click.prevent="selectSub(cat.name, sub.name)">
@{{ sub.name }}
<span class="cat-count">@{{ sub.count }}</span>
</a>
</li>
</ul>
</li>
</ul>
</nav>
{{-- ── League / conference pill filter ── --}}
<div class="league-filter" v-if="isLeagueStore && activeCategory !== null && leagues.length > 0">
<span class="lf-label">League / Conf:</span>
<a href="#"
:class="{active: activeLeague === null}"
@click.prevent="activeLeague = null">All</a>
<a href="#"
v-for="lg in leagues" :key="lg.name"
:class="{active: activeLeague === lg.name}"
@click.prevent="activeLeague = lg.name">
@{{ lg.name }}
<span class="cat-count">@{{ lg.count }}</span>
</a>
</div>
{{-- ── Announcements (kept outside loop) ── --}}
@if ($announcement->IsActive)
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
<p><b>Shop Announcements:</b></p>
{!! nl2br(e($announcement->Announcement)) !!}
</div>
</div>
</div>
@endif
@if($store_array[0]->Id == 174 || $store_array[0]->Id == 175 || $store_array[0]->Id == 178 || $store_array[0]->Id == 179 || $store_array[0]->Id == 177 || $store_array[0]->Id == 189 || $store_array[0]->Id == 176 || $store_array[0]->Id == 190 || $store_array[0]->Id == 191 || $store_array[0]->Id == 192 || $store_array[0]->Id == 194)
<div class="row">
<div class="col-md-12">
<div class="alert alert-warning">
<p><b>Please read:</b></p>
@@ -172,58 +510,172 @@
@endif
</div>
</div>
@else
<div class="col-md-12">
<div class="alert alert-warning">
<p><b>Please read:</b></p>
1. Items purchased are made on demand. Orders will be shipped based on dates set by your store administrator.<br>
2. Store payments are processed through PayPal. A PayPal account is not required to make a purchase.<br>
@if($store_array[0]->Id == 222)
3. Orders will be batch processed on a monthly basis, please allow 4-6 weeks for delivery.<br>
@else
3. Orders will be batch processed on a weekly basis, please allow 2-3 weeks for delivery.<br>
@endif
4. We are currently only shipping to US locations. For international orders, please contact <b>orders@crewsportswear.com</b> if you'd like to place an order.<br>
5. Expect shipping delays due to COVID-19.<br>
6. All sales are final. No returns or exchanges will be accepted.<br><br>
<b>DISCLAIMER:</b> Masks and gaiters sold by Crew Sportswear are not intended for medical use. Crew Sportswear does not make any medical or health claims.
</div>
</div>
@endif
<!-- BEGIN PRODUCTS -->
@foreach($product_array as $i => $product)
@if($product->PrivacyStatus == "public")
@foreach($thumbnails as $t => $thumb)
@if($thumb['product_id'] == $product->Id)
@define $storeFolder = $thumb['folder']
@define $filename = $thumb['thumb']
@endif
@endforeach
<div class="col-md-3 col-sm-6">
<span class="thumbnail">
<a href="{{ url('teamstore') }}/{{ $store_array[0]->StoreUrl }}/product/{{ $product->ProductURL }}">
<img style="height: 201.84px;" src="{{ config('site_config.images_url') }}/{{ $filename }}" alt="{{ $product->ProductName }}" >
{{-- ── Product grid ── --}}
<div class="row products-grid">
<div class="col-md-12 text-center" v-if="filtered.length === 0">
<p class="empty-state">No products found in this category.</p>
</div>
<div class="col-md-3 col-sm-6 product-col" v-for="p in filtered" :key="p.id">
<div class="product-card">
<a :href="productUrl(p)" class="product-image-link">
<img class="product-image" :src="imgUrl(p)" :alt="p.name">
</a>
<h4 class="text-center product-name-holder">{{ $product->ProductName }}</h4>
<hr class="line">
<div class="row">
<div class="col-md-7 col-sm-7">
<p class="price">{{ $product->ProductPrice }} <small style="font-size: 15px;"> {{ $store_array[0]->StoreCurrency }}</small></p>
<div class="product-card-body">
<h4 class="text-center product-name-holder">@{{ p.name }}</h4>
<div class="product-card-footer">
<p class="price">@{{ p.price }} <small class="price-currency">@{{ store.currency }}</small></p>
<a :href="productUrl(p)" class="btn btn-success btn-view-details">View Details</a>
</div>
</div>
</div>
</div>
<div class="col-md-5 col-sm-5">
<a href="{{ url('teamstore') }}/{{ $store_array[0]->StoreUrl }}/product/{{ $product->ProductURL }}" class="btn btn-success right" > View Details</a>
</div>
</div>
</span>
</div>
@endif
@endforeach
<!-- END PRODUCTS -->
</div>{{-- /ts-app --}}
</div>
</div> <!-- cotainer -->
<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
<script>
(function () {
// ── sport & item-type keyword maps ──────────────────────────────────
const SPORTS = [
'Basketball','Football','Soccer','Baseball','Softball',
'Volleyball','Hockey','Lacrosse','Wrestling','Tennis',
'Swimming','Track','Cross Country','Golf','Cheerleading',
'Dance','Rugby','Bowling','Gymnastics','Cycling',
];
const ITEMS = [
'Jersey','T-Shirt','Tee','Hoodie','Sweatshirt','Jacket',
'Shorts','Pants','Tank','Top','Pullover','Zip-Up',
'Hat','Cap','Beanie','Polo','Uniform','Warmup','Pinnie',
];
// ── league / conference keyword map ──────────────────────────────────
// Order matters: more specific phrases first
const LEAGUES = [
{ key: 'WNBA', terms: ['\\bwnba\\b'] },
{ key: 'NBA', terms: ['\\bnba\\b'] },
{ key: 'NFL', terms: ['\\bnfl\\b'] },
{ key: 'MLB', terms: ['\\bmlb\\b'] },
{ key: 'NHL', terms: ['\\bnhl\\b'] },
{ key: 'MLS', terms: ['\\bmls\\b'] },
{ key: 'Big Ten', terms: ['\\bbig\\s*ten\\b','\\bbig\\s*10\\b','\\bbig10\\b'] },
{ key: 'ACC', terms: ['\\bacc\\b'] },
{ key: 'SEC', terms: ['\\bsec\\b'] },
{ key: 'Big 12', terms: ['\\bbig\\s*12\\b','\\bbig12\\b'] },
{ key: 'Pac-12', terms: ['\\bpac[-\\s]*12\\b','\\bpac12\\b'] },
{ key: 'AAC', terms: ['\\baac\\b'] },
{ key: 'CUSA', terms: ['\\bcusa\\b','\\bc-usa\\b'] },
{ key: 'MAC', terms: ['\\bmac\\b'] },
{ key: 'Sun Belt',terms: ['\\bsun\\s+belt\\b'] },
{ key: 'Mountain West', terms: ['\\bmountain\\s+west\\b','\\bmwc\\b'] },
];
function classify(name) {
const n = name.toLowerCase();
const sport = SPORTS.find(s => n.includes(s.toLowerCase())) || 'Other';
const item = ITEMS.find(i => n.includes(i.toLowerCase())) || 'Other';
let league = null;
for (const lg of LEAGUES) {
if (lg.terms.some(t => {
try { return new RegExp(t, 'i').test(n); } catch(e) { return n.includes(t); }
})) {
league = lg.key;
break;
}
}
return { sport, item, league };
}
const { createApp } = Vue;
const store = window._tsStore || { url:'', currency:'', minoBase:'' };
const allProducts = Array.isArray(window._tsProducts) ? window._tsProducts : [];
createApp({
data() {
return {
products : allProducts,
store : store,
activeCategory : null,
activeSubCategory: null,
activeLeague : null,
};
},
computed: {
totalPublic() {
return this.products.length;
},
isLeagueStore() {
return this.store.url === 'hi-five-franchise-store';
},
// Build [ { name:'Basketball', count:N, subs:[{name:'Jersey',count:N},...] }, ... ]
categories() {
const map = {};
this.products.forEach(p => {
const { sport, item } = classify(p.name);
if (!map[sport]) map[sport] = {};
map[sport][item] = (map[sport][item] || 0) + 1;
});
return Object.entries(map)
.sort((a,b) => a[0].localeCompare(b[0]))
.map(([name, subs]) => ({
name,
count: Object.values(subs).reduce((a,b) => a+b, 0),
subs: Object.entries(subs)
.sort((a,b) => a[0].localeCompare(b[0]))
.map(([s, count]) => ({ name: s, count }))
.filter(s => s.name !== 'Other' || Object.keys(subs).length === 1),
}));
},
// Available leagues for the currently active category (+ optional sub)
// Only computed for hi-five-franchise-store
leagues() {
if (!this.isLeagueStore) return [];
const map = {};
this.products.forEach(p => {
const { sport, item, league } = classify(p.name);
if (!league) return;
if (this.activeCategory && sport !== this.activeCategory) return;
if (this.activeSubCategory && item !== this.activeSubCategory) return;
map[league] = (map[league] || 0) + 1;
});
return Object.entries(map)
.sort((a, b) => a[0].localeCompare(b[0]))
.map(([name, count]) => ({ name, count }));
},
filtered() {
if (!this.activeCategory && !this.activeLeague) return this.products;
return this.products.filter(p => {
const { sport, item, league } = classify(p.name);
if (this.activeCategory && sport !== this.activeCategory) return false;
if (this.activeSubCategory && item !== this.activeSubCategory) return false;
if (this.isLeagueStore && this.activeLeague && league !== this.activeLeague) return false;
return true;
});
},
},
methods: {
selectCategory(cat) {
this.activeCategory = cat;
this.activeSubCategory = null;
this.activeLeague = null;
},
selectSub(cat, sub) {
this.activeCategory = cat;
this.activeSubCategory = sub;
this.activeLeague = null;
},
productUrl(p) {
return '/teamstore/' + store.url + '/product/' + p.url;
},
imgUrl(p) {
return store.minoBase + 'images/' + p.img;
},
},
}).mount('#ts-app');
})();
</script>
</div>{{-- /container --}}
@endsection

View File

@@ -7,6 +7,45 @@
@endif
<style>
body {
background: #f4f6f8;
}
.product-page {
padding-top: 14px;
padding-bottom: 28px;
}
.product-breadcrumb {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 10px;
margin-bottom: 18px;
padding: 10px 14px;
}
.product-breadcrumb .breadcrumb {
margin: 0;
background: transparent;
padding: 0;
}
.product-breadcrumb .breadcrumb > li,
.product-breadcrumb .breadcrumb > li.active,
.product-breadcrumb .breadcrumb > li + li:before {
color: #6b7280;
font-size: 12px;
}
.product-breadcrumb .breadcrumb > li > a {
color: #374151;
text-decoration: none;
}
.product-breadcrumb .breadcrumb > li > a:hover {
color: #111827;
}
p{
font-size: 12px;
margin-top: 5px;
@@ -30,7 +69,8 @@
box-shadow: 0px 0px 10px #4bc6ff;
} */
.line{
margin-bottom: 5px;
margin: 14px 0;
border-color: #e5e7eb;
}
@media screen and (max-width: 770px) {
.right{
@@ -117,18 +157,45 @@
border: none;
}
.carousel-control.left {
margin-left: -35px;
margin-top: 7px;
}
.carousel-control.right {
margin-right: -35px;
margin-top: 7px;
#myCarousel {
position: relative;
width: 100%;
}
.carousel-control {
width: 0%;
width: 34px;
height: 34px;
top: 50%;
margin-top: -17px;
opacity: 1;
text-shadow: none;
}
.carousel-control.left {
left: -18px;
margin-left: 0;
}
.carousel-control.right {
right: -18px;
margin-right: 0;
}
.carousel-control .glyphicon {
width: 34px;
height: 34px;
line-height: 34px;
border-radius: 50%;
background: rgba(255, 255, 255, 0.95);
border: 1px solid #d1d5db;
color: #374151;
font-size: 14px;
}
.carousel-control:hover .glyphicon {
background: #ffffff;
border-color: #9ca3af;
color: #111827;
}
.custom-chevron-left,
@@ -139,11 +206,127 @@
.hide-bullets {
list-style:none;
margin-left: -40px;
margin-top:20px;
margin-left: 0;
margin-top: 0;
margin-bottom: 0;
padding-left: 0;
}
.hide-bullets > li {
margin-bottom: 12px;
}
.main-gallery-card,
.product-info-card,
.description-card {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 12px;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
}
.main-gallery-card {
padding: 16px;
}
.main-image-stage {
border: 1px solid #eef0f3;
border-radius: 10px;
background: #fcfcfd;
min-height: 430px;
display: flex;
align-items: center;
justify-content: center;
}
.main-product-image {
max-height: 400px;
width: auto;
max-width: 100%;
}
.thumbnail {
border-radius: 10px;
border: 1px solid #d1d5db;
background: #fff;
margin-bottom: 0;
transition: border-color 0.2s, box-shadow 0.2s;
}
.thumbnail:hover {
border-color: #9ca3af;
box-shadow: 0 3px 12px rgba(0, 0, 0, 0.08);
}
.a_thumbnail.active {
border-color: #3b82f6;
box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.2);
}
.image-thumbnails {
border-radius: 8px;
object-fit: contain;
}
.product-info-card {
padding: 22px;
}
.product-title {
margin: 0;
font-size: 28px;
line-height: 1.2;
font-weight: 700;
color: #111827;
}
.price {
font-size: 30px;
margin: 8px 0 18px;
color: #0f172a;
font-weight: 700;
}
.price small {
font-size: 14px;
color: #6b7280;
font-weight: 500;
}
#frm-order-list {
padding-top: 2px;
}
#btn-add-to-cart {
min-height: 44px;
padding: 10px 18px;
border-radius: 9px;
font-weight: 600;
font-size: 14px;
letter-spacing: 0.2px;
margin-top: 10px;
}
.description-card {
margin-top: 18px;
padding: 18px 22px;
}
.description-title {
margin: 0 0 10px;
font-size: 16px;
font-weight: 600;
color: #111827;
}
.description-text {
margin: 0;
font-size: 14px;
line-height: 1.65;
color: #4b5563;
}
.spacer-top{
margin-top: 40px;
margin-top: 24px;
}
.roster-input{
border-radius: 0px;
@@ -208,12 +391,49 @@
overflow: auto;
}
@media screen and (max-width: 991px) {
.product-info-card {
margin-top: 16px;
}
.main-image-stage {
min-height: 350px;
}
#btn-add-to-cart {
width: 100%;
float: none !important;
}
}
@media screen and (max-width: 768px) {
.main-image-stage {
min-height: 300px;
}
.carousel-control.left {
left: -10px;
}
.carousel-control.right {
right: -10px;
}
.product-title {
font-size: 23px;
}
.price {
font-size: 26px;
}
}
</style>
<div class="container">
<div class="container product-page">
<div class="row">
<div class="col-md-12">
<nav aria-label="breadcrumb">
<nav aria-label="breadcrumb" class="product-breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{ url('teamstore') }}/{{ $store_array[0]->StoreUrl }}">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">{{ $product_array[0]->ProductName }}</li>
@@ -224,23 +444,23 @@
<div class="row">
<div class="col-md-5 col-sm-5">
<div class="row">
<div class="col-sm-12" id="carousel-bounding-box">
<div class="main-gallery-card">
<div id="carousel-bounding-box">
<div class="main-image-stage">
<div class="carousel slide" id="myCarousel" data-interval="false">
<!-- Carousel items -->
<div class="carousel-inner">
@define $i = 0
@foreach($thumbnails_array as $thumbnail)
@if($thumbnail->ImageClass == 'active')
<div class="active item text-center" data-slide-number="{{ $i }}">
<span class="zoom img-zoom">
<img style="height:400px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image }}">
<img class="main-product-image" src="{{ minio_url('images/' . $thumbnail->Image) }}">
</span>
</div>
@else
<div class="item text-center" data-slide-number="{{ $i }}">
<span class="zoom img-zoom">
<img style="height:400px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image }}">
<img class="main-product-image" src="{{ minio_url('images/' . $thumbnail->Image) }}">
</span>
</div>
@endif
@@ -248,7 +468,6 @@
@endforeach
</div>
<!-- Carousel nav -->
<a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
@@ -257,35 +476,30 @@
</a>
</div>
</div>
<!-- </div> -->
</div>
<hr class="line">
<div class="row">
<div class="col-md-12">
<ul class="hide-bullets">
<ul class="hide-bullets row">
@define $j = 0
@foreach($thumbnails_array as $thumbnail)
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail {{ $thumbnail->ImageClass }}" id="carousel-selector-{{ $j }}">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image }}"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $thumbnail->Image) }}"/>
</a>
</li>
@define $j++
@endforeach
</ul>
</div>
</div>
</div>
<div class="col-md-7 col-sm-7">
<div class="panel panel-default">
<div class="panel-heading">
<h1>{{ $product_array[0]->ProductName }}</h1> <p class="price">{{ $product_array[0]->ProductPrice }} <small> {{ $store_array[0]->StoreCurrency }} </small></p>
</div>
<div class="panel-body">
<div class="product-info-card">
<h1 class="product-title">{{ $product_array[0]->ProductName }}</h1>
<p class="price">{{ $product_array[0]->ProductPrice }} <small> {{ $store_array[0]->StoreCurrency }} </small></p>
<div class="row">
<div class="col-md-12">
<form id="frm-order-list">
@@ -300,13 +514,18 @@
</div>
</div>
<div class="description-card">
<h3 class="description-title">Description</h3>
<p class="description-text">{{ $product_array[0]->ProductDescription }}</p>
</div>
<div class="spacer-top"></div>
<div class="row">
<div class="col-md-12">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#productDescription" aria-controls="productDescription" role="tab" data-toggle="tab">Description</a></li>
<li role="presentation" class="active"><a href="#productDescription" aria-controls="productDescription" role="tab" data-toggle="tab">More Details</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="productDescription">
<div class="row">
@@ -320,7 +539,6 @@
</div>
</div>
</div>
</div>
</div> <!-- container -->
</div>

View File

@@ -2,64 +2,188 @@
@section('content')
<style>
a.thumbnail>img {
/* height: 250px; */
body {
background: #f4f6f8;
}
.hide-bullets {
.store-page {
padding-top: 14px;
padding-bottom: 26px;
}
.store-header {
margin-bottom: 14px;
}
.store-title {
margin: 0;
font-size: 24px;
font-weight: 700;
color: #111827;
}
.store-subtitle {
margin: 6px 0 0;
font-size: 13px;
color: #6b7280;
}
.store-toolbar {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 12px;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
padding: 14px;
margin-bottom: 18px;
}
.store-toolbar label {
font-size: 12px;
color: #4b5563;
font-weight: 600;
margin-bottom: 6px;
text-transform: uppercase;
letter-spacing: 0.4px;
}
.store-toolbar .form-control,
.store-toolbar .btn {
height: 40px;
border-radius: 8px;
}
.store-toolbar .form-control {
border-color: #d1d5db;
box-shadow: none;
}
.store-toolbar .form-control:focus {
border-color: #9ca3af;
box-shadow: 0 0 0 3px rgba(156, 163, 175, 0.18);
}
.store-grid {
list-style: none;
margin-left: -40px;
margin-top:20px;
position: relative;
padding-left: 0;
margin: 0 -10px;
}
.thumbnail{
border: none;
display: unset;
background-color: transparent;
}
.li-custom{
.store-grid > li {
padding: 10px;
}
.store-logo{
/* height: 250px;
width: 250px;
.store-card {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 12px;
box-shadow: 0 1px 2px rgba(16, 24, 40, 0.04);
overflow: hidden;
object-fit: contain; */
/* cursor: pointer; */
height: 100%;
transition: transform 0.2s, box-shadow 0.2s, border-color 0.2s;
}
.store-card:hover {
transform: translateY(-2px);
border-color: #d1d5db;
box-shadow: 0 8px 24px rgba(15, 23, 42, 0.08);
}
.store-link {
display: block;
text-decoration: none;
}
.store-link:hover,
.store-link:focus {
text-decoration: none;
}
.store-logo-wrap {
height: 170px;
background: #f8fafc;
border-bottom: 1px solid #e5e7eb;
display: flex;
align-items: center;
justify-content: center;
padding: 14px;
}
.store-logo {
max-width: 100%;
max-height: 100%;
width: auto;
height: auto;
object-fit: contain;
}
.store-meta {
padding: 12px;
min-height: 72px;
display: flex;
align-items: center;
justify-content: center;
}
.store-name {
margin: 0;
font-size: 15px;
line-height: 1.35;
font-weight: 700;
color: #111827;
text-align: center;
text-transform: uppercase;
word-break: break-word;
}
.store-lock {
color: #6b7280;
margin-left: 4px;
}
.store-pagination {
margin-top: 18px;
}
.store-pagination .pagination {
margin: 0;
}
@media (max-width: 767px) {
.store-title {
font-size: 21px;
}
.store-toolbar {
padding: 12px;
}
.store-logo-wrap {
height: 155px;
}
a.thumbnail>img{
height: 150px
}
</style>
<div class="container">
<div class="row">
<div class="container store-page">
<div class="row store-header">
<div class="col-lg-12">
<h2 style="font-size: 20px; font-weight: bold; ">TEAM STORES</h2>
<hr>
<h2 class="store-title">Team Stores</h2>
<p class="store-subtitle">Browse and open your team store.</p>
</div>
</div><!-- /row -->
</div>
<div class="store-toolbar">
<form role="search" id="frm_search_store">
<div class="row">
<!-- <div class="col-sm-12"> -->
<!-- <div class="well"> -->
<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="col-md-8 col-sm-7">
<label>Search Store</label>
<div class="input-group">
<input type="text" class="form-control" placeholder="Search Store" value="{{ $keyword }}" name="q">
<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>
<div class="col-md-4 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>
@@ -68,42 +192,47 @@
</select>
</div>
</div>
</div>
</form>
<div class="clearfix"></div>
<!-- </div> -->
<!-- </div> -->
</div>
<div class="row" id="slider-thumbs">
<!-- Bottom switcher of slider -->
<ul class="hide-bullets">
<div id="slider-thumbs">
<ul class="store-grid row">
@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;">
<li class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
<div class="store-card">
@if($store->Password != null)
<a class="thumbnail password-protected" href="#" data-store-id="{{ $store->Id }}" data-store-url="{{ $store->StoreUrl }}">
<a class="store-link password-protected" href="#" data-store-id="{{ $store->Id }}" data-store-url="{{ $store->StoreUrl }}">
<div class="store-logo-wrap">
<img class="store-logo" src="{{ minio_url('uploads/images/teamstore/' . $store->ImageFolder . '/' . $store->StoreLogo) }}">
</div>
</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>
<div class="store-meta">
<h4 class="store-name">{{ $store->StoreName }} <i class="fa fa-lock store-lock" title="This store is password protected."></i></h4>
</div>
@else
<a class="thumbnail" href="{{ url('teamstore') . '/' . $store->StoreUrl }}">
<a class="store-link" href="{{ url('teamstore') . '/' . $store->StoreUrl }}">
<div class="store-logo-wrap">
<img class="store-logo" src="{{ minio_url('uploads/images/teamstore/' . $store->ImageFolder . '/' . $store->StoreLogo) }}">
</div>
<div class="store-meta">
<h4 class="store-name">{{ $store->StoreName }}</h4>
</div>
</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="row store-pagination">
<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">

View File

@@ -0,0 +1,56 @@
@extends('layout.main')
@section('content')
<div class="row">
<div class="col-md-6 col-md-offset-3" style="margin-top: 40px; margin-bottom: 40px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><strong>Send Test Email</strong></h3>
</div>
<div class="panel-body">
@if (session('message'))
<div class="alert alert-{{ session('status') }} alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
{{ session('message') }}
</div>
@endif
<!-- Mail Config Info -->
<div class="well well-sm" style="font-size: 12px;">
<strong>Current Mail Config</strong><br>
Driver: <code>{{ config('mail.driver') ?: '(not set)' }}</code><br>
Host: <code>{{ config('mail.host') ?: '(not set)' }}</code><br>
Port: <code>{{ config('mail.port') ?: '(not set)' }}</code><br>
Username: <code>{{ config('mail.username') ?: '(not set)' }}</code><br>
Encryption: <code>{{ config('mail.encryption') ?: '(not set)' }}</code>
</div>
<form method="POST" action="{{ url('test-email/send') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group{{ $errors->has('recipient') ? ' has-error' : '' }}">
<label for="recipient">Recipient Email</label>
<input type="email"
name="recipient"
id="recipient"
class="form-control"
placeholder="you@example.com"
value="{{ old('recipient') }}"
required>
@if ($errors->has('recipient'))
<span class="help-block">{{ $errors->first('recipient') }}</span>
@endif
</div>
<button type="submit" class="btn btn-primary btn-block">
<i class="fa fa-envelope"></i> Send Test Email
</button>
</form>
</div>
</div>
</div>
</div>
@endsection

View File

@@ -108,7 +108,7 @@
<label>Item URL</label>
<input type="text" class="form-control" id="product_url" name="itemUrl" placeholder="Item URL">
<!-- <div class="input-group">
<span class="input-group-addon" id="basic-addon3">{{ url('/') . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<span class="input-group-addon" id="basic-addon3">{{ url() . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<input type="text" class="form-control" id="product_url" name="itemUrl" aria-describedby="basic-addon3" data-error="#err-itemUrl" >
</div>
<span id="err-itemUrl"></span> -->

View File

@@ -42,7 +42,7 @@
@foreach($array_client_designs as $row)
@foreach($array_template_paths as $key => $row1)
@if($key == 0)
<img src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
<img src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
@endif
@endforeach
@endforeach
@@ -56,7 +56,7 @@
@if($key == 0)
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail active">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}"/>
</a>
<!-- <p>Select Default Thumbnail:</p>
<div class="text-center">
@@ -66,7 +66,7 @@
@else
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-{{ strtolower($row1->Side) }}-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-' . strtolower($row1->Side) . '-thumbnail.png') }}"/>
</a>
<!-- <p>&nbsp;</p>
<div class="text-center">
@@ -133,7 +133,7 @@
<label>Item URL</label>
<input type="text" class="form-control" id="product_url" name="itemUrl" placeholder="Item URL">
<!-- <div class="input-group">
<span class="input-group-addon" id="basic-addon3">{{ url('/') . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<span class="input-group-addon" id="basic-addon3">{{ url() . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<input type="text" class="form-control" id="product_url" name="itemUrl" aria-describedby="basic-addon3" data-error="#err-itemUrl" >
</div>
<span id="err-itemUrl"></span> -->

View File

@@ -32,7 +32,7 @@
@foreach($array_client_designs as $row)
<div class="col-md-3 col-sm-6">
<span class="thumbnail">
<img src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}" >
<img src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}" alt="{{ $row->DesignName }}" >
<h4 class="design-name-holder">{{ $row->DesignName }}</h4>
<small>{{ date('F j, Y g:i a', strtotime($row->DateCreated)) }}</small>
<hr class="line">

View File

@@ -33,7 +33,7 @@
<div class="row">
<div class="col-md-2">
<div class="text-center">
<img class="previewImage" id="active_thumbnail" src="{{ config('site_config.images_url') . '/images/' . $array_thumbnail_display[0]->Image }}">
<img class="previewImage" id="active_thumbnail" src="{{ minio_url('images/' . $array_thumbnail_display[0]->Image) }}">
</div>
</div>
<div class="col-md-10">

View File

@@ -93,7 +93,7 @@
<div class="text-center">
@foreach($img_thumb as $img)
@if($img->ProductId == $item->ProductId)
<img class="previewImage" src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
<img class="previewImage" src="{{ minio_url('images/' . $img->Image) }}">
@endif
@endforeach
</div>

View File

@@ -42,7 +42,7 @@
@foreach($array_client_designs as $row)
@foreach($array_template_paths as $key => $row1)
@if($key == 0)
<img src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
<img src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
@endif
@endforeach
@endforeach
@@ -56,7 +56,7 @@
@if($key == 0)
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail active">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}"/>
</a>
<!-- <p>Select Default Thumbnail:</p>
<div class="text-center">
@@ -66,7 +66,7 @@
@else
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-{{ strtolower($row1->Side) }}-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-' . strtolower($row1->Side) . '-thumbnail.png') }}"/>
</a>
<!-- <p>&nbsp;</p>
<div class="text-center">
@@ -133,7 +133,7 @@
<label>Item URL</label>
<input type="text" class="form-control" id="product_url" name="itemUrl" placeholder="Item URL">
<!-- <div class="input-group">
<span class="input-group-addon" id="basic-addon3">{{ url('/') . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<span class="input-group-addon" id="basic-addon3">{{ url() . "/teamstore/" . $store_array[0]->StoreUrl . '/'}}</span>
<input type="text" class="form-control" id="product_url" name="itemUrl" aria-describedby="basic-addon3" data-error="#err-itemUrl" >
</div>
<span id="err-itemUrl"></span> -->

View File

@@ -59,7 +59,7 @@
<div class="col-md-3 col-sm-6">
<div class="thumbnail" >
<a href="{{ url('user/store-items/item') }}/{{ $product->ProductURL }}">
<img style="height:200px" src="{{ config('site_config.images_url') }}/{{ $filename . '?t=' . time() }}" alt="{{ $product->ProductName }}" >
<img style="height:200px" src="{{ minio_url('images/' . $filename) . '?t=' . time() }}" alt="{{ $product->ProductName }}" >
</a>
<hr class="line">
<div class="pull-right">

View File

@@ -63,7 +63,7 @@
<div id="{{ 'order_number_' . $product->Id }}">
<div class="thumbnail" >
<a href="#">
<img style="height:200px" src="{{ config('site_config.images_url') }}/{{ $filename . '?t=' . time() }}" alt="{{ $product->ProductName }}" >
<img style="height:200px" src="{{ minio_url('images/' . $filename) . '?t=' . time() }}" alt="{{ $product->ProductName }}" >
</a>
<hr class="line">
<div class="pull-right">

View File

@@ -39,7 +39,7 @@
@foreach($array_client_designs as $row)
@foreach($array_template_paths as $key => $row1)
@if($key == 0)
<img src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
<img src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}" alt="{{ $row->DesignName }}" id="main-thumbnail" class="img img-responsive">
@endif
@endforeach
@endforeach
@@ -53,13 +53,13 @@
@if($key == 0)
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail active">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-front-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-front-thumbnail.png') }}"/>
</a>
</li>
@else
<li class="col-sm-3 col-xs-3">
<a class="thumbnail a_thumbnail">
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $row->DesignCode }}-{{ strtolower($row1->Side) }}-thumbnail.png"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $row->DesignCode . '-' . strtolower($row1->Side) . '-thumbnail.png') }}"/>
</a>
</li>
@endif

View File

@@ -36,7 +36,7 @@
<div class="col-md-12 text-center">
@foreach($thumbnails_array as $thumbnail)
@if($thumbnail->ImageClass == 'active')
<img style="height:400px" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}" id="main-thumbnail">
<img style="height:400px" src="{{ minio_url('images/' . $thumbnail->Image) . '?t=' . time() }}" id="main-thumbnail">
@endif
@endforeach
</div>
@@ -58,7 +58,7 @@
<li class="col-sm-3 col-xs-4">
<a class="thumbnail a_thumbnail {{ $thumbnail->ImageClass }}" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px;">
<!-- <span class="close">&times;</span> -->
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}"/>
<img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ minio_url('images/' . $thumbnail->Image) . '?t=' . time() }}"/>
</a>
<div class="funkyradio">
<div class="funkyradio-primary">
@@ -200,7 +200,7 @@
<tr id="{{ 'item-' . $thumbnail->Id }}">
<td class="text-center" style="width: 50px"><i class="fa fa-bars"></i></td>
<td><img class="img img-responsive product-center" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}"/></td>
<td><img class="img img-responsive product-center" style="height: 59.45px;" src="{{ minio_url('images/' . $thumbnail->Image) . '?t=' . time() }}"/></td>
<td class="text-center">
<!-- <button class="btn btn-default btn-xs btn-edit-clipart" data-id="#"><i class="fa fa-edit"></i></button> -->
<button class="btn btn-default btn-sm btn-delete-item-image" data-id="{{ $thumbnail->Id }}" data-filename="{{ $thumbnail->Image }}" title="Delete Image"><i class="fa fa-trash"></i></button>

View File

@@ -1,22 +0,0 @@
<?php
use Illuminate\Support\Facades\Route;
/*
|--------------------------------------------------------------------------
| API Routes
|--------------------------------------------------------------------------
|
| Here is where you can register API routes for your application. These
| routes are loaded by the RouteServiceProvider within a group which
| is assigned the "api" middleware group. Enjoy building your API!
|
*/
Route::group(['middleware' => ['isAuthorized', 'cors']], function () {
Route::post('login', 'ApiController@login');
Route::post('insert', 'ApiController@insert');
Route::get('tracking', 'ApiController@getTrackingStatus');
Route::get('order-status', 'ApiController@getOrderStatus');
Route::get('steps', 'ApiController@getSteps');
});

View File

@@ -1,190 +0,0 @@
<?php
use Illuminate\Support\Facades\Route;
/*
|--------------------------------------------------------------------------
| Web Routes
|--------------------------------------------------------------------------
|
| Here is where you can register web routes for your application. These
| routes are loaded by the RouteServiceProvider within a group which
| contains the "web" middleware group. Now create something great!
|
*/
// Authentication Routes (expanded from Route::controllers)
Route::get('login', 'Auth\AuthController@showLoginForm')->name('login');
Route::post('login', 'Auth\AuthController@login');
Route::post('logout', 'Auth\AuthController@logout')->name('logout');
Route::get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
Route::post('register', 'Auth\RegisterController@register');
// Password Reset Routes
Route::get('password/reset', 'Auth\PasswordController@getEmail');
Route::post('password/email', 'Auth\PasswordController@postEmail');
Route::get('password/reset/{token}', 'Auth\PasswordController@getReset');
Route::post('password/reset', 'Auth\PasswordController@postReset');
// Main Routes
Route::get('/', 'MainController@index');
Route::get('/sportslist', 'MainController@sports');
Route::get('/sports/{url}', 'MainController@templatesCat');
Route::get('/sports/{url}/{id}', 'MainController@templatesByCategory');
Route::get('/templatelist', 'MainController@fetchTemplates');
Route::get('/cartcount', 'MainController@countCart');
Route::get('/removeitem/{id}', 'MainController@removeCartItem');
// Custom Authentication
Route::post('/custom/auth', 'CustomAuthController@authenticate');
Route::post('/custom/register', 'CustomAuthController@postRegister');
// Cart and Checkout
Route::get('cart', 'teamstore\TeamStoreController@cart')->name('cart');
Route::get('/checkout', 'teamstore\TeamStoreController@checkout');
Route::get('/mail', 'teamstore\TeamStoreController@mail');
// Designer Routes
Route::get('/designer/{templateid}', 'designer\DesignerController@index');
Route::get('/designer/preview/{designCode}', 'designer\DesignerController@getDesign');
Route::post('/designer/a/buy-form', 'designer\DesignerController@buyForm');
// Designer Edit Routes
Route::get('/designer/edit/{designCode}', 'designer\DesignerController@editDesign');
// Designer AJAX Routes
Route::post('/designer/a/save-roster', 'designer\DesignerController@saveRoster');
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');
// Team Store Routes
Route::get('/teamstore', 'teamstore\TeamStoreController@storelist');
Route::get('/teamstore/{storename}', 'teamstore\TeamStoreController@index');
Route::get('/teamstore/{storename}/product/{producurl}', 'teamstore\TeamStoreController@productDetails');
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/checkpassword', 'teamstore\TeamStoreController@checkTeamStorePassword');
// User Routes (Protected by normaluser middleware)
Route::group(['middleware' => 'normaluser', 'prefix' => 'user'], function () {
Route::get('/', 'user\UserController@index');
// Address Book
Route::get('address-book', 'user\UserController@addressBook');
Route::get('address-book/create', 'user\UserController@createAddressBook');
Route::post('address-book/save', 'user\UserController@saveAddressBook');
Route::get('address-book/edit/{id}', 'user\UserController@editAddressBook');
Route::post('address-book/update', 'user\UserController@updateAddressBook');
// Profile
Route::get('profile', 'user\UserController@profile');
Route::get('profile/edit', 'user\UserController@editProfile');
Route::post('profile/update', 'user\UserController@updateProfile');
Route::get('profile/change-password', 'user\UserController@changePassword');
Route::post('profile/update-password', 'user\UserController@updatePassword');
// Orders
Route::get('orders', 'user\UserController@orders');
Route::get('orders/view/{ck}', 'user\UserController@orderDetails');
// My Designs
Route::get('my-designs', 'user\UserController@myDesigns');
Route::get('my-designs/view/{id}', 'user\UserController@viewDesign');
Route::post('my-designs/update', 'user\UserController@updateDesignDetails');
Route::get('my-designs/sell-design/{designCode}', 'user\UserController@sellDesign');
Route::post('my-designs/addstoreitem', 'user\UserController@saveNewStoreItem');
Route::get('my-designs/buy-design/{designCode}', 'user\UserController@buyDesign');
// Store Management
Route::get('store', 'user\UserController@store');
Route::get('store-items', 'user\UserController@storeItems');
Route::get('store-items/item/{url}', 'user\UserController@viewStoreItem');
Route::post('store-items/update', 'user\UserController@storeItemUpdate');
Route::get('store-items/add-item', 'user\UserController@addStoreItem');
Route::post('store-items/save-new-item', 'user\UserController@saveNewItem');
Route::post('store-items/save-new-item-image', 'user\UserController@saveNewItemImage');
Route::get('store-items/re-arrange', 'user\UserController@itemStoreReArrange');
Route::post('store-items/delete', 'user\UserController@deleteStoreItem');
// Store Settings
Route::get('store-settings', 'user\UserController@storeSetting');
Route::post('store-settings/update', 'user\UserController@storeSettingUpdate');
// Store Orders
Route::get('store-orders', 'user\UserController@storeOrders');
// Email Verification
Route::get('email-verify', 'user\UserController@emailVerify');
Route::post('post/resend-verification', 'user\UserController@resendVericationCode');
Route::post('post/verify-code', 'user\UserController@verifyCode');
// AJAX Routes
Route::post('update-active-thumbnail', 'user\UserController@updateActiveThumbnail');
Route::post('post/save-thumbnail-ordering', 'user\UserController@saveThumbnailOrdering');
Route::post('post/save-item-ordering', 'user\UserController@saveItemOrdering');
Route::post('post/show-store-order-details', 'user\UserController@showStoreOrderDetails');
Route::post('post/delete-image-thumb', 'user\UserController@deleteImageThumb');
// Announcement
Route::get('announcement', 'user\UserController@announcementIndex');
Route::post('announcement/updateSave', 'user\UserController@announcementUpdateSave');
Route::post('announcement/status/update', 'user\UserController@announcementUpdateStatus');
});
// PayPal Routes (Protected by auth middleware)
Route::group(['middleware' => 'auth'], function () {
Route::get('payPremium', 'paypal\PaypalController@payPremium')->name('payPremium');
Route::get('getCheckout', 'paypal\PaypalController@getCheckout')->name('getCheckout');
Route::get('getDone', 'paypal\PaypalController@getDone')->name('getDone');
Route::get('getCancel', 'paypal\PaypalController@getCancel')->name('getCancel');
Route::get('getDoneTest', 'paypal\PaypalController@getDoneTest')->name('getDoneTest');
});
// Admin Routes (Protected by admin middleware)
Route::group(['middleware' => 'admin', 'prefix' => 'admin'], function () {
Route::get('/', function () {
return view('sub_pages.index');
});
// Sports Management
Route::get('sports', 'SportsController@displayAllSports');
Route::get('sports/add', 'SportsController@displayAddSportPage');
Route::post('sports/save', 'SportsController@saveNewSports');
Route::get('sports/edit/{sportsname}', 'SportsController@sportsDetails');
Route::post('sports/update', 'SportsController@updateSports');
Route::get('sports/sportsname', 'SportsController@selectSportsName');
// Templates Management
Route::get('templates', 'TemplatesController@displayTemplates');
Route::post('templates/id/{id}', 'TemplatesController@getTemplates');
Route::get('templates/add', 'TemplatesController@displayAddTemplatePage');
Route::get('templates/type', 'TemplatesController@getTemplateTypes');
Route::get('templates/getlastid', 'TemplatesController@getLastId');
Route::post('templates/save', 'TemplatesController@saveNewTemplates');
Route::get('templates/edit/{tempcode}', 'TemplatesController@displayEditTemplatePage');
Route::post('templates/update', 'TemplatesController@updateTemplate');
Route::get('templates/edit/{tempcode}/p-add', 'PrintPatternController@displayAddPrintTemplatePage');
// Patterns Management
Route::get('pattern/get', 'PatternsController@getPatterns');
Route::post('pattern/get/withvalue', 'PatternsController@getPatternsWithPostValue');
// Print Template
Route::post('print-template/save', 'PrintPatternController@savePrintPattern');
});
// Cliparts Routes
Route::get('cliparts/index', 'cliparts\ClipartsController@index');

View File

@@ -1,23 +0,0 @@
<?php
require __DIR__.'/vendor/autoload.php';
$app = require_once __DIR__.'/bootstrap/app.php';
$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
try {
echo "APP_KEY from env: " . env('APP_KEY') . "\n";
echo "APP_CIPHER from config: " . config('app.cipher') . "\n";
echo "Key starts with base64: " . (strpos(env('APP_KEY'), 'base64:') === 0 ? 'YES' : 'NO') . "\n";
$key = env('APP_KEY');
if (strpos($key, 'base64:') === 0) {
$decoded = base64_decode(substr($key, 7));
echo "Decoded key length: " . strlen($decoded) . " bytes\n";
}
} catch (Exception $e) {
echo "Error: " . $e->getMessage() . "\n";
echo "File: " . $e->getFile() . ":" . $e->getLine() . "\n";
}

View File

@@ -1,88 +0,0 @@
#!/bin/bash
# Test Laravel 5.5 upgrade in Docker container
echo "========================================="
echo "Laravel 5.5 Upgrade Test Script"
echo "========================================="
echo ""
# Colors
GREEN='\033[0;32m'
RED='\033[0;31m'
YELLOW='\033[1;33m'
NC='\033[0m' # No Color
# Build the container
echo -e "${YELLOW}Step 1: Building Docker container with PHP 7.0...${NC}"
docker compose -f docker-compose.local.yml build app
if [ $? -ne 0 ]; then
echo -e "${RED}✗ Docker build failed${NC}"
exit 1
fi
echo -e "${GREEN}✓ Docker build successful${NC}"
echo ""
# Start the container
echo -e "${YELLOW}Step 2: Starting container...${NC}"
docker compose -f docker-compose.local.yml up -d app
if [ $? -ne 0 ]; then
echo -e "${RED}✗ Failed to start container${NC}"
exit 1
fi
echo -e "${GREEN}✓ Container started${NC}"
echo ""
# Wait for container to be ready
echo "Waiting for container to be ready..."
sleep 5
# Check PHP version
echo -e "${YELLOW}Step 3: Verifying PHP version...${NC}"
PHP_VERSION=$(docker compose -f docker-compose.local.yml exec -T app php -v | head -1)
echo "PHP Version: $PHP_VERSION"
echo ""
# Check Laravel version
echo -e "${YELLOW}Step 4: Verifying Laravel installation...${NC}"
LARAVEL_VERSION=$(docker compose -f docker-compose.local.yml exec -T app php artisan --version)
echo "Laravel Version: $LARAVEL_VERSION"
echo ""
# Test route:list
echo -e "${YELLOW}Step 5: Testing route:list command...${NC}"
docker compose -f docker-compose.local.yml exec -T app php artisan route:list 2>&1 | head -20
echo ""
# Check for errors in logs
echo -e "${YELLOW}Step 6: Checking for errors...${NC}"
docker compose -f docker-compose.local.yml logs app | grep -i error | tail -10
echo ""
# Final status
echo "========================================="
if docker compose -f docker-compose.local.yml exec -T app php artisan list > /dev/null 2>&1; then
echo -e "${GREEN}✓ Laravel 5.5 upgrade successful!${NC}"
echo -e "${GREEN} All artisan commands are working${NC}"
echo ""
echo "Next steps:"
echo " 1. Test the application: http://localhost:8080"
echo " 2. Check database migrations"
echo " 3. Test authentication flow"
echo " 4. Verify designer functionality"
else
echo -e "${RED}✗ Some issues detected${NC}"
echo "Check the logs above for details"
fi
echo "========================================="
# Keep container running
echo ""
echo "Container is running. Access it with:"
echo " docker compose -f docker-compose.local.yml exec app bash"
echo ""
echo "Stop with:"
echo " docker compose -f docker-compose.local.yml down"

View File

@@ -1,99 +0,0 @@
#!/bin/bash
# Quick functionality test script for Laravel upgrade
# Run this after each upgrade step to verify core features
set -e
CONTAINER_NAME="crewsportswear_app_local"
BASE_URL="http://localhost:8082"
echo "=========================================="
echo "Laravel Upgrade - Functionality Tests"
echo "=========================================="
echo ""
# Check if container is running
if ! docker ps | grep -q "$CONTAINER_NAME"; then
echo "❌ Container $CONTAINER_NAME is not running"
echo " Start it with: docker compose -f docker-compose.local.yml up -d"
exit 1
fi
echo "✓ Container is running"
echo ""
# Test 1: Artisan commands
echo "Test 1: Artisan Commands"
echo "------------------------"
docker exec $CONTAINER_NAME php artisan --version || { echo "❌ Artisan failed"; exit 1; }
echo "✓ Artisan working"
echo ""
# Test 2: Route list
echo "Test 2: Route Discovery"
echo "------------------------"
docker exec $CONTAINER_NAME php artisan route:list | head -5 || echo "⚠️ Route list not available (normal for Laravel 5.0-5.2)"
echo "✓ Route system loaded"
echo ""
# Test 3: Database connection
echo "Test 3: Database Connection"
echo "----------------------------"
docker exec $CONTAINER_NAME php -r "require 'vendor/autoload.php'; \$app = require_once 'bootstrap/app.php'; \$app->make('Illuminate\Contracts\Console\Kernel')->bootstrap(); try { DB::connection()->getPdo(); echo 'DB Connected\n'; } catch(Exception \$e) { echo 'DB Error: ' . \$e->getMessage() . '\n'; exit(1); }" || { echo "❌ Database connection failed"; exit 1; }
echo "✓ Database connected"
echo ""
# Test 4: HTTP Response (if app is running)
echo "Test 4: HTTP Response"
echo "----------------------"
HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" $BASE_URL 2>/dev/null || echo "000")
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ]; then
echo "✓ HTTP server responding (Status: $HTTP_CODE)"
elif [ "$HTTP_CODE" = "500" ]; then
echo "⚠️ Server error (500) - Check logs"
else
echo "⚠️ Unexpected response: $HTTP_CODE"
fi
echo ""
# Test 5: View compilation
echo "Test 5: View Compilation"
echo "-------------------------"
docker exec $CONTAINER_NAME php artisan view:clear || echo "⚠️ View clear unavailable"
echo "✓ Views can be cleared"
echo ""
# Test 6: Cache operations
echo "Test 6: Cache System"
echo "---------------------"
docker exec $CONTAINER_NAME php artisan cache:clear || { echo "❌ Cache clear failed"; exit 1; }
echo "✓ Cache system working"
echo ""
# Test 7: Config cache (optional)
echo "Test 7: Config System"
echo "----------------------"
docker exec $CONTAINER_NAME php artisan config:clear || echo "⚠️ Config clear unavailable"
echo "✓ Config system accessible"
echo ""
# Show recent logs
echo "Test 8: Error Logs"
echo "-------------------"
docker exec $CONTAINER_NAME sh -c "tail -20 /var/www/html/storage/logs/laravel.log 2>/dev/null || echo 'No log file yet (expected on fresh install)'"
echo ""
echo "=========================================="
echo "✓ Basic functionality tests passed!"
echo "=========================================="
echo ""
echo "Manual tests needed:"
echo " 1. Visit $BASE_URL in browser"
echo " 2. Test user registration/login"
echo " 3. Test sports category pages"
echo " 4. Test designer tool"
echo " 5. Test cart functionality"
echo ""
echo "View logs: docker logs $CONTAINER_NAME"
echo "Access shell: docker exec -it $CONTAINER_NAME bash"
echo ""