From 942af1f0a8aedbda4020689085ae16702e13ccf0 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Tue, 25 Feb 2020 11:53:26 +0800
Subject: [PATCH 1/4] added contact us page

---
 .htaccess                                   |  2 +-
 resources/views/designer/designer.blade.php | 64 ++++++++++-----------
 resources/views/layout/navbar.blade.php     | 11 +++-
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/.htaccess b/.htaccess
index 56a5195..557db7e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,7 +6,7 @@
     # Redirect Trailing Slashes...
     RewriteRule ^(.*)/$public /$1 [L,R=301]
     RewriteCond %{SERVER_PORT} 80
-    RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
+    #RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php
index 4baebfa..6fdde52 100644
--- a/resources/views/designer/designer.blade.php
+++ b/resources/views/designer/designer.blade.php
@@ -550,37 +550,37 @@
 
                                     </div>
                                     <div class="tab-pane fade" id="tab-add-text">
-										<div id="addNewTextId">
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<!-- <button type="button" class="btn btn-danger pull-right btn-sm remove addMarginLeft" title="Remove object"><i class="fa fa-trash" aria-hidden="true"></i></button> -->
-													<button type="button" onclick="addNewText();" class="btn btn-primary pull-right btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> New Text</button>
-												</div>
-											</div>
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<label>Enter team name here</label>
-													<textarea name="editedTextInput" id="editedTextInput" class="form-control" placeholder="Enter team name here"></textarea>
+																			<div id="addNewTextId">
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<!-- <button type="button" class="btn btn-danger pull-right btn-sm remove addMarginLeft" title="Remove object"><i class="fa fa-trash" aria-hidden="true"></i></button> -->
+																						<button type="button" onclick="addNewText();" class="btn btn-primary pull-right btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> New Text</button>
+																					</div>
+																				</div>
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<label>Enter team name here</label>
+																						<textarea name="editedTextInput" id="editedTextInput" class="form-control" placeholder="Enter team name here"></textarea>
 
-												</div>
-											</div>
-										</div>
-										<div id="enterTextId">
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<label>Enter team name here</label>
-													<textarea name="textInput" id="textInput" class="form-control" placeholder="Enter team name here"></textarea>
-													<!--span id="errfirstName" style="color: #dd4b39"></span> !-->
-												</div>
+																					</div>
+																				</div>
+																			</div>
+																			<div id="enterTextId">
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<label>Enter team name here</label>
+																						<textarea name="textInput" id="textInput" class="form-control" placeholder="Enter team name here"></textarea>
+																						<!--span id="errfirstName" style="color: #dd4b39"></span> !-->
+																					</div>
 
-												<div class="form-group col-sm-12">
-													<button type="button" id="okBtn" onclick="addText();" class="btn btn-primary btn-block btn-sm">OK</button>
-												</div>
-											</div>
-										</div>
-                                        <div id="textProperties">
-                                            @include('designer.text_properties')
-                                        </div>
+																					<div class="form-group col-sm-12">
+																						<button type="button" id="okBtn" onclick="addText();" class="btn btn-primary btn-block btn-sm">OK</button>
+																					</div>
+																				</div>
+																			</div>
+																			<div id="textProperties">
+																					@include('designer.text_properties')
+																			</div>
                                     </div>
 
                                     <div class="tab-pane fade" id="tab-add-number">
@@ -613,9 +613,9 @@
                                     </div>
 
                                     <div class="tab-pane fade" id="tab-clipart">
-										<div id="tab-clipart-content">
-										</div>
-									</div>
+																			<div id="tab-clipart-content">
+																			</div>
+																		</div>
 
                                     <div class="tab-pane fade" id="tab-upload-image">
 										<!-- <div class="row">
diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index a07c771..ae8333c 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -254,8 +254,15 @@
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4 class="modal-title">Contact Us</h4>
             </div>
-            <div class="modal-body">
-                <p>Coming soon.</p>
+            <div class="modal-body text-center">
+                <h1>Contact Us</h1>
+                <hr>
+                <h3>Email Address: <small><a href="#">customer-service@crewsportswear.com</a></small></h3>
+                <h3>Address: <small><a href="#">1281 Humbracht Circle
+                    Suite J
+                    Bartlett, Illinois
+                    60103</a></small>
+                </h3>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

From 3f96f8209011e8cfee9cdfd7a9c99a739f584afd Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Tue, 25 Feb 2020 12:06:28 +0800
Subject: [PATCH 2/4] add jac

---
 resources/views/layout/navbar.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index ae8333c..81dd92b 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -9,6 +9,7 @@
             </button>
             <a class="navbar-brand" href="{{ url('/') }}">
                 <img src="{{asset('public/images/logo.png')}}" />
+                <small>JAC Printing & Graphics Co.</small>
             </a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
@@ -141,7 +142,8 @@
     }
 
     .navbar-custom{
-        min-height: 100px;
+        /* min-height: 100px; */
+        min-height: 125px;
     }
 
     @media (max-width: 768px){

From 99f89a968b3dfa34a7cd3cd9b854bbc4bc3d5f15 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Tue, 25 Feb 2020 12:21:10 +0800
Subject: [PATCH 3/4] removed JAC

---
 resources/views/layout/navbar.blade.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index 81dd92b..9f986b9 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -9,7 +9,7 @@
             </button>
             <a class="navbar-brand" href="{{ url('/') }}">
                 <img src="{{asset('public/images/logo.png')}}" />
-                <small>JAC Printing & Graphics Co.</small>
+                {{-- <small>JAC Printing & Graphics Co.</small> --}}
             </a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
@@ -142,8 +142,7 @@
     }
 
     .navbar-custom{
-        /* min-height: 100px; */
-        min-height: 125px;
+        min-height: 100px;
     }
 
     @media (max-width: 768px){

From 8408695473decc8726ce91f7f8d7bd3579d1d57c Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Tue, 25 Feb 2020 12:29:23 +0800
Subject: [PATCH 4/4] uncomment RewriteRule

---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 557db7e..56a5195 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,7 +6,7 @@
     # Redirect Trailing Slashes...
     RewriteRule ^(.*)/$public /$1 [L,R=301]
     RewriteCond %{SERVER_PORT} 80
-    #RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
+    RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f