Merge pull request #317 from ssg-java3-240304/develop

Merge Master 2024년 8월 30일
ssg-java3-240304 · Aug 30, 2024 · b69f5cd · b69f5cd
2 parents e8ca554 + b4a955f
commit b69f5cd
Show file tree

Hide file tree

Showing 53 changed files with 399 additions and 1,530 deletions.
diff --git a/src/main/java/com/readyauction/app/AppController.java b/src/main/java/com/readyauction/app/AppController.java
@@ -3,13 +3,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
+@RequestMapping("/index")
 @Slf4j
 public class AppController {
 
-    @GetMapping("/")
-    public String index() {
-        return "redirect:/auction";
+    @GetMapping("")
+    public void index() {
     }
 }
diff --git a/src/main/resources/static/assets/images/banner/category-hover-bg.png b/src/main/resources/static/assets/images/banner/category-hover-bg.png
diff --git a/src/main/resources/static/assets/images/banner/hero-banner2.png b/src/main/resources/static/assets/images/banner/hero-banner2.png
diff --git a/src/main/resources/static/assets/images/blog/bb1.png b/src/main/resources/static/assets/images/blog/bb1.png
diff --git a/src/main/resources/static/assets/images/blog/blog-writer1.png b/src/main/resources/static/assets/images/blog/blog-writer1.png
diff --git a/src/main/resources/static/assets/images/collection/sp1.png b/src/main/resources/static/assets/images/collection/sp1.png
diff --git a/src/main/resources/static/assets/images/collection/sp2.png b/src/main/resources/static/assets/images/collection/sp2.png
diff --git a/src/main/resources/static/assets/images/collection/sp3.png b/src/main/resources/static/assets/images/collection/sp3.png
diff --git a/src/main/resources/static/assets/images/collection/sp4.png b/src/main/resources/static/assets/images/collection/sp4.png
diff --git a/src/main/resources/static/assets/images/default.png b/src/main/resources/static/assets/images/default.png
diff --git a/src/main/resources/static/assets/images/index1.png b/src/main/resources/static/assets/images/index1.png
diff --git a/...sources/static/assets/images/blog/bb3.png → ...resources/static/assets/images/index2.png b/...sources/static/assets/images/blog/bb3.png → ...resources/static/assets/images/index2.png
diff --git a/...sources/static/assets/images/blog/bb2.png → ...resources/static/assets/images/index3.png b/...sources/static/assets/images/blog/bb2.png → ...resources/static/assets/images/index3.png
diff --git a/src/main/resources/static/assets/images/product/feat-1.png b/src/main/resources/static/assets/images/product/feat-1.png
diff --git a/src/main/resources/static/assets/images/product/feat-2.png b/src/main/resources/static/assets/images/product/feat-2.png
diff --git a/src/main/resources/static/assets/images/product/feat-3.png b/src/main/resources/static/assets/images/product/feat-3.png
diff --git a/src/main/resources/static/assets/images/product/feat-4.png b/src/main/resources/static/assets/images/product/feat-4.png
diff --git a/src/main/resources/static/assets/images/product/lp-1.png b/src/main/resources/static/assets/images/product/lp-1.png
diff --git a/src/main/resources/static/assets/images/product/lp-2.png b/src/main/resources/static/assets/images/product/lp-2.png
diff --git a/src/main/resources/static/assets/images/product/lp-3.png b/src/main/resources/static/assets/images/product/lp-3.png
diff --git a/src/main/resources/static/assets/images/product/lp-4.png b/src/main/resources/static/assets/images/product/lp-4.png
diff --git a/src/main/resources/static/assets/images/product/lp-5.png b/src/main/resources/static/assets/images/product/lp-5.png
diff --git a/src/main/resources/static/assets/images/product/lp-6.png b/src/main/resources/static/assets/images/product/lp-6.png
diff --git a/src/main/resources/static/assets/images/product/product-b1.png b/src/main/resources/static/assets/images/product/product-b1.png
diff --git a/src/main/resources/static/assets/images/product/product-b2.png b/src/main/resources/static/assets/images/product/product-b2.png
diff --git a/src/main/resources/static/assets/images/product/product-b3.png b/src/main/resources/static/assets/images/product/product-b3.png
diff --git a/src/main/resources/static/assets/images/product/product-b4.png b/src/main/resources/static/assets/images/product/product-b4.png
diff --git a/src/main/resources/static/assets/images/testimonial/testi-reviewer1.png b/src/main/resources/static/assets/images/testimonial/testi-reviewer1.png
diff --git a/src/main/resources/static/assets/images/testimonial/testi-reviewer2.png b/src/main/resources/static/assets/images/testimonial/testi-reviewer2.png
diff --git a/src/main/resources/static/assets/images/winner/winner-b1.png b/src/main/resources/static/assets/images/winner/winner-b1.png
diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html
diff --git a/src/main/resources/templates/auction/auction.html b/src/main/resources/templates/auction/auction.html
@@ -43,11 +43,11 @@
     <div class="breadcrumb breadcrumb-style-one mb-0">
         <div class="container">
             <div class="col-lg-12 text-center">
-                <h1 class="breadcrumb-title">Auction</h1>
+                <h1 class="breadcrumb-title">경매 목록</h1>
                 <ul class="d-flex justify-content-center breadcrumb-items">
                     <li class="breadcrumb-item"><i class="bi bi-house-door"></i> <a th:href="@{/}">Home</a>
                     </li>
-                    <li class="breadcrumb-item active">Auction</li>
+                    <li class="breadcrumb-item active">경매 목록</li>
                 </ul>
             </div>
         </div>

diff --git a/src/main/resources/templates/auction/auctionDetails.html b/src/main/resources/templates/auction/auctionDetails.html
@@ -470,7 +470,7 @@ <h2>알림</h2>
                 <h1 class="breadcrumb-title">경매 물품 상세 정보</h1>
                 <ul class="d-flex justify-content-center breadcrumb-items">
                     <li class="breadcrumb-item"><i class="bi bi-house-door"></i> <a th:href="@{/}">Home</a></li>
-                    <li class="breadcrumb-item active">Auction Details</li>
+                    <li class="breadcrumb-item active">경매 물품 상세 정보</li>
                 </ul>
             </div>
         </div>