update nginx

updated
update
2024-01-05 23:09:45 +08:00 · 2024-01-05 22:42:41 +08:00 · 2024-01-05 21:07:55 +08:00 · 2024-01-05 21:06:56 +08:00 · 2024-01-05 20:58:45 +08:00 · 2024-01-05 20:58:19 +08:00
68 changed files with 3276 additions and 1940 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,63 +0,0 @@
-# Git files
-.git
-.gitignore
-.gitattributes
-
-# Docker files
-Dockerfile*
-docker-compose*.yml
-.dockerignore
-
-# Documentation
-README.md
-DEPLOYMENT_GUIDE.md
-*.md
-
-# Development files
-.env.example
-.env.local
-.env.testing
-
-# IDE files
-.vscode/
-.idea/
-*.swp
-*.swo
-
-# OS files
-.DS_Store
-Thumbs.db
-
-# Node modules and build files
-node_modules/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Laravel specific
-/vendor
-/storage/logs/*
-!/storage/logs/.gitkeep
-/storage/framework/cache/*
-!/storage/framework/cache/.gitkeep
-/storage/framework/sessions/*
-!/storage/framework/sessions/.gitkeep
-/storage/framework/views/*
-!/storage/framework/views/.gitkeep
-/bootstrap/cache/*
-!/bootstrap/cache/.gitkeep
-
-# Testing
-/tests
-phpunit.xml
-phpspec.yml
-
-# Build tools
-gulpfile.js
-package.json
-package-lock.json
-yarn.lock
-
-# Scripts
-start-local.sh
-rebuild.sh
--- a/DEPLOYMENT_GUIDE.md
+++ b/DEPLOYMENT_GUIDE.md
@@ -1,229 +0,0 @@
-# Google Cloud Run Deployment Guide for Merchbay Laravel Application
-
-This guide will help you deploy your Laravel 5 application to Google Cloud Run using the provided `cloudbuild.yaml` configuration.
-
-## Prerequisites
-
-1. **Google Cloud Project**: Ensure you have a Google Cloud Project with billing enabled
-2. **APIs Enabled**: Enable the following APIs:
-   - Cloud Build API
-   - Cloud Run API
-   - Container Registry API (or Artifact Registry API)
-   - Cloud SQL API (if using Cloud SQL)
-   - Secret Manager API (recommended for secrets)
-
-3. **gcloud CLI**: Install and configure the Google Cloud CLI
-
-## Pre-deployment Setup
-
-### 1. Create Cloud SQL Instance (Recommended)
-
-```bash
-# Create MySQL instance
-gcloud sql instances create merchbay-db \
-    --database-version=MYSQL_8_0 \
-    --tier=db-f1-micro \
-    --region=us-central1
-
-# Create database
-gcloud sql databases create merchbay --instance=merchbay-db
-
-# Create user
-gcloud sql users create laravel_user \
-    --instance=merchbay-db \
-    --password=YOUR_SECURE_PASSWORD
-```
-
-### 2. Store Secrets in Secret Manager
-
-```bash
-# Application key (generate a new one)
-echo "base64:$(openssl rand -base64 32)" | gcloud secrets create APP_KEY --data-file=-
-
-# Database password
-echo "YOUR_DB_PASSWORD" | gcloud secrets create DB_PASSWORD --data-file=-
-
-# PayPal secrets
-echo "YOUR_PAYPAL_LIVE_SECRET" | gcloud secrets create PAYPAL_LIVE_SECRET --data-file=-
-echo "YOUR_PAYPAL_SANDBOX_SECRET" | gcloud secrets create PAYPAL_SANDBOX_SECRET --data-file=-
-
-# Mail password
-echo "YOUR_MAIL_PASSWORD" | gcloud secrets create MAIL_PASSWORD --data-file=-
-```
-
-### 3. Update cloudbuild.yaml Variables
-
-Update the substitution variables in `cloudbuild.yaml`:
-
-```yaml
-substitutions:
-  _SERVICE_NAME: 'merchbay-laravel'
-  _REGION: 'us-central1'  # Change to your preferred region
-  _CLOUDSQL_INSTANCE: 'YOUR_PROJECT_ID:us-central1:merchbay-db'
-  _DB_DATABASE: 'merchbay'
-  _DB_USERNAME: 'laravel_user'
-  # ... other variables
-```
-
-## Deployment Steps
-
-### 1. Set up Cloud Build Trigger
-
-```bash
-# Connect your repository to Cloud Build
-gcloud builds triggers create github \
-    --repo-name=YOUR_REPO_NAME \
-    --repo-owner=YOUR_GITHUB_USERNAME \
-    --branch-pattern="^main$" \
-    --build-config=cloudbuild.yaml
-
-# Or trigger manually
-gcloud builds submit --config=cloudbuild.yaml .
-```
-
-### 2. Manual Deployment (Alternative)
-
-```bash
-# Set your project ID
-export PROJECT_ID=your-project-id
-
-# Build and deploy
-gcloud builds submit --config=cloudbuild.yaml \
-    --substitutions=_PROJECT_ID=$PROJECT_ID,_SERVICE_NAME=merchbay-laravel
-```
-
-## Post-deployment Tasks
-
-### 1. Run Database Migrations
-
-```bash
-# Create a one-time job for migrations
-gcloud run jobs create laravel-migrate \
-    --image=gcr.io/$PROJECT_ID/merchbay-laravel:latest \
-    --region=us-central1 \
-    --set-env-vars="APP_ENV=production" \
-    --set-cloudsql-instances=$PROJECT_ID:us-central1:merchbay-db \
-    --command="php" \
-    --args="artisan,migrate,--force" \
-    --max-retries=1
-
-# Execute the migration
-gcloud run jobs execute laravel-migrate --region=us-central1 --wait
-```
-
-### 2. Set up Custom Domain (Optional)
-
-```bash
-# Map custom domain
-gcloud run domain-mappings create \
-    --service=merchbay-laravel \
-    --domain=your-domain.com \
-    --region=us-central1
-```
-
-### 3. Configure Load Balancer and CDN (Optional)
-
-For better performance, consider setting up:
- Cloud Load Balancer
- Cloud CDN for static assets
- Cloud Storage for file uploads
-
-## Environment Variables Reference
-
-The following environment variables are configured in the Cloud Run service:
-
-### Application Settings
- `APP_ENV=production`
- `APP_DEBUG=false`
- `APP_KEY` (from Secret Manager)
-
-### Database Settings
- `DB_HOST=127.0.0.1` (Cloud SQL Proxy)
- `DB_DATABASE=merchbay`
- `DB_USERNAME=laravel_user`
- `DB_PASSWORD` (from Secret Manager)
-
-### Cache & Session
- `CACHE_DRIVER=redis` (requires Redis setup)
- `SESSION_DRIVER=redis`
- `QUEUE_DRIVER=database`
-
-### PayPal Configuration
- `PAYPAL_MODE=live` (or 'sandbox' for testing)
- `PAYPAL_LIVE_CLIENT_ID`
- `PAYPAL_LIVE_SECRET`
- `PAYPAL_SANDBOX_CLIENT_ID`
- `PAYPAL_SANDBOX_SECRET`
-
-### Mail Configuration
- `MAIL_DRIVER=smtp`
- `MAIL_HOST`
- `MAIL_PORT`
- `MAIL_USERNAME`
- `MAIL_PASSWORD`
-
-## Monitoring and Logging
-
-### Enable Application Insights
-
-```bash
-# Enable Cloud Logging
-gcloud logging sinks create laravel-logs \
-    bigquery.googleapis.com/projects/$PROJECT_ID/datasets/app_logs
-```
-
-### Set up Uptime Monitoring
-
-```bash
-# Create uptime check
-gcloud alpha monitoring uptime create \
-    --display-name="Merchbay Laravel App" \
-    --http-check-path="/" \
-    --hostname=your-service-url.run.app
-```
-
-## Troubleshooting
-
-### Common Issues
-
-1. **502 Bad Gateway**: Check logs with `gcloud run services logs read merchbay-laravel`
-2. **Database Connection Issues**: Verify Cloud SQL instance and VPC configuration
-3. **Memory Issues**: Increase memory allocation in cloudbuild.yaml
-4. **Timeout Issues**: Increase timeout and check for long-running operations
-
-### Debugging Commands
-
-```bash
-# View service logs
-gcloud run services logs read merchbay-laravel --region=us-central1
-
-# Get service details
-gcloud run services describe merchbay-laravel --region=us-central1
-
-# Check revisions
-gcloud run revisions list --service=merchbay-laravel --region=us-central1
-```
-
-## Security Considerations
-
-1. **Use Secret Manager** for all sensitive data
-2. **Enable VPC** for database connections
-3. **Configure IAM** with least privilege principle
-4. **Enable Cloud Armor** for DDoS protection
-5. **Use HTTPS** with managed SSL certificates
-6. **Regular Updates** for dependencies and base images
-
-## Cost Optimization
-
-1. **Set Min Instances to 0** for cost savings
-2. **Use Appropriate CPU/Memory** settings
-3. **Implement Caching** (Redis/Memcached)
-4. **Optimize Images** and use multi-stage builds
-5. **Monitor Usage** with Cloud Monitoring
-
-## Support
-
-For issues specific to:
- **Cloud Run**: Check [Cloud Run documentation](https://cloud.google.com/run/docs)
- **Laravel**: Check [Laravel documentation](https://laravel.com/docs)
- **PayPal Integration**: Check [PayPal developer documentation](https://developer.paypal.com/)
--- a/14
+++ b/14
@@ -11,23 +11,29 @@ RUN apk --update --no-cache add \
    zip \
    unzip \
    libmcrypt-dev \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
    && docker-php-ext-install gd pdo pdo_mysql zip mcrypt

 # Set the working directory in the container
 WORKDIR /var/www

+# Clear cache
+# RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Copy the Laravel application files to the container
 COPY . .

 # Set appropriate permissions for Laravel storage and bootstrap cache
-RUN chown -R www-data:www-data storage bootstrap/cache
+RUN chown -R www-data:www-data storage bootstrap

 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

 # Install Laravel dependencies
-RUN composer install --no-interaction --no-plugins --no-scripts
+RUN composer install --no-plugins --no-scripts
+
+# Generate Laravel application key
+RUN php artisan key:generate

 # Create directory for the socket and set permissions
 RUN mkdir -p /run/php && chown www-data:www-data /run/php
@@ -36,5 +42,5 @@ RUN mkdir -p /run/php && chown www-data:www-data /run/php
 # COPY www.conf /usr/local/etc/php-fpm.d/www.conf

 # Expose port 9000 and start php-fpm server
-EXPOSE 9000
+EXPOSE 80
 CMD ["php-fpm"]
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,71 +0,0 @@
-# Debug Dockerfile - Let's try the original approach that was working
-FROM php:5.6-fpm-alpine
-
-# Set working directory
-WORKDIR /var/www
-
-# Install system dependencies and PHP extensions
-RUN apk --update --no-cache add \
-    nginx \
-    libpng-dev \
-    libjpeg-turbo-dev \
-    freetype-dev \
-    libzip-dev \
-    zip \
-    unzip \
-    libmcrypt-dev \
-    curl \
-    git \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install gd pdo pdo_mysql zip mcrypt mbstring
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Copy the Laravel application files to the container
-COPY . .
-
-# Set appropriate permissions for Laravel storage and bootstrap cache
-RUN chown -R www-data:www-data storage bootstrap/cache
-
-# Install Laravel dependencies
-RUN composer install --no-interaction --no-plugins --no-scripts --no-dev
-
-# Create .env file
-RUN if [ ! -f .env ]; then cp .env.example .env; fi
-
-# Generate application key
-RUN php artisan key:generate || true
-
-# Create directory for the socket and set permissions
-RUN mkdir -p /run/php && chown www-data:www-data /run/php
-
-# Configure nginx for Laravel
-RUN echo 'server {
-    listen 80;
-    server_name localhost;
-    root /var/www/public;
-    index index.php index.html index.htm;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location ~ \.php$ {
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        include fastcgi_params;
-    }
-}' > /etc/nginx/conf.d/default.conf
-
-# Create startup script
-RUN echo '#!/bin/sh
-php-fpm -D
-nginx -g "daemon off;"' > /start.sh && chmod +x /start.sh
-
-# Expose port 80
-EXPOSE 80
-
-# Start both PHP-FPM and Nginx
-CMD ["/start.sh"]
--- a/Dockerfile.basic
+++ b/Dockerfile.basic
@@ -1,39 +0,0 @@
-# Bare minimum working Dockerfile for Laravel 5.0
-FROM php:5.6-apache
-
-WORKDIR /var/www/html
-
-# Install absolute essentials only
-RUN apt-get update \
-    && apt-get install -y \
-        curl \
-        git \
-        libmcrypt-dev \
-    && docker-php-ext-install \
-        pdo \
-        pdo_mysql \
-        mcrypt \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Enable Apache rewrite
-RUN a2enmod rewrite
-
-# Configure Apache for Laravel
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-
-# Copy app and set permissions
-COPY . /var/www/html/
-RUN chown -R www-data:www-data /var/www/html
-
-# Basic Laravel setup
-RUN if [ ! -f .env ]; then cp .env.example .env; fi
-RUN composer install --no-dev --no-interaction --ignore-platform-reqs
-RUN php artisan key:generate || true
-
-EXPOSE 80
-CMD ["apache2-foreground"]
--- a/Dockerfile.cloudrun
+++ b/Dockerfile.cloudrun
@@ -1,132 +0,0 @@
-# Dockerfile optimized for Google Cloud Run
-# Use PHP 5.6 with Apache (matches Laravel 5.0 requirements perfectly)
-FROM php:5.6-apache
-
-# Set working directory
-WORKDIR /var/www/html
-
-# Install system dependencies and PHP extensions required for Laravel
-RUN apt-get update && apt-get install -y \
-    libpng-dev \
-    libjpeg62-turbo-dev \
-    libfreetype6-dev \
-    libmcrypt-dev \
-    zlib1g-dev \
-    zip \
-    unzip \
-    git \
-    curl \
-    libxml2-dev \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install \
-        pdo \
-        pdo_mysql \
-        mbstring \
-        zip \
-        gd \
-        xml \
-        mcrypt \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Enable Apache modules and configure
-RUN a2enmod rewrite headers
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# Configure Apache document root for Laravel
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
-# Copy Apache virtual host configuration
-COPY <<EOF /etc/apache2/sites-available/000-default.conf
-<VirtualHost *:80>
-    ServerAdmin webmaster@localhost
-    DocumentRoot /var/www/html/public
-    
-    <Directory /var/www/html/public>
-        AllowOverride All
-        Require all granted
-    </Directory>
-    
-    # Logging
-    ErrorLog \${APACHE_LOG_DIR}/error.log
-    CustomLog \${APACHE_LOG_DIR}/access.log combined
-    
-    # Security headers
-    Header always set X-Content-Type-Options nosniff
-    Header always set X-Frame-Options DENY
-    Header always set X-XSS-Protection "1; mode=block"
-    Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
-    Header always set Referrer-Policy "strict-origin-when-cross-origin"
-</VirtualHost>
-EOF
-
-# Copy application files
-COPY . /var/www/html/
-
-# Fix Git ownership issue for the repository
-RUN git config --global --add safe.directory /var/www/html || true
-
-# Install PHP dependencies
-RUN composer install --no-dev --optimize-autoloader --no-interaction
-
-# Set proper permissions for Laravel
-RUN chown -R www-data:www-data /var/www/html \
-    && chmod -R 755 /var/www/html \
-    && chmod -R 775 /var/www/html/storage \
-    && chmod -R 775 /var/www/html/bootstrap/cache
-
-# Create .env file from .env.example if it doesn't exist
-RUN if [ ! -f /var/www/html/.env ]; then \
-        cp /var/www/html/.env.example /var/www/html/.env; \
-    fi
-
-# Switch to www-data user for Laravel commands to avoid ownership issues
-USER www-data
-
-# Generate application key (will be overridden by environment variables in Cloud Run)
-RUN php artisan key:generate || true
-
-# Clear and cache configuration for production
-RUN php artisan config:clear || true \
-    && php artisan route:clear || true \
-    && php artisan view:clear || true
-
-# Switch back to root for the remaining setup
-USER root
-
-# Create startup script
-COPY <<EOF /usr/local/bin/start.sh
-#!/bin/bash
-set -e
-
-# Fix Git ownership issue
-git config --global --add safe.directory /var/www/html || true
-
-# Wait for database to be ready (if using Cloud SQL)
-echo "Starting Laravel application..."
-
-# Run Laravel optimizations
-php artisan config:cache || true
-php artisan route:cache || true
-php artisan view:cache || true
-
-# Start Apache in foreground
-exec apache2-foreground
-EOF
-
-RUN chmod +x /usr/local/bin/start.sh
-
-# Expose port 80 (Cloud Run will map this to 8080)
-EXPOSE 80
-
-# Health check for Cloud Run
-HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
-    CMD curl -f http://localhost/ || exit 1
-
-# Use the startup script
-CMD ["/usr/local/bin/start.sh"]
--- a/Dockerfile.minimal
+++ b/Dockerfile.minimal
@@ -1,86 +0,0 @@
-# Minimal Dockerfile for Laravel 5.0 with PHP 5.6
-FROM php:5.6-apache
-
-# Set working directory
-WORKDIR /var/www/html
-
-# Install only essential system dependencies
-RUN apt-get update && apt-get install -y \
-    libmcrypt-dev \
-    libpng-dev \
-    libjpeg62-turbo-dev \
-    libfreetype6-dev \
-    zlib1g-dev \
-    zip \
-    unzip \
-    git \
-    curl \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install \
-        pdo \
-        pdo_mysql \
-        mcrypt \
-        gd \
-        zip \
-        mbstring \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Enable Apache modules
-RUN a2enmod rewrite
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# Configure Apache document root for Laravel
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
-# Simple Apache configuration
-RUN echo '<VirtualHost *:80>\n\
-    DocumentRoot /var/www/html/public\n\
-    <Directory /var/www/html/public>\n\
-        AllowOverride All\n\
-        Require all granted\n\
-    </Directory>\n\
-</VirtualHost>' > /etc/apache2/sites-available/000-default.conf
-
-# Copy application files
-COPY . /var/www/html/
-
-# Fix Git ownership issue
-RUN git config --global --add safe.directory /var/www/html || true
-
-# Install PHP dependencies
-RUN composer install --no-dev --optimize-autoloader --no-interaction
-
-# Set proper permissions
-RUN chown -R www-data:www-data /var/www/html \
-    && chmod -R 755 /var/www/html \
-    && chmod -R 775 /var/www/html/storage \
-    && chmod -R 775 /var/www/html/bootstrap/cache
-
-# Create .env file if it doesn't exist
-RUN if [ ! -f /var/www/html/.env ]; then \
-        cp /var/www/html/.env.example /var/www/html/.env; \
-    fi
-
-# Switch to www-data for Laravel commands
-USER www-data
-RUN php artisan key:generate || true
-USER root
-
-# Create simple startup script
-RUN echo '#!/bin/bash\n\
-set -e\n\
-echo "Starting Laravel application..."\n\
-exec apache2-foreground' > /usr/local/bin/start.sh \
-    && chmod +x /usr/local/bin/start.sh
-
-# Expose port 80
-EXPOSE 80
-
-# Start Apache
-CMD ["/usr/local/bin/start.sh"]
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -1,75 +0,0 @@
-# Ultra-minimal Dockerfile for Laravel 5.0 with PHP 5.6
-FROM php:5.6-apache
-
-# Set working directory
-WORKDIR /var/www/html
-
-# Install packages one by one to identify issues
-RUN apt-get update
-
-# Install core development tools first
-RUN apt-get install -y \
-    curl \
-    git \
-    zip \
-    unzip
-
-# Install mcrypt (most important for Laravel 5.0)
-RUN apt-get install -y libmcrypt-dev \
-    && docker-php-ext-install mcrypt
-
-# Install basic PHP extensions
-RUN docker-php-ext-install \
-    pdo \
-    pdo_mysql \
-    mbstring
-
-# Try to install GD dependencies
-RUN apt-get install -y \
-    libpng-dev \
-    libjpeg-dev \
-    libfreetype6-dev \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install gd
-
-# Install zip extension
-RUN apt-get install -y zlib1g-dev \
-    && docker-php-ext-install zip
-
-# Clean up
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Enable Apache rewrite module
-RUN a2enmod rewrite
-
-# Configure Apache
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-
-# Copy application files
-COPY . /var/www/html/
-
-# Set basic permissions
-RUN chown -R www-data:www-data /var/www/html \
-    && chmod -R 755 /var/www/html
-
-# Create .env file if needed
-RUN if [ ! -f /var/www/html/.env ]; then \
-        cp /var/www/html/.env.example /var/www/html/.env; \
-    fi
-
-# Install dependencies without dev packages
-RUN composer install --no-dev --no-interaction || true
-
-# Generate Laravel key
-RUN php artisan key:generate || true
-
-# Expose port 80
-EXPOSE 80
-
-# Start Apache
-CMD ["apache2-foreground"]
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,60 +0,0 @@
-# Test Dockerfile to identify available packages
-FROM php:5.6-apache
-
-WORKDIR /var/www/html
-
-# Update package lists first
-RUN apt-get update
-
-# Test each package individually
-RUN apt-get install -y curl || echo "curl failed"
-RUN apt-get install -y git || echo "git failed"
-RUN apt-get install -y zip || echo "zip failed"
-RUN apt-get install -y unzip || echo "unzip failed"
-
-# Test mcrypt (most important)
-RUN apt-get install -y libmcrypt-dev || echo "libmcrypt-dev failed"
-
-# Test image libraries one by one
-RUN apt-get install -y libpng-dev || echo "libpng-dev failed"
-RUN apt-get install -y libjpeg-dev || echo "libjpeg-dev failed"
-RUN apt-get install -y libfreetype6-dev || echo "libfreetype6-dev failed"
-
-# Test zip library
-RUN apt-get install -y zlib1g-dev || echo "zlib1g-dev failed"
-
-# Try to install PHP extensions
-RUN docker-php-ext-install mcrypt || echo "mcrypt extension failed"
-RUN docker-php-ext-install pdo || echo "pdo extension failed"
-RUN docker-php-ext-install pdo_mysql || echo "pdo_mysql extension failed"
-RUN docker-php-ext-install mbstring || echo "mbstring extension failed"
-
-# Test GD configuration
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ || echo "gd configure failed"
-RUN docker-php-ext-install gd || echo "gd extension failed"
-
-# Test zip extension
-RUN docker-php-ext-install zip || echo "zip extension failed"
-
-# Clean up
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Basic Apache setup
-RUN a2enmod rewrite
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-
-# Test copy and basic setup
-COPY . /var/www/html/
-RUN chown -R www-data:www-data /var/www/html
-
-# Test Laravel commands
-RUN if [ ! -f .env ]; then cp .env.example .env; fi || echo ".env creation failed"
-RUN composer install --no-dev --no-interaction || echo "composer install failed"
-RUN php artisan key:generate || echo "key generation failed"
-
-EXPOSE 80
-CMD ["apache2-foreground"]
--- a/PHP_COMPATIBILITY.md
+++ b/PHP_COMPATIBILITY.md
@@ -1,100 +0,0 @@
-# Laravel 5.0 and PHP Compatibility Guide
-
-## Issue: mcrypt Extension Required
-
-Laravel 5.0 requires the `mcrypt` PHP extension, which was:
-
- **Deprecated** in PHP 7.1
- **Removed** in PHP 7.2+
-
-## Solutions
-
-### Option 1: Use PHP 5.6 (Current Implementation)
-
-The `Dockerfile.minimal` has been updated to use PHP 5.6 which is the ideal match for Laravel 5.0.
-
-**Pros:**
-
- Perfect compatibility with Laravel 5.0
- Native mcrypt support
- All packages available and tested
- Matches original development environment
-
-**Cons:**
-
- PHP 5.6 reached end-of-life in December 2018
- Security concerns for long-term production use
-
-### Option 2: Upgrade Laravel (Recommended for Production)
-Upgrade to Laravel 5.5+ which doesn't require mcrypt.
-
-```bash
-# Update composer.json
-"laravel/framework": "5.8.*"
-
-# Remove mcrypt dependencies and update encryption
-php artisan key:generate
-```
-
-### Option 3: Use OpenSSL Instead (Laravel 5.2+)
-If upgrading Laravel, update encryption configuration:
-
-```php
-// config/app.php
-'cipher' => 'AES-256-CBC',
-```
-
-## Current Docker Configuration
-
-The Dockerfile now uses:
-
- **Base Image**: `php:5.6-apache`
- **mcrypt Extension**: Native support (no installation issues)
- **Other Extensions**: All Laravel 5.0 requirements met
- **Package Compatibility**: Perfect match for PHP 5.6
-
-## Production Recommendations
-
-For a production deployment, consider:
-
-1. **Upgrade Laravel** to 5.8 or later (LTS)
-2. **Use PHP 7.4+** for better performance and security
-3. **Replace mcrypt** with OpenSSL encryption
-
-## Quick Upgrade Path (Optional)
-
-If you want to modernize the application:
-
-### Step 1: Update composer.json
-```json
-{
-    "require": {
-        "laravel/framework": "5.8.*"
-    }
-}
-```
-
-### Step 2: Update Dockerfile to use PHP 7.4
-```dockerfile
-FROM php:7.4-apache
-# Remove mcrypt installation
-```
-
-### Step 3: Update configuration
-```bash
-php artisan key:generate
-php artisan config:cache
-```
-
-## Security Note
-
-Since PHP 7.1 is end-of-life, monitor for security updates and consider upgrading the Laravel version for long-term production use.
-
-## Testing the Current Setup
-
-The current configuration should work with:
-```bash
-./start-local.sh
-```
-
-This will use PHP 7.1 with mcrypt support for Laravel 5.0 compatibility.
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -405,7 +405,7 @@ class PaypalController extends Controller
 		if (count($grouped_item) <= 0) {
 			$tax_value = 0;
 		} else {
-			if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1  || $grouped_item[0]->StoreId == 329 || $grouped_item[0]->StoreId == 340 || $grouped_item[0]->StoreId == 346) {
+			if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1  || $grouped_item[0]->StoreId == 329 || $grouped_item[0]->StoreId == 340) {
 				$tax_value = 0;
 			} else {
 				$tax_value = 0.10;
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -161,6 +161,73 @@ class TeamStoreController extends Controller
 			->with('thumbnails', $thumbnails);
 	}

+	public function storeIndex(Request $request)
+	{
+		// $analyticsData = Analytics::getMostVisitedPages(14, 50);
+
+		// foreach($analyticsData as $key => $val){
+		// 	if (strpos($val['url'], 'teamstore') !== false) {
+		// 		$teamstore[] = $val['url'];
+		// 	}
+		// }
+
+		// foreach($teamstore as $t){
+		// 	$sad = explode('/', $t);
+
+		// 	if(count($sad) == 4){
+		// 		$arr_teamstore[] = explode('?', $sad['3'])['0'];
+
+		// 	}
+		// }
+
+		// var_dump(array_unique($arr_teamstore));
+
+		$m 		= new TeamStoreModel;
+		$q 		= $request->input('q');
+		$sort 	= $request->input('s');
+
+		if (isset($q) && isset($sort)) {
+
+			if ($sort == "latest") {
+				$field = "Id";
+				$sort_value = "DESC";
+			} elseif ($sort == "al-desc") {
+				$field = "StoreName";
+				$sort_value = "DESC";
+			} elseif ($sort == "oldest") {
+				$field = "Id";
+				$sort_value = "ASC";
+			} else {
+				$field = "StoreName";
+				$sort_value = "ASC";
+			}
+
+			if ($q != "") {
+				// keyword and sort
+				$stores_array 	= $m->selectTeamstoreSearch($field, $sort_value, $q);
+			} else {
+				// sort only
+				$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
+			}
+		} else {
+			$field = "StoreName";
+			$sort_value = "ASC";
+			$sort = "al-asc";
+			$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
+		}
+
+		$getCarousel = $m->getCarousel();
+		// var_dump($getCarousel);
+
+		$featured_products 	 = $m->selectFeaturedProducts();
+		return view('merchbay.stores')
+			->with('stores_array', $stores_array)
+			->with('keyword', $q)
+			->with('filter', $sort)
+			->with('carousel_images', $getCarousel)
+			->with('featured_products', $featured_products);
+	}
+
 	public function storelist(Request $request)
 	{
 		// $analyticsData = Analytics::getMostVisitedPages(14, 50);
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -81,6 +81,8 @@ Route::get('/', 'teamstore\TeamStoreController@storelist');  // old

 // Route::group(['middleware' => 'teamstoresession'], function () {

+Route::get('/stores', 'teamstore\TeamStoreController@storeIndex');
+
 Route::get('/store/{storename}', 'teamstore\TeamStoreController@index');
 Route::get('/store/{storename}/product/{producurl}', 'teamstore\TeamStoreController@productDetails');
 // Route::post('/teamstore/q/addnewrow', 'teamstore\TeamStoreController@addNewRow');
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,156 +0,0 @@
-# Google Cloud Build configuration for Laravel 5 application deployment to Cloud Run
-steps:
-  # Step 1: Build the Docker image
-  - name: 'gcr.io/cloud-builders/docker'
-    args: 
-      - 'build'
-      - '-t'
-      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
-      - '-t'
-      - 'gcr.io/$PROJECT_ID/merchbay-laravel:latest'
-      - '-f'
-      - 'Dockerfile.simple'
-      - '.'
-    id: 'build-image'
-
-  # Step 2: Push the Docker image to Google Container Registry
-  - name: 'gcr.io/cloud-builders/docker'
-    args: 
-      - 'push'
-      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
-    id: 'push-image'
-    waitFor: ['build-image']
-
-  # Step 3: Push the latest tag as well
-  - name: 'gcr.io/cloud-builders/docker'
-    args: 
-      - 'push'
-      - 'gcr.io/$PROJECT_ID/merchbay-laravel:latest'
-    id: 'push-latest'
-    waitFor: ['build-image']
-
-  # Step 4: Run database migrations (optional - only if you have Cloud SQL configured)
-  # Uncomment and configure if you need to run migrations
-  # - name: 'gcr.io/cloud-builders/gcloud'
-  #   entrypoint: 'bash'
-  #   args:
-  #     - '-c'
-  #     - |
-  #       gcloud run jobs create laravel-migrate \
-  #         --image=gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA \
-  #         --region=$_REGION \
-  #         --set-env-vars="APP_ENV=production,APP_KEY=$_APP_KEY,DB_HOST=$_DB_HOST,DB_DATABASE=$_DB_DATABASE,DB_USERNAME=$_DB_USERNAME,DB_PASSWORD=$_DB_PASSWORD" \
-  #         --set-cloudsql-instances=$_CLOUDSQL_INSTANCE \
-  #         --command="php" \
-  #         --args="artisan,migrate,--force" \
-  #         --max-retries=1 \
-  #         --replace || true
-  #       gcloud run jobs execute laravel-migrate --region=$_REGION --wait
-  #   id: 'run-migrations'
-  #   waitFor: ['push-image']
-
-  # Step 5: Deploy to Cloud Run
-  - name: 'gcr.io/cloud-builders/gcloud'
-    args:
-      - 'run'
-      - 'deploy'
-      - '$_SERVICE_NAME'
-      - '--image'
-      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
-      - '--region'
-      - '$_REGION'
-      - '--platform'
-      - 'managed'
-      - '--allow-unauthenticated'
-      - '--port'
-      - '8080'
-      - '--memory'
-      - '$_MEMORY'
-      - '--cpu'
-      - '$_CPU'
-      - '--timeout'
-      - '$_TIMEOUT'
-      - '--concurrency'
-      - '$_CONCURRENCY'
-      - '--min-instances'
-      - '$_MIN_INSTANCES'
-      - '--max-instances'
-      - '$_MAX_INSTANCES'
-      - '--set-env-vars'
-      - 'APP_ENV=production,APP_DEBUG=false,APP_KEY=$_APP_KEY,DB_HOST=$_DB_HOST,DB_DATABASE=$_DB_DATABASE,DB_USERNAME=$_DB_USERNAME,DB_PASSWORD=$_DB_PASSWORD,CACHE_DRIVER=redis,SESSION_DRIVER=redis,QUEUE_DRIVER=database,PAYPAL_MODE=$_PAYPAL_MODE,PAYPAL_LIVE_CLIENT_ID=$_PAYPAL_LIVE_CLIENT_ID,PAYPAL_LIVE_SECRET=$_PAYPAL_LIVE_SECRET,PAYPAL_SANDBOX_CLIENT_ID=$_PAYPAL_SANDBOX_CLIENT_ID,PAYPAL_SANDBOX_SECRET=$_PAYPAL_SANDBOX_SECRET,MAIL_DRIVER=$_MAIL_DRIVER,MAIL_HOST=$_MAIL_HOST,MAIL_PORT=$_MAIL_PORT,MAIL_USERNAME=$_MAIL_USERNAME,MAIL_PASSWORD=$_MAIL_PASSWORD,GOOGLE_ANALYTICS_VIEW_ID=$_GOOGLE_ANALYTICS_VIEW_ID'
-      - '--set-cloudsql-instances'
-      - '$_CLOUDSQL_INSTANCE'
-      - '--vpc-connector'
-      - '$_VPC_CONNECTOR'
-      - '--add-cloudsql-instances'
-      - '$_CLOUDSQL_INSTANCE'
-    id: 'deploy-service'
-    waitFor: ['push-image']
-
-# Substitution variables - you can override these in your Cloud Build trigger
-substitutions:
-  # Service configuration
-  _SERVICE_NAME: 'merchbay-laravel'
-  _REGION: 'us-central1'
-  
-  # Resource limits
-  _MEMORY: '1Gi'
-  _CPU: '1000m'
-  _TIMEOUT: '300s'
-  _CONCURRENCY: '80'
-  _MIN_INSTANCES: '0'
-  _MAX_INSTANCES: '10'
-  
-  # Database configuration (Cloud SQL)
-  _CLOUDSQL_INSTANCE: 'YOUR_PROJECT_ID:REGION:INSTANCE_NAME'
-  _DB_HOST: '127.0.0.1'
-  _DB_DATABASE: 'merchbay'
-  _DB_USERNAME: 'laravel_user'
-  _DB_PASSWORD: 'YOUR_DB_PASSWORD'
-  
-  # VPC configuration (if needed)
-  _VPC_CONNECTOR: 'projects/YOUR_PROJECT_ID/locations/REGION/connectors/CONNECTOR_NAME'
-  
-  # Application configuration
-  _APP_KEY: 'base64:YOUR_APP_KEY_HERE'
-  
-  # PayPal configuration
-  _PAYPAL_MODE: 'live'
-  _PAYPAL_LIVE_CLIENT_ID: 'YOUR_PAYPAL_LIVE_CLIENT_ID'
-  _PAYPAL_LIVE_SECRET: 'YOUR_PAYPAL_LIVE_SECRET'
-  _PAYPAL_SANDBOX_CLIENT_ID: 'YOUR_PAYPAL_SANDBOX_CLIENT_ID'
-  _PAYPAL_SANDBOX_SECRET: 'YOUR_PAYPAL_SANDBOX_SECRET'
-  
-  # Mail configuration
-  _MAIL_DRIVER: 'smtp'
-  _MAIL_HOST: 'smtp.gmail.com'
-  _MAIL_PORT: '587'
-  _MAIL_USERNAME: 'your-email@domain.com'
-  _MAIL_PASSWORD: 'your-app-password'
-  
-  # Google Analytics
-  _GOOGLE_ANALYTICS_VIEW_ID: 'YOUR_GA_VIEW_ID'
-
-# Build options
-options:
-  # Use a more powerful machine for faster builds
-  machineType: 'E2_HIGHCPU_8'
-  
-  # Enable detailed logging
-  logging: CLOUD_LOGGING_ONLY
-
-# Build timeout
-timeout: '1200s'
-
-# Store build logs in Cloud Logging
-logsBucket: 'gs://YOUR_PROJECT_ID_cloudbuild-logs'
-
-# Available logs for debugging
-availableSecrets:
-  secretManager:
-    - versionName: 'projects/YOUR_PROJECT_ID/secrets/APP_KEY/versions/latest'
-      env: 'APP_KEY'
-    - versionName: 'projects/YOUR_PROJECT_ID/secrets/DB_PASSWORD/versions/latest'
-      env: 'DB_PASSWORD'
-    - versionName: 'projects/YOUR_PROJECT_ID/secrets/PAYPAL_LIVE_SECRET/versions/latest'
-      env: 'PAYPAL_LIVE_SECRET'
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -1,75 +0,0 @@
-# Docker Compose for local development and testing
-version: '3.8'
-
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile.basic
-    ports:
-      - "8080:80"
-    environment:
-      - APP_ENV=local
-      - APP_DEBUG=true
-      - APP_KEY=base64:your-app-key-here
-      - DB_HOST=mysql
-      - DB_DATABASE=merchbay
-      - DB_USERNAME=laravel_user
-      - DB_PASSWORD=secret
-      - CACHE_DRIVER=file
-      - SESSION_DRIVER=file
-      - REDIS_HOST=redis
-      - QUEUE_DRIVER=sync
-      - PAYPAL_MODE=sandbox
-      - PAYPAL_SANDBOX_CLIENT_ID=your-sandbox-client-id
-      - PAYPAL_SANDBOX_SECRET=your-sandbox-secret
-      - MAIL_DRIVER=log
-    volumes:
-      - ./storage:/var/www/html/storage
-      - ./bootstrap/cache:/var/www/html/bootstrap/cache
-    depends_on:
-      - mysql
-      - redis
-    networks:
-      - app-network
-
-  mysql:
-    image: mysql:8.0
-    environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=merchbay
-      - MYSQL_USER=laravel_user
-      - MYSQL_PASSWORD=secret
-    ports:
-      - "3306:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-    networks:
-      - app-network
-
-  redis:
-    image: redis:7-alpine
-    ports:
-      - "6379:6379"
-    networks:
-      - app-network
-
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-      - PMA_HOST=mysql
-      - PMA_USER=root
-      - PMA_PASSWORD=root
-    ports:
-      - "8081:80"
-    depends_on:
-      - mysql
-    networks:
-      - app-network
-
-volumes:
-  mysql_data:
-
-networks:
-  app-network:
-    driver: bridge
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:

  #Nginx Service
  webserver:
-    image: nginx:alpine
+    image: nginx:latest
    container_name: webserver
    restart: unless-stopped
    tty: true
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -3,29 +3,37 @@ server {
    index index.php index.html;
    error_log  /var/log/nginx/error.log;
    access_log /var/log/nginx/access.log;
-    root /var/www/public;
+    root /var/www;
+    index index.php index.html;

     location / {
+        if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '*';
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE, HEAD';
+                add_header 'Access-Control-Max-Age' '1728000';
+                add_header 'Access-Control-Allow-Headers' '*';
+                #add_header 'Content-Type: text/plain; charset=UTF-8';
+                #add_header 'Content-Length: 0';
+                return 204;
+        }
        try_files $uri $uri/ /index.php?$query_string;
-    }

+    }
    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass app:9000;
        fastcgi_index index.php;
+        fastcgi_pass app:9000;
+   
        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
        fastcgi_param PATH_INFO $fastcgi_path_info;
-    }
+        fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

-    location ~ /\.ht {
-        deny all;
    }
-
    location ~* \.(css|less|js|jpg|png|gif)$ {
-        expires 0;
            add_header Cache-Control "no-cache, no-store, must-revalidate";
            add_header Pragma "no-cache";
+            expires 0;
    }
+
 }
--- a/public/assets/css/merchbay/styles-stores.css
+++ b/public/assets/css/merchbay/styles-stores.css
@@ -0,0 +1,395 @@
+html,
+body {
+  width: 100%;
+  height: 100%;
+  font-family: "Montserrat", sans-serif !important;
+  background-color: #f5f5f6;
+  font-size: 0.9rem;
+}
+
+a {
+  text-decoration: none;
+  color:#000000;
+}
+
+.bg-black {
+  background-color: #000;
+}
+
+.navbar-brand span {
+  font-weight: 900;
+}
+
+.navbar-brand > img {
+  height: 28px !important;
+}
+
+.btn-white-outline {
+  color: #ffffff;
+  border-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-white-outline:hover {
+  color: #000000;
+  border-color: #ffffff;
+  background-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-black-outline {
+  color: #ffffff;
+  border-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-navbar-cart {
+  color: #fff;
+  background-color: transparent;
+  border-color: transparent;
+}
+
+.btn-navbar-cart:hover {
+  color: #fff;
+  background-color: transparent;
+  border-color: transparent;
+}
+
+/* .container {
+  padding-right: 0px !important;
+  padding-left: 0px !important;
+} */
+
+.btn-green {
+  color: #fff;
+  background-color: #28a745;
+  border-color: #28a745;
+}
+
+.btn-green:hover {
+  color: #28a745;
+  background-color: #fff;
+  border-color: #28a745;
+}
+
+.btn-black {
+  color: #fff;
+  background-color: #000000;
+  border-color: #000000;
+}
+
+.btn-black:hover {
+  color: rgb(0, 0, 0);
+  background-color: transparent;
+  border-color: #000000;
+}
+
+.added-or {
+  position: relative;
+}
+
+.added-or::before {
+  content: "or";
+  position: absolute;
+  display: inline-block;
+  padding: 5px;
+  margin-right: 48px;
+  left: -15px;
+  font-size: 1rem;
+}
+
+.navbar-auth-buttons a {
+  line-height: 1.9;
+}
+
+.wrapper {
+  min-height: 100vh;
+}
+
+.copyright {
+  margin-bottom: -5px;
+  font-size: 0.7rem;
+}
+
+
+.main__banner {
+  padding-top: 66px;
+}
+
+.store-logo {
+  height: 165px;
+  display: inline-block;
+  /* border: 1px solid #e2e2e2; */
+  position: relative;
+}
+
+.store-locked{
+  background-color: rgb(0 0 0 / 60%);
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  padding: 67px;
+  text-align: center;
+}
+
+.store-locked > i {
+  font-size: 2rem;
+  color: #ffffff;
+}
+
+.store-logo img {
+  object-fit: contain;
+  width: 100%;
+  max-height: 250px;
+  height: 165px;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  /* padding: 5px; */
+  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+}
+
+.product-image img {
+  object-fit: contain;
+  width: 100%;
+  max-height: 250px;
+  padding: 5px;
+}
+
+.store-name,
+.product-name {
+  font-size: 0.8rem;
+  font-weight: 600;
+  padding: 5px;
+  color: #000000;
+}
+
+.product-name-display h3 {
+  font-weight: 600;
+}
+
+.product-price {
+  font-size: 1rem;
+  font-weight: 700;
+  padding: 0px 5px;
+  margin: -5px 0px;
+}
+
+.product-price-display div {
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #9a9a9a;
+  margin-right: 5px;
+  margin-top: -5px;
+}
+
+.store a {
+  text-decoration: none;
+  color: #2c2c2c;
+}
+
+.product a {
+  text-decoration: none;
+}
+
+.store-banner {
+  /* background-color: #000000; */
+  height: auto;
+  object-fit: contain;
+}
+
+.please-read-title,
+.disclaimer, .announcement {
+  font-size: 0.8rem;
+  color: #000000;
+  font-weight: bold;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+
+.disclaimer-message {
+  font-size: 0.7rem;
+  color: #ffffff;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+
+.announcement-message {
+  font-size: 0.7rem;
+  color: #ffffff;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+.please-read li {
+  font-size: 0.7rem;
+  color: #858585;
+}
+
+.bg-black {
+  background-color: #000000;
+}
+
+.bg-announcement {
+  background-color: #000000;
+}
+
+.navbar-toggler {
+  border: 1px solid #fff !important;
+}
+
+.nav-link {
+  padding: 0.25rem 0.5rem !important;
+  line-height: 1rem;
+}
+
+.sort-by {
+  text-align: right;
+}
+
+.custom-hr {
+  background-color: #e3e3e3 !important;
+  height: 2px !important;
+}
+
+a.btn-white-outline.nuxt-link-exact-active {
+  background-color: #fff;
+  color: #000;
+}
+
+.product-price > .previous-price {
+  margin-right: 10px;
+}
+
+.product-price > .current-price {
+  color: #e01414;
+  font-size: 1.1rem;
+}
+
+.breadcrumb-item a {
+  color: #9a9a9a !important;
+  text-decoration: none;
+  font-weight: 500;
+}
+
+.breadcrumb-item.active {
+  color: #9a9a9a !important;
+}
+
+.breadcrumb-item + .breadcrumb-item::before {
+  color: #9a9a9a !important;
+}
+
+.adbg {
+  background-color: #bdc6c5;
+}
+
+span.designer-text {
+  color: #b90a0c;
+}
+
+.product-active-thumbnail {
+  height: 400px;
+}
+
+@media (max-width: 992px) {
+  .footer-menu {
+    text-align: center;
+  }
+
+  .copyright {
+    text-align: center;
+  }
+
+  .added-or::before {
+    display: none;
+  }
+
+  .navbar-collapse.collapsing .navbar-nav {
+    display: block;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: -45%;
+    transition: all 0.2s ease;
+  }
+
+  .navbar-nav {
+    background-color: #fff;
+  }
+
+  .navbar-collapse.show .navbar-nav {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    flex-direction: column;
+    height: 100vh;
+    width: 65%;
+    transition: left 0.35s ease;
+    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+    z-index: 9999;
+  }
+
+  .navbar-nav .nav-link {
+    padding-right: 1rem;
+    padding-left: 1rem;
+  }
+
+  .nav-item {
+    padding-left: 1rem;
+    padding-right: 1rem;
+    padding-top: 0.8rem;
+  }
+  .store-logo img {
+    /* max-height: 100%; */
+    height: 150px;
+    object-fit: contain;
+    box-shadow: unset;
+    /* width: 1; */
+  }
+
+  .store-name {
+    text-align: center;
+  }
+
+  .product-image img {
+    max-height: 100%;
+  }
+
+  .sort-by {
+    text-align: left;
+  }
+
+  .product-active-thumbnail {
+    height: 345px;
+  }
+
+  .btn-white-outline {
+    color: #000000;
+    border-color: #000000;
+  }
+
+  .btn-white-outline:hover {
+    color: #ffffff;
+    border-color: #000000;
+    background-color: #000000;
+  }
+
+  .bi.bi-cart-fill {
+    color: #000000;
+  }
+
+  /* footer {
+    height: inherit;
+  }
+
+  .footer-socials-icons{
+    text-align: center;
+    margin-top: 5px;
+  } */
+}
--- a/public/assets/css/merchbay/styles.css
+++ b/public/assets/css/merchbay/styles.css
@@ -1,437 +1,431 @@
-html,
-body {
-  width: 100%;
-  height: 100%;
-  font-family: "Montserrat", sans-serif !important;
-  background-color: #f5f5f6;
-  font-size: 0.9rem;
+@font-face {
+    font-family: "AmazonEmberDisplay_Bd";
+    src: url("../../fonts/AmazonEmberDisplay_Bd.ttf") format("truetype");
 }
-
-a {
-  text-decoration: none;
-  color:#000000;
+@font-face {
+    font-family: "AmazonEmberDisplay_He";
+    src: url("../../fonts/AmazonEmberDisplay_He.ttf") format("truetype");
 }
-
-.bg-black {
-  background-color: #000;
+@font-face {
+    font-family: "AmazonEmberDisplay_Lt";
+    src: url("../../fonts/AmazonEmberDisplay_Lt.ttf") format("truetype");
 }
-
-.navbar-brand span {
-  font-weight: 900;
+@font-face {
+    font-family: "AmazonEmberDisplay_Md";
+    src: url("../../fonts/AmazonEmberDisplay_Md.ttf") format("truetype");
 }
-
-.navbar-brand > img {
-  height: 28px !important;
+@font-face {
+    font-family: "AmazonEmberDisplay_Rg";
+    src: url("../../fonts/AmazonEmberDisplay_Rg.ttf") format("truetype");
 }
-
-.btn-white-outline {
-  color: #ffffff;
-  border-color: #ffffff;
-  font-size: 0.7rem !important;
-}
-
-.btn-white-outline:hover {
-  color: #000000;
-  border-color: #ffffff;
-  background-color: #ffffff;
-  font-size: 0.7rem !important;
-}
-
-.btn-black-outline {
-  color: #ffffff;
-  border-color: #ffffff;
-  font-size: 0.7rem !important;
-}
-
-.btn-navbar-cart {
-  color: #fff;
-  background-color: transparent;
-  border-color: transparent;
-}
-
-.btn-navbar-cart:hover {
-  color: #fff;
-  background-color: transparent;
-  border-color: transparent;
-}
-
-/* .container {
-  padding-right: 0px !important;
-  padding-left: 0px !important;
-} */
-
-.btn-green {
-  color: #fff;
-  background-color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-green:hover {
-  color: #28a745;
-  background-color: #fff;
-  border-color: #28a745;
-}
-
-.btn-black {
-  color: #fff;
-  background-color: #000000;
-  border-color: #000000;
-}
-
-.btn-black:hover {
-  color: rgb(0, 0, 0);
-  background-color: transparent;
-  border-color: #000000;
-}
-
-.added-or {
-  position: relative;
-}
-
-.added-or::before {
-  content: "or";
-  position: absolute;
-  display: inline-block;
-  padding: 5px;
-  margin-right: 48px;
-  left: -15px;
-  font-size: 1rem;
-}
-
-.navbar-auth-buttons a {
-  line-height: 1.9;
-}
-
-.wrapper {
-  min-height: 100vh;
-}
-
-footer {
-  background: #000000;
-  color: white;
-  /* line-height: 50px; */
-  /* padding: 0 20px; */
-  height: 70px;
-}
-
-.footer-socials-icons{
-  float: right;
-}
-
-.footer-menu {
-  list-style-type: none;
-  margin: 0;
+html, body {
    padding: 0;
-  /* text-align: right; */
+    margin: 0;
+    font-family: AmazonEmberDisplay_Rg !important;
+    height: 100%;
 }
-
-li.footer-menu-item {
-  display: inline-block;
-  /* padding: 0px 5px; */
-  font-size: 12px;
+html {
+    scroll-padding-top: 67px;
 }
-
-li.footer-menu-item::after {
-  content: " |";
-  /* margin: 0px 10px 0px 10px; */
+.navbar-custom {
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+    background-color: #191919;
 }
-
-li.footer-menu-item:last-child::after {
+.navbar-custom .navbar-brand {
+    text-transform: uppercase;
+    font-size: 1rem;
+    letter-spacing: 0.1rem;
+    font-weight: 700;
+}
+.navbar-custom .navbar-nav .nav-item .nav-link {
+    text-transform: uppercase;
+    font-size: 0.8rem;
+    font-weight: 700;
+    letter-spacing: 0.1rem;
+}
+header.masthead {
+    position: relative;
+    overflow: hidden;
+    padding-bottom: 7rem;
+    background: url(../../../images/band-background.jpg);
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-attachment: scroll;
+    background-size: cover;
+    border-bottom: 15px solid;
+    border-image: linear-gradient(to right, #59caf4 33.33%, #f38d9a 33.33%, #f38d9a 66.66%, #fcc375 66.66%) 5;
+}
+header.masthead::after {
    content: "";
-  /* margin: 0 10px; */
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: linear-gradient(120deg, #252525, #252525);
+    opacity: 0.7;
 }
-
-li.footer-menu-item a {
-  color: #f2f2f2;
-  text-decoration: none;
-}
-
-li.footer-menu-item a:hover {
-  text-decoration: underline;
-}
-
-.copyright {
-  margin-bottom: -5px;
-  font-size: 0.7rem;
-}
-
-.col-footer {
-  margin-top: -15px;
-}
-.store-logo {
-  height: 165px;
-  display: inline-block;
-  /* border: 1px solid #e2e2e2; */
+header.masthead .masthead-content {
+    z-index: 1;
    position: relative;
 }
-
-.store-locked{
-  background-color: rgb(0 0 0 / 60%);
-  height: 100%;
-  width: 100%;
-  top: 0;
-  left: 0;
-  position: absolute;
-  padding: 67px;
-  text-align: center;
-}
-
-.store-locked > i {
-  font-size: 2rem;
-  color: #ffffff;
-}
-
-.store-logo img {
-  object-fit: contain;
-  width: 100%;
-  max-height: 250px;
-  height: 165px;
-  top: 0;
-  bottom: 0;
-  margin: auto;
-  /* padding: 5px; */
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
-}
-
-.product-image img {
-  object-fit: contain;
-  width: 100%;
-  max-height: 250px;
-  padding: 5px;
-}
-
-.store-name,
-.product-name {
-  font-size: 0.8rem;
-  font-weight: 600;
-  padding: 5px;
-  color: #000000;
-}
-
-.product-name-display h3 {
-  font-weight: 600;
-}
-
-.product-price {
-  font-size: 1rem;
-  font-weight: 700;
-  padding: 0px 5px;
-  margin: -5px 0px;
-}
-
-.product-price-display div {
-  font-size: 1.5rem;
-  font-weight: 600;
-  color: #9a9a9a;
-  margin-right: 5px;
-  margin-top: -5px;
-}
-
-.store a {
-  text-decoration: none;
-  color: #2c2c2c;
-}
-
-.product a {
-  text-decoration: none;
-}
-
-.store-banner {
-  /* background-color: #000000; */
-  height: auto;
-  object-fit: contain;
-}
-
-.please-read-title,
-.disclaimer, .announcement {
-  font-size: 0.8rem;
-  color: #000000;
+header.masthead .masthead-content .masthead-heading {
+    font-size: 4rem !important;
+    font-family: AmazonEmberDisplay_He;
    font-weight: bold;
-  padding: 0px;
-  margin: 0px;
-  padding-left: 1.3rem;
 }
-
-.disclaimer-message {
-  font-size: 0.7rem;
-  color: #ffffff;
-  padding: 0px;
-  margin: 0px;
-  padding-left: 1.3rem;
+header.masthead .masthead-content .masthead-subheading {
+    font-size: 3rem !important;
+    font-family: AmazonEmberDisplay_He;
+    font-weight: bold;
 }
-
-.announcement-message {
-  font-size: 0.7rem;
-  color: #ffffff;
-  padding: 0px;
-  margin: 0px;
-  padding-left: 1.3rem;
+header.masthead .bg-circle {
+    z-index: 0;
+    position: absolute;
+    border-radius: 100%;
+    background: linear-gradient(0deg, #ee0979 0%, #ff6a00 100%);
 }
-.please-read li {
-  font-size: 0.7rem;
-  color: #858585;
+header.masthead .bg-circle-1 {
+    height: 90rem;
+    width: 90rem;
+    bottom: -55rem;
+    left: -55rem;
 }
-
-.bg-black {
-  background-color: #000000;
+header.masthead .bg-circle-2 {
+    height: 50rem;
+    width: 50rem;
+    top: -25rem;
+    right: -25rem;
 }
-
-.bg-announcement {
-  background-color: #000000;
+header.masthead .bg-circle-3 {
+    height: 20rem;
+    width: 20rem;
+    bottom: -10rem;
+    right: 5%;
 }
-
-.navbar-toggler {
-  border: 1px solid #fff !important;
+header.masthead .bg-circle-4 {
+    height: 30rem;
+    width: 30rem;
+    top: -5rem;
+    right: 35%;
 }
-
-.nav-link {
-  padding: 0.25rem 0.5rem !important;
-  line-height: 1rem;
+@media (min-width: 992px) {
+    header.masthead {
+        padding-top: calc(10rem + 55px);
+        padding-bottom: 10rem;
   }
-
-.sort-by {
-  text-align: right;
+    header.masthead .masthead-content .masthead-heading {
+        font-size: 6rem;
   }
-
-.custom-hr {
-  background-color: #e3e3e3 !important;
-  height: 2px !important;
+    header.masthead .masthead-content .masthead-subheading {
+        font-size: 4rem;
   }
-
-a.btn-white-outline.nuxt-link-exact-active {
-  background-color: #fff;
-  color: #000;
 }
-
-.product-price > .previous-price {
-  margin-right: 10px;
-}
-
-.product-price > .current-price {
-  color: #e01414;
-  font-size: 1.1rem;
-}
-
-.breadcrumb-item a {
-  color: #9a9a9a !important;
-  text-decoration: none;
-  font-weight: 500;
-}
-
-.breadcrumb-item.active {
-  color: #9a9a9a !important;
-}
-
-.breadcrumb-item + .breadcrumb-item::before {
-  color: #9a9a9a !important;
-}
-
-.adbg {
-  background-color: #bdc6c5;
-}
-
-span.designer-text {
-  color: #b90a0c;
-}
-
-.product-active-thumbnail {
-  height: 400px;
-}
-
-@media (max-width: 992px) {
-  .footer-menu {
+section.industries {
+    padding-top: 5rem;
+    padding-bottom: calc(10rem - 4.5rem);
    text-align: center;
 }
-
-  .copyright {
+section.services, section.contact-us {
+    padding-top: 5rem;
+    padding-bottom: calc(10rem - 4.5rem);
    text-align: center;
 }
-
-  .added-or::before {
-    display: none;
+section h3 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
+    font-weight: bold;
 }
-
-  .navbar-collapse.collapsing .navbar-nav {
+/* Remove default list styles */
+ul.horizontal-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    text-align: center;
+   /* Center items horizontally on small screens */
+    display: flex;
+    justify-content: center;
+    gap: 60px;
+}
+/* Style each list item */
+ul.horizontal-list li {
+    width: 115px;
+    display: inline-block;
+   /* Display items horizontally */
+}
+ul.horizontal-list li p {
+    font-size: 0.8rem;
+}
+/* Style the images within list items */
+ul.horizontal-list li img {
+    max-width: 100%;
+   /* Make images responsive */
+    height: auto;
+   /* Maintain the aspect ratio of the images */
+    vertical-align: middle;
+   /* Align images vertically within the list item */
+    height: 115px;
+}
+/* Style the text content (if needed) */
+ul.horizontal-list li span {
    display: block;
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: -45%;
-    transition: all 0.2s ease;
+   /* Ensure text is on a new line */
+    text-align: center;
+   /* Center text horizontally within each list item */
+    font-family: AmazonEmberDisplay_He;
+    width: 115px;
 }
-
-  .navbar-nav {
+/* Media query for smaller screens */
+@media (max-width: 768px) {
+    ul.horizontal-list li {
+        display: block;
+       /* Stack items vertically on smaller screens */
+        margin-right: 0;
+       /* Remove margin between items */
+        margin-bottom: 10px;
+       /* Add space between items vertically */
+   }
+}
+section.parallax-section {
+    padding-top: 10rem;
+    padding-bottom: calc(10rem - 4.5rem);
+    background: url("../../../images/fabric\ printer.png") no-repeat center center fixed;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    color: #fff;
+    height: 500px;
+    -webkit-filter: brightness(40%);
+    filter: brightness(40%);
+}
+section.section-right-img {
+    background-color: #191919;
+    color: #fff;
+}
+section.section-right-img h2 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
+}
+section.section-right-img .section-content {
+    padding-left: 50px;
+    margin-top: 20px;
+}
+section.section-right-img .uniforms-image {
+    background: url("../../../images/custom-team-wear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+}
+section.section-right-img .spiritwear-image {
+    background: url("../../../images/spiritwear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+}
+section.section-right-img .streetwear-image {
+    background: url("../../../images/streetwear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+}
+section.section-left-img {
    background-color: #fff;
+    color: #191919;
 }
-
-  .navbar-collapse.show .navbar-nav {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    flex-direction: column;
-    height: 100vh;
-    width: 65%;
-    transition: left 0.35s ease;
-    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
-    z-index: 9999;
+section.section-left-img h2 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
 }
-
-  .navbar-nav .nav-link {
-    padding-right: 1rem;
-    padding-left: 1rem;
+section.section-left-img .section-content {
+    padding-left: 50px;
+    margin-top: 20px;
 }
-
-  .nav-item {
-    padding-left: 1rem;
-    padding-right: 1rem;
-    padding-top: 0.8rem;
+section.section-left-img .corportate-image {
+    background: url("../../../images/corporatewear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
 }
-  .store-logo img {
-    /* max-height: 100%; */
-    height: 150px;
-    object-fit: contain;
-    box-shadow: unset;
-    /* width: 1; */
+section.section-left-img .influencer-image {
+    background: url("../../../images/influencers.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
 }
-
-  .store-name {
+section.section-left-img .band-image {
+    background: url("../../../images/bandmerch.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+}
+.icon {
+    display: inline-block;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+    overflow: hidden;
+}
+.icon.size-21 {
+    width: 21px !important;
+    height: 21px !important;
+}
+.icon.icon-sign-up {
+    background-image: url("../../../images/icons/SIGN\ UP.svg");
+    width: 25px !important;
+    height: 18px !important;
+}
+.icon.icon-sign-in {
+    background-image: url("../../../images/icons/SIGN\ IN.svg");
+    width: 25px !important;
+    height: 18px !important;
+}
+.icon.icon-cart {
+    background-image: url("../../../images/icons/CART.svg");
+    width: 25px !important;
+    height: 18px !important;
+}
+.icon.icon-catalog {
+    background-image: url("../../../images/icons/CATALOG\ ICON.svg");
+    width: 25px !important;
+    height: 18px !important;
+}
+.icon.industries-team-uniform {
+    background-image: url("../../../images/icons/INDUSTRIES\ 1.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.industries-band {
+    background-image: url("../../../images/icons/INDUSTRIES\ 2.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.industries-school {
+    background-image: url("../../../images/icons/INDUSTRIES\ 3.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.industries-influencer {
+    background-image: url("../../../images/icons/INDUSTRIES\ 4.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.industries-streetwear {
+    background-image: url("../../../images/icons/INDUSTRIES\ 5.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.industries-corporate {
+    background-image: url("../../../images/icons/INDUSTRIES\ 6.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-sublimation {
+    background-image: url("../../../images/icons/SERVICES\ 1.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-dtf {
+    background-image: url("../../../images/icons/SERVICES\ 2.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-screen-print {
+    background-image: url("../../../images/icons/SERVICES\ 3.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-embroidery {
+    background-image: url("../../../images/icons/SERVICES\ 4.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-cutsaw {
+    background-image: url("../../../images/icons/SERVICES\ 5.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.services-fulfillment {
+    background-image: url("../../../images/icons/SERVICES\ 6.svg");
+    width: 100px !important;
+    height: 100px !important;
+}
+.icon.merchbay-icon {
+    background-image: url("../../../images/icons/MERCHBAY\ LOGO\ ICON.svg");
+    width: 150px !important;
+    height: 125px !important;
+}
+.horizontal-divider {
+    width: 150px;
+    height: 7px;
+    background-color: #59caf4;
    text-align: center;
+    margin: 0px auto;
 }
-
-  .product-image img {
-    max-height: 100%;
+.horizontal-divider.bg-red {
+    background-color: #f38d9a !important;
 }
-
-  .sort-by {
-    text-align: left;
+.horizontal-divider.bg-yellow {
+    background-color: #fcc375 !important;
 }
-
-  .product-active-thumbnail {
-    height: 345px;
+.gap-100 {
+    gap: 100px !important;
 }
-
-  .btn-white-outline {
-    color: #000000;
-    border-color: #000000;
+.contact-input-custom {
+    border-radius: 0px !important;
+    border: 8px solid #c4d2d7 !important;
 }
-
-  .btn-white-outline:hover {
-    color: #ffffff;
-    border-color: #000000;
-    background-color: #000000;
+.contact-input-custom::-webkit-input-placeholder {
+    color: #c4d2d7;
+    font-size: 16px;
 }
-
-  .bi.bi-cart-fill {
-    color: #000000;
+input {
+    color: #434445;
+}
+.btn-contact {
+    border-radius: 0;
+    background-color: #59caf4;
+    border: 1px solid #59caf4;
+    color: #ececec;
+}
+.btn-contact:hover {
+    border-radius: 0;
+    background-color: #4db2d7;
+    border: 1px solid #4db2d7;
+    color: #ececec;
 }
-
 footer {
-    height: inherit;
-  }
-
-  .footer-socials-icons{
+    background-color: #171717;
    text-align: center;
-    margin-top: 5px;
+    padding: 1rem 0px;
+    border-bottom: 15px solid;
+    border-image: linear-gradient(to right, #59caf4 33.33%, #f38d9a 33.33%, #f38d9a 66.66%, #fcc375 66.66%) 5;
 }
+footer p {
+    color: #fff;
+}
+.login-page-right {
+    background: url("../../../images/bb.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 100vh;
+}
+section.login {
+    padding-top: 5rem;
+    text-align: center;
 }
--- a/public/assets/css/merchbay/styles.old.css
+++ b/public/assets/css/merchbay/styles.old.css
@@ -0,0 +1,437 @@
+html,
+body {
+  width: 100%;
+  height: 100%;
+  font-family: "Montserrat", sans-serif !important;
+  background-color: #f5f5f6;
+  font-size: 0.9rem;
+}
+
+a {
+  text-decoration: none;
+  color:#000000;
+}
+
+.bg-black {
+  background-color: #000;
+}
+
+.navbar-brand span {
+  font-weight: 900;
+}
+
+.navbar-brand > img {
+  height: 28px !important;
+}
+
+.btn-white-outline {
+  color: #ffffff;
+  border-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-white-outline:hover {
+  color: #000000;
+  border-color: #ffffff;
+  background-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-black-outline {
+  color: #ffffff;
+  border-color: #ffffff;
+  font-size: 0.7rem !important;
+}
+
+.btn-navbar-cart {
+  color: #fff;
+  background-color: transparent;
+  border-color: transparent;
+}
+
+.btn-navbar-cart:hover {
+  color: #fff;
+  background-color: transparent;
+  border-color: transparent;
+}
+
+/* .container {
+  padding-right: 0px !important;
+  padding-left: 0px !important;
+} */
+
+.btn-green {
+  color: #fff;
+  background-color: #28a745;
+  border-color: #28a745;
+}
+
+.btn-green:hover {
+  color: #28a745;
+  background-color: #fff;
+  border-color: #28a745;
+}
+
+.btn-black {
+  color: #fff;
+  background-color: #000000;
+  border-color: #000000;
+}
+
+.btn-black:hover {
+  color: rgb(0, 0, 0);
+  background-color: transparent;
+  border-color: #000000;
+}
+
+.added-or {
+  position: relative;
+}
+
+.added-or::before {
+  content: "or";
+  position: absolute;
+  display: inline-block;
+  padding: 5px;
+  margin-right: 48px;
+  left: -15px;
+  font-size: 1rem;
+}
+
+.navbar-auth-buttons a {
+  line-height: 1.9;
+}
+
+.wrapper {
+  min-height: 100vh;
+}
+
+footer {
+  background: #000000;
+  color: white;
+  /* line-height: 50px; */
+  /* padding: 0 20px; */
+  height: 70px;
+}
+
+.footer-socials-icons{
+  float: right;
+}
+
+.footer-menu {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  /* text-align: right; */
+}
+
+li.footer-menu-item {
+  display: inline-block;
+  /* padding: 0px 5px; */
+  font-size: 12px;
+}
+
+li.footer-menu-item::after {
+  content: " |";
+  /* margin: 0px 10px 0px 10px; */
+}
+
+li.footer-menu-item:last-child::after {
+  content: "";
+  /* margin: 0 10px; */
+}
+
+li.footer-menu-item a {
+  color: #f2f2f2;
+  text-decoration: none;
+}
+
+li.footer-menu-item a:hover {
+  text-decoration: underline;
+}
+
+.copyright {
+  margin-bottom: -5px;
+  font-size: 0.7rem;
+}
+
+.col-footer {
+  margin-top: -15px;
+}
+.store-logo {
+  height: 165px;
+  display: inline-block;
+  /* border: 1px solid #e2e2e2; */
+  position: relative;
+}
+
+.store-locked{
+  background-color: rgb(0 0 0 / 60%);
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  padding: 67px;
+  text-align: center;
+}
+
+.store-locked > i {
+  font-size: 2rem;
+  color: #ffffff;
+}
+
+.store-logo img {
+  object-fit: contain;
+  width: 100%;
+  max-height: 250px;
+  height: 165px;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  /* padding: 5px; */
+  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+}
+
+.product-image img {
+  object-fit: contain;
+  width: 100%;
+  max-height: 250px;
+  padding: 5px;
+}
+
+.store-name,
+.product-name {
+  font-size: 0.8rem;
+  font-weight: 600;
+  padding: 5px;
+  color: #000000;
+}
+
+.product-name-display h3 {
+  font-weight: 600;
+}
+
+.product-price {
+  font-size: 1rem;
+  font-weight: 700;
+  padding: 0px 5px;
+  margin: -5px 0px;
+}
+
+.product-price-display div {
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #9a9a9a;
+  margin-right: 5px;
+  margin-top: -5px;
+}
+
+.store a {
+  text-decoration: none;
+  color: #2c2c2c;
+}
+
+.product a {
+  text-decoration: none;
+}
+
+.store-banner {
+  /* background-color: #000000; */
+  height: auto;
+  object-fit: contain;
+}
+
+.please-read-title,
+.disclaimer, .announcement {
+  font-size: 0.8rem;
+  color: #000000;
+  font-weight: bold;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+
+.disclaimer-message {
+  font-size: 0.7rem;
+  color: #ffffff;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+
+.announcement-message {
+  font-size: 0.7rem;
+  color: #ffffff;
+  padding: 0px;
+  margin: 0px;
+  padding-left: 1.3rem;
+}
+.please-read li {
+  font-size: 0.7rem;
+  color: #858585;
+}
+
+.bg-black {
+  background-color: #000000;
+}
+
+.bg-announcement {
+  background-color: #000000;
+}
+
+.navbar-toggler {
+  border: 1px solid #fff !important;
+}
+
+.nav-link {
+  padding: 0.25rem 0.5rem !important;
+  line-height: 1rem;
+}
+
+.sort-by {
+  text-align: right;
+}
+
+.custom-hr {
+  background-color: #e3e3e3 !important;
+  height: 2px !important;
+}
+
+a.btn-white-outline.nuxt-link-exact-active {
+  background-color: #fff;
+  color: #000;
+}
+
+.product-price > .previous-price {
+  margin-right: 10px;
+}
+
+.product-price > .current-price {
+  color: #e01414;
+  font-size: 1.1rem;
+}
+
+.breadcrumb-item a {
+  color: #9a9a9a !important;
+  text-decoration: none;
+  font-weight: 500;
+}
+
+.breadcrumb-item.active {
+  color: #9a9a9a !important;
+}
+
+.breadcrumb-item + .breadcrumb-item::before {
+  color: #9a9a9a !important;
+}
+
+.adbg {
+  background-color: #bdc6c5;
+}
+
+span.designer-text {
+  color: #b90a0c;
+}
+
+.product-active-thumbnail {
+  height: 400px;
+}
+
+@media (max-width: 992px) {
+  .footer-menu {
+    text-align: center;
+  }
+
+  .copyright {
+    text-align: center;
+  }
+
+  .added-or::before {
+    display: none;
+  }
+
+  .navbar-collapse.collapsing .navbar-nav {
+    display: block;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: -45%;
+    transition: all 0.2s ease;
+  }
+
+  .navbar-nav {
+    background-color: #fff;
+  }
+
+  .navbar-collapse.show .navbar-nav {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    flex-direction: column;
+    height: 100vh;
+    width: 65%;
+    transition: left 0.35s ease;
+    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+    z-index: 9999;
+  }
+
+  .navbar-nav .nav-link {
+    padding-right: 1rem;
+    padding-left: 1rem;
+  }
+
+  .nav-item {
+    padding-left: 1rem;
+    padding-right: 1rem;
+    padding-top: 0.8rem;
+  }
+  .store-logo img {
+    /* max-height: 100%; */
+    height: 150px;
+    object-fit: contain;
+    box-shadow: unset;
+    /* width: 1; */
+  }
+
+  .store-name {
+    text-align: center;
+  }
+
+  .product-image img {
+    max-height: 100%;
+  }
+
+  .sort-by {
+    text-align: left;
+  }
+
+  .product-active-thumbnail {
+    height: 345px;
+  }
+
+  .btn-white-outline {
+    color: #000000;
+    border-color: #000000;
+  }
+
+  .btn-white-outline:hover {
+    color: #ffffff;
+    border-color: #000000;
+    background-color: #000000;
+  }
+
+  .bi.bi-cart-fill {
+    color: #000000;
+  }
+
+  footer {
+    height: inherit;
+  }
+
+  .footer-socials-icons{
+    text-align: center;
+    margin-top: 5px;
+  }
+}
--- a/public/assets/css/sass/styles.scss
+++ b/public/assets/css/sass/styles.scss
@@ -0,0 +1,517 @@
+@font-face {
+  font-family: "AmazonEmberDisplay_Bd";
+  src: url("../fonts/AmazonEmberDisplay_Bd.ttf") format("truetype");
+}
+@font-face {
+  font-family: "AmazonEmberDisplay_He";
+  src: url("../fonts/AmazonEmberDisplay_He.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "AmazonEmberDisplay_Lt";
+  src: url("../fonts/AmazonEmberDisplay_Lt.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "AmazonEmberDisplay_Md";
+  src: url("../fonts/AmazonEmberDisplay_Md.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "AmazonEmberDisplay_Rg";
+  src: url("../fonts/AmazonEmberDisplay_Rg.ttf") format("truetype");
+}
+
+html,
+body {
+  padding: 0;
+  margin: 0;
+  font-family: AmazonEmberDisplay_Rg !important;
+  height: 100%;
+}
+
+html {
+  scroll-padding-top: 67px;
+}
+
+//   .btn-xl {
+//     text-transform: uppercase;
+//     padding: 1.5rem 3rem;
+//     font-size: 0.9rem;
+//     font-weight: 700;
+//     letter-spacing: 0.1rem;
+//   }
+
+.navbar-custom {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  background-color: #191919;
+}
+.navbar-custom .navbar-brand {
+  text-transform: uppercase;
+  font-size: 1rem;
+  letter-spacing: 0.1rem;
+  font-weight: 700;
+}
+.navbar-custom .navbar-nav .nav-item .nav-link {
+  text-transform: uppercase;
+  font-size: 0.8rem;
+  font-weight: 700;
+  letter-spacing: 0.1rem;
+}
+
+header.masthead {
+  position: relative;
+  overflow: hidden;
+  //   padding-top: calc(7rem + 72px);
+  padding-bottom: 7rem;
+  //   background: linear-gradient(0deg, #ff6a00 0%, #ee0979 100%);
+  background: url(../images/band-background.jpg);
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-attachment: scroll;
+  background-size: cover;
+  border-bottom: 15px solid;
+  border-image: linear-gradient(
+      to right,
+      #59caf4 33.33%,
+      #f38d9a 33.33%,
+      #f38d9a 66.66%,
+      #fcc375 66.66%
+    )
+    5;
+  //   -webkit-filter: brightness(50%);
+  //   filter:brightness(50%);
+}
+header.masthead::after {
+  content: ""; // ::before and ::after both require content
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-image: linear-gradient(120deg, #252525, #252525);
+  opacity: 0.7;
+}
+
+header.masthead .masthead-content {
+  z-index: 1;
+  position: relative;
+}
+header.masthead .masthead-content .masthead-heading {
+  font-size: 4rem !important;
+  font-family: AmazonEmberDisplay_He;
+  font-weight: bold;
+}
+header.masthead .masthead-content .masthead-subheading {
+  font-size: 3rem !important;
+  font-family: AmazonEmberDisplay_He;
+  font-weight: bold;
+}
+header.masthead .bg-circle {
+  z-index: 0;
+  position: absolute;
+  border-radius: 100%;
+  background: linear-gradient(0deg, #ee0979 0%, #ff6a00 100%);
+}
+header.masthead .bg-circle-1 {
+  height: 90rem;
+  width: 90rem;
+  bottom: -55rem;
+  left: -55rem;
+}
+header.masthead .bg-circle-2 {
+  height: 50rem;
+  width: 50rem;
+  top: -25rem;
+  right: -25rem;
+}
+header.masthead .bg-circle-3 {
+  height: 20rem;
+  width: 20rem;
+  bottom: -10rem;
+  right: 5%;
+}
+header.masthead .bg-circle-4 {
+  height: 30rem;
+  width: 30rem;
+  top: -5rem;
+  right: 35%;
+}
+
+@media (min-width: 992px) {
+  header.masthead {
+    padding-top: calc(10rem + 55px);
+    padding-bottom: 10rem;
+  }
+  header.masthead .masthead-content .masthead-heading {
+    font-size: 6rem;
+  }
+  header.masthead .masthead-content .masthead-subheading {
+    font-size: 4rem;
+  }
+}
+
+section.industries {
+  padding-top: 5rem;
+  padding-bottom: calc(10rem - 4.5rem);
+  text-align: center;
+}
+
+section.services, section.contact-us {
+  padding-top: 5rem;
+  padding-bottom: calc(10rem - 4.5rem);
+  text-align: center;
+}
+
+section {
+  h3 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
+    font-weight: bold;
+  }
+}
+
+/* Remove default list styles */
+ul.horizontal-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  text-align: center; /* Center items horizontally on small screens */
+  display: flex;
+  justify-content: center;
+  gap: 60px;
+}
+
+/* Style each list item */
+ul.horizontal-list li {
+  width: 115px;
+  display: inline-block; /* Display items horizontally */
+  //   margin-right: 50px; /* Add space between items (adjust as needed) */
+
+  p {
+    font-size: 0.8rem;
+  }
+}
+
+/* Style the images within list items */
+ul.horizontal-list li img {
+  max-width: 100%; /* Make images responsive */
+  height: auto; /* Maintain the aspect ratio of the images */
+  vertical-align: middle; /* Align images vertically within the list item */
+  height: 115px;
+}
+
+/* Style the text content (if needed) */
+ul.horizontal-list li span {
+  display: block; /* Ensure text is on a new line */
+  text-align: center; /* Center text horizontally within each list item */
+  font-family: AmazonEmberDisplay_He;
+  width: 115px;
+}
+
+/* Media query for smaller screens */
+@media (max-width: 768px) {
+  ul.horizontal-list li {
+    display: block; /* Stack items vertically on smaller screens */
+    margin-right: 0; /* Remove margin between items */
+    margin-bottom: 10px; /* Add space between items vertically */
+  }
+}
+
+section.parallax-section {
+  padding-top: 10rem;
+  padding-bottom: calc(10rem - 4.5rem);
+  background: url("../images/fabric\ printer.png") no-repeat center center fixed;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+  color: #ffffff;
+  height: 500px;
+  -webkit-filter: brightness(40%);
+  filter: brightness(40%);
+}
+
+section.section-right-img {
+  background-color: #191919;
+  color: #fff;
+
+  h2 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
+  }
+
+  .section-content {
+    padding-left: 50px;
+    margin-top: 20px;
+  }
+
+  .uniforms-image {
+    background: url("../images/custom-team-wear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+
+  .spiritwear-image {
+    background: url("../images/spiritwear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+  .streetwear-image {
+    background: url("../images/streetwear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+
+  
+}
+
+section.section-left-img {
+  background-color: #fff;
+  color: #191919;
+
+  h2 {
+    font-family: AmazonEmberDisplay_Bd;
+    font-size: 2.5rem;
+  }
+
+  .section-content {
+    padding-left: 50px;
+    margin-top: 20px;
+  }
+
+  .corportate-image {
+    background: url("../images/corporatewear.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+
+  .influencer-image {
+    background: url("../images/influencers.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+
+  .band-image {
+    background: url("../images/bandmerch.jpg") no-repeat center center;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    height: 550px;
+  }
+}
+
+.icon {
+  display: inline-block;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  overflow: hidden;
+
+  &.size-21 {
+    width: 21px !important;
+    height: 21px !important;
+  }
+
+  &.icon-sign-up {
+    background-image: url("../images/icons/SIGN\ UP.svg");
+    width: 25px !important;
+    height: 18px !important;
+  }
+
+  &.icon-sign-in {
+    background-image: url("../images/icons/SIGN\ IN.svg");
+    width: 25px !important;
+    height: 18px !important;
+  }
+
+  &.icon-cart {
+    background-image: url("../images/icons/CART.svg");
+    width: 25px !important;
+    height: 18px !important;
+  }
+
+  &.icon-catalog {
+    background-image: url("../images/icons/CATALOG\ ICON.svg");
+    width: 25px !important;
+    height: 18px !important;
+  }
+
+  &.industries-team-uniform {
+    background-image: url("../images/icons/INDUSTRIES\ 1.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.industries-band {
+    background-image: url("../images/icons/INDUSTRIES\ 2.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+  &.industries-school {
+    background-image: url("../images/icons/INDUSTRIES\ 3.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.industries-influencer {
+    background-image: url("../images/icons/INDUSTRIES\ 4.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.industries-streetwear {
+    background-image: url("../images/icons/INDUSTRIES\ 5.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.industries-corporate {
+    background-image: url("../images/icons/INDUSTRIES\ 6.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-sublimation {
+    background-image: url("../images/icons/SERVICES\ 1.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-dtf {
+    background-image: url("../images/icons/SERVICES\ 2.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-screen-print {
+    background-image: url("../images/icons/SERVICES\ 3.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-embroidery {
+    background-image: url("../images/icons/SERVICES\ 4.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-cutsaw {
+    background-image: url("../images/icons/SERVICES\ 5.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.services-fulfillment {
+    background-image: url("../images/icons/SERVICES\ 6.svg");
+    width: 100px !important;
+    height: 100px !important;
+  }
+
+  &.merchbay-icon {
+    background-image: url("../images/icons/MERCHBAY\ LOGO\ ICON.svg");
+    width: 150px !important;
+    height: 125px !important;
+  }
+}
+
+.horizontal-divider {
+  width: 150px;
+  height: 7px;
+  background-color: #59caf4;
+  text-align: center;
+  margin: 0px auto;
+
+  &.bg-red {
+    background-color: #f38d9a !important;
+  }
+
+  &.bg-yellow {
+    background-color: #fcc375 !important;
+  }
+}
+
+.gap-100 {
+  gap: 100px !important;
+}
+
+.contact-input-custom {
+  border-radius: 0px !important;
+  border: 8px solid #c4d2d7 !important;
+}
+
+.contact-input-custom::-webkit-input-placeholder {
+  color: #c4d2d7;
+  font-size: 16px;
+}
+
+input {
+  color: #434445;
+}
+
+.btn-contact {
+  border-radius: 0;
+  background-color: #59caf4;
+  border: 1px solid #59caf4;
+  color: #ececec;
+}
+
+
+.btn-contact:hover {
+  border-radius: 0;
+  background-color: #4db2d7;
+  border: 1px solid #4db2d7;
+  color: #ececec;
+}
+
+
+footer {
+  background-color: #171717;
+  text-align: center;
+  padding: 1rem 0px;
+  border-bottom: 15px solid;
+  border-image: linear-gradient(
+      to right,
+      #59caf4 33.33%,
+      #f38d9a 33.33%,
+      #f38d9a 66.66%,
+      #fcc375 66.66%
+    )
+    5;
+  p {
+    color: #fff;
+  }
+}
+
+.login-page-right {
+  background: url("../images/bb.jpg") no-repeat center center;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+  height: 100vh;
+}
+
+
+section.login {
+  padding-top: 5rem;
+  // padding-bottom: calc(10rem - 4.5rem);
+  text-align: center;
+}
--- a/public/assets/fonts/AmazonEmberDisplay_Bd.ttf
+++ b/public/assets/fonts/AmazonEmberDisplay_Bd.ttf
--- a/public/assets/fonts/AmazonEmberDisplay_He.ttf
+++ b/public/assets/fonts/AmazonEmberDisplay_He.ttf
--- a/public/assets/fonts/AmazonEmberDisplay_Lt.ttf
+++ b/public/assets/fonts/AmazonEmberDisplay_Lt.ttf
--- a/public/assets/fonts/AmazonEmberDisplay_Md.ttf
+++ b/public/assets/fonts/AmazonEmberDisplay_Md.ttf
--- a/public/assets/fonts/AmazonEmberDisplay_Rg.ttf
+++ b/public/assets/fonts/AmazonEmberDisplay_Rg.ttf
--- a/public/images/band-background.jpg
+++ b/public/images/band-background.jpg
--- a/public/images/bandmerch.jpg
+++ b/public/images/bandmerch.jpg
--- a/public/images/bb.jpg
+++ b/public/images/bb.jpg
--- a/public/images/corporatewear.jpg
+++ b/public/images/corporatewear.jpg
--- a/public/images/custom-team-wear.jpg
+++ b/public/images/custom-team-wear.jpg
--- a/public/images/fabric
+++ b/public/images/fabric
--- a/public/images/icons/BROWSE
+++ b/public/images/icons/BROWSE
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 260.7 60"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path id="XMLID_158_" class="st0" d="M253.6,0H7.1C3.2,0,0,3.2,0,7.1v45.7C0,56.8,3.2,60,7.1,60h246.5c3.9,0,7.1-3.2,7.1-7.1V7.1
+	C260.7,3.2,257.5,0,253.6,0 M256.5,52.9c0,1.6-1.3,2.9-2.9,2.9H7.1c-1.6,0-2.9-1.3-2.9-2.9V7.1c0-1.6,1.3-2.9,2.9-2.9h246.5
+	c1.6,0,2.9,1.3,2.9,2.9V52.9z M45.5,39.2c-0.4,0-0.6-0.2-0.6-0.6V20.8c0-0.4,0.2-0.6,0.6-0.6h5.9c1.8,0,3.3,0.5,4.3,1.4
+	c1.1,0.9,1.6,2.1,1.6,3.6c0,0.9-0.2,1.7-0.6,2.4c-0.4,0.7-1.1,1.2-1.9,1.6c1.2,0.3,2.1,0.9,2.7,1.7c0.6,0.8,0.9,1.8,0.9,2.9
+	c0,1.6-0.6,2.9-1.7,3.9c-1.2,1-2.7,1.4-4.7,1.4H45.5z M51,28.3c2.1,0,3.1-0.9,3.1-2.8c0-1.8-1-2.8-3-2.8H48v5.6H51z M51.9,36.7
+	c2.1,0,3.2-1,3.2-3c0-2-1.1-3-3.3-3H48v6H51.9z M62.2,39.2c-0.4,0-0.6-0.2-0.6-0.6V25.8c0-0.4,0.2-0.6,0.6-0.6h1.4
+	c0.3,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4l0.3,1.6c0.7-0.8,1.4-1.4,2.1-1.7c0.6-0.3,1.3-0.5,2.1-0.5h0.1c0.2,0,0.4,0,0.6,0.1
+	c0.2,0,0.3,0.1,0.3,0.2c0.1,0.1,0.1,0.3,0.1,0.6v1.5c0,0.4-0.2,0.6-0.5,0.6c-0.1,0-0.3,0-0.5,0c-0.2,0-0.4,0-0.6,0
+	c-1.3,0-2.5,0.3-3.6,1v9.5c0,0.4-0.2,0.6-0.6,0.6H62.2z M78.1,39.6c-2.1,0-3.8-0.7-5-2c-1.2-1.3-1.8-3.1-1.8-5.4
+	c0-2.3,0.6-4.1,1.8-5.4c1.2-1.3,2.8-1.9,5-1.9c2.1,0,3.8,0.6,5,1.9s1.8,3.1,1.8,5.4c0,2.3-0.6,4.1-1.8,5.4
+	C81.9,38.9,80.2,39.6,78.1,39.6 M78.1,37c2.3,0,3.4-1.6,3.4-4.8c0-3.2-1.1-4.8-3.4-4.8c-2.3,0-3.4,1.6-3.4,4.8
+	C74.7,35.4,75.8,37,78.1,37 M91.2,39.2c-0.4,0-0.7-0.2-0.8-0.6l-4-12.4c-0.1-0.3-0.1-0.5-0.1-0.5c0-0.3,0.2-0.4,0.5-0.4h2.2
+	c0.4,0,0.6,0.2,0.7,0.5l2.6,10.1l2.7-10.1c0.1-0.2,0.1-0.4,0.3-0.4c0.1-0.1,0.3-0.1,0.5-0.1h1.8c0.2,0,0.4,0,0.5,0.1
+	c0.1,0.1,0.2,0.2,0.2,0.4l2.7,10.3l2.7-10.3c0.1-0.3,0.3-0.5,0.7-0.5h2c0.3,0,0.5,0.1,0.5,0.4c0,0.1,0,0.3-0.1,0.5l-4.1,12.4
+	c-0.1,0.4-0.4,0.6-0.8,0.6h-1.9c-0.2,0-0.4,0-0.5-0.1c-0.1-0.1-0.2-0.2-0.3-0.5l-2.6-9.9l-2.6,9.9c-0.1,0.2-0.1,0.4-0.3,0.5
+	c-0.1,0.1-0.3,0.1-0.5,0.1H91.2z M112.9,39.6c-1.4,0-2.8-0.2-4-0.7c-0.3-0.1-0.5-0.2-0.6-0.3c-0.1-0.1-0.1-0.3-0.1-0.6v-1
+	c0-0.4,0.1-0.5,0.4-0.5c0.1,0,0.4,0.1,0.8,0.2c1.3,0.4,2.5,0.5,3.5,0.5c0.9,0,1.6-0.1,2-0.4c0.4-0.3,0.6-0.7,0.6-1.3
+	c0-0.4-0.1-0.7-0.4-1c-0.3-0.2-0.7-0.5-1.4-0.8l-2.3-0.9c-2-0.8-3.1-2.1-3.1-3.8c0-1.3,0.5-2.3,1.4-3c0.9-0.7,2.2-1.1,3.8-1.1
+	c1.1,0,2.3,0.2,3.4,0.6c0.3,0.1,0.5,0.2,0.5,0.3c0.1,0.1,0.1,0.3,0.1,0.6v1c0,0.2,0,0.3-0.1,0.4c-0.1,0.1-0.2,0.1-0.3,0.1
+	c-0.1,0-0.3,0-0.7-0.1c-1.1-0.3-2.1-0.4-2.8-0.4c-0.8,0-1.5,0.1-1.8,0.4c-0.4,0.2-0.6,0.6-0.6,1.2c0,0.4,0.1,0.7,0.4,1
+	c0.3,0.2,0.8,0.5,1.5,0.8l2.1,0.8c1.1,0.4,1.9,0.9,2.4,1.5c0.5,0.6,0.7,1.3,0.7,2.2c0,1.4-0.5,2.4-1.5,3.2S114.6,39.6,112.9,39.6
+	 M127.4,39.6c-2.3,0-4-0.6-5.2-1.9c-1.2-1.2-1.8-3-1.8-5.4c0-2.4,0.6-4.2,1.7-5.5c1.2-1.3,2.8-2,4.9-2c1.8,0,3.2,0.5,4.1,1.5
+	c1,1,1.4,2.4,1.4,4.1c0,0.6,0,1.3-0.1,1.9c0,0.2-0.1,0.4-0.2,0.5c-0.1,0.1-0.2,0.1-0.4,0.1h-8.4c0.1,1.4,0.4,2.4,1.2,3.1
+	c0.7,0.6,1.8,1,3.3,1c1.1,0,2.2-0.2,3.4-0.5c0.1,0,0.3-0.1,0.3-0.1c0.1,0,0.1,0,0.2,0c0.3,0,0.4,0.2,0.4,0.5v1c0,0.3,0,0.5-0.1,0.6
+	c-0.1,0.1-0.3,0.2-0.6,0.3C130.4,39.3,129,39.6,127.4,39.6 M129.7,30.8v-0.2c0-1.1-0.2-2-0.7-2.5c-0.5-0.6-1.2-0.9-2.1-0.9
+	c-1,0-1.8,0.3-2.4,1c-0.6,0.7-1,1.5-1.1,2.7H129.7z M143.7,39.2c-0.4,0-0.6-0.2-0.6-0.6V20.8c0-0.4,0.2-0.6,0.6-0.6h6.5
+	c1.9,0,3.4,0.5,4.5,1.6c1.1,1.1,1.7,2.5,1.7,4.3c0,1.8-0.6,3.3-1.7,4.3c-1.1,1.1-2.6,1.6-4.5,1.6h-3.8v6.5c0,0.4-0.2,0.6-0.6,0.6
+	H143.7z M149.8,29.4c1.1,0,1.9-0.3,2.4-0.8c0.5-0.6,0.8-1.4,0.8-2.5c0-1.1-0.3-1.9-0.8-2.5c-0.5-0.6-1.3-0.8-2.4-0.8h-3.4v6.7H149.8
+	z M160.1,39.2c-0.4,0-0.6-0.2-0.6-0.6V25.8c0-0.4,0.2-0.6,0.6-0.6h1.4c0.3,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4l0.3,1.6
+	c0.7-0.8,1.4-1.4,2.1-1.7c0.6-0.3,1.3-0.5,2.1-0.5h0.1c0.2,0,0.4,0,0.6,0.1c0.2,0,0.3,0.1,0.3,0.2c0.1,0.1,0.1,0.3,0.1,0.6v1.5
+	c0,0.4-0.2,0.6-0.5,0.6c-0.1,0-0.3,0-0.5,0c-0.2,0-0.4,0-0.6,0c-1.3,0-2.5,0.3-3.6,1v9.5c0,0.4-0.2,0.6-0.6,0.6H160.1z M176,39.6
+	c-2.1,0-3.8-0.7-5-2c-1.2-1.3-1.8-3.1-1.8-5.4c0-2.3,0.6-4.1,1.8-5.4c1.2-1.3,2.8-1.9,5-1.9c2.1,0,3.8,0.6,5,1.9s1.8,3.1,1.8,5.4
+	c0,2.3-0.6,4.1-1.8,5.4C179.8,38.9,178.1,39.6,176,39.6 M176,37c2.3,0,3.4-1.6,3.4-4.8c0-3.2-1.1-4.8-3.4-4.8
+	c-2.3,0-3.4,1.6-3.4,4.8C172.6,35.4,173.7,37,176,37 M191,39.5c-1.8,0-3.2-0.7-4.2-2c-1-1.3-1.6-3.1-1.6-5.3c0-1.5,0.3-2.8,0.8-4
+	c0.5-1.1,1.2-2,2.1-2.6c0.9-0.6,1.9-0.9,3.1-0.9c1.5,0,2.8,0.5,4,1.4v-6.7c0-0.4,0.2-0.6,0.6-0.6h2c0.4,0,0.6,0.2,0.6,0.6v19
+	c0,0.4-0.2,0.6-0.6,0.6h-1.6c-0.4,0-0.6-0.2-0.7-0.5l-0.2-0.8C194.1,38.9,192.7,39.5,191,39.5 M192.1,36.9c1.1,0,2.1-0.3,3.1-1v-7.5
+	c-0.9-0.7-2-1-3.1-1c-1.2,0-2.1,0.4-2.7,1.2c-0.6,0.8-0.9,2-0.9,3.6C188.6,35.3,189.7,36.9,192.1,36.9 M206.3,39.6
+	c-1.3,0-2.3-0.4-3-1.1c-0.7-0.7-1.1-1.8-1.1-3.1v-9.5c0-0.4,0.2-0.6,0.6-0.6h2c0.4,0,0.6,0.2,0.6,0.6v8.6c0,0.9,0.2,1.6,0.5,2
+	c0.4,0.4,0.9,0.6,1.8,0.6c1.1,0,2.3-0.4,3.4-1.1V25.8c0-0.4,0.2-0.6,0.6-0.6h2c0.4,0,0.6,0.2,0.6,0.6v12.7c0,0.4-0.2,0.6-0.6,0.6
+	h-1.4c-0.3,0-0.4,0-0.5-0.1c-0.1-0.1-0.2-0.2-0.2-0.4l-0.2-1C209.7,38.9,208,39.6,206.3,39.6 M224.3,39.5c-2.1,0-3.8-0.6-4.9-1.9
+	c-1.1-1.2-1.7-3-1.7-5.3c0-2.3,0.6-4.1,1.8-5.4c1.2-1.3,2.8-1.9,5-1.9c1.1,0,2.1,0.2,3,0.5c0.3,0.1,0.5,0.2,0.5,0.3
+	c0.1,0.1,0.1,0.3,0.1,0.6v1c0,0.4-0.1,0.5-0.4,0.5c-0.1,0-0.3,0-0.5-0.1c-0.7-0.2-1.4-0.3-2.2-0.3c-1.4,0-2.4,0.4-3,1.1
+	c-0.6,0.7-1,1.9-1,3.4v0.4c0,1.5,0.3,2.7,1,3.4c0.6,0.7,1.7,1.1,3,1.1c0.6,0,1.4-0.1,2.2-0.3c0.2,0,0.3-0.1,0.4-0.1s0.1,0,0.2,0
+	c0.3,0,0.4,0.2,0.4,0.5v1c0,0.3,0,0.5-0.1,0.6c-0.1,0.1-0.3,0.2-0.5,0.3C226.5,39.3,225.4,39.5,224.3,39.5 M236.4,39.4
+	c-1.4,0-2.5-0.3-3.2-1c-0.7-0.7-1-1.7-1-3.1v-7.6h-1.8c-0.4,0-0.6-0.2-0.6-0.6v-0.8c0-0.2,0-0.4,0.1-0.5c0.1-0.1,0.2-0.2,0.4-0.2
+	l1.9-0.3l0.4-3.3c0-0.2,0.1-0.4,0.2-0.5c0.1-0.1,0.3-0.1,0.5-0.1h1.4c0.4,0,0.6,0.2,0.6,0.6v3.2h3.4c0.4,0,0.6,0.2,0.6,0.6v1.3
+	c0,0.4-0.2,0.6-0.6,0.6h-3.4v7.4c0,0.6,0.2,1.1,0.5,1.3c0.3,0.3,0.8,0.4,1.5,0.4c0.4,0,0.8,0,1-0.1c0.3-0.1,0.5-0.1,0.6-0.1
+	c0.3,0,0.5,0.2,0.5,0.5v1c0,0.3-0.1,0.5-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.3C238,39.3,237.2,39.4,236.4,39.4 M37.6,19.8H35h-2h-1.6h-1
+	h-1H16.3v20.9h13.1h2H33h2h3.6V19.8H37.6z M18.3,21.8h11.1v16.9H18.3V21.8z M33,38.7h-1.6V21.8H33V38.7z M35,21.8h1.6v16.9H35V21.8z
+	"/>
+</svg>
--- a/public/images/icons/CART.svg
+++ b/public/images/icons/CART.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 25.1 25"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FDC477;}
+</style>
+<path class="st0" d="M8.8,15.6h14.1v3.6H7.8c-0.8,0-1.6-0.4-2.1-0.9c-0.5-0.5-0.8-1.3-0.8-2.1c0-0.4,0.1-0.9,0.3-1.3l1.1-2.3
+	L2.5,3.6H0V0h4.9l4.4,10.8h10.2l1.1-5.2H8.8V2h16.3l-2.6,12.4H9.4L8.8,15.6z M8.1,20c-1.4,0-2.5,1.1-2.5,2.5c0,1.4,1.1,2.5,2.5,2.5
+	c1.4,0,2.5-1.1,2.5-2.5C10.6,21.1,9.5,20,8.1,20 M20.3,20c-1.4,0-2.5,1.1-2.5,2.5c0,1.4,1.1,2.5,2.5,2.5c1.4,0,2.5-1.1,2.5-2.5
+	C22.8,21.1,21.7,20,20.3,20"/>
+</svg>
--- a/public/images/icons/CATALOG
+++ b/public/images/icons/CATALOG
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22.3 20.9"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path id="XMLID_184_" class="st0" d="M21.3,0h-2.6h-2h-1.6h-1h-1H0v20.9h13.1h2h1.6h2h3.6V0H21.3z M2,2h11.1v16.9H2V2z M16.7,18.9
+	h-1.6V2h1.6V18.9z M18.7,2h1.6v16.9h-1.6V2z"/>
+</svg>
--- a/public/images/icons/DESIGN
+++ b/public/images/icons/DESIGN
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 23.1 20.9"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path class="st0" d="M18,0h5v8.4H17V6.7h4.3V1.8H18H17C16.1,4,14,5.6,11.5,5.6C9,5.6,6.9,4,6.1,1.8H5H1.8v4.9h4.1v12.5h11.2V10h1.8
+	v11H4.1V8.4H0V0h5h2.4l0.2,0.7c0.4,1.8,2,3.1,3.9,3.1c1.9,0,3.5-1.3,3.9-3.1L15.6,0H18z"/>
+</svg>
--- a/public/images/icons/DESIGN
+++ b/public/images/icons/DESIGN
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 260.7 60"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path class="st0" d="M62.7,18.5h-6.6c-0.3,0-0.4,0.1-0.6,0.2c-0.1,0.1-0.2,0.3-0.2,0.6v18.8c0,0.3,0.1,0.4,0.2,0.6s0.3,0.2,0.6,0.2
+	h6.7c3,0,5.3-0.9,6.9-2.7c1.6-1.8,2.4-4.3,2.4-7.5c0-3.3-0.8-5.8-2.4-7.5C68.1,19.4,65.7,18.5,62.7,18.5 M67.6,28.9
+	c0,4.3-1.8,6.5-5.3,6.5h-2.5V21.9h2.5c3.6,0,5.3,2.1,5.3,6.4V28.9z M82.8,23.4c-2.3,0-4.1,0.7-5.4,2.1c-1.3,1.4-1.9,3.3-1.9,5.8
+	c0,2.6,0.7,4.6,1.9,5.9c1.3,1.3,3.2,2,5.7,2c1.7,0,3.3-0.3,4.7-0.8c0.3-0.1,0.4-0.2,0.5-0.3c0.1-0.1,0.1-0.3,0.1-0.7v-1.3
+	c0-0.4-0.2-0.7-0.5-0.7c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0C86.2,35.9,85,36,83.9,36c-1.5,0-2.6-0.3-3.3-0.9
+	c-0.7-0.6-1.1-1.5-1.2-2.8h8.5c0.2,0,0.4,0,0.5-0.1c0.1-0.1,0.2-0.3,0.2-0.6c0.1-0.8,0.1-1.5,0.1-2.1c0-2-0.5-3.5-1.6-4.6
+	C86.2,23.9,84.7,23.4,82.8,23.4 M85.1,29.7h-5.7c0.1-1.1,0.4-1.9,1-2.5c0.6-0.6,1.3-0.9,2.3-0.9c1.7,0,2.5,1,2.5,2.9V29.7z
+	 M99.3,30.2c1.2,0.5,2.1,1.1,2.6,1.7c0.5,0.6,0.8,1.5,0.8,2.5c0,1.4-0.6,2.6-1.7,3.5c-1.1,0.9-2.6,1.3-4.4,1.3
+	c-1.7,0-3.3-0.3-4.7-0.9c-0.3-0.1-0.4-0.2-0.5-0.4c-0.1-0.1-0.1-0.3-0.1-0.6v-1.3c0-0.4,0.2-0.7,0.5-0.7c0.1,0,0.2,0,0.4,0.1
+	c0.6,0.2,1.4,0.4,2.2,0.5c0.8,0.1,1.5,0.2,2.2,0.2c1.4,0,2.1-0.5,2.1-1.5c0-0.4-0.1-0.7-0.3-0.9c-0.2-0.2-0.7-0.4-1.4-0.7l-2.3-0.9
+	c-1.2-0.5-2.1-1-2.6-1.7c-0.5-0.7-0.8-1.6-0.8-2.6c0-1.3,0.5-2.4,1.6-3.2c1.1-0.8,2.5-1.2,4.3-1.2c1.4,0,2.7,0.2,3.9,0.7
+	c0.3,0.1,0.4,0.2,0.5,0.3c0.1,0.1,0.1,0.3,0.1,0.7v1.3c0,0.4-0.2,0.7-0.5,0.7c-0.1,0-0.4-0.1-0.8-0.2c-0.8-0.2-1.8-0.4-2.8-0.4
+	c-0.8,0-1.4,0.1-1.8,0.3c-0.4,0.2-0.6,0.5-0.6,0.9c0,0.3,0.1,0.6,0.3,0.8c0.2,0.2,0.7,0.5,1.4,0.7L99.3,30.2 M107.9,17
+	c0.7,0,1.3,0.2,1.8,0.6c0.4,0.4,0.7,1,0.7,1.7s-0.2,1.3-0.7,1.7c-0.4,0.4-1,0.6-1.8,0.6c-0.7,0-1.3-0.2-1.8-0.6
+	c-0.5-0.4-0.7-1-0.7-1.7s0.2-1.3,0.7-1.7C106.6,17.2,107.2,17,107.9,17 M109.3,23.8c0.3,0,0.5,0.1,0.6,0.2c0.1,0.1,0.2,0.3,0.2,0.6
+	v13.5c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.8c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V24.6c0-0.3,0.1-0.5,0.2-0.6
+	c0.1-0.1,0.3-0.2,0.6-0.2H109.3 M127.2,23.9h-2.1c-0.2,0-0.4,0-0.5,0.1c-0.1,0.1-0.2,0.3-0.3,0.5l-0.2,0.6c-0.6-0.6-1.2-1-1.9-1.3
+	c-0.7-0.3-1.5-0.4-2.3-0.4c-1.8,0-3.3,0.7-4.4,2.1c-1.1,1.4-1.6,3.2-1.6,5.5c0,2.3,0.5,4.1,1.6,5.4c1.1,1.4,2.5,2,4.4,2
+	c1.5,0,2.8-0.5,3.9-1.5v1.2c0,1.3-0.3,2.3-0.9,2.9c-0.6,0.6-1.5,0.9-2.8,0.9c-1.2,0-2.5-0.2-4.1-0.7c-0.2-0.1-0.3-0.1-0.4-0.1
+	c-0.3,0-0.5,0.2-0.5,0.7v1.3c0,0.3,0,0.5,0.1,0.6c0.1,0.1,0.3,0.2,0.5,0.4c1.5,0.6,3.1,1,4.7,1c2.3,0,4.2-0.7,5.5-2
+	c1.3-1.3,2-3.2,2-5.6V24.6c0-0.3-0.1-0.5-0.2-0.6C127.6,23.9,127.5,23.9,127.2,23.9 M123.7,34.5c-0.4,0.3-0.8,0.5-1.2,0.6
+	c-0.5,0.1-0.9,0.2-1.4,0.2c-1,0-1.8-0.4-2.3-1.1c-0.5-0.7-0.7-1.8-0.7-3.3c0-2.9,0.9-4.3,2.8-4.3c1.1,0,2,0.2,2.8,0.7V34.5z
+	 M141.8,23.4c1.4,0,2.5,0.4,3.2,1.1c0.8,0.8,1.1,1.8,1.1,3.2v10.3c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.8
+	c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V29c0-0.8-0.2-1.4-0.5-1.8c-0.4-0.4-0.9-0.6-1.6-0.6c-1.1,0-2.1,0.3-3.2,1v10.4
+	c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2H133c-0.3,0-0.4-0.1-0.6-0.2c-0.1-0.1-0.2-0.3-0.2-0.6V24.6c0-0.3,0.1-0.5,0.2-0.6
+	c0.1-0.1,0.3-0.2,0.6-0.2h2.1c0.5,0,0.7,0.2,0.8,0.6l0.3,1C138,24.1,139.8,23.4,141.8,23.4 M178.7,18.5c0.3,0,0.5,0.1,0.6,0.2
+	c0.1,0.1,0.2,0.3,0.2,0.6v18.8c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.4c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V24.8
+	l-4.2,8.5c-0.1,0.2-0.2,0.3-0.4,0.4c-0.1,0.1-0.3,0.1-0.6,0.1h-2.6c-0.3,0-0.5,0-0.6-0.1c-0.1-0.1-0.3-0.2-0.4-0.4l-4.2-8.5v13.3
+	c0,0.3-0.1,0.4-0.2,0.6s-0.3,0.2-0.6,0.2h-2.4c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V19.2c0-0.3,0.1-0.5,0.2-0.6s0.3-0.2,0.6-0.2
+	h3.4c0.3,0,0.5,0,0.6,0.1c0.1,0.1,0.3,0.2,0.4,0.4l5.2,11l5.3-11c0.1-0.2,0.2-0.3,0.4-0.4c0.1-0.1,0.3-0.1,0.6-0.1H178.7
+	 M190.6,23.4c-2.3,0-4.1,0.7-5.4,2.1c-1.3,1.4-1.9,3.3-1.9,5.8c0,2.6,0.7,4.6,1.9,5.9c1.3,1.3,3.2,2,5.7,2c1.7,0,3.3-0.3,4.7-0.8
+	c0.3-0.1,0.4-0.2,0.5-0.3c0.1-0.1,0.1-0.3,0.1-0.7v-1.3c0-0.4-0.2-0.7-0.5-0.7c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0
+	c-1.4,0.4-2.7,0.6-3.8,0.6c-1.5,0-2.6-0.3-3.3-0.9c-0.7-0.6-1.1-1.5-1.2-2.8h8.5c0.2,0,0.4,0,0.5-0.1c0.1-0.1,0.2-0.3,0.2-0.6
+	c0.1-0.8,0.1-1.5,0.1-2.1c0-2-0.5-3.5-1.6-4.6C194,23.9,192.5,23.4,190.6,23.4 M193,29.7h-5.7c0.1-1.1,0.4-1.9,1-2.5
+	c0.6-0.6,1.3-0.9,2.3-0.9c1.7,0,2.5,1,2.5,2.9V29.7z M209.1,23.7c0.3,0,0.5,0.1,0.6,0.2c0.1,0.1,0.2,0.3,0.2,0.6v2.5
+	c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2c-0.1,0-0.3,0-0.5,0c-0.2,0-0.5,0-0.8,0c-0.5,0-1,0.1-1.6,0.2
+	c-0.6,0.1-1.2,0.3-1.6,0.5v9.8c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.8c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V24.6
+	c0-0.3,0.1-0.5,0.2-0.6c0.1-0.1,0.3-0.2,0.6-0.2h2.1c0.4,0,0.7,0.2,0.8,0.6l0.4,1.6c0.8-0.9,1.5-1.5,2.2-1.8
+	c0.7-0.4,1.4-0.5,2.2-0.5H209.1 M222.7,35.5c0.3,0,0.5,0.2,0.5,0.6v1.5c0,0.3,0,0.5-0.1,0.7c-0.1,0.1-0.3,0.2-0.5,0.3
+	c-0.6,0.2-1.2,0.4-1.8,0.5c-0.6,0.1-1.2,0.1-1.8,0.1c-2.4,0-4.2-0.7-5.5-2c-1.3-1.3-1.9-3.2-1.9-5.7c0-2.5,0.7-4.4,2-5.8
+	c1.3-1.4,3.2-2.1,5.5-2.1c1.2,0,2.3,0.2,3.3,0.6c0.3,0.1,0.4,0.2,0.5,0.3c0.1,0.1,0.1,0.3,0.1,0.7v1.3c0,0.4-0.2,0.7-0.5,0.7
+	c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0c-0.8-0.2-1.6-0.3-2.3-0.3c-1.4,0-2.4,0.3-3,1c-0.6,0.7-1,1.8-1,3.3v0.4c0,1.5,0.3,2.6,1,3.3
+	c0.6,0.7,1.6,1,2.9,1c0.7,0,1.5-0.1,2.4-0.3C222.4,35.5,222.6,35.5,222.7,35.5 M239.2,24.5c0.8,0.8,1.1,1.8,1.1,3.2v10.3
+	c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.8c-0.3,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.6V29c0-0.8-0.2-1.4-0.5-1.8
+	c-0.4-0.4-0.9-0.6-1.6-0.6c-1.1,0-2.1,0.3-3.2,1v10.4c0,0.3-0.1,0.4-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.2h-2.8c-0.3,0-0.4-0.1-0.6-0.2
+	s-0.2-0.3-0.2-0.6V17.9c0-0.3,0.1-0.5,0.2-0.6c0.1-0.1,0.3-0.2,0.6-0.2h2.8c0.3,0,0.5,0.1,0.6,0.2c0.1,0.1,0.2,0.3,0.2,0.6v7.3
+	c1.7-1.2,3.4-1.8,5.3-1.8C237.4,23.4,238.5,23.8,239.2,24.5 M253.6,0H7.1C3.2,0,0,3.2,0,7.1v45.7C0,56.8,3.2,60,7.1,60h246.5
+	c3.9,0,7.1-3.2,7.1-7.1V7.1C260.7,3.2,257.5,0,253.6,0 M256.5,52.9c0,1.6-1.3,2.9-2.9,2.9H7.1c-1.6,0-2.9-1.3-2.9-2.9V7.1
+	c0-1.6,1.3-2.9,2.9-2.9h246.5c1.6,0,2.9,1.3,2.9,2.9V52.9z M38,18.4h5.9v9.9h-7.1v-2.1h5v-5.7H38h-1.3c-1,2.6-3.4,4.5-6.4,4.5
+	c-2.9,0-5.4-1.9-6.4-4.5h-1.3h-3.8v5.7h4.8v14.7H37V30.1H39v12.9H21.7V28.3h-4.8v-9.9h5.9h2.8l0.2,0.8c0.5,2.1,2.4,3.7,4.6,3.7
+	c2.2,0,4.1-1.6,4.6-3.7l0.2-0.8H38z"/>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64.9 58.9"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<path class="st0" d="M59.9,18.7V5h-9.1h-3c-2.3,6.2-8.3,10.7-15.3,10.7h0c-7.1,0-13-4.5-15.3-10.7h-3H5v13.7h11.6v35.2h31.6V28.1h5
+	v30.9H11.6V23.7H0V0h14.1h6.8l0.5,1.9c1.2,5,5.7,8.8,11.1,8.8h0c5.4,0,9.9-3.8,11.1-8.8L44,0h6.8h14.1v23.7H47.8v-5H59.9z
+	 M27.8,25.7h-5l-2.2,2.1v7.6h11.2v-3.4h-7.8v-3l0.5-0.5h5l2.2-2.2v-4.8l-2.6-2.6h-5.9l-2.6,2.6V24h3.4v-1.2l0.7-0.7h2.8l0.7,0.7v2.3
+	L27.8,25.7z M33,29.7v2.9l2.7,2.7h5.8l2.7-2.7v-4.6l-1.4-1.5l1.3-1.4v-3.9l-2.6-2.6h-5.8l-2.6,2.6v2.6h3.3v-1.1l0.7-0.7h2.9l0.7,0.7
+	v1.9l-0.7,0.7h-4.1v2.6h4.2l0.7,0.7v2.3l-0.8,0.8h-2.9l-0.8-0.8v-1.4H33z"/>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 65.5 54.4"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<path id="XMLID_236_" class="st0" d="M32.7,8.3c-4.5,0-8.8,0.2-12.6,0.7c-0.5,0.1-0.9-0.3-0.9-0.8V4.7C19.3,4.3,19.6,4,20,4
+	c2.9-0.3,5.9-0.5,9.2-0.6c0.4,0,0.8-0.4,0.8-0.8V0.8c0-0.4,0.4-0.8,0.8-0.8h3.4c0.4,0,0.8,0.4,0.8,0.8v5v1.7c0,0.4-0.4,0.8-0.8,0.8
+	C33.7,8.3,33.2,8.3,32.7,8.3 M52.6,10.1c0.5,0.1,1-0.3,1-0.8V7.8v-5c0-0.4-0.4-0.8-0.8-0.8h-3.4c-0.4,0-0.8,0.4-0.8,0.8v1.5
+	c-0.4-0.1-0.8-0.1-1.3-0.2c-2.6-0.3-5.5-0.6-8.5-0.7c-0.4,0-0.8,0.3-0.8,0.8v3.4c0,0.4,0.3,0.8,0.8,0.8C44,8.7,48.8,9.3,52.6,10.1
+	 M64.7,7.4c0.4,0,0.8,0.4,0.8,0.8v10.3v22.2V48c0,0.4-0.4,0.8-0.8,0.8h-3.1c-0.6,0-1.1-0.5-1.1-1.1v0c0-0.8-0.7-1.3-1.4-1
+	c-1.3,0.5-2.7,0.9-4.3,1.2c-0.2,0-0.3,0.1-0.5,0.1v3.6c0,0.4-0.4,0.8-0.8,0.8H50c-0.4,0-0.8-0.4-0.8-0.8v-1.8c0-0.5-0.4-0.8-0.9-0.8
+	c-3.6,0.5-7.7,0.8-12,0.9c-0.4,0-0.8,0.4-0.8,0.8v2.9c0,0.4-0.4,0.8-0.8,0.8h-3.4c-0.4,0-0.8-0.4-0.8-0.8v-2.9
+	c0-0.4-0.3-0.8-0.8-0.8c-4.1-0.1-8.1-0.4-11.6-0.8c-0.4-0.1-0.8-0.1-1.3-0.2v2.6c0,0.4-0.4,0.8-0.8,0.8h-3.4c-0.4,0-0.8-0.4-0.8-0.8
+	v-2.8c0-0.4-0.3-0.7-0.6-0.8c-1.5-0.3-2.9-0.7-4.2-1.1c-0.2-0.1-0.5-0.2-0.7-0.2C5.7,46.4,5,47,5,47.7c0,0.6-0.5,1.1-1.1,1.1H0.8
+	C0.4,48.8,0,48.4,0,48v-7.4V18.5V8.2c0-0.4,0.4-0.8,0.8-0.8h3.9c0.1,0,0.2,0,0.3-0.1C6.6,6.6,8.5,6,10.8,5.4c0.2,0,0.3-0.1,0.5-0.1
+	V2.8c0-0.4,0.4-0.8,0.8-0.8h3.4c0.4,0,0.8,0.4,0.8,0.8v5v1c0,0.4-0.3,0.7-0.7,0.8c-2.5,0.4-4.7,0.9-6.4,1.5c-1.7,0.5-3,1.1-3.7,1.6
+	c-0.1,0.1-0.2,0.2-0.3,0.2c0.2,0.2,0.5,0.4,0.9,0.6c1,0.6,2.7,1.2,4.9,1.8c0.4-0.3,0.5-0.4,1-0.8v-1.4c0-0.4,0.4-0.8,0.8-0.8h3.4
+	c0.4,0,0.8,0.4,0.8,0.8v9v1.2c0,0.4,0.3,0.7,0.7,0.8c0.5,0.1,0.9,0.1,1.4,0.2c3.2,0.4,6.7,0.6,10.4,0.7c0.6,0,1.1-0.5,1.1-1.1v-0.3
+	c0-0.6-0.5-1.1-1.1-1.1c-3.1-0.1-6.1-0.3-8.9-0.5c-0.4,0-0.7-0.4-0.7-0.8v-3.4c0-0.5,0.4-0.8,0.9-0.8c2.8,0.3,5.8,0.5,9,0.6
+	c0.4,0,0.8-0.3,0.8-0.8v-1.5c0-0.4,0.4-0.8,0.8-0.8h3.4c0.4,0,0.8,0.4,0.8,0.8v9v0.8c3.2-0.1,6.3-0.2,9.2-0.5
+	c1.2-0.1,2.4-0.3,3.5-0.4c0.5-0.1,0.9-0.5,0.9-1.1v-0.7c0-0.5-0.4-0.8-0.9-0.8c-2.7,0.4-5.7,0.7-8.9,0.8c-0.4,0-0.8-0.3-0.8-0.8
+	v-3.4c0-0.4,0.3-0.8,0.7-0.8c2.4-0.1,4.8-0.3,6.9-0.6c0.8-0.1,1.6-0.2,2.3-0.3c0.4-0.1,0.7-0.4,0.7-0.8v-2.5c0-0.4,0.4-0.8,0.8-0.8
+	h3.4c0.4,0,0.8,0.4,0.8,0.8v9V23c1.1-0.2,2.1-0.5,3-0.8c0.9-0.3,1.8-0.5,2.5-0.9l0.7-1v-0.7c0-0.5-0.5-0.9-1.1-0.7
+	c-0.4,0.1-0.8,0.3-1.2,0.4c-0.5,0.2-1-0.2-1-0.7v-3.6c0-0.3,0.2-0.6,0.5-0.7c1-0.4,1.8-0.8,2.2-1.1c0.1-0.1,0.2-0.2,0.3-0.2
+	c-0.2-0.2-0.5-0.4-0.9-0.6c-0.6-0.3-1.4-0.7-2.3-1c-0.3-0.1-0.5-0.4-0.5-0.7V7c0-0.5,0.5-0.9,1-0.7c0.3,0.1,0.5,0.2,0.8,0.3
+	c0.8,0.3,1.5,0.5,2.2,0.8c0.1,0,0.2,0.1,0.3,0.1H64.7z M8.3,22.2c0.9,0.2,1.8,0.5,2.7,0.7c0.5,0.1,1-0.3,1-0.8v-0.7
+	c0-0.5-0.4-1-0.9-1.1c-1.4-0.3-2.8-0.7-4-1.1c-0.4-0.1-0.7-0.3-1.1-0.4C5.6,18.7,5,19.1,5,19.6v0.7c0,0.4,0.3,0.8,0.7,1
+	C6.5,21.7,7.3,21.9,8.3,22.2"/>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 78.2 67.5"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<g id="XMLID_237_">
+	<path id="XMLID_274_" class="st0" d="M19,26.2L19,26.2z"/>
+	<polygon id="XMLID_273_" class="st0" points="19,26.2 39.3,14.4 59.1,26.2 61.1,22.7 41.3,11 41.3,4 45.4,4 45.4,5.1 42.1,5.1 
+		42.1,9.1 49.4,9.1 49.4,0 37.3,0 37.3,11 17,22.7 	"/>
+	<path id="XMLID_267_" class="st0" d="M78.2,46.8L68.9,34H57.8v-7.5h-4v37h-3.4V46.1H28.2v17.5h-3.8v-37h-4v37H9.3V46.8H18v-4H7.9
+		l3.5-4.8H18v-4l-8.7,0L0,46.8h5.3v20.8h15.1h2h33.4h2h15.1V46.8H78.2z M46.4,63.1h-5.1V50.1h5.1V63.1z M32.2,50.1h5.1v13.1h-5.1
+		V50.1z M66.9,38l3.5,4.8H57.8V38H66.9z M68.9,63.5H57.8V46.8h11.1V63.5z"/>
+	<path id="XMLID_238_" class="st0" d="M28.2,41.1h22.3v-2V28.3H28.2V41.1z M46.4,37.1h-5.1v-4.8h5.1V37.1z M32.2,32.3h5.1v4.8h-5.1
+		V32.3z"/>
+</g>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 52.4 60.1"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<path id="XMLID_237_" class="st0" d="M40.5,35.6c1.9-2.8,3-6.1,3-9.7c0-4.8-1.9-9.1-5.1-12.2c-3.1-3.1-7.4-5.1-12.2-5.1
+	c-4.8,0-9.1,1.9-12.2,5.1c-3.1,3.1-5.1,7.4-5.1,12.2c0,3.6,1.1,7,3,9.8c0.4,0.6,0.3,1.5-0.4,2c-0.6,0.4-1.5,0.3-2-0.4
+	C7.4,34.1,6.1,30.2,6.1,26c0-11.1,9-20.1,20.1-20.1c11.1,0,20.1,9,20.1,20.1c0,4.2-1.3,8-3.4,11.2c-0.4,0.6-1.3,0.8-2,0.4
+	C40.3,37.1,40.1,36.3,40.5,35.6z M6.6,41.3c0.7-0.5,0.8-1.4,0.4-2c-2.5-3.7-4-8.2-4-13.1c0-6.4,2.6-12.2,6.8-16.4
+	c4.2-4.2,10-6.8,16.4-6.8c6.4,0,12.2,2.6,16.4,6.8c4.2,4.2,6.8,10,6.8,16.4c0,4.8-1.5,9.3-4,13c-0.5,0.7-0.3,1.6,0.4,2
+	c0.7,0.5,1.6,0.3,2-0.4c2.8-4.2,4.5-9.2,4.5-14.6C52.4,11.7,40.6,0,26.2,0C11.7,0,0,11.7,0,26.2c0,5.5,1.7,10.5,4.5,14.7
+	C5,41.6,5.9,41.8,6.6,41.3z M44.4,46.4c-3.2-2.9-7.5-4.5-12.2-4.5h-0.3c2.6-1.8,4.2-4.7,4.2-8.1V22.9c0-5.5-4.4-9.9-9.9-9.9H26
+	c-5.5,0-9.9,4.4-9.9,9.9v10.8c0,3.4,1.7,6.3,4.2,8.1h-0.3c-4.7,0-9,1.6-12.2,4.5c-3.1,2.8-5.1,6.9-5.1,11.5c0,0.1,0,0.1,0,0.2v0.2
+	c0,0.5,0.2,1,0.6,1.3c0.4,0.4,0.8,0.6,1.3,0.6c0.5,0,1-0.2,1.3-0.6c0.4-0.4,0.6-0.8,0.6-1.3c0-3.8,1.5-6.8,3.9-9
+	c2.4-2.2,5.8-3.5,9.7-3.5h12.1c3.8,0,7.2,1.3,9.7,3.5c2.4,2.2,3.9,5.3,3.9,9c0,0.5,0.2,1,0.6,1.3c0.4,0.4,0.8,0.6,1.3,0.6
+	s1-0.2,1.3-0.6c0.4-0.4,0.6-0.8,0.6-1.3V58c0-0.1,0-0.1,0-0.2C49.5,53.2,47.5,49.2,44.4,46.4z"/>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 61.9 66.8"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<path id="XMLID_268_" class="st0" d="M61.7,20.3C61.6,20.2,50.3,8,50.3,7.9C50,7.2,48.1,3.4,47,1.1c-0.4-0.9-1.4-1.3-2.4-1
+	c-4.5,1.7-9.3,3.2-13.8,3.3c0,0-0.2,0-0.3,0c-6.3,0-11.4-1.8-13.6-2.7c-0.7-0.3-1.5,0-1.9,0.7c-1.2,2.2-3.7,6.5-3.7,6.5
+	C11.4,8,0.1,19.7,0,19.8C-0.4,20,2.4,50.6,2.2,51c0,0,0,6.8,0,6.8c0,0.2,0.2,0.4,0.4,0.4h7.2c-0.1,0.3,0.1,7.6,0,8.1
+	c0,0.2,0.2,0.4,0.4,0.4h41.2c0.2,0,0.4-0.2,0.4-0.4v-5.6V59V20.7c0-0.2-0.2-0.4-0.4-0.4h-3.4h-0.3v36.4c0,0.2-0.2,0.4-0.4,0.4H16.7
+	c-0.2,0-0.4,0.2-0.4,0.4v3c0,0.2,0.2,0.4,0.4,0.4h30.8c0.7,0,0.4,1.1,0.4,1.5c0,0.2-0.2,0.4-0.4,0.4H14.4c-0.2,0-0.4-0.2-0.4-0.4
+	v-2.9V20.7c0-0.2-0.2-0.4-0.4-0.4h-3.2c-0.2,0-0.4,0.2-0.4,0.4v27.8c0,0.2-0.2,0.4-0.4,0.4H6.6c-0.2,0-0.4-0.2-0.4-0.4l-2-27
+	c0-0.1,0-0.2,0.1-0.3l9.1-9.6c0.1-0.1,0.3-0.2,0.5-0.1L28.9,18c1.3,0.6,2.7,0.5,4,0l14.8-6.5c0.2-0.1,0.4,0,0.5,0.1l9.2,10
+	c0.6,0.4-2.2,26.8-1.9,27.3c-0.1,0-1.5,0-1.6,0c-0.2,0-0.4,0.2-0.4,0.4v3c0,0.7,1.5,0.4,1.9,0.4v1.5h-1.5c-0.2,0-0.4,0.2-0.4,0.4v3
+	c0,0.2,0.2,0.4,0.4,0.4H59c0.2,0,0.4-0.2,0.4-0.4V51C59.5,50.9,61.8,20.5,61.7,20.3L61.7,20.3l0.2-0.2L61.7,20.3z M6.3,54.1v-1.3
+	h3.6v1.5H6.3V54.1z M16.1,7.7c0.2-0.3,0.5-1.2,1-0.7c0.8,0.7,2.9,2.6,3.6,3.2l-4.4-1.9C16.1,8.2,16,7.9,16.1,7.7 M31.2,13.8
+	c-0.2,0.2-0.4,0.2-0.6,0l-8.3-7.4c5.5,1.3,11.5,1.3,17.1-0.4L31.2,13.8z M40.5,10.4l4.2-4L45,6.2c0.1,0.4,1.2,1.8,0.5,2.1L40.5,10.4
+	z M38.6,39.3H22.4c-0.1,0.1-5.9,7.4-6,7.5c-0.1,0.1-0.1,0.2-0.1,0.3v7.4c0,0.2,0.2,0.4,0.4,0.4h28.5c0.2,0,0.4-0.2,0.4-0.4v-7.9
+	c0-0.1,0-0.2-0.1-0.3l-6-7H38.6z M41.6,50.8V51H20.8c-0.2,0-0.4-0.2-0.4-0.4c0-0.2-0.1-2.4,0.1-2.5l3.8-4.7c0.1-0.1,0.2-0.2,0.3-0.2
+	h12.9c0.1,0,0.3,0.1,0.3,0.2l3.8,4.3C41.8,47.7,41.6,50.6,41.6,50.8"/>
+</svg>
--- a/public/images/icons/INDUSTRIES
+++ b/public/images/icons/INDUSTRIES
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 53 67.6"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+</style>
+<g id="XMLID_269_">
+	<path id="XMLID_350_" class="st0" d="M45.1,7.7V0H8v7.7H0v59.9h53V7.7H45.1z M34.3,63.6h-5.5V50.5h5.5V63.6z M24.2,63.6h-5.5V50.5
+		h5.5V63.6z M49,63.6H38.8l0-17.6H14.2v17.6H4V11.7h8V4h29.1v3.7H15.4v4H49V63.6z"/>
+	<rect id="XMLID_349_" x="9.6" y="14.9" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_348_" x="23.1" y="14.9" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_347_" x="36.6" y="14.9" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_321_" x="9.6" y="26.1" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_320_" x="23.1" y="26.1" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_319_" x="36.6" y="26.1" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_318_" x="9.6" y="37.3" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_317_" x="23.1" y="37.3" class="st0" width="6.8" height="5.4"/>
+	<rect id="XMLID_270_" x="36.6" y="37.3" class="st0" width="6.8" height="5.4"/>
+</g>
+</svg>
--- a/public/images/icons/MERCHBAY
+++ b/public/images/icons/MERCHBAY
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 58.6 34.3"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F48F9B;}
+	.st1{fill:#5ACBF5;}
+	.st2{fill:#FDC477;}
+</style>
+<g>
+	<path class="st0" d="M39.2,33.1c0.3,0.5-0.1,1.1-0.7,1.1h-9.2h-9.3c-0.6,0-1-0.6-0.7-1.1l4.6-8l4.6-8c0.3-0.5,1-0.5,1.3,0l4.6,8
+		L39.2,33.1z"/>
+	<path class="st1" d="M26.7,11.4c0.1,0.2,0.1,0.5,0,0.8l-7.5,13l-5.1,8.8c-0.1,0.2-0.4,0.4-0.7,0.4H0.8c-0.6,0-1-0.6-0.7-1.1
+		l9.5-16.4L19,0.4c0.3-0.5,1-0.5,1.3,0L26.7,11.4"/>
+	<path class="st2" d="M38.3,0.4c0.3-0.5,1-0.5,1.3,0l18.9,32.7c0.3,0.5-0.1,1.1-0.7,1.1H45.2c-0.3,0-0.5-0.1-0.7-0.4l-5.1-8.8
+		l-7.5-13c-0.1-0.2-0.1-0.5,0-0.8L38.3,0.4z"/>
+</g>
+</svg>
--- a/public/images/icons/MERCHBAY
+++ b/public/images/icons/MERCHBAY
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 281.2 50"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F48F9B;}
+	.st1{fill:#5ACBF5;}
+	.st2{fill:#FDC477;}
+	.st3{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M39.2,38.3c0.3,0.5-0.1,1.1-0.7,1.1h-9.2h-9.3c-0.6,0-1-0.6-0.7-1.1l4.6-8l4.6-8c0.3-0.5,1-0.5,1.3,0l4.6,8
+		L39.2,38.3z"/>
+	<path class="st1" d="M26.7,16.5c0.1,0.2,0.1,0.5,0,0.8l-7.5,13L14.1,39c-0.1,0.2-0.4,0.4-0.7,0.4H0.8c-0.6,0-1-0.6-0.7-1.1
+		l9.5-16.4L19,5.5c0.3-0.5,1-0.5,1.3,0L26.7,16.5"/>
+	<path class="st2" d="M38.3,5.5c0.3-0.5,1-0.5,1.3,0l18.9,32.7c0.3,0.5-0.1,1.1-0.7,1.1H45.2c-0.3,0-0.5-0.1-0.7-0.4l-5.1-8.8
+		l-7.5-13c-0.1-0.2-0.1-0.5,0-0.8L38.3,5.5z"/>
+	<path class="st3" d="M195.3,13.3c1.1,0.6,1.8,1.4,2.3,2.2c1,1.7,1.1,3.5,1.1,4.2c0,0.1,0,0.2,0,0.2v1.9v17.1l-0.1,0.1l-0.1,0.1
+		h-7.5l-0.1-0.1l-0.1-0.1V21.8c0-1.8-0.8-2.6-0.8-2.6c-0.7-0.6-1.7-0.9-2.6-0.9c-1.3,0-2.6,0.4-3.6,0.8c-0.8,0.3-1.4,0.6-1.6,0.8
+		v18.9l-0.1,0.1l-0.1,0.1h-7.4l-0.1-0.1l-0.1-0.1v-36l0-0.1l0-0.1l7.4-2.7l0.1,0.1l0.1,0.1v15c1.9-1.4,4.9-2.8,8.8-2.8
+		C192.8,12.3,194.2,12.7,195.3,13.3 M248.2,13.1c2.3,0.8,3.5,2.7,4.2,4.4c0.6,1.7,0.7,3.3,0.7,3.9c0,0.1,0,0.2,0,0.2v17.4l-0.1,0.1
+		l-0.1,0.1h-4.8l0,0l0,0l-1.6-2.1c-2.9,2.7-6.4,3-7.5,3c-0.2,0-0.3,0-0.4,0c-1.8,0-3.3-0.4-4.4-1c-1.1-0.6-1.9-1.5-2.4-2.4
+		c-1.1-1.8-1.2-3.8-1.2-4.6c0-0.2,0-0.4,0-0.4l0,0c0,0,0,0,0,0v0l0,0l0,0c0.4-3.2,1.9-5.2,3.8-6.4c1.9-1.2,4.3-1.5,6.3-1.5
+		c2.4,0,4.4,0.4,5.1,0.6c0-0.6,0.1-1.1,0.1-1.5c0-2.3-0.4-3.1-0.5-3.2l0,0l0,0l0,0c-0.3-0.5-0.8-0.8-1.5-1.1
+		c-0.7-0.2-1.5-0.3-2.4-0.3c-3.7,0-8.6,1.6-8.6,1.6l-0.2,0.1l-0.1-0.2l0,0v-4.8l0,0l0,0l0,0c2.7-1.5,6.2-2.4,9.7-2.4
+		C244.4,12.1,246.4,12.4,248.2,13.1 M245.9,28.4c-0.4-0.1-1.7-0.4-3.2-0.4c-0.8,0-1.7,0.1-2.5,0.3c-0.8,0.3-1.4,0.7-1.8,1.3
+		c-0.3,0.4-0.4,1-0.5,1.7c0,0.1,0,0.2,0,0.3c0,1.1,0.3,1.7,0.7,2.2c0.4,0.4,1,0.6,1.7,0.6c1.2,0,2.6-0.5,3.7-1
+		c0.9-0.4,1.6-0.8,1.8-0.9V28.4z M281.1,13.1L281.1,13.1l-7.4-0.1l-0.1,0l-0.1,0l-5.2,18.2l-5.8-18.2l-0.1,0l-0.1,0h-7.7l-0.1,0.1
+		l-0.1,0.1l10.1,26c0,0,0,0.1,0,0.1c0,0.3-0.2,1.1-0.6,2c-0.4,0.9-1.1,1.7-2.2,2.2c-0.7,0.3-1.4,0.4-2.1,0.4c-1.5,0-2.8-0.4-2.9-0.4
+		l-0.2-0.1l-0.1,0.2l0,0v5.6l0,0.1l0,0.1l0.1,0c1.7,0.5,3.1,0.7,4.4,0.7c3.6,0,5.9-1.7,7.2-3.3c1.3-1.6,1.8-3.2,1.8-3.3L281.1,13.1
+		L281.1,13.1z M151.5,12.8L151.5,12.8c-5.2,0-8.2,2.1-9.6,3.5l-1.4-3.1l-0.1,0l0,0h-5.5l-0.1,0.1l-0.1,0.1v25.7l0.1,0.1l0.1,0.1h7.5
+		l0.1-0.1l0.1-0.1V20.7c1.5-0.7,3.1-0.9,4.6-0.9c2.3,0,4.2,0.5,4.3,0.6l0.2,0.1l0.1-0.2l0,0v-7.3L151.5,12.8L151.5,12.8z
+		 M126.3,13.6c1.4,0.8,2.4,1.9,3.2,3.1c1.5,2.5,1.8,5.5,1.8,7.7c0,1.9-0.3,3.3-0.3,3.4l0,0.1l-0.1,0l0,0h-15.4c0,1,0.3,2.4,1.1,3.5
+		c0.9,1.2,2.4,2.2,5.2,2.3c0.2,0,0.4,0,0.6,0c5.2,0,8.2-1.5,8.2-1.5l0.2-0.1l0.1,0.2l0,0v5.3l0,0.1l0,0.1l-0.1,0
+		c-5.2,1.8-9.6,1.9-9.7,1.9c0,0-0.2,0-0.4,0c-1.1,0-4.1-0.2-6.9-2c-2.8-1.8-5.3-5.3-5.3-11.8c0-6.4,2.5-9.9,5.3-11.7
+		c2.8-1.8,5.8-2,6.9-2c0.3,0,0.4,0,0.5,0C123.1,12.3,124.9,12.8,126.3,13.6 M124.7,23.1c0-0.1,0-0.3,0-0.6c0-0.6-0.1-1.4-0.3-2.2
+		c-0.3-0.8-0.8-1.6-1.6-2.1c-0.6-0.3-1.3-0.5-2.2-0.5c-1.3,0-2.3,0.3-3.1,0.9c-0.8,0.5-1.3,1.2-1.6,1.9c-0.6,1.1-0.7,2.2-0.7,2.6
+		H124.7 M171.9,14.3L171.9,14.3c-1.5-0.9-3.4-1.3-5-1.5c-1.6-0.2-2.8-0.2-2.8-0.2c-2.9,0-5.1,0.8-6.8,1.9c-2.5,1.8-3.8,4.4-4.4,6.7
+		c-0.7,2.3-0.7,4.3-0.7,4.7c0,0,0,0.1,0,0.1c0,0.2,0,0.4,0,0.6c0,0.9,0.1,1.7,0.2,2.5c0.7,5.1,4.4,9.3,9.4,10.4c1,0.2,2,0.3,2.9,0.3
+		c4.1,0,7.1-1.7,7.2-1.7l0.1,0l0-0.1l0,0v-5.1l0,0l-0.1-0.2l-0.2,0.1c-0.1,0-2.5,1.1-5.1,1.1c-0.6,0-1.2-0.1-1.8-0.2
+		c-1.6-0.4-2.7-1-3.5-2.1c-0.8-1.1-1.2-2.9-1.3-5.6v-0.1c0-2.7,0.6-4.3,1.6-5.4c1-1.1,2.4-1.5,3.9-1.7c0.4,0,0.7-0.1,1.1-0.1
+		c2.6,0,5.1,0.8,5.1,0.8l0.2,0.1l0.1-0.2l0,0L171.9,14.3L171.9,14.3L171.9,14.3z M102.2,13.3c-1.1-0.6-2.4-1-4.2-1
+		c-3.9,0-6.9,1.4-8.8,2.8l-0.9,0.7c-0.1-0.1-0.1-0.2-0.2-0.3c-0.5-0.8-1.2-1.6-2.3-2.2c-1.1-0.6-2.4-1-4.2-1c-3.9,0-6.9,1.4-8.8,2.8
+		L71,12.3h-5.9v26.6l0.1,0.1l0.1,0.1h7.4l0.1-0.1l0.1-0.1V19.9c0.2-0.1,0.8-0.4,1.6-0.8c1-0.4,2.3-0.8,3.6-0.8c1,0,1.9,0.2,2.6,0.9
+		c0,0,0.8,0.8,0.8,2.6v17.1l0.1,0.1l0.1,0.1h0h7.4h0l0.1-0.1l0.1-0.1V19.9c0.2-0.1,0.8-0.4,1.6-0.8c1-0.4,2.3-0.8,3.6-0.8
+		c1,0,1.9,0.2,2.6,0.9c0,0,0.8,0.8,0.8,2.6v17.1l0.1,0.1L98,39h7.4l0.1-0.1l0.1-0.1V21.8v-1.9c0,0,0-0.1,0-0.2
+		c0-0.7-0.1-2.5-1.1-4.2C104,14.7,103.3,13.9,102.2,13.3 M229.1,25.8C229.1,25.9,229.1,25.9,229.1,25.8c0,0.3,0,0.5,0,0.7
+		c0,0.9-0.1,1.7-0.2,2.5c-0.7,5.1-4.4,9.3-9.4,10.4c-1,0.2-2,0.3-2.9,0.3c-4.1,0-7.1-1.7-7.2-1.7l-1.1-0.5l-1.6,1.4l-0.1,0.1
+		l-0.1,0.1h-4.3l-0.1-0.1l-0.1-0.1v-36l0-0.1l0-0.1l7.4-2.7l0.1,0.1l0.1,0.1v13.8c1.3-0.7,3-1,4.4-1.2c1.6-0.2,2.8-0.2,2.8-0.2
+		c2.9,0,5.1,0.8,6.8,1.9c2.5,1.8,3.8,4.4,4.4,6.7C229,23.4,229.1,25.4,229.1,25.8 M221.3,25.6c0-2.7-0.6-4.3-1.6-5.4
+		c-1-1.1-2.4-1.5-3.9-1.7c-0.4,0-0.7-0.1-1.1-0.1c-2.1,0-4,0.5-4.8,0.7v13.4c0.8,0.3,2.7,1,4.7,1c0.6,0,1.2-0.1,1.8-0.2
+		c1.6-0.4,2.7-1,3.5-2.1C220.8,30.1,221.3,28.4,221.3,25.6L221.3,25.6z"/>
+</g>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 79.4 72.1"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+	.st1{fill:#FDC477;}
+	.st2{fill:#F48F9B;}
+	.st3{fill:#5ACBF5;}
+</style>
+<g id="XMLID_270_">
+	<path id="XMLID_348_" class="st0" d="M69.5,22.9v6.1h9.9V0H62.1h-8.3l-0.6,2.4c-1.5,6.2-7,10.8-13.5,10.8h0
+		c-6.6,0-12.1-4.6-13.5-10.8L25.6,0h-8.3H0v29.1h14.2v43.1h51V22.9h-6.1V66H20.4V22.9H6.1V6.1h11.1H21c2.8,7.6,10.1,13.1,18.8,13.1
+		h0c8.6,0,15.9-5.5,18.8-13.1h3.7h11.1v16.8H69.5z"/>
+	<path id="XMLID_321_" class="st1" d="M59.1,66H20.4V51.6h38.7V66z"/>
+	<path id="XMLID_319_" class="st2" d="M59.1,51.6H20.4V37.3h38.7V51.6z"/>
+	<path id="XMLID_317_" class="st3" d="M59.1,37.3H20.4V22.9h38.7V37.3z"/>
+</g>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 63.1 72.2"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FDC477;}
+	.st1{fill:#F48F9B;}
+	.st2{fill:#5ACBF5;}
+	.st3{fill:#181818;}
+</style>
+<g id="XMLID_317_">
+	<path id="XMLID_401_" class="st0" d="M47,43.1c-0.8,2.3-2.1,4.4-3.9,6.1c-3,3-7.1,4.8-11.6,4.8c-4.5,0-8.6-1.8-11.6-4.8
+		c-1.7-1.7-3-3.8-3.9-6.1H47"/>
+	<path id="XMLID_399_" class="st1" d="M48,37.6c0,1.9-0.3,3.8-1,5.5h-31c-0.6-1.7-1-3.5-1-5.5c0-1.9,0.3-3.8,1-5.5h31
+		C47.6,33.8,48,35.7,48,37.6"/>
+	<path id="XMLID_347_" class="st2" d="M43.2,26c1.7,1.7,3,3.8,3.9,6.1h-31c0.8-2.3,2.1-4.4,3.9-6.1c3-3,7.1-4.8,11.6-4.8
+		C36.1,21.2,40.2,23,43.2,26"/>
+	<path id="XMLID_318_" class="st3" d="M63.1,12.6v59.6H57V15.9h-9.4V6.1H6.1v60h44.7v6.1H0V0h50L63.1,12.6z M31.5,15.1
+		c12.5,0,22.5,10.1,22.5,22.6c0,12.5-10.1,22.5-22.5,22.5C19.1,60.2,9,50.1,9,37.6C9,25.2,19.1,15.1,31.5,15.1 M19.9,49.2
+		c3,3,7.1,4.8,11.6,4.8c4.5,0,8.6-1.8,11.6-4.8c1.7-1.7,3-3.8,3.9-6.1c0.6-1.7,1-3.5,1-5.5c0-1.9-0.3-3.8-1-5.5
+		c-0.8-2.3-2.1-4.4-3.9-6.1c-3-3-7.1-4.8-11.6-4.8c-4.5,0-8.6,1.8-11.6,4.8c-1.7,1.7-3,3.8-3.9,6.1c-0.6,1.7-1,3.5-1,5.5
+		c0,1.9,0.3,3.8,1,5.5C16.9,45.4,18.2,47.5,19.9,49.2"/>
+</g>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 83.9 71.7"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+	.st1{fill:#F48F9B;}
+	.st2{fill:#FDC477;}
+	.st3{fill:#181818;}
+</style>
+<g id="XMLID_318_">
+	<path id="XMLID_435_" class="st0" d="M32,71.7h-9.3v-33H32V71.7z"/>
+	<g id="XMLID_348_">
+		<path id="XMLID_460_" class="st1" d="M46.3,71.7H38v-33h8.3V71.7z"/>
+		<path id="XMLID_458_" class="st1" d="M46.3,71.7H38v-33h8.3V71.7z"/>
+	</g>
+	<path id="XMLID_321_" class="st2" d="M61.7,71.7h-9.3v-33h9.3V71.7z"/>
+	<path id="XMLID_319_" class="st3" d="M75.6,0c4.6,0,8.3,3.7,8.3,8.3v20.2h-5.4v-6.1v-2.5V8.3c0-1.2-1-2.1-2.1-2.1H9
+		c-1.2,0-2.1,1-2.1,2.1v14.1h13.5h45.2h8.9v16.4h-6.5v29.9c0,2.6-3.1,4.4-5.8,1.8c-0.2-0.2-0.3-0.5-0.3-0.8V38.8h-9.2v29.9
+		c0,2.6-3.1,4.4-5.8,1.8c-0.2-0.2-0.3-0.5-0.3-0.8V38.8h-8.2v29.9c0,2.6-3.1,4.4-5.8,1.8C32.1,70.3,32,70,32,69.7V38.8h-9.3v29.9
+		c0,2.6-3.1,4.4-5.8,1.8c-0.2-0.2-0.3-0.5-0.3-0.8V38.8h-7V28.5H0V8.3C0,3.7,3.7,0,8.3,0H75.6"/>
+</g>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 61.1 72.1"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+	.st1{fill:#FDC477;}
+	.st2{fill:#F48F9B;}
+	.st3{fill:#5ACBF5;}
+</style>
+<path id="XMLID_429_" class="st0" d="M61.1,66v6.1H0V66h5V21.4L21.3,5.1h2V0h14.4v5.1h2l16.3,16.3v39H50V24L37.3,11.2H23.8L11.1,24
+	v42H61.1z"/>
+<path id="XMLID_348_" class="st1" d="M45.4,66H11.2V52h34.2V66z"/>
+<path id="XMLID_321_" class="st2" d="M45.4,52H11.2V38h34.2V52z"/>
+<path id="XMLID_319_" class="st3" d="M45.4,38H11.2V24h34.2V38z"/>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 51.1 85"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FDC477;}
+	.st1{fill:#F48F9B;}
+	.st2{fill:#5ACBF5;}
+	.st3{fill:#181818;}
+</style>
+<g id="XMLID_320_">
+	<path id="XMLID_486_" class="st0" d="M41.5,66H20.4V51.6h21.2V66z"/>
+	<path id="XMLID_484_" class="st1" d="M41.5,51.6H20.4V37.3h21.2V51.6z"/>
+	<path id="XMLID_482_" class="st2" d="M41.5,37.3H20.4V22.9h21.2V37.3z"/>
+	<path id="XMLID_321_" class="st3" d="M51,78.7c-0.6-2.7-3-4.3-5.5-4.2l-1.7-3.9c-1,1-2,1.7-2.9,2.3l1.3,3.1
+		c-1.5,1.5-2.1,3.8-1.2,5.9c1.3,3,5.1,4.1,7.9,2.1C50.6,82.8,51.4,80.7,51,78.7z M46.5,81.2c-0.8,0.4-1.8,0-2.1-0.8
+		c-0.4-0.8,0-1.8,0.8-2.1c0.8-0.4,1.8,0,2.1,0.8C47.7,79.9,47.3,80.9,46.5,81.2z M47.2,62.8c4.8-10.9-0.4-17.8-0.4-17.8l-6,13.7
+		h-2.9v6.6L37.6,66H20.4V22.9H6.1V6.1h11.1H21c2.8,7.6,10.1,13.1,18.8,13.1c0.6,0,1.2,0,1.8-0.1V13c-0.6,0.1-1.2,0.1-1.8,0.1
+		c-6.6,0-12.1-4.6-13.5-10.8L25.6,0h-8.3H0v29.1h14.2v43.1h20.7l-1,2.4c-2.5-0.1-4.9,1.5-5.5,4.2c-0.4,2,0.4,4.1,2.1,5.3
+		c2.8,2,6.6,0.8,7.9-2.1c0.9-2.1,0.4-4.4-1.2-5.9l1.7-3.8C41.6,70.8,44.9,68,47.2,62.8z M35,80.4c-0.4,0.8-1.3,1.2-2.1,0.8
+		c-0.8-0.4-1.2-1.3-0.8-2.1c0.4-0.8,1.3-1.2,2.1-0.8C35,78.6,35.4,79.6,35,80.4z M41.5,29.3h-3.7v-5.9h3.7V29.3z M41.5,41.1h-3.7
+		v-5.9h3.7V41.1z M41.5,7.1h-3.7V1.2h3.7V7.1z M37.9,46.9h3.7v5.9h-3.7V46.9z"/>
+</g>
+</svg>
--- a/public/images/icons/SERVICES
+++ b/public/images/icons/SERVICES
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 67.8 72.1"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#181818;}
+	.st1{fill:#FDC477;}
+	.st2{fill:#F48F9B;}
+	.st3{fill:#5ACBF5;}
+</style>
+<path id="XMLID_477_" class="st0" d="M60.2,35.7H7.6v-8.6l60.3,0.2L58.1,0.1l-15.4,0l-0.4,3.3c-0.1,0.5-0.2,0.9-0.6,1.5
+	c-0.5,0.8-1.5,1.6-2.9,2.3c-1.4,0.7-3.3,1.1-5.6,1.1h-0.2h0c-3.1,0-5.5-0.8-7-1.9c-0.8-0.5-1.3-1.1-1.7-1.6c-0.4-0.5-0.5-1-0.6-1.5
+	L23.4,0L9.3,0L0.1,26.7h0h0v0L0,27.1h0.1v14.8v1.2v14.1v0.4v14.4h67.5V57.7v-0.4V43.1v-1.2V30h-7.5V35.7z M14.6,7.5l2.8,0
+	c0.2,0.5,0.5,1,0.8,1.5c1.4,2.1,3.5,3.8,6,5c2.5,1.2,5.5,1.8,8.7,1.8h0l0.2,0c4.3,0,8.2-1.1,11.1-3.1c1.5-1,2.7-2.2,3.7-3.6
+	c0.3-0.5,0.6-0.9,0.8-1.4l4.1,0l4.4,12.2l-46.8-0.1L14.6,7.5z M60.2,64.7H7.6v-7h52.6V64.7z M60.2,50.2H7.6v-7.1h52.6V50.2z"/>
+<path id="XMLID_429_" class="st1" d="M60.2,64.7H7.6v-7h52.6V64.7z"/>
+<path id="XMLID_348_" class="st2" d="M60.2,50.2H7.6v-7.1h52.6V50.2z"/>
+<path id="XMLID_321_" class="st3" d="M60.2,35.7H7.6v-8.6h52.6V35.7z"/>
+</svg>
--- a/public/images/icons/SIGN
+++ b/public/images/icons/SIGN
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20.6 22"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path class="st0" d="M14.1,13.8h-2c1.8-0.6,3.1-2.2,3.1-4.2V4.5c0-2.5-2-4.5-4.5-4.5h-1C7.3,0,5.3,2,5.3,4.5v5.1
+	c0,2,1.3,3.7,3.1,4.2h-2c-3.6,0-6.5,2.9-6.5,6.5V22h10.3h10.3v-1.7C20.6,16.7,17.7,13.8,14.1,13.8 M8.6,4.5c0-0.7,0.5-1.2,1.2-1.2h1
+	c0.7,0,1.2,0.5,1.2,1.2v5.1c0,0.7-0.5,1.2-1.2,1.2h-1c-0.7,0-1.2-0.5-1.2-1.2V4.5z"/>
+</svg>
--- a/public/images/icons/SIGN
+++ b/public/images/icons/SIGN
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 28.2 22"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F48F9B;}
+</style>
+<path class="st0" d="M21.7,13.8h-2c1.8-0.6,3.1-2.2,3.1-4.2V4.5c0-2.5-2-4.5-4.5-4.5h-1C15,0,13,2,13,4.5v5.1c0,2,1.3,3.7,3.1,4.2
+	h-2c-3.6,0-6.5,2.9-6.5,6.5V22h10.3h10.3v-1.7C28.2,16.7,25.3,13.8,21.7,13.8 M16.2,4.5c0-0.7,0.5-1.2,1.2-1.2h1
+	c0.7,0,1.2,0.5,1.2,1.2v5.1c0,0.7-0.5,1.2-1.2,1.2h-1c-0.7,0-1.2-0.5-1.2-1.2V4.5z M9.7,11.9H0V8.6h3.2V4.9h3.3v3.7h3.2V11.9z
+	 M3.2,13.1h3.3v2.1H3.2V13.1z"/>
+</svg>
--- a/public/images/icons/START
+++ b/public/images/icons/START
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 260.7 60"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5ACBF5;}
+</style>
+<path id="XMLID_158_" class="st0" d="M253.6,0H7.1C3.2,0,0,3.2,0,7.1v45.7C0,56.8,3.2,60,7.1,60h246.5c3.9,0,7.1-3.2,7.1-7.1V7.1
+	C260.7,3.2,257.5,0,253.6,0 M256.5,52.9c0,1.6-1.3,2.9-2.9,2.9H7.1c-1.6,0-2.9-1.3-2.9-2.9V7.1c0-1.6,1.3-2.9,2.9-2.9h246.5
+	c1.6,0,2.9,1.3,2.9,2.9V52.9z M53.7,39.3c-0.8,0-1.7-0.1-2.5-0.2c-0.9-0.1-1.6-0.3-2.3-0.6c-0.3-0.1-0.5-0.2-0.6-0.3
+	c-0.1-0.1-0.1-0.3-0.1-0.6v-1.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.2-0.2,0.3-0.2c0.2,0,0.5,0.1,1,0.2c0.6,0.2,1.3,0.3,2.1,0.4
+	c0.8,0.1,1.5,0.2,2.1,0.2c1.3,0,2.3-0.2,3.1-0.7c0.7-0.5,1.1-1.2,1.1-2.1c0-0.6-0.2-1.2-0.6-1.6c-0.4-0.4-1.2-0.8-2.3-1.2l-2.5-1
+	c-1.6-0.6-2.7-1.3-3.4-2.1c-0.7-0.8-1.1-1.9-1.1-3.1c0-1.7,0.6-3.1,1.8-4.1c1.2-1,2.9-1.5,4.9-1.5c1.4,0,2.9,0.2,4.5,0.7
+	c0.3,0.1,0.5,0.2,0.6,0.3c0.1,0.1,0.1,0.3,0.1,0.6V22c0,0.2,0,0.3-0.1,0.4c-0.1,0.1-0.2,0.2-0.3,0.2c-0.2,0-0.5-0.1-1-0.2
+	c-1.3-0.3-2.5-0.5-3.6-0.5c-2.5,0-3.7,0.8-3.7,2.5c0,0.6,0.2,1.2,0.7,1.6c0.4,0.4,1.2,0.8,2.4,1.2l2.4,0.9c1.6,0.6,2.7,1.3,3.4,2.1
+	c0.7,0.8,1.1,1.9,1.1,3.1c0,1.9-0.7,3.4-2,4.4C57.8,38.7,56,39.3,53.7,39.3 M69.4,39c-1.5,0-2.6-0.3-3.3-1c-0.7-0.7-1.1-1.7-1.1-3.2
+	v-7.7h-1.8c-0.4,0-0.6-0.2-0.6-0.6v-0.8c0-0.2,0-0.4,0.1-0.5c0.1-0.1,0.2-0.2,0.4-0.2l1.9-0.3l0.4-3.4c0-0.2,0.1-0.4,0.2-0.5
+	c0.1-0.1,0.3-0.1,0.5-0.1h1.5c0.4,0,0.6,0.2,0.6,0.6v3.3h3.4c0.4,0,0.6,0.2,0.6,0.6v1.3c0,0.4-0.2,0.6-0.6,0.6h-3.4v7.6
+	c0,0.6,0.2,1.1,0.5,1.4c0.3,0.3,0.8,0.4,1.6,0.4c0.4,0,0.8,0,1-0.1c0.3-0.1,0.5-0.1,0.6-0.1c0.3,0,0.5,0.2,0.5,0.5v1
+	c0,0.3-0.1,0.5-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.3C71,38.9,70.2,39,69.4,39 M78.4,39.2c-1.3,0-2.4-0.4-3.2-1.2S74,36.2,74,35
+	c0-1.4,0.5-2.5,1.5-3.3c1-0.8,2.3-1.2,4-1.2c1,0,2.1,0.1,3.2,0.4v-1.7c0-1-0.2-1.6-0.6-2c-0.4-0.4-1.1-0.6-2.2-0.6
+	c-0.6,0-1.3,0.1-2,0.2c-0.7,0.1-1.5,0.3-2.1,0.5c-0.2,0.1-0.3,0.1-0.5,0.1c-0.2,0-0.4-0.2-0.4-0.5v-1c0-0.3,0-0.4,0.1-0.6
+	c0.1-0.1,0.3-0.2,0.6-0.4c1.5-0.6,3.1-0.8,4.8-0.8c1.8,0,3.2,0.4,4,1.1c0.9,0.7,1.3,1.9,1.3,3.5v9.4c0,0.4-0.2,0.6-0.6,0.6h-1.5
+	c-0.4,0-0.6-0.2-0.7-0.6l-0.1-0.8c-0.7,0.6-1.4,1-2.2,1.3C80,39.1,79.2,39.2,78.4,39.2 M79.3,36.9c0.5,0,1.1-0.1,1.7-0.3
+	c0.6-0.2,1.2-0.6,1.7-1v-2.7c-1-0.2-1.9-0.3-2.6-0.3c-1.9,0-2.9,0.8-2.9,2.3c0,0.7,0.2,1.2,0.6,1.5C78.1,36.7,78.7,36.9,79.3,36.9
+	 M90.1,38.8c-0.4,0-0.6-0.2-0.6-0.6v-13c0-0.4,0.2-0.6,0.6-0.6h1.5c0.3,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4l0.3,1.6
+	c0.7-0.8,1.4-1.4,2.1-1.7c0.7-0.3,1.4-0.5,2.1-0.5h0.1c0.2,0,0.4,0,0.6,0.1c0.2,0,0.3,0.1,0.3,0.2c0.1,0.1,0.1,0.3,0.1,0.6v1.5
+	c0,0.4-0.2,0.6-0.5,0.6c-0.1,0-0.3,0-0.5,0c-0.2,0-0.4,0-0.6,0c-1.4,0-2.6,0.4-3.7,1.1v9.7c0,0.4-0.2,0.6-0.6,0.6H90.1z M106.1,39
+	c-1.5,0-2.6-0.3-3.3-1c-0.7-0.7-1.1-1.7-1.1-3.2v-7.7h-1.8c-0.4,0-0.6-0.2-0.6-0.6v-0.8c0-0.2,0-0.4,0.1-0.5
+	c0.1-0.1,0.2-0.2,0.4-0.2l1.9-0.3l0.4-3.4c0-0.2,0.1-0.4,0.2-0.5c0.1-0.1,0.3-0.1,0.5-0.1h1.5c0.4,0,0.6,0.2,0.6,0.6v3.3h3.4
+	c0.4,0,0.6,0.2,0.6,0.6v1.3c0,0.4-0.2,0.6-0.6,0.6H105v7.6c0,0.6,0.2,1.1,0.5,1.4c0.3,0.3,0.8,0.4,1.6,0.4c0.4,0,0.8,0,1-0.1
+	c0.3-0.1,0.5-0.1,0.6-0.1c0.3,0,0.5,0.2,0.5,0.5v1c0,0.3-0.1,0.5-0.2,0.6c-0.1,0.1-0.3,0.2-0.6,0.3C107.7,38.9,106.9,39,106.1,39
+	 M119.5,38.8c-0.4,0-0.6-0.2-0.6-0.6V20c0-0.4,0.2-0.6,0.6-0.6h6c2.9,0,5.1,0.8,6.6,2.5c1.5,1.7,2.3,4.1,2.3,7.2
+	c0,3.1-0.8,5.5-2.3,7.2c-1.5,1.7-3.7,2.5-6.6,2.5H119.5z M122.3,36.1h2.8c3.9,0,5.8-2.2,5.8-6.7v-0.6c0-4.5-1.9-6.7-5.8-6.7h-2.8
+	V36.1z M144.1,39.2c-2.4,0-4.1-0.6-5.3-1.9c-1.2-1.3-1.8-3.1-1.8-5.5c0-2.4,0.6-4.3,1.8-5.6c1.2-1.3,2.8-2,5-2
+	c1.8,0,3.2,0.5,4.2,1.5c1,1,1.5,2.4,1.5,4.2c0,0.6,0,1.3-0.1,2c0,0.2-0.1,0.4-0.2,0.5c-0.1,0.1-0.2,0.1-0.4,0.1H140
+	c0.1,1.4,0.5,2.5,1.2,3.1c0.7,0.7,1.9,1,3.4,1c1.1,0,2.3-0.2,3.5-0.5c0.1,0,0.3-0.1,0.3-0.1c0.1,0,0.1,0,0.2,0
+	c0.3,0,0.4,0.2,0.4,0.6v1c0,0.3,0,0.5-0.1,0.6c-0.1,0.1-0.3,0.2-0.6,0.4C147.1,39,145.7,39.2,144.1,39.2 M146.4,30.3V30
+	c0-1.1-0.2-2-0.7-2.6c-0.5-0.6-1.2-0.9-2.2-0.9c-1,0-1.8,0.3-2.5,1c-0.6,0.7-1,1.6-1.1,2.7H146.4z M156.1,39.2
+	c-1.5,0-2.8-0.2-4.1-0.7c-0.3-0.1-0.5-0.2-0.6-0.4c-0.1-0.1-0.1-0.3-0.1-0.6v-1c0-0.4,0.1-0.6,0.4-0.6c0.1,0,0.4,0.1,0.8,0.2
+	c1.3,0.4,2.5,0.6,3.6,0.6c0.9,0,1.6-0.1,2-0.4c0.4-0.3,0.6-0.7,0.6-1.3c0-0.4-0.1-0.7-0.4-1c-0.3-0.3-0.7-0.5-1.5-0.8l-2.3-0.9
+	c-2.1-0.8-3.1-2.1-3.1-3.9c0-1.3,0.5-2.3,1.5-3.1c1-0.8,2.3-1.1,3.9-1.1c1.2,0,2.3,0.2,3.5,0.6c0.3,0.1,0.5,0.2,0.6,0.3
+	c0.1,0.1,0.1,0.3,0.1,0.6v1c0,0.2,0,0.4-0.1,0.4c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.3,0-0.7-0.1c-1.2-0.3-2.1-0.4-2.9-0.4
+	c-0.9,0-1.5,0.1-1.9,0.4c-0.4,0.3-0.6,0.6-0.6,1.2c0,0.4,0.1,0.7,0.4,1c0.3,0.3,0.8,0.5,1.6,0.8l2.2,0.8c1.1,0.4,1.9,0.9,2.4,1.5
+	c0.5,0.6,0.7,1.4,0.7,2.3c0,1.4-0.5,2.5-1.5,3.3C159.2,38.8,157.8,39.2,156.1,39.2 M166,22.2c-0.6,0-1.1-0.2-1.5-0.5
+	c-0.4-0.3-0.5-0.8-0.5-1.4c0-0.6,0.2-1.1,0.5-1.4c0.4-0.3,0.8-0.5,1.5-0.5c0.6,0,1.1,0.2,1.5,0.5c0.4,0.3,0.5,0.8,0.5,1.4
+	c0,0.6-0.2,1.1-0.5,1.4C167.1,22,166.6,22.2,166,22.2 M165,38.8c-0.4,0-0.6-0.2-0.6-0.6v-13c0-0.4,0.2-0.6,0.6-0.6h2.1
+	c0.4,0,0.6,0.2,0.6,0.6v13c0,0.4-0.2,0.6-0.6,0.6H165z M176.8,44.9c-1.4,0-2.8-0.3-4.2-0.8c-0.3-0.1-0.5-0.2-0.6-0.4
+	c-0.1-0.1-0.1-0.3-0.1-0.6V42c0-0.4,0.1-0.5,0.4-0.5c0.1,0,0.2,0,0.2,0c0.1,0,0.3,0.1,0.5,0.2c1.2,0.4,2.4,0.6,3.5,0.6
+	c1.4,0,2.4-0.3,3.1-1c0.6-0.6,1-1.7,1-3.2v-1.2c-1.2,1-2.6,1.6-4.1,1.6c-1.7,0-3.1-0.6-4.2-1.9c-1-1.3-1.6-3-1.6-5.2
+	c0-1.5,0.2-2.8,0.7-3.9c0.5-1.1,1.2-1.9,2.1-2.5c0.9-0.6,1.9-0.9,3-0.9c1.6,0,3,0.6,4.2,1.7l0.2-0.7c0.1-0.4,0.3-0.6,0.7-0.6h1.5
+	c0.4,0,0.6,0.2,0.6,0.6v12.7c0,2.3-0.6,4-1.8,5.2C180.8,44.3,179.1,44.9,176.8,44.9 M177.5,36c1.1,0,2.1-0.4,3.1-1.1v-7.2
+	c-1-0.7-2-1-3.1-1c-1.1,0-2,0.4-2.5,1.1c-0.6,0.7-0.8,1.9-0.8,3.4C174.1,34.4,175.3,36,177.5,36 M188.2,38.8c-0.4,0-0.6-0.2-0.6-0.6
+	v-13c0-0.4,0.2-0.6,0.6-0.6h1.5c0.3,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4l0.2,1c1.8-1.3,3.6-2,5.5-2c1.4,0,2.4,0.4,3.1,1.1
+	c0.7,0.7,1.1,1.8,1.1,3.1v9.9c0,0.4-0.2,0.6-0.6,0.6h-2.1c-0.4,0-0.6-0.2-0.6-0.6v-8.8c0-0.9-0.2-1.6-0.6-2c-0.4-0.4-1-0.6-1.8-0.6
+	c-1.2,0-2.5,0.4-3.8,1.2v10.2c0,0.4-0.2,0.6-0.6,0.6H188.2z M205.8,22.2c-0.6,0-1.1-0.2-1.5-0.5c-0.4-0.3-0.5-0.8-0.5-1.4
+	c0-0.6,0.2-1.1,0.5-1.4c0.4-0.3,0.8-0.5,1.5-0.5c0.6,0,1.1,0.2,1.5,0.5c0.4,0.3,0.5,0.8,0.5,1.4c0,0.6-0.2,1.1-0.5,1.4
+	C206.9,22,206.4,22.2,205.8,22.2 M204.7,38.8c-0.4,0-0.6-0.2-0.6-0.6v-13c0-0.4,0.2-0.6,0.6-0.6h2.1c0.4,0,0.6,0.2,0.6,0.6v13
+	c0,0.4-0.2,0.6-0.6,0.6H204.7z M211.9,38.8c-0.4,0-0.6-0.2-0.6-0.6v-13c0-0.4,0.2-0.6,0.6-0.6h1.5c0.3,0,0.4,0,0.5,0.1
+	c0.1,0.1,0.2,0.2,0.2,0.4l0.2,1c1.8-1.3,3.6-2,5.5-2c1.4,0,2.4,0.4,3.1,1.1c0.7,0.7,1.1,1.8,1.1,3.1v9.9c0,0.4-0.2,0.6-0.6,0.6h-2.1
+	c-0.4,0-0.6-0.2-0.6-0.6v-8.8c0-0.9-0.2-1.6-0.6-2c-0.4-0.4-1-0.6-1.8-0.6c-1.2,0-2.5,0.4-3.8,1.2v10.2c0,0.4-0.2,0.6-0.6,0.6H211.9
+	z M233,44.9c-1.4,0-2.8-0.3-4.2-0.8c-0.3-0.1-0.5-0.2-0.6-0.4c-0.1-0.1-0.1-0.3-0.1-0.6V42c0-0.4,0.1-0.5,0.4-0.5c0.1,0,0.2,0,0.2,0
+	c0.1,0,0.3,0.1,0.5,0.2c1.2,0.4,2.4,0.6,3.5,0.6c1.4,0,2.4-0.3,3.1-1c0.6-0.6,1-1.7,1-3.2v-1.2c-1.2,1-2.6,1.6-4.1,1.6
+	c-1.7,0-3.1-0.6-4.2-1.9c-1-1.3-1.6-3-1.6-5.2c0-1.5,0.2-2.8,0.7-3.9c0.5-1.1,1.2-1.9,2.1-2.5c0.9-0.6,1.9-0.9,3-0.9
+	c1.6,0,3,0.6,4.2,1.7l0.2-0.7c0.1-0.4,0.3-0.6,0.7-0.6h1.5c0.4,0,0.6,0.2,0.6,0.6v12.7c0,2.3-0.6,4-1.8,5.2
+	C237,44.3,235.3,44.9,233,44.9 M233.7,36c1.1,0,2.1-0.4,3.1-1.1v-7.2c-1-0.7-2-1-3.1-1c-1.1,0-2,0.4-2.5,1.1
+	c-0.6,0.7-0.8,1.9-0.8,3.4C230.3,34.4,231.4,36,233.7,36 M33.9,19.8h4.9V28h-5.9v-1.7h4.2v-4.7h-3.2h-1c-0.8,2.2-2.9,3.7-5.3,3.7
+	c-2.4,0-4.5-1.6-5.3-3.7h-1h-3.2v4.7h4v12.2h11v-8.9h1.7v10.7H20.4V28h-4v-8.2h4.9h2.4l0.2,0.7c0.4,1.7,2,3,3.8,3
+	c1.9,0,3.4-1.3,3.8-3l0.2-0.7H33.9z"/>
+</svg>
--- a/public/images/influencers.jpg
+++ b/public/images/influencers.jpg
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/public/images/spiritwear.jpg
+++ b/public/images/spiritwear.jpg
--- a/public/images/streetwear.jpg
+++ b/public/images/streetwear.jpg
--- a/public/images/sublimation-fabric.jpg
+++ b/public/images/sublimation-fabric.jpg
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-# Check if docker compose (new) or docker-compose (old) is available
-if command -v docker &>/dev/null; then
-    if docker compose version &>/dev/null; then
-        DOCKER_COMPOSE="docker compose"
-    elif command -v docker-compose &>/dev/null; then
-        DOCKER_COMPOSE="docker-compose"
-    else
-        echo "❌ Error: Neither 'docker compose' nor 'docker-compose' found."
-        echo "Please install Docker Desktop from https://www.docker.com/products/docker-desktop/"
-        exit 1
-    fi
-else
-    echo "❌ Error: Docker is not installed."
-    echo "Please install Docker Desktop from https://www.docker.com/products/docker-desktop/"
-    exit 1
-fi
-
-echo "🚀 Starting rebuild process..."
-
-# Function to display usage
-show_usage() {
-    echo "Usage: ./rebuild.sh [OPTIONS]"
-    echo "Options:"
-    echo "  -h, --help     Show this help message"
-    echo "  -c, --clean    Perform a clean rebuild (no cache)"
-    echo "  -f, --fresh    Perform a fresh migration"
-}
-
-# Default values
-CLEAN_BUILD=false
-FRESH_MIGRATION=false
-
-# Parse arguments
-while [[ "$#" -gt 0 ]]; do
-    case $1 in
-        -h|--help) show_usage; exit 0 ;;
-        -c|--clean) CLEAN_BUILD=true ;;
-        -f|--fresh) FRESH_MIGRATION=true ;;
-        *) echo "Unknown parameter: $1"; show_usage; exit 1 ;;
-    esac
-    shift
-done
-
-# Pull latest changes from git
-echo "📥 Pulling latest changes from git..."
-if ! git pull; then
-    echo "❌ Git pull failed. Please resolve any conflicts and try again."
-    exit 1
-fi
-
-# Stop running containers
-echo "📥 Stopping running containers..."
-$DOCKER_COMPOSE down
-
-# Remove old images if clean build
-if [ "$CLEAN_BUILD" = true ] ; then
-    echo "🧹 Cleaning Docker cache..."
-    $DOCKER_COMPOSE rm -f
-    docker system prune -f
-fi
-
-# Build and start containers
-echo "🏗️  Building containers..."
-if [ "$CLEAN_BUILD" = true ] ; then
-    $DOCKER_COMPOSE build --no-cache
-else
-    $DOCKER_COMPOSE build
-fi
-
-# Start containers
-echo "🚀 Starting containers..."
-$DOCKER_COMPOSE up -d
-
-# Wait for the containers to be ready
-echo "⏳ Waiting for containers to be ready..."
-sleep 10
-
-# Clear Laravel cache
-echo "🧹 Clearing Laravel cache..."
-$DOCKER_COMPOSE exec app php artisan cache:clear
-$DOCKER_COMPOSE exec app php artisan config:clear
-$DOCKER_COMPOSE exec app php artisan view:clear
-
-# Run composer install
-echo "📦 Installing dependencies..."
-$DOCKER_COMPOSE exec app composer install
-
-# Generate application key if .env exists and APP_KEY is empty
-if [ -f .env ] && ! grep -q "^APP_KEY=[A-Za-z0-9+/]\{40\}$" .env; then
-    echo "🔑 Generating application key..."
-    $DOCKER_COMPOSE exec app php artisan key:generate
-fi
-
-# Run migrations if requested
-if [ "$FRESH_MIGRATION" = true ] ; then
-    echo "🔄 Running fresh migrations..."
-    $DOCKER_COMPOSE exec app php artisan migrate:fresh
-else
-    echo "🔄 Running migrations..."
-    $DOCKER_COMPOSE exec app php artisan migrate
-fi
-
-echo "✨ Rebuild completed!"
-echo "🌐 Your application should be available at http://localhost:8080" 
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,7 +1,7 @@
@extends('merchbay_main')

@section('main-content')
-<style>
+{{-- <style>
 	.error {
 		color: red;
 	}
@@ -28,7 +28,6 @@
 						<div class="mb-3">
 							<label for="exampleInputEmail1" class="form-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">
-							<!-- <div id="emailHelp" class="form-text">We'll never share your email with anyone else.</div> -->
 						</div>
 						<div class="mb-3">
 							<label for="exampleInputPassword1" class="form-label">Password</label>
@@ -51,5 +50,72 @@
 			</div>
 		</div>
 	</div>
+</div> --}}
+
+<section class="login">
+    <div class="container-fluid">
+      <div class="row align-items-center">
+        <div class="col-lg-6">
+          <div class="row gx-5 justify-content-center align-items-center">
+            <div class="col-lg-8 text-start">
+              <h3>Sign to start creating custom merch</h3>
+              <!-- <div class="horizontal-divider bg-yellow"></div> -->
+              <p>
+                <router-link to="/create-account">Create a free account</router-link>
+                or login to start designing
+              </p>
            </div>
+
+            <div class="col-lg-8 mt-5">
+			
+			<div id="login-response-msg"></div>
+			<form role="form" id="frm-login">
+				<input type="hidden" name="redirect" value="{{ Request::get('redirectUrl')  }}">
+				<input type="hidden" name="_token" value="{{ csrf_token() }}">
+                <div class="mb-3">
+                  <input
+                    type="text"
+                    class="form-control form-control-lg contact-input-custom"
+                    placeholder="Username*"
+					name="email" value="{{ old('email') }}" 
+                    required
+                  />
+                </div>
+                <div class="mb-3">
+                  <input
+                    type="password"
+					name="password"
+                    class="form-control form-control-lg contact-input-custom"
+                    required
+                    placeholder="Password*"
+                  />
+                </div>
+                <!-- <div class="mb-3">
+              <input
+                type="text"
+                class="form-control form-control-lg contact-input-custom"
+                id="exampleFormControlInput1"
+                placeholder="Phone Number*"
+              />
+            </div>
+            <div class="mb-3">
+              <textarea
+                class="form-control form-control-lg contact-input-custom"
+                required
+                rows="5"
+                placeholder="What can we help you with?"
+              ></textarea>
+            </div> -->
+
+                <div class="mb-3">
+                  <button class="btn btn-lg btn-contact w-100">Submit</button>
+                </div>
+              </form>
+            </div>
+          </div>
+        </div>
+        <div class="col login-page-right"></div>
+      </div>
+    </div>
+  </section>
@endsection
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,6 +1,6 @@
@extends('merchbay_main')
@section('main-content')
-<style>
+{{-- <style>
  .error {
    color: red;
  }
@@ -128,5 +128,74 @@
      </div>
    </div>
  </div>
+</div> --}}
+<section class="login">
+  <div class="container-fluid">
+    <div class="row align-items-center">
+      <div class="col-lg-6">
+        <div class="row gx-5 justify-content-center align-items-center">
+          <div class="col-lg-8 text-start">
+            <h3>Create free account and start designing merch.</h3>
+            <!-- <div class="horizontal-divider bg-yellow"></div> -->
          </div>
+
+          <div class="col-lg-8 mt-5">
+            <form action="">
+              <div class="mb-3">
+                <input
+                  type="text"
+                  class="form-control form-control-lg contact-input-custom"
+                  placeholder="Email Address*"
+                  required
+                />
+              </div>
+              <div class="mb-3">
+                <input
+                  type="password"
+                  class="form-control form-control-lg contact-input-custom"
+                  required
+                  placeholder="Password*"
+                />
+              </div>
+              <div class="mb-3">
+                <input
+                  type="password"
+                  class="form-control form-control-lg contact-input-custom"
+                  required
+                  placeholder="Confirm Password*"
+                />
+              </div>
+              <!-- <div class="mb-3">
+            <input
+              type="text"
+              class="form-control form-control-lg contact-input-custom"
+              id="exampleFormControlInput1"
+              placeholder="Phone Number*"
+            />
+          </div>
+          <div class="mb-3">
+            <textarea
+              class="form-control form-control-lg contact-input-custom"
+              required
+              rows="5"
+              placeholder="What can we help you with?"
+            ></textarea>
+          </div> -->
+
+              <div class="mb-3">
+                <button class="btn btn-lg btn-contact w-100">Submit</button>
+              </div>
+
+              <p class="text-start">
+                Already have an account?
+                <a href="{{ url('./auth/login') }}">Login</a>
+              </p>
+            </form>
+          </div>
+        </div>
+      </div>
+      <div class="col login-page-right"></div>
+    </div>
+  </div>
+</section>
@endsection
--- a/resources/views/merchbay/footer.blade.php
+++ b/resources/views/merchbay/footer.blade.php
@@ -1,31 +1,6 @@
-<footer class="footer-bg py-3">
-  <div class="container">
-    <div class="row h-100">
-      <div class="col-lg-7 align-self-center">
-        <div class="copyright">Copyright &copy; {{ date('Y') }}, <b>MERCHBAY</b>. All right reserved.</div>
-        <ul class="footer-menu">
-          {{-- <li class="footer-menu-item">
-            <a href="#">About Us</a>
-          </li> --}}
-          <li class="footer-menu-item">
-            <a href="{{ url('contact-us') }}">Contact Us</a>
-          </li>
-          <li class="footer-menu-item">
-            <a href="{{ url('/terms-of-use') }}">Terms of Use</a>
-          </li>
-          <li class="footer-menu-item">
-            <a href="{{ url('/privacy-policy') }}">Privacy Policy</a>
-          </li>
-        </ul>
-      </div>
-
-      {{-- <div class="col-lg-5 align-self-center">
-        <div class="footer-socials-icons">
-          <img src="{{asset('public/images/socials/facebook-icon_42x42.png')}}" width="30" alt="" class="img-fluid mr-3">
-          <img src="{{asset('public/images/socials/instagram-icon_42x42.png')}}" width="30" alt="" class="img-fluid mr-3">
-          <img src="{{asset('public/images/socials/twitter-icon_42x42.png')}}" width="30" alt="" class="img-fluid mr-3">
-        </div>
-      </div> --}}
-    </div>
+<footer>
+  <div>
+    <i class="icon merchbay-icon"></i>
+    <p>2023 © Merchbay, Inc. All Rights Reserved</p>
  </div>
 </footer>
--- a/resources/views/merchbay/index.blade.php
+++ b/resources/views/merchbay/index.blade.php
@@ -1,205 +1,413 @@
@extends('merchbay_main')
@section('main-content')
-    <style>
-        .fishes {
-            position: relative;
-            top: 0;
-            left: 0;
-        }
+  <!-- Header-->
+  <header class="masthead text-center text-white">
+    <div class="masthead-content">
+      <div class="container px-5">
+        <h1 class="masthead-heading mb-0">NO MINIMUMS | 100% CUSTOM</h1>
+        <h2 class="masthead-subheading mb-0">CREATE MERCH FIT FOR YOU</h2>
+        <p class="my-3">
+          Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam
+          nonummy nibh euismod tincidunt ut laoreet dolore <br />
+          magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis
+          nostrud exerci tation ullamcorper suscipit lobortis nisl <br />
+          ut aliquip ex ea commodo consequat. Duis autem vel eum
+        </p>

-        .fish {
-            position: absolute;
-            top: 60px;
-            left: 80px;
-        }
-        .carousel-item{
-            min-height: 350px;
-            height: 350px;
-        }
-        .carousel-item>a {
-            min-height: 350px;
-            height: 350px;
-            position: relative;
-        }
+        <div class="mt-5">
+          <a href="{{ url('/stores')}}" class="btn btn-outline-primary btn-lg mx-3 px-3">
+            <i class="icon icon-catalog"></i>
+            Browse Product
+          </a>

-        .carousel-item>a>img.blurred {
-            width: 100%;
-            height: 100%;
-            object-fit: cover;
-            filter: blur(1rem);
-        }
+          <a class="btn btn-outline-primary btn-lg mx-3 px-3" href="{{ url('/templates')}}"
+            >Start Designing
+          </a>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="bg-circle-1 bg-circle"></div>
+    <div class="bg-circle-2 bg-circle"></div>
+    <div class="bg-circle-3 bg-circle"></div>
+    <div class="bg-circle-4 bg-circle"></div> -->
+  </header>

-        .top-image {
-            position: absolute;
-            z-index: 1;
-
-            top: 50%;
-            right: 50%;
-            transform: translate(50%, -50%);
-            width: 100%;
-        }
-
-        .top-image>img {
-            width: 100%;
-        }
-
-    </style>
-    <div class="main__carousel">
-        <div class="">
-            <div class="row">
+  <section class="industries">
+    <div class="container px-5">
+      <div class="row gx-5 align-items-center">
        <div class="col-lg-12">
-                    <div id="carouselExampleDark" class="carousel slide" data-bs-ride="carousel">
-                        {{-- <div id="carouselExampleDark" class="carousel carousel-dark slide" data-bs-ride="carousel"> --}}
-                        <ol class="carousel-indicators">
-                            @foreach ($carousel_images as $key => $carousel)
-                                @if ($key == 0)
-                                    <li data-bs-target="#carouselExampleDark" data-bs-slide-to="{{ $key }}"
-                                        class="active"></li>
-                                @else
-                                    <li data-bs-target="#carouselExampleDark" data-bs-slide-to="{{ $key }}"></li>
-                                @endif
-                            @endforeach
-                            {{-- <li data-bs-target="#carouselExampleDark" data-bs-slide-to="0" class="active"></li>
-                            <li data-bs-target="#carouselExampleDark" data-bs-slide-to="1"></li> --}}
-                            {{-- <li data-bs-target="#carouselExampleDark" data-bs-slide-to="2"></li>
-                            <li data-bs-target="#carouselExampleDark" data-bs-slide-to="3"></li> --}}
-                        </ol>
-                        <div class="carousel-inner">
-                            {{-- <div class="carousel-item active" data-bs-interval="10000"> --}}
+          <h3>Industries We Serve</h3>
+          <div class="horizontal-divider"></div>

-                            @foreach ($carousel_images as $key => $carousel)
-                                @if ($key == 0)
-                                    <div class="carousel-item active" data-bs-interval="10000">
-                                        <a href="{{ url('store') }}/{{ $carousel->StoreUrl }}">
-                                            <div class="top-image">
+          <div class="py-5">
+            <ul class="horizontal-list">
+              <li>
+                <i class="icon industries-team-uniform"></i>
+                <span>Team Uniforms</span>
+              </li>
+              <li>
+                <i class="icon industries-band"></i>
+                <span>Band Merch</span>
+              </li>
+              <li>
+                <i class="icon industries-school"></i>
+                <span>School Spiritwear</span>
+              </li>
+              <li>
+                <i class="icon industries-influencer"></i>
+                <span>Influencer Merch</span>
+              </li>
+              <li>
+                <i class="icon industries-streetwear"></i>
+                <span>Streetwear/ Private Label</span>
+              </li>
+              <li>
+                <i class="icon industries-corporate"></i>
+                <span>Corporate Apparel</span>
+              </li>
+              <!-- Add more items as needed -->
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="parallax-section">
+    <div class="container px-5">
+      <div class="row gx-5 align-items-center">
+        <div class="col-lg-12"></div>
+      </div>
+    </div>
+  </section>
+
+  <section class="services" id="services">
+    <div class="container px-5">
+      <div class="row gx-5 align-items-center">
+        <div class="col-lg-12">
+          <h3>Our Services</h3>
+          <div class="horizontal-divider"></div>
+
+          <div class="py-5">
+            <ul class="horizontal-list gap-100">
+              <li>
+                <i class="icon services-sublimation"></i>
+                <span>Sublimation</span>
+                <p>No Minimums No Limits On Color Or Design Placement</p>
+              </li>
+              <li>
+                <i class="icon services-dtf"></i>
+                <span>Direct to Film</span>
+                <p>No Minimums No Color Limits No Screen Set Up Fees</p>
+              </li>
+              <li>
+                <i class="icon services-screen-print"></i>
+                <span>Screen Print</span>
+                <p>Traditonal Silk Screening Best For Larger Orders</p>
+              </li>
+              <li>
+                <i class="icon services-embroidery"></i>
+                <span>Embroidery</span>
+                <p>
+                  Gives Your Garments A High End Finish Best On Polos, Hats, And
+                  Outerwear
+                </p>
+              </li>
+              <li>
+                <i class="icon services-cutsaw"></i>
+                <span>Cut & Sew</span>
+                <p>
+                  Gives Your Garments A High End Finish Best On Polos, Hats, And
+                  Outerwear
+                </p>
+              </li>
+              <li>
+                <i class="icon services-fulfillment"></i>
+                <span>Fulfillment</span>
+                <p>
+                  Let Us Handle The Entire Process From Capturing Orders to Drop
+                  Shipping
+                </p>
+              </li>
+              <!-- Add more items as needed -->
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-right-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0">
+          <div class="uniforms-image">
+            <!-- <img
+              class="img-fluid"
+              src="../assets//images/custom-team-wear.jpg"
+              alt="..."
+            /> -->
+          </div>
+        </div>
+        <div class="col-lg-7">
+          <div class="p-5">
+            <h2 class="display-4">Uniforms and Team Wear</h2>
+            <div class="horizontal-divider m-0"></div>
+
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-left-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0 order-lg-2">
+          <div class="band-image">
+            <!-- <img
+              class="img-fluid"
+              src="../assets//images/bandmerch.jpg"
+              alt="..."
+            /> -->
+          </div>
+        </div>
+        <div class="col-lg-7">
+          <div class="p-5 order-lg-1">
+            <h2 class="display-4">Band Merch</h2>
+            <div class="horizontal-divider m-0 bg-red"></div>
+
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-right-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0">
+          <div class="spiritwear-image">
+            <!-- <img
+              class="img-fluid"
+              src="../assets//images/spiritwear.jpg"
+              alt="..."
+            /> -->
+          </div>
+        </div>
+        <div class="col-lg-7">
+          <div class="p-5">
+            <h2 class="display-4">School Spiritwear</h2>
+            <div class="horizontal-divider m-0 bg-yellow"></div>
+
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-left-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0 order-lg-2">
+          <div class="influencer-image">
+            <!-- <img
+              class="img-fluid"
+              src="../assets//images/influencers.jpg"
+              alt="..."
+            /> -->
+          </div>
+        </div>
+        <div class="col-lg-7">
+          <div class="p-5 order-lg-1">
+            <h2 class="display-4">Influencer Merch</h2>
+            <div class="horizontal-divider m-0"></div>
+
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-right-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0">
+          <div class="streetwear-image">
+            <!-- <img
+              class="img-fluid"
+              src="../assets//images/streetwear.jpg"
+              alt="..."
+            /> -->
+          </div>
+        </div>
+        <div class="col-lg-7">
+          <div class="p-5">
+            <h2 class="display-4">Streetwear/Private Label</h2>
+            <div class="horizontal-divider m-0 bg-red"></div>
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section-left-img">
+    <div class="container-fluid p-0 m-0">
+      <div class="row p-0 m-0 align-items-center">
+        <div class="col-lg-5 p-0 m-0 order-lg-2">
+          <div class="corportate-image"></div>
+          <!-- <div class="">
            <img
-                                                    src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}" />
-                                            </div>
-                                            <img src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}"
-                                                class="blurred" />
-                                        </a>
-                                    </div>
-                                @else
-                                    <div class="carousel-item" data-bs-interval="10000">
-                                        <a href="{{ url('store') }}/{{ $carousel->StoreUrl }}">
-                                            <div class="top-image">
-                                                <img
-                                                    src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}" />
-                                            </div>
-                                            <img src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}"
-                                                class="blurred" />
-                                        </a>
-                                    </div>
-                                @endif
-                            @endforeach
-
-
-                            <!-- <div class="carousel-item" data-bs-interval="10000">
-                                                <img src="https://crewsportswear.app:5955/WIPCAPS.jpg" class="d-block w-100" alt="...">
+              class="img-fluid"
+              src="../assets//images/corporatewear.jpg"
+              alt="..."
+            />
          </div> -->
-                            <!-- <div class="carousel-item" data-bs-interval="10000">
-                                                <img src="https://crewsportswear.app:5955/NINONG.jpg" class="d-block w-100" alt="...">
-                                              </div> -->
-                            {{-- <div class="carousel-item">
-                                <a href="">
-                                    <img src="https://crewsportswear.app:5955/DRIVE.jpg" class="d-block w-100" alt="...">
-                                </a>
-                            </div> --}}
        </div>
-                        <a class="carousel-control-prev" href="#carouselExampleDark" role="button" data-bs-slide="prev">
-                            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-                            <span class="visually-hidden">Previous</span>
-                        </a>
-                        <a class="carousel-control-next" href="#carouselExampleDark" role="button" data-bs-slide="next">
-                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
-                            <span class="visually-hidden">Next</span>
+        <div class="col-lg-7">
+          <div class="p-5 order-lg-1">
+            <h2 class="display-4">Corporate Apparel</h2>
+            <div class="horizontal-divider m-0 bg-red"></div>
+
+            <div class="section-content">
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod
+                aliquid, mollitia odio veniam sit iste esse assumenda amet
+                aperiam exercitationem, ea animi blanditiis recusandae! Ratione
+                voluptatum molestiae adipisci, beatae obcaecati.
+              </p>
+
+              <div class="pt-5">
+                <a class="btn btn-outline-primary btn-xl px-3" href="#scroll"
+                  >Start Designing
                </a>
              </div>
            </div>
          </div>
        </div>
      </div>
+    </div>
+  </section>
+
+  <section class="contact-us" id="contact">
+    <div class="container px-5">
+      <div class="row gx-5 justify-content-center align-items-center">
+        <div class="col-lg-12">
+          <h3>Get In Touch</h3>
+          <div class="horizontal-divider bg-yellow"></div>
+        </div>

-    <div class="main__content mt-5">
-        <div class="container">
-            <!-- Forms Search -->
-            <div class="row justify-content-md-center">
-                <div class="col-lg-8">
-                    <form class="row g-2 g-lg-5">
-                        <div class="col-lg-9">
-                            <div class="input-group">
-                                {{-- <input
+        <div class="col-lg-6 mt-5">
+          <form action="">
+            <div class="mb-3">
+              <input
                type="text"
-                  class="form-control border-end-0"
-                  placeholder="Search Store"
-                  aria-label="Search Store"
-                  aria-describedby="basic-addon2"
-                /> --}}
-                                <input type="text" class="form-control border-end-0" placeholder="Search Store"
-                                    value="{{ $keyword }}" name="q">
-                                <input type="hidden" class="form-control border-end-0" placeholder="Search Store"
-                                    value="latest" name="s">
-                                <button class="input-group-text bg-white border-start-0" id="basic-addon2"><i
-                                        class="fa fa-search"></i></button>
+                class="form-control form-control-lg contact-input-custom"
+                placeholder="Fullname*"
+                required
+              />
            </div>
+            <div class="mb-3">
+              <input
+                type="email"
+                class="form-control form-control-lg contact-input-custom"
+                required
+                placeholder="Email Address*"
+              />
            </div>
-                        <div class="col-lg-3 added-or">
-                            <a href="{{ url('templates') }}" type="submit" class="btn btn-black mb-3 w-100">
-                                Design your own
-                            </a>
+            <div class="mb-3">
+              <input
+                type="text"
+                class="form-control form-control-lg contact-input-custom"
+                id="exampleFormControlInput1"
+                placeholder="Phone Number*"
+              />
+            </div>
+            <div class="mb-3">
+              <textarea
+                class="form-control form-control-lg contact-input-custom"
+                required
+                rows="5"
+                placeholder="What can we help you with?"
+              ></textarea>
+            </div>
+
+            <div class="mb-3">
+              <button class="btn btn-lg btn-contact w-100">Submit</button>
            </div>
          </form>
        </div>
      </div>
-
-            @include('teamstore-sublayouts.stores')
-            <!-- First 12 Stores -->
-
-            <!-- Featured Products -->
-            <div class="row py-5">
-                <div class="col-lg-12">
-                    <div class="text-center">
-                        <h3>Featured Products</h3>
-                    </div>
-                </div>
-                @foreach ($featured_products as $product)
-                    <div class="col-lg-2 col-md-3 col-6" v-for="index in 6" :key="index">
-                        <div class="text-center p-3">
-                            <a href="{{ url('store') . '/' . $product->StoreUrl . '/product/' . $product->ProductURL }}">
-                                <div class="store-logo">
-                                    <img src="{{ config('site_config.images_url') . '/' . $product->Image }}"
-                                        alt="{{ $product->ProductName }}" class="d-block border shadow-sm">
-                                </div>
-                                <div class="store-name text-truncate">{{ $product->ProductName }}</div>
-                            </a>
-                        </div>
-                    </div>
-                @endforeach
-
-            </div>
-        </div>
-    </div>
-
-    <!-- calling designers -->
-    <div class="adbg">
-        <div class="row py-3">
-            <div class="col-lg-8">
-                <div class="p-5">
-                    <h2>
-                        Calling all <span class="designer-text">Creators</span>
-                    </h2>
-                    <p>
-                        <a href="{{ url('auth/login') }}">Sign in</a> on Merchbay and share your creativity and expand
-                        <br />your ideas. Click below button to know more.
-                    </p>
-
-                    <div class="pt-3">
-                        <a href="{{ url('/contact-us') }}" type="button" class="btn btn-black mb-3 px-5">
-                            Learn more
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
    </div>
+  </section>
@endsection
--- a/resources/views/merchbay/navbar.blade.php
+++ b/resources/views/merchbay/navbar.blade.php
@@ -1,17 +1,14 @@
-<nav class="navbar navbar-expand-lg bg-black">
+{{-- <nav class="navbar navbar-expand-lg bg-black">
  <div class="container">
    <a class="navbar-brand text-white" href="/">
      <span>M</span>erchbay
-      {{-- <img src="{{asset('/public/images/merchbay-white.png')}}" class="img-fluid" alt="logo"> --}}
    </a>
    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarMainToggler" aria-controls="navbarMainToggler" aria-expanded="false" aria-label="Toggle navigation">
      <i class="bi bi-list text-white"></i>
    </button>
    <div class="collapse navbar-collapse justify-content-end" id="navbarMainToggler" v-if="hasMenu">
      <ul class="navbar-nav ml-auto mb-2 mb-lg-0">
-        <!-- <li class="d-inline d-lg-none">
-              <button data-toggle="collapse" data-target="#navbarMainToggler" class="close float-end" aria-expanded="true">×</button>
-          </li> -->
+
        <li class="nav-item text-center d-md-none d-block">
          <h5>Menu</h5>
        </li>
@@ -49,10 +46,115 @@
          <a href="{{ url('cart') }}" type="button" class="nav-link btn btn-navbar-cart btn-sm">
            <i class="fa fa-shopping-cart"></i>
            <span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
-            {{-- <span class="visually-hidden">unread messages</span> --}}
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav> --}}
+
+
+  <nav class="navbar navbar-expand-lg navbar-dark navbar-custom fixed-top">
+    <div class="container px-5">
+      <a href="/" class="navbar-brand">
+        <img src="{{ asset('/public/images/logo.png') }}" alt="logo" height="36px" />
+      </a>
+      <!-- <a class="navbar-brand" href="#page-top">
+       
+      </a> -->
+      <button
+        class="navbar-toggler"
+        type="button"
+        data-bs-toggle="collapse"
+        data-bs-target="#navbarResponsive"
+        aria-controls="navbarResponsive"
+        aria-expanded="false"
+        aria-label="Toggle navigation"
+      >
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarResponsive">
+        <ul class="navbar-nav">
+          <li class="nav-item">
+            <a class="nav-link" href="#services"> Services </a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#contact"> Contact Us</a>
+          </li>
+        </ul>
+
+        <ul class="navbar-nav ms-auto">
+          @if (Auth::guest())
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('./auth/register') }}">
+                <i class="icon icon-sign-up"></i> Sign Up
+              </a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('./auth/login') }}">
+                <i class="icon icon-sign-in"></i>
+                Log In
+              </a>
+            </li>
+          @else
+
+          
+          @if(Auth::user()->role == "admin")
+          <li class="nav-item">
+            <a class="nav-link" href="{{ url('./auth/admin') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
+            </a>
+          </li>
+          @elseif(Auth::user()->role == "store_owner")
+          <li class="nav-item">
+            {{-- <a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a> --}}
+            <a class="nav-link" href="{{ url('./auth/user') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
+            </a>
+          </li>
+          @else
+          <li class="nav-item">
+            <a class="nav-link" href="{{ url('./auth/user') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
+            </a>
+          </li>
+          @endif
+
+
+          <li class="nav-item">
+            {{-- <a href="{{ url('./auth/logout') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Logout</a> --}}
+            <a class="nav-link" href="{{ url('./auth/logout') }}">
+              <i class="icon icon-sign-in"></i>
+              Logout
+            </a>
+          </li>
+
+          @endif
+            
+          <li class="nav-item">
+            {{-- <a href="{{ url('cart') }}" type="button" class="nav-link btn btn-navbar-cart btn-sm">
+            <i class="icon icon-cart"></i>
+              <span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
+            </a> --}}
+            <a class="nav-link" href="{{ url('cart') }}" type="button">
+              <i class="icon icon-cart"></i>
+              <span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
            </a>
          </li>
        </ul>
      </div>
    </div>
  </nav>
+
+
+
+<style scoped>
+.navbar-custom .navbar-nav .nav-item .nav-link {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+</style>
--- a/resources/views/merchbay/stores.blade.php
+++ b/resources/views/merchbay/stores.blade.php
@@ -0,0 +1,162 @@
+@extends('merchbay_main')
+@section('main-content')
+ 
+    <div class="main__carousel">
+        <div class="">
+            <div class="row">
+                <div class="col-lg-12">
+                    <div id="carouselExampleDark" class="carousel slide" data-bs-ride="carousel">
+                        {{-- <div id="carouselExampleDark" class="carousel carousel-dark slide" data-bs-ride="carousel"> --}}
+                        <ol class="carousel-indicators">
+                            @foreach ($carousel_images as $key => $carousel)
+                                @if ($key == 0)
+                                    <li data-bs-target="#carouselExampleDark" data-bs-slide-to="{{ $key }}"
+                                        class="active"></li>
+                                @else
+                                    <li data-bs-target="#carouselExampleDark" data-bs-slide-to="{{ $key }}"></li>
+                                @endif
+                            @endforeach
+                            {{-- <li data-bs-target="#carouselExampleDark" data-bs-slide-to="0" class="active"></li>
+                            <li data-bs-target="#carouselExampleDark" data-bs-slide-to="1"></li> --}}
+                            {{-- <li data-bs-target="#carouselExampleDark" data-bs-slide-to="2"></li>
+                            <li data-bs-target="#carouselExampleDark" data-bs-slide-to="3"></li> --}}
+                        </ol>
+                        <div class="carousel-inner">
+                            {{-- <div class="carousel-item active" data-bs-interval="10000"> --}}
+
+                            @foreach ($carousel_images as $key => $carousel)
+                                @if ($key == 0)
+                                    <div class="carousel-item active" data-bs-interval="10000">
+                                        <a href="{{ url('store') }}/{{ $carousel->StoreUrl }}">
+                                            <div class="top-image">
+                                                <img
+                                                    src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}" />
+                                            </div>
+                                            <img src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}"
+                                                class="blurred" />
+                                        </a>
+                                    </div>
+                                @else
+                                    <div class="carousel-item" data-bs-interval="10000">
+                                        <a href="{{ url('store') }}/{{ $carousel->StoreUrl }}">
+                                            <div class="top-image">
+                                                <img
+                                                    src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}" />
+                                            </div>
+                                            <img src="{{ config('site_config.uploads') . 'teamstore/' . $carousel->ImageFolder . '/' . $carousel->StoreBanner }}"
+                                                class="blurred" />
+                                        </a>
+                                    </div>
+                                @endif
+                            @endforeach
+
+
+                            <!-- <div class="carousel-item" data-bs-interval="10000">
+                                                <img src="https://crewsportswear.app:5955/WIPCAPS.jpg" class="d-block w-100" alt="...">
+                                              </div> -->
+                            <!-- <div class="carousel-item" data-bs-interval="10000">
+                                                <img src="https://crewsportswear.app:5955/NINONG.jpg" class="d-block w-100" alt="...">
+                                              </div> -->
+                            {{-- <div class="carousel-item">
+                                <a href="">
+                                    <img src="https://crewsportswear.app:5955/DRIVE.jpg" class="d-block w-100" alt="...">
+                                </a>
+                            </div> --}}
+                        </div>
+                        <a class="carousel-control-prev" href="#carouselExampleDark" role="button" data-bs-slide="prev">
+                            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+                            <span class="visually-hidden">Previous</span>
+                        </a>
+                        <a class="carousel-control-next" href="#carouselExampleDark" role="button" data-bs-slide="next">
+                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                            <span class="visually-hidden">Next</span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="main__content mt-5">
+        <div class="container">
+            <!-- Forms Search -->
+            <div class="row justify-content-md-center">
+                <div class="col-lg-8">
+                    <form class="row g-2 g-lg-5">
+                        <div class="col-lg-9">
+                            <div class="input-group">
+                                {{-- <input
+                  type="text"
+                  class="form-control border-end-0"
+                  placeholder="Search Store"
+                  aria-label="Search Store"
+                  aria-describedby="basic-addon2"
+                /> --}}
+                                <input type="text" class="form-control border-end-0" placeholder="Search Store"
+                                    value="{{ $keyword }}" name="q">
+                                <input type="hidden" class="form-control border-end-0" placeholder="Search Store"
+                                    value="latest" name="s">
+                                <button class="input-group-text bg-white border-start-0" id="basic-addon2"><i
+                                        class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                        <div class="col-lg-3 added-or">
+                            <a href="{{ url('templates') }}" type="submit" class="btn btn-black mb-3 w-100">
+                                Design your own
+                            </a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+
+            @include('teamstore-sublayouts.stores')
+            <!-- First 12 Stores -->
+
+            <!-- Featured Products -->
+            <div class="row py-5">
+                <div class="col-lg-12">
+                    <div class="text-center">
+                        <h3>Featured Products</h3>
+                    </div>
+                </div>
+                @foreach ($featured_products as $product)
+                    <div class="col-lg-2 col-md-3 col-6" v-for="index in 6" :key="index">
+                        <div class="text-center p-3">
+                            <a href="{{ url('store') . '/' . $product->StoreUrl . '/product/' . $product->ProductURL }}">
+                                <div class="store-logo">
+                                    <img src="{{ config('site_config.images_url') . '/' . $product->Image }}"
+                                        alt="{{ $product->ProductName }}" class="d-block border shadow-sm">
+                                </div>
+                                <div class="store-name text-truncate">{{ $product->ProductName }}</div>
+                            </a>
+                        </div>
+                    </div>
+                @endforeach
+
+            </div>
+        </div>
+    </div>
+
+    <!-- calling designers -->
+    <div class="adbg">
+        <div class="row py-3">
+            <div class="col-lg-8">
+                <div class="p-5">
+                    <h2>
+                        Calling all <span class="designer-text">Creators</span>
+                    </h2>
+                    <p>
+                        <a href="{{ url('auth/login') }}">Sign in</a> on Merchbay and share your creativity and expand
+                        <br />your ideas. Click below button to know more.
+                    </p>
+
+                    <div class="pt-3">
+                        <a href="{{ url('/contact-us') }}" type="button" class="btn btn-black mb-3 px-5">
+                            Learn more
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
--- a/resources/views/merchbay_main.blade.php
+++ b/resources/views/merchbay_main.blade.php
@@ -10,11 +10,12 @@
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">

    <title>Merchbay</title>
-    <link rel="icon" href="{{ asset('favicon.ico') }}">
+    <link rel="icon" href="{{ asset('public/favicon.ico') }}">
    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;400;500;600;700;800;900&display=swap" rel="stylesheet">

-    <link href="{{ asset('assets/css/merchbay/styles.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/assets/css/merchbay/styles-stores.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/assets/css/merchbay/styles.css') }}" rel="stylesheet">
    <!-- <link href="{{ asset('public/assets/login/css/style.css') }}" rel="stylesheet">
    <link href="{{ asset('public/assets/login/css/form-elements.css') }}" rel="stylesheet"> -->
    <script src='https://www.google.com/recaptcha/api.js'></script>
@@ -80,14 +81,14 @@
        }(document, 'script', 'facebook-jssdk'));
    </script> -->
    @include('merchbay.navbar')
-    <div class="container">
-        <div class="wrapper bg-white">
+    {{-- <div class="container-fluid">
+        <div class="wrapper bg-white"> --}}
            @yield('main-content')

            <!-- Your Chat Plugin code -->
            <div class="fb-customerchat" attribution="install_email" attribution_version="biz_inbox" page_id="107414144973415">
-            </div>
-        </div>
+            {{-- </div>
+        </div> --}}
        @include('merchbay.footer')
    </div>

@@ -258,7 +259,7 @@
        }

        function fetchCanada() {
-            $.getJSON("{{ asset('/api/canada.json') }}", function(items) {
+            $.getJSON("{{ asset('/public/api/canada.json') }}", function(items) {
                var states = [];

                Object.keys(items).forEach(function(state) {
@@ -307,7 +308,7 @@
        }

        function fetchUSA() {
-            $.getJSON("{{ asset('/api/usaCities.json') }}", function(data) {
+            $.getJSON("{{ asset('/public/api/usaCities.json') }}", function(data) {
                var states = [];

                for (i = 0; i < data.length; i++) {
--- a/start-local.sh
+++ b/start-local.sh
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Quick start script for local development and testing before Cloud Run deployment
-
-set -e
-
-echo "🚀 Starting Merchbay Laravel Application Setup..."
-
-# Check if Docker is running
-if ! docker info > /dev/null 2>&1; then
-    echo "❌ Docker is not running. Please start Docker and try again."
-    exit 1
-fi
-
-# Determine which docker compose command to use
-if command -v docker-compose > /dev/null 2>&1; then
-    DOCKER_COMPOSE="docker-compose"
-elif docker compose version > /dev/null 2>&1; then
-    DOCKER_COMPOSE="docker compose"
-else
-    echo "❌ Neither 'docker-compose' nor 'docker compose' is available."
-    echo "Please install Docker Compose and try again."
-    exit 1
-fi
-
-echo "ℹ️ Using: $DOCKER_COMPOSE"
-
-# Check if .env file exists
-if [ ! -f .env ]; then
-    echo "📄 Creating .env file from .env.example..."
-    cp .env.example .env
-    echo "✅ .env file created. Please update it with your configuration."
-fi
-
-# Build and start services
-echo "🔨 Building Docker images..."
-$DOCKER_COMPOSE -f docker-compose.local.yml build
-
-echo "🚀 Starting services..."
-$DOCKER_COMPOSE -f docker-compose.local.yml up -d
-
-echo "⏳ Waiting for services to be ready..."
-sleep 30
-
-# Run Laravel setup commands
-echo "🔧 Setting up Laravel..."
-$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan key:generate
-#$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan migrate --force
-$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan config:cache
-$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan route:cache
-$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan view:cache
-
-echo "✅ Setup complete!"
-echo ""
-echo "🌐 Your application is now running at:"
-echo "   Application: http://localhost:8080"
-echo "   phpMyAdmin:  http://localhost:8081"
-echo ""
-echo "📊 Check logs with:"
-echo "   $DOCKER_COMPOSE -f docker-compose.local.yml logs -f app"
-echo ""
-echo "🛑 Stop the application with:"
-echo "   $DOCKER_COMPOSE -f docker-compose.local.yml down"
-echo ""
-echo "🚀 When ready to deploy to Cloud Run, use:"
-echo "   gcloud builds submit --config=cloudbuild.yaml"
Author	SHA1	Message	Date
Frank John Begornia	316adc77a6	update nginx	2024-01-05 23:09:45 +08:00
Frank John Begornia	459d28b6b8	updated	2024-01-05 22:42:41 +08:00
Frank John Begornia	ee13d3269e	update	2024-01-05 21:07:55 +08:00
Frank John Begornia	a4fb9e3d32	updated	2024-01-05 21:06:56 +08:00
Frank John Begornia	ad00da3e0b	updated docker file	2024-01-05 20:58:45 +08:00
Frank John Begornia	f44fa68797	updated	2024-01-05 20:58:19 +08:00
Frank John Begornia	d87efd86e7	updated	2023-12-30 01:56:09 +08:00
Frank John Begornia	78d99b5ff6	updated docker	2023-12-30 00:26:02 +08:00
Frank John Begornia	3394c94677	updated	2023-12-27 20:39:40 +08:00