From 175f71c8da006128c9b1f570f96a39485242a6f7 Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Wed, 24 Jan 2024 12:36:56 +0900
Subject: [PATCH 1/2] change search bar

---
 src/main/webapp/WEB-INF/views/category/list.jsp  | 12 ++++++------
 src/main/webapp/WEB-INF/views/in/list.jsp        | 10 +++++-----
 src/main/webapp/WEB-INF/views/modal/category.jsp | 12 ++++++------
 src/main/webapp/WEB-INF/views/modal/product.jsp  | 10 +++++-----
 src/main/webapp/WEB-INF/views/modal/vendor.jsp   | 10 +++++-----
 src/main/webapp/WEB-INF/views/price/list.jsp     |  8 ++++----
 src/main/webapp/WEB-INF/views/product/list.jsp   | 10 +++++-----
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/category/list.jsp b/src/main/webapp/WEB-INF/views/category/list.jsp
index 858c0df..550ace2 100644
--- a/src/main/webapp/WEB-INF/views/category/list.jsp
+++ b/src/main/webapp/WEB-INF/views/category/list.jsp
@@ -18,14 +18,14 @@
 					<div class="input-group mb-3 w-30 col-centered">
 						<div class="w-25">
 						<select class="form-select" name="searchn" id="searchn">
-							<option selected="selected" value="4">세분류</option>
-							<option value="1">대분류</option>
-							<option value="2">중분류</option>
-							<option value="3">소분류</option>
-							<option value="0">KAN코드</option>
+							<option selected="selected" value="4" <c:if test="${searchn == 4}">selected="selected"</c:if>>세분류</option>
+							<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if>>대분류</option>
+							<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if>>중분류</option>
+							<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if>>소분류</option>
+							<option value="0" <c:if test="${searchn == 0}">selected="selected"</c:if>>KAN코드</option>
 						</select>
 						</div>
-						<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+						<input type="text" id="search" name="search"  value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 						<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 						
 						<!-- 페이징작업용 -->
diff --git a/src/main/webapp/WEB-INF/views/in/list.jsp b/src/main/webapp/WEB-INF/views/in/list.jsp
index 568af45..619c4fd 100644
--- a/src/main/webapp/WEB-INF/views/in/list.jsp
+++ b/src/main/webapp/WEB-INF/views/in/list.jsp
@@ -19,13 +19,13 @@
 					<div class="input-group mb-3 w-30 col-centered">
 						<div class="w-25">
 						<select class="form-select" name="searchn" id="searchn">
-							<option selected="selected" value="0">제품명</option>
-							<option value="1">입고날짜</option>
-							<option value="2">담당자</option>
-							<option value="3">입고예정그룹번호</option>
+							<option selected="selected" value="0"  <c:if test="${searchn == 0}">selected="selected"</c:if> >제품명</option>
+							<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if> >입고날짜</option>
+							<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if> >담당자</option>
+							<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if> >입고예정그룹번호</option>
 						</select>
 						</div>
-						<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+						<input type="text" id="search" name="search" value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 						<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 						
 						<!-- 페이징작업용 -->
diff --git a/src/main/webapp/WEB-INF/views/modal/category.jsp b/src/main/webapp/WEB-INF/views/modal/category.jsp
index 86ad135..02c1de8 100644
--- a/src/main/webapp/WEB-INF/views/modal/category.jsp
+++ b/src/main/webapp/WEB-INF/views/modal/category.jsp
@@ -83,14 +83,14 @@
 	            <div class="input-group mb-3 w-50 col-centered">
 							<div class="w-30">
 	                <select class="form-select" name="searchn" id="searchn">
-						<option selected="selected" value="4">세분류</option>
-						<option value="1">대분류</option>
-						<option value="2">중분류</option>
-						<option value="3">소분류</option>
-						<option value="0">KAN코드</option>
+						<option selected="selected" value="4" <c:if test="${searchn == 4}">selected="selected"</c:if> >세분류</option>
+						<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if> >대분류</option>
+						<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if> >중분류</option>
+						<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if> >소분류</option>
+						<option value="0" <c:if test="${searchn == 0}">selected="selected"</c:if> >KAN코드</option>
 					</select>
 					</div>
-					<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+					<input type="text" id="search" name="search" value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 					<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 					<!-- 페이징작업용 -->
 					<input type="hidden" id="searchn1" value="${searchn}">
diff --git a/src/main/webapp/WEB-INF/views/modal/product.jsp b/src/main/webapp/WEB-INF/views/modal/product.jsp
index 23146c3..5cac550 100644
--- a/src/main/webapp/WEB-INF/views/modal/product.jsp
+++ b/src/main/webapp/WEB-INF/views/modal/product.jsp
@@ -88,13 +88,13 @@
 	            <div class="input-group mb-3 w-50 col-centered">
 							<div class="w-30">
 	                <select class="form-select" name="searchn" id="searchn">
-						<option selected="selected" value="0">제품명</option>
-						<option value="1">회사명</option>
-						<option value="2">분류</option>
-						<option value="3">담당자명</option>
+						<option selected="selected" value="0" <c:if test="${searchn == 0}">selected="selected"</c:if> >제품명</option>
+						<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if>>회사명</option>
+						<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if>>분류</option>
+						<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if>>담당자명</option>
 					</select>
 					</div>
-					<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+					<input type="text" id="search" name="search"  value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 					<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 					<!-- 페이징작업용 -->
 					<input type="hidden" id="searchn1" value="${searchn}">
diff --git a/src/main/webapp/WEB-INF/views/modal/vendor.jsp b/src/main/webapp/WEB-INF/views/modal/vendor.jsp
index 2fa73e5..6ca4457 100644
--- a/src/main/webapp/WEB-INF/views/modal/vendor.jsp
+++ b/src/main/webapp/WEB-INF/views/modal/vendor.jsp
@@ -81,13 +81,13 @@
 	            <div class="input-group mb-3 w-50 col-centered">
 							<div class="w-30">
 	                <select class="form-select" name="searchn" id="searchn">
-						<option selected="selected" value="0">업체명</option>
-						<option value="1">업체명</option>
-						<option value="2">거래처 담당자</option>
-						<option value="3">거래처 담당자 전화번호</option>
+						<option selected="selected" value="0" <c:if test="${searchn == 0}">selected="selected"</c:if>>업체명</option>
+						<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if>>업체명</option>
+						<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if>>거래처 담당자</option>
+						<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if>>거래처 담당자 전화번호</option>
 					</select>
 					</div>
-					<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+					<input type="text" id="search" name="search" value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 					<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 					<!-- 페이징작업용 -->
 					<input type="hidden" id="searchn1" value="${searchn}">
diff --git a/src/main/webapp/WEB-INF/views/price/list.jsp b/src/main/webapp/WEB-INF/views/price/list.jsp
index 1ba6984..d56053d 100644
--- a/src/main/webapp/WEB-INF/views/price/list.jsp
+++ b/src/main/webapp/WEB-INF/views/price/list.jsp
@@ -19,12 +19,12 @@
 					<div class="input-group mb-3 w-30 col-centered">
 						<div class="w-25">
 						<select class="form-select" name="searchn" id="searchn">
-							<option selected="selected" value="0">제품명</option>
-							<option value="1">가격</option>
-							<option value="2">등록날짜</option>
+							<option selected="selected" value="0" <c:if test="${searchn == 0}">selected="selected"</c:if> >제품명</option>
+							<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if> >가격</option>
+							<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if> >등록날짜</option>
 						</select>
 						</div>
-						<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+						<input type="text" id="search" name="search" value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 						<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 						
 						<!-- 페이징작업용 -->
diff --git a/src/main/webapp/WEB-INF/views/product/list.jsp b/src/main/webapp/WEB-INF/views/product/list.jsp
index 469870f..207c0d2 100644
--- a/src/main/webapp/WEB-INF/views/product/list.jsp
+++ b/src/main/webapp/WEB-INF/views/product/list.jsp
@@ -19,13 +19,13 @@
 					<div class="input-group mb-3 w-30 col-centered">
 						<div class="w-25">
 						<select class="form-select" name="searchn" id="searchn">
-							<option selected="selected" value="0">제품명</option>
-							<option value="1">회사명</option>
-							<option value="2">분류</option>
-							<option value="3">담당자명</option>
+							<option selected="selected" value="0" <c:if test="${searchn == 0}">selected="selected"</c:if>>제품명</option>
+							<option value="1" <c:if test="${searchn == 1}">selected="selected"</c:if>>회사명</option>
+							<option value="2" <c:if test="${searchn == 2}">selected="selected"</c:if>>분류</option>
+							<option value="3" <c:if test="${searchn == 3}">selected="selected"</c:if>>담당자명</option>
 						</select>
 						</div>
-						<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+						<input type="text" id="search" name="search" value="${search}" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
 						<button class="btn btn-info" type="button" id="searchBtn">검색</button>
 						
 						<!-- 페이징작업용 -->

From 390da27e28ed7544bb773fefd0f79e7d0b02c866 Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Wed, 24 Jan 2024 12:48:30 +0900
Subject: [PATCH 2/2] change mainpage img

---
 src/main/webapp/WEB-INF/views/base/main.jsp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/base/main.jsp b/src/main/webapp/WEB-INF/views/base/main.jsp
index 7c03fdf..2c66282 100644
--- a/src/main/webapp/WEB-INF/views/base/main.jsp
+++ b/src/main/webapp/WEB-INF/views/base/main.jsp
@@ -12,7 +12,8 @@
 
     <div class="row">
         <div class="col-md-6 ">
-            <div><img alt="Default Image" src="/resources/static/img/mainpage/2.png" width="500px" /></div>
+        <br>
+            <div class="col text-center"><img alt="Default Image" src="/resources/static/img/mainpage/2.png" width="550px" /></div>
         </div>
 
         <div class="col-md-5">