diff --git a/stockMate/src/main/java/com/stockm8/config/ApplicationContextProvider.java b/stockMate/src/main/java/com/stockm8/config/ApplicationContextProvider.java
new file mode 100644
index 0000000..fd86ab2
--- /dev/null
+++ b/stockMate/src/main/java/com/stockm8/config/ApplicationContextProvider.java
@@ -0,0 +1,20 @@
+package com.stockm8.config;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationContextProvider implements ApplicationContextAware {
+
+    private static ApplicationContext context;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        context = applicationContext;
+    }
+
+    public static <T> T getBean(Class<T> requiredType) {
+        return context.getBean(requiredType);
+    }
+}
diff --git a/stockMate/src/main/java/com/stockm8/config/WebConfig.java b/stockMate/src/main/java/com/stockm8/config/WebConfig.java
index 38226fb..d7938b1 100644
--- a/stockMate/src/main/java/com/stockm8/config/WebConfig.java
+++ b/stockMate/src/main/java/com/stockm8/config/WebConfig.java
@@ -40,6 +40,7 @@
 import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
+import com.stockm8.interceptor.AdminInterceptor;
 import com.stockm8.interceptor.AuthorizationInterceptor;
 import com.stockm8.interceptor.FlashMessageInterceptor;
 import com.zaxxer.hikari.HikariConfig;
@@ -61,12 +62,25 @@ public class WebConfig implements WebMvcConfigurer {
     @Autowired
     private FlashMessageInterceptor flashMessageInterceptor;
     
+    @Autowired
+    private AdminInterceptor adminInterceptor;
+    
     /**
      * 인터셉터 설정
      * 특정 URL 패턴에 대해 AuthorizationInterceptor를 적용하며, 일부 URL은 제외합니다.
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(adminInterceptor)
+        		.addPathPatterns("/admin/**") // /admin/** 경로에만 적용
+        		.excludePathPatterns( // 인터셉터를 제외할 경로
+                "/",               // HomeController 경로
+                "/favicon.ico",    // 브라우저 기본 요청
+                "/resources/**",   // 정적 리소스
+                "/user/**",	       // 로그인 및 회원가입 관련 요청
+                "/static/**",
+        		"/api/**"    	    // API 요청에 대해서는 세션 체크를 제외
+        		);
     	// Intercepter 적용
         registry.addInterceptor(authorizationInterceptor)
                 .addPathPatterns("/dashboard", "/business", "/category/**", "/product/**", "/warehouse/**", "/stock/**", "/order/**","/admin/**" ) // 인터셉터를 적용할 경로
diff --git a/stockMate/src/main/java/com/stockm8/controller/AdminController.java b/stockMate/src/main/java/com/stockm8/controller/AdminController.java
index b8f4361..3bc50c9 100644
--- a/stockMate/src/main/java/com/stockm8/controller/AdminController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/AdminController.java
@@ -1,31 +1,22 @@
 package com.stockm8.controller;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.stockm8.domain.vo.Criteria;
-import com.stockm8.domain.vo.OrderItemVO;
-import com.stockm8.domain.vo.OrderVO;
-import com.stockm8.domain.vo.PageVO;
-import com.stockm8.domain.vo.OrderVO.OrderType;
-import com.stockm8.domain.vo.StockVO;
+import org.springframework.web.bind.annotation.SessionAttribute;
+
+import com.stockm8.domain.dto.PendingUserDTO;
+import com.stockm8.domain.enums.UserRole;
 import com.stockm8.domain.vo.UserVO;
 import com.stockm8.service.OrderService;
 import com.stockm8.service.UserService;
@@ -33,48 +24,65 @@
 @Controller
 @RequestMapping(value = "/admin/*")
 public class AdminController {
-	
+
 	// 현재 로그인한 사용자 정보 가져오기(인터셉터에서 정의됨)
 	private UserVO getCurrentUser(HttpServletRequest request) {
-        return (UserVO) request.getAttribute("currentUser");
-    }
-    
-    private static final Logger logger = LoggerFactory.getLogger(AdminController.class);
-    
-    @Inject
-    private OrderService orderService;
-    @Inject
-    private UserService userService;
-    
-    /**
-     * 어드민 메인 페이지 표시(GET)
-     * http://localhost:8088/admin/adminMain
-     * 
-     */
-    @RequestMapping(value = "/adminMain", method = RequestMethod.GET)
-    public String adminMainGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        logger.info("adminMainGET() 호출");
-        
-        UserVO currentUser = getCurrentUser(request);
-        int businessId = currentUser.getBusinessId();
-	    
-	    return "admin/adminMain";
-    }
-    /**
-     * 어드민 회원목록표시(GET)
-     * http://localhost:8088/admin/adminList
-     * 
-     */
-    @RequestMapping(value = "/adminList", method = RequestMethod.GET)
-    public String adminListGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-    	logger.info("adminListGET() 호출");
-    	
-        UserVO currentUser = getCurrentUser(request);
-        int businessId = currentUser.getBusinessId();
-    	
-    	return "admin/adminList";
+		return (UserVO) request.getAttribute("currentUser");
+	}
+
+	private static final Logger logger = LoggerFactory.getLogger(AdminController.class);
+
+	@Inject
+	private OrderService orderService;
+	@Inject
+	private UserService userService;
+
+	/**
+	 * 관리자 메인 페이지 표시(GET) http://localhost:8088/admin/main
+	 * 
+	 * @throws Exception
+	 * 
+	 */
+	@GetMapping("/main")
+	public String adminMainGET(@SessionAttribute("userId") Long userId, Model model) throws Exception {
+		logger.info("adminMainGET() 호출 - 페이지 접근 (userId: {})", userId);
+
+		// userId로 사용자 정보 가져오기
+		UserVO user = userService.getUserById(userId);
+
+		if (user != null) {
+			// 관리자 여부 확인 (ADMIN인 경우)
+			boolean isAdmin = user.getUserRole() == UserRole.ADMIN;
+			model.addAttribute("isAdmin", isAdmin); // JSP에 전달할 데이터
+		}
+		return "admin/main"; // 메인 페이지 반환
+	}
+
+	@GetMapping("/approve")
+	public String adminApproveGET(@SessionAttribute("userId") Long userId, Model model) throws Exception {
+        logger.info("adminApproveGET() 호출 - 페이지 접근 (userId: {})", userId);
+
+        // 조건에 맞는 사용자와 사업자 정보 가져오기
+        List<PendingUserDTO> pendingUsers = userService.getPendingUsersWithBusiness();
+
+        // JSP로 전달
+        model.addAttribute("pendingUsers", pendingUsers);
+
+        return "admin/main"; // JSP 페이지 반환
     }
 
+	/**
+	 * 관리자 회원목록표시(GET) http://localhost:8088/admin/userList
+	 * 
+	 */
+	@RequestMapping(value = "/adminList", method = RequestMethod.GET)
+	public String adminListGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		logger.info("adminListGET() 호출");
+
+		UserVO currentUser = getCurrentUser(request);
+		int businessId = currentUser.getBusinessId();
+
+		return "admin/userList";
+	}
 
-    
-} //AdminController
\ No newline at end of file
+} // AdminController
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/controller/UserController.java b/stockMate/src/main/java/com/stockm8/controller/UserController.java
index 1f45ba3..fa2a6da 100644
--- a/stockMate/src/main/java/com/stockm8/controller/UserController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/UserController.java
@@ -138,16 +138,6 @@ public String userLoginPOST(UserVO user, RedirectAttributes rttr, HttpSession se
 		return "redirect:/user/signin"; // 로그인 페이지 이동
 	}
 
-
-	// 대시보드 페이지 - GET
-	@RequestMapping(value = "/dashboard", method = RequestMethod.GET)
-	public void dashGET() {
-
-		logger.info(" dashGET() 호출 ");
-
-		logger.info(" /user/main -> /user/dash.jsp 연결 ");
-	}
-
 	// 로그아웃 - GET
 	@RequestMapping(value = "/signout", method = RequestMethod.GET)
 	public String userLogoutGET(HttpSession session) throws Exception {
@@ -158,7 +148,7 @@ public String userLogoutGET(HttpSession session) throws Exception {
 
 		// 로그아웃 처리 후 페이지 이동
 
-		return "redirect:/user/main";
+		return "redirect:/user/signin";
 	}
 
 
diff --git a/stockMate/src/main/java/com/stockm8/domain/dto/PendingUserDTO.java b/stockMate/src/main/java/com/stockm8/domain/dto/PendingUserDTO.java
new file mode 100644
index 0000000..63c5bee
--- /dev/null
+++ b/stockMate/src/main/java/com/stockm8/domain/dto/PendingUserDTO.java
@@ -0,0 +1,23 @@
+package com.stockm8.domain.dto;
+
+import java.sql.Timestamp;
+
+import lombok.Data;
+
+@Data
+public class PendingUserDTO {
+
+    // 사용자 정보
+    private Long userId;
+    private String email;
+    private String userName;
+    private String userRole;
+    private String telNumber;
+    private Timestamp createdAt;
+
+    // 사업자 정보
+    private Integer businessId;
+    private String businessNumber;
+    private String businessName;
+
+}
diff --git a/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java b/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
index 8b9b686..2128934 100644
--- a/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
+++ b/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
@@ -16,7 +16,7 @@ public class UserVO {
     private String email;          // 사용자 이메일(로그인 ID)
     private String password;       // 사용자 비밀번호
     private String userName;       // 사용자 이름
-    private UserRole userRole;     // 사용자 역할 (admin, manager, staff)
+    private UserRole userRole;     // 사용자 역할 (ADMIN, MANAGER, STAFF)
     private Integer businessId;    // 사업자 고유 ID (NULL 가능)
     private String telNumber;      // 사용자 전화번호
     private Integer createdBy;     // 계정을 승인한 사용자 ID
@@ -24,7 +24,6 @@ public class UserVO {
     private Timestamp updatedAt;   // 계정 수정 날짜
     private UserStatus userStatus; // 계정 상태 (approved, pending, rejected)
     private Boolean isDeleted;     // 삭제 여부 (true/false)
-
 }
 
 
diff --git a/stockMate/src/main/java/com/stockm8/interceptor/AdminInterceptor.java b/stockMate/src/main/java/com/stockm8/interceptor/AdminInterceptor.java
new file mode 100644
index 0000000..d76101b
--- /dev/null
+++ b/stockMate/src/main/java/com/stockm8/interceptor/AdminInterceptor.java
@@ -0,0 +1,100 @@
+package com.stockm8.interceptor;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.stockm8.domain.enums.UserRole;
+import com.stockm8.domain.vo.UserVO;
+import com.stockm8.service.UserService;
+
+@Component
+public class AdminInterceptor implements HandlerInterceptor {
+
+	private static final Logger logger = LoggerFactory.getLogger(AdminInterceptor.class);
+	
+	@Autowired
+	private UserService userService; // 유저 정보를 가져오기 위한 서비스 클래스
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+	    HttpSession session = request.getSession(false);
+	    Long userId = (session != null) ? (Long) session.getAttribute("userId") : null;
+
+	    // 1. 세션에서 사용자 ID 확인
+	    if (userId == null) {
+	        logger.warn("세션에 유저 ID가 없습니다. 로그인 페이지로 이동합니다.");
+	        saveRequestedUrlToSession(request);
+	        return sendErrorMessage(request, response, "세션이 만료되었습니다. 다시 로그인해주세요.", "/user/signin");
+	    }
+
+	    // 2. DB에서 사용자 정보 조회
+	    UserVO user = userService.getUserById(userId);
+	    if (user == null) {
+	        logger.warn("해당 유저({}) 정보를 찾을 수 없습니다. 회원가입 페이지로 이동합니다.", userId);
+	        return sendErrorMessage(request, response, "유저 정보를 찾을 수 없습니다. 회원가입을 진행해주세요.", "/user/signup");
+	    }
+
+	    // 3. 삭제된 계정 확인
+	    if (Boolean.TRUE.equals(user.getIsDeleted())) {
+	        logger.warn("삭제된 유저({})입니다. 로그인 페이지로 이동합니다.", userId);
+	        return sendErrorMessage(request, response, "삭제된 계정입니다. 관리자에게 문의해주세요.", "/user/signin");
+	    }
+
+	    // 4. 관리자 권한 확인
+	    if (user.getUserRole() != UserRole.ADMIN) {
+	        logger.warn("권한 없는 접근 시도 (유저 ID: {}, 역할: {}).", userId, user.getUserRole());
+	        return sendErrorMessage(request, response, "관리자 전용 페이지입니다. 접근 권한이 없습니다.", "/user/signin");
+	    }
+
+	    // 검증 성공: 사용자 정보 저장
+	    logger.info("관리자 확인 완료 (유저 ID: {}, 이름: {}).", userId, user.getUserName());
+	    request.setAttribute("currentUser", user);
+	    return true;
+	}
+
+	/**
+	 * 에러 메시지와 함께 리다이렉트 처리
+	 */
+	private boolean sendErrorMessage(HttpServletRequest request, HttpServletResponse response, String message, String redirectUrl) throws IOException {
+	    request.getSession().setAttribute("errorMessage", message);
+	    response.sendRedirect(request.getContextPath() + redirectUrl);
+	    return false; // 요청 중단
+	}
+
+	/**
+	 * 요청한 URL을 세션에 저장 (로그인 후 리다이렉트를 위해)
+	 */
+	private void saveRequestedUrlToSession(HttpServletRequest request) {
+	    String requestedUrl = request.getRequestURI();
+	    String queryString = request.getQueryString();
+	    if (queryString != null) {
+	        requestedUrl += "?" + queryString;
+	    }
+	    request.getSession().setAttribute("requestedUrl", requestedUrl);
+	}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+	
+}
diff --git a/stockMate/src/main/java/com/stockm8/interceptor/AuthorizationInterceptor.java b/stockMate/src/main/java/com/stockm8/interceptor/AuthorizationInterceptor.java
index 28a2a5f..9739ae3 100644
--- a/stockMate/src/main/java/com/stockm8/interceptor/AuthorizationInterceptor.java
+++ b/stockMate/src/main/java/com/stockm8/interceptor/AuthorizationInterceptor.java
@@ -83,7 +83,6 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         
         logger.info("유효한 사용자 확인 (유저 ID: {}, 회사 ID: {})", userId, user.getBusinessId());
         return true; // 유효성 검사 통과
-        
 	}
 	
 	// 원래 요청 URL 저장 메서드
diff --git a/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java b/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
index 85d296d..fda445f 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
@@ -4,8 +4,8 @@
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
+import com.stockm8.domain.dto.PendingUserDTO;
 import com.stockm8.domain.vo.UserVO;
 
 
@@ -19,6 +19,9 @@ public interface UserDAO {
 
     // 회원정보 조회동작
     public UserVO getUser(Long userId , String password); //
+    
+    // 조건에 맞는 pending 회원 리스트와 사업자 정보 가져오기
+    public List<PendingUserDTO> selectPendingUsersWithBusiness();
 
     // 회원정보 수정동작
     public void updateUser (UserVO user);
diff --git a/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java b/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
index c81d567..2bbbc04 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
+import com.stockm8.domain.dto.PendingUserDTO;
 import com.stockm8.domain.vo.UserVO;
 
 @Repository
@@ -50,6 +51,16 @@ public UserVO getUser(Long userId, String password) {
 	    // 비밀번호와 사용자 ID를 사용하여 조회
 	    return sqlSession.selectOne(NAMESPACE + "getUser", params);
 	}
+	
+	@Override
+	public UserVO getUserInfoById(Long userId) throws Exception {
+	    return sqlSession.selectOne("UserMapper.getUserInfoById", userId);
+	}
+
+	@Override
+	public List<PendingUserDTO> selectPendingUsersWithBusiness() {
+		return sqlSession.selectList(NAMESPACE + "selectPendingUsersWithBusiness");
+	}
 
 	@Override
 	public void updateUser(UserVO user) {
@@ -61,10 +72,7 @@ public void updateUser(UserVO user) {
 		   
 	}
 	
-	@Override
-	public UserVO getUserInfoById(Long userId) throws Exception {
-	    return sqlSession.selectOne("UserMapper.getUserInfoById", userId);
-	}
+
 
 	@Override
 	public void updatePassword(Long userId, String newPassword) {
diff --git a/stockMate/src/main/java/com/stockm8/service/UserService.java b/stockMate/src/main/java/com/stockm8/service/UserService.java
index f41df29..18d72ec 100644
--- a/stockMate/src/main/java/com/stockm8/service/UserService.java
+++ b/stockMate/src/main/java/com/stockm8/service/UserService.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.stockm8.domain.vo.BusinessVO;
+import com.stockm8.domain.dto.PendingUserDTO;
 import com.stockm8.domain.vo.UserVO;
 
 public interface UserService {
@@ -18,6 +18,9 @@ public interface UserService {
    // 회원정보 조회
    public UserVO getUser(Long userId,String password) throws Exception;
    
+   // 조건에 맞는 pending 회원 리스트와 사업자 정보 가져오기
+   public List<PendingUserDTO> getPendingUsersWithBusiness() throws Exception;
+   
    // 회원정보 수정
    public void updateUser(UserVO user) throws Exception;
    
diff --git a/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
index bf9b4f9..1b28c8a 100644
--- a/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
+++ b/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.stockm8.domain.dto.PendingUserDTO;
 import com.stockm8.domain.vo.BusinessVO;
 import com.stockm8.domain.vo.UserVO;
 import com.stockm8.persistence.BusinessDAO;
@@ -47,6 +48,11 @@ public UserVO getUser(Long userId, String password) throws Exception {
 		return userDAO.getUser(userId, password);
 	}
 	
+	@Override
+	public List<PendingUserDTO> getPendingUsersWithBusiness() throws Exception {		// TODO Auto-generated method stub
+        return userDAO.selectPendingUsersWithBusiness();
+	}
+
 	// 회원 정보 수정 
 	@Override
 	public void updateUser(UserVO user) throws Exception {
diff --git a/stockMate/src/main/resources/log4j.xml b/stockMate/src/main/resources/log4j.xml
index 5df8957..1e1d52e 100644
--- a/stockMate/src/main/resources/log4j.xml
+++ b/stockMate/src/main/resources/log4j.xml
@@ -11,6 +11,10 @@
 	</appender>
 	
 	<!-- Application Loggers -->
+	<logger name="com.stockm8.interceptor">
+		<level value="info" />
+	</logger>
+	
 	<logger name="com.stockm8.controller">
 		<level value="info" />
 	</logger>
@@ -23,6 +27,7 @@
 		<level value="info" />
 	</logger>
 	
+	
 	<!-- 3rdparty Loggers -->
 	<logger name="org.springframework.core">
 		<level value="info" />
diff --git a/stockMate/src/main/resources/mappers/userMapper.xml b/stockMate/src/main/resources/mappers/userMapper.xml
index 5d01627..ef5ae3b 100644
--- a/stockMate/src/main/resources/mappers/userMapper.xml
+++ b/stockMate/src/main/resources/mappers/userMapper.xml
@@ -71,6 +71,24 @@
 		FROM users
 		WHERE user_id = #{userId}
 	</select>
+	
+   <!-- 역할이 ADMIN 또는 MANAGER이고 상태가 pending이며 isDeleted가 false인 회원 리스트 조회 -->
+    <select id="selectPendingUsersWithBusiness" resultType="com.stockm8.domain.dto.PendingUserDTO">
+        SELECT u.user_id, 
+               u.email, 
+               u.user_name, 
+               u.user_role, 
+               u.tel_number, 
+               u.created_at, 
+               b.business_id, 
+               b.business_number, 
+               b.business_name
+        FROM users u
+        LEFT JOIN business b ON u.business_id = b.business_id
+        WHERE u.user_role IN ('ADMIN', 'MANAGER')
+          AND u.user_status = 'PENDING'
+          AND u.is_deleted = FALSE
+    </select>
 
 	<!-- 회원정보 수정 -->
 	<update id="updateUser">
diff --git a/stockMate/src/main/webapp/WEB-INF/views/admin/approve.jsp b/stockMate/src/main/webapp/WEB-INF/views/admin/approve.jsp
new file mode 100644
index 0000000..2de5a16
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/admin/approve.jsp
@@ -0,0 +1,38 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <title>승인 대기 사용자 리스트</title>
+</head>
+<body>
+<h1>승인 대기 사용자 리스트</h1>
+<table border="1">
+    <thead>
+        <tr>
+            <th>사용자 ID</th>
+            <th>이메일</th>
+            <th>이름</th>
+            <th>역할</th>
+            <th>전화번호</th>
+            <th>사업자등록번호</th>
+            <th>회사명</th>
+            <th>가입 날짜</th>
+        </tr>
+    </thead>
+    <tbody>
+        <c:forEach var="user" items="${pendingUsers}">
+            <tr>
+                <td>${user.userId}</td>
+                <td>${user.email}</td>
+                <td>${user.userName}</td>
+                <td>${user.userRole}</td>
+                <td>${user.telNumber}</td>
+                <td>${user.businessNumber}</td>
+                <td>${user.businessName}</td>
+                <td>${user.createdAt}</td>
+            </tr>
+        </c:forEach>
+    </tbody>
+</table>
+</body>
+</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/admin/adminMain.jsp b/stockMate/src/main/webapp/WEB-INF/views/admin/main.jsp
similarity index 80%
rename from stockMate/src/main/webapp/WEB-INF/views/admin/adminMain.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/admin/main.jsp
index eed9545..9bc16cc 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/admin/adminMain.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/admin/main.jsp
@@ -47,14 +47,14 @@
 	
 	<!-- 버튼 영역 -->
     <div class="container">
-        <form action="adminMemberEdit.jsp" method="post">
-            <button type="submit">회원 수정 및 삭제</button>
+        <form action="admin/approve" method="get">
+            <button type="submit">가입 승인</button>
         </form>
-        <form action="adminMemberList.jsp" method="get">
-            <button type="submit">회원 전체 목록 조회</button>
+        <form action="admin/userList" method="get">
+            <button type="submit">회원 목록 조회</button>
         </form>
-        <form action="adminRegistrationApproval.jsp" method="post">
-            <button type="submit">회원가입 승인</button>
+		<form action="admin/edit" method="get">
+            <button type="submit">회원 수정 및 삭제</button>
         </form>
     </div>
 
diff --git a/stockMate/src/main/webapp/WEB-INF/views/admin/adminList.jsp b/stockMate/src/main/webapp/WEB-INF/views/admin/userList.jsp
similarity index 100%
rename from stockMate/src/main/webapp/WEB-INF/views/admin/adminList.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/admin/userList.jsp
diff --git a/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp b/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
index dc12105..c24a202 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
@@ -1,39 +1,76 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>카테고리 등록</title>
-<link rel="stylesheet" href="<c:url value='/resources/css/CategoryregistStyle.css' />">
-<link rel="stylesheet" href="<c:url value='/resources/css/modalStyle.css' />">
+<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle2.css' />">
+<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle2.css' />">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const form = document.querySelector("form");
+        const submitButton = document.querySelector("button[type='submit']");
+        const spinner = document.querySelector(".spinner");
+
+        // 실시간 입력 검증
+        const categoryNameInput = document.getElementById("categoryName");
+        categoryNameInput.addEventListener("input", function () {
+            const feedback = document.getElementById("name-feedback");
+            if (this.value.length < 2) {
+                feedback.textContent = "카테고리 이름은 최소 2글자 이상이어야 합니다.";
+                this.style.borderColor = "#ff4d4d";
+            } else {
+                feedback.textContent = "";
+                this.style.borderColor = "#28a745";
+            }
+        });
+
+        // 폼 제출 시 로딩 효과
+        form.addEventListener("submit", function () {
+            submitButton.classList.add("loading");
+            submitButton.textContent = "등록 중...";
+            spinner.style.display = "block";
+        });
+    });
+</script>
 </head>
 <body>
-	
-	<form action="/category/register" method="post">
-		<h2>카테고리 등록 페이지</h2>
-	    <!-- 상위 카테고리 선택 -->
-	    <label for="parentCategoryId">상위 카테고리:</label>
-	    <select id="parentCategoryId" name="parentId">
-	        <option value="">-- 상위 카테고리 선택 --</option>
-	        <c:forEach var="cat" items="${categoryList}">
-	            <option value="${cat.categoryId}">${cat.categoryName}</option>
-	        </c:forEach>
-	    </select>
-	
-	    <!-- 카테고리 이름 -->
-	    <label for="categoryName">카테고리 이름:</label>
-	    <input type="text" id="categoryName" name="categoryName" required />
-	
-	    <!-- 숨겨진 사업자 ID -->
-	    <input type="hidden" id="businessId" name="businessId" value="${sessionScope.businessId}" />
-	
-	    <!-- 등록 버튼 -->
-	    <button type="submit">등록</button> <br>
-	    <a href="/category/list" class="btn btn-primary">카테고리 리스트로 이동</a>
-	</form>
-
-	
+    <!-- 카테고리 리스트 이동 버튼 -->
+
+	<div class="container fade-in">
+		<button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드</button>
+		<button class="category-link-button" onclick="location.href='/category/list';" >카테고리 리스트</button>
+        <h2>카테고리 등록 페이지</h2>
+
+        <form action="/category/register" method="post">
+            <!-- 상위 카테고리 선택 -->
+            <label for="parentCategoryId">상위 카테고리:</label>
+            <select id="parentCategoryId" name="parentId" required>
+                <option value="">-- 상위 카테고리 선택 --</option>
+                <c:forEach var="cat" items="${categoryList}">
+                    <option value="${cat.categoryId}">${cat.categoryName}</option>
+                </c:forEach>
+            </select>
+
+            <!-- 카테고리 이름 -->
+            <label for="categoryName">카테고리 이름:</label>
+            <input type="text" id="categoryName" name="categoryName" required />
+            <div id="name-feedback" style="color: #ff4d4d; font-size: 12px;"></div>
+
+            <!-- 숨겨진 사업자 ID -->
+            <input type="hidden" id="businessId" name="businessId" value="${sessionScope.businessId}" />
+
+            <!-- 등록 버튼 -->
+            <button type="submit" class="primary-button">등록</button>
+            <div class="spinner"></div>
+        </form>
+
+    </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
index 731b04a..b678aab 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
@@ -5,7 +5,7 @@
 <html lang="ko">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">    
     <title>대시보드</title>
     <style>
         /* Reset and Global Styles */
@@ -88,6 +88,76 @@
             background-color: #003f8c;
             transform: translateY(-5px);
         }
+		
+		/* Dropdown Menu - Horizontal Styling */
+		.menu-dropdown {
+		    position: relative;
+		    display: inline-block;
+		}
+		
+		.dropdown-btn {
+		    display: block;
+		    padding: 10px 20px;
+		    font-size: 16px;
+		    font-weight: bold;
+		    color: #fff;
+		    background-color: #007BFF;
+		    border-radius: 5px;
+		    text-decoration: none;
+		    cursor: pointer;
+		    text-align: center;
+		    transition: background-color 0.3s, transform 0.2s;
+		}
+		
+		.dropdown-btn:hover {
+		    background-color: #0056b3;
+		    transform: translateY(-3px);
+		}
+		
+		/* Horizontal Dropdown Content */
+		.dropdown-content {
+		    display: none;
+		    position: absolute;
+		    top: 0;
+		    left: 100%; /* 옆으로 펼쳐지도록 설정 */
+		    background-color: #ffffff;
+		    border: 1px solid #ddd;
+		    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+		    white-space: nowrap; /* 글자가 줄바꿈되지 않도록 설정 */
+		    border-radius: 5px;
+		    z-index: 1000;
+		}
+		
+		.dropdown-content a {
+		    display: block;
+		    padding: 10px 15px;
+		    font-size: 14px;
+		    font-weight: 500;
+		    color: #333;
+		    text-decoration: none;
+		    transition: background-color 0.3s, color 0.3s;
+		}
+		
+		.dropdown-content a:hover {
+		    background-color: #f0f0f0;
+		    color: #007BFF;
+		}
+		
+		/* Show the Dropdown */
+		.menu-dropdown:hover .dropdown-content {
+		    display: block;
+		}
+		
+		@keyframes fadeIn {
+		    from {
+		        opacity: 0;
+		        transform: translateY(-10px);
+		    }
+		    to {
+		        opacity: 1;
+		        transform: translateY(0);
+		    }
+		}
 
         /* Sidebar */
         .sidebar {
@@ -181,22 +251,29 @@
             <a href="/receiving/main">입고</a>
             <a href="/shipment/main">출고</a>
             <a href="/stock/list">재고</a>
-            <a href="/admin/adminMain">관리자 페이지</a>
+            <a href="/admin/main">관리자 페이지</a>
         </div>
 
         <!-- Content Section -->
         <div class="content">
-            <!-- Sidebar -->
-            <div class="sidebar">
-                <div class="disabled">Dashboard</div>
-				<a href="warehouse/register">창고 등록</a>
-				<a href="stock/register">재고 등록</a>
-                <a href="product/register">상품 등록</a>
-                <a href="user/editinfo1">내정보 조회/수정</a>
-                <a href="user/changepassword1">비밀번호 변경</a>
-                <a href="user/howtouse2">대시보드 사용법</a>
-                <a href="user/signout" style="color: red;">Sign out</a>
-                <a href="user/main" onclick="return confirmLogout();" style="color: red;">Sign out</a>
+			<!-- Sidebar -->
+			<div class="sidebar fade-in">
+			    <!-- 등록페이지 드롭다운 메뉴 -->
+			    <div class="menu-dropdown">
+			        <a href="#" class="dropdown-btn">등록페이지</a>
+			        <ul class="dropdown-content">
+			            <li><a href="warehouse/register">창고 등록</a></li>
+			            <li><a href="category/register">카테고리 등록</a></li>
+			            <li><a href="product/register">상품 등록</a></li>
+			            <li><a href="stock/register">재고 등록</a></li>
+			        </ul>
+			    </div>
+				    <!-- 기타 메뉴 -->
+				    <a href="user/editinfo1">내정보 조회/수정</a>
+				    <a href="user/changepassword1">비밀번호 변경</a>
+				    <a href="user/howtouse2">대시보드 사용법</a>
+				    <a href="user/signout" class="signout" style="color: red;">Sign out</a>
+				</div>
 			<script>
 			function confirmLogout() {
 			    alert("로그아웃 되었습니다");
@@ -254,6 +331,31 @@
                 }]
             }
         });
+        
+        document.addEventListener("DOMContentLoaded", function () {
+            const dropdownBtn = document.querySelector('.dropdown-btn');
+            const dropdownContent = document.querySelector('.dropdown-content');
+            let isDropdownVisible = false;
+
+            dropdownBtn.addEventListener('click', (e) => {
+                e.preventDefault();
+                isDropdownVisible = !isDropdownVisible;
+
+                if (isDropdownVisible) {
+                    dropdownContent.style.display = 'block';
+                } else {
+                    dropdownContent.style.display = 'none';
+                }
+            });
+
+            // 다른 영역 클릭 시 드롭다운 닫기
+            document.addEventListener('click', (e) => {
+                if (!dropdownBtn.contains(e.target) && !dropdownContent.contains(e.target)) {
+                    dropdownContent.style.display = 'none';
+                    isDropdownVisible = false;
+                }
+            });
+        });
     </script>
 </body>
 </html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/product/detail.jsp b/stockMate/src/main/webapp/WEB-INF/views/product/detail.jsp
index b80bc6f..79766cc 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/product/detail.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/product/detail.jsp
@@ -5,6 +5,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>상품 상세 정보</title>
     <link rel="stylesheet" href="<c:url value='/resources/css/warehouseDetailStyle.css' />">
 </head>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/product/register.jsp b/stockMate/src/main/webapp/WEB-INF/views/product/register.jsp
index b8e2a8f..fc05640 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/product/register.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/product/register.jsp
@@ -4,65 +4,71 @@
 <!DOCTYPE html>
 <html lang="ko">
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>상품 등록</title>
-<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle.css' />">
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>상품 등록</title>
+<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle2.css' />">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 </head>
 <body>
-    <div class="container">
-        <button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드로 돌아가기</button>
-        <h1>상품 등록</h1>
-        <form method="post" action="/product/register">
-            <!-- 카테고리 선택 -->
-            <label for="categoryId">카테고리 선택</label>
-            <div class="category-group">
-                <select id="categoryId" name="categoryId" required>
-                    <option value="">-- 카테고리 선택 --</option>
-                    <c:forEach var="cat" items="${categoryList}">
-                        <option value="${cat.categoryId}">${cat.categoryName}</option>
-                    </c:forEach>
-                </select>
-                <a href="/category/register" class="category-link">새로운 카테고리 등록</a>
-            </div>
+	<div class="container fade-in">
+		<button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드</button>
+		<h1>상품 등록</h1>
+		<form method="post" action="/product/register">
+			<!-- 카테고리 선택 -->
+			<label for="categoryId">카테고리 선택</label>
+			<div class="category-group">
+				<select id="categoryId" name="categoryId" required>
+					<option value="">-- 카테고리 선택 --</option>
+					<c:forEach var="cat" items="${categoryList}">
+						<option value="${cat.categoryId}">${cat.categoryName}</option>
+					</c:forEach>
+				</select> 
+				<a href="/category/register" class="category-link">새로운 카테고리 등록</a>
+			</div>
 
-            <!-- 상품명 -->
-            <label for="productName">상품명</label>
-            <input type="text" id="productName" name="productName" required placeholder="예: 무선 마우스">
+			<!-- 상품명 -->
+			<label for="productName">상품명</label> 
+			<input type="text" id="productName" name="productName" required placeholder="예: 무선 마우스">
 
-            <!-- 바코드 -->
-            <label for="productBarcode">바코드</label>
-            <div class="barcode-group">
-                <input type="text" id="productBarcode" name="productBarcode" placeholder="예: 1234567890123" pattern="\d{13}">
-                <button type="button" id="generateBarcode" class="barcode-btn">자동 생성</button>
-            </div>
+			<!-- 바코드 -->
+			<label for="productBarcode">바코드</label>
+			<div class="barcode-group">
+				<input type="text" id="productBarcode" name="productBarcode"
+					placeholder="예: 1234567890123" pattern="\d{13}">
+				<button type="button" id="generateBarcode" class="barcode-btn">자동
+					생성</button>
+			</div>
 
-            <!-- 기본 단위 -->
-            <label for="baseUnit">기본 단위</label>
-            <input type="text" id="baseUnit" name="baseUnit" required placeholder="예: 박스">
+			<!-- 기본 단위 -->
+			<label for="baseUnit">기본 단위</label> <input type="text" id="baseUnit"
+				name="baseUnit" required placeholder="예: 박스">
 
-            <!-- 세트 크기 -->
-            <label for="setSize">세트 크기</label>
-            <input type="number" id="setSize" name="setSize" required placeholder="예: 10 (한 세트 당 10개)">
+			<!-- 세트 크기 -->
+			<label for="setSize">세트 크기</label> <input type="number" id="setSize"
+				name="setSize" required placeholder="예: 10 (한 세트 당 10개)">
 
-            <!-- 기본 단가 -->
-            <label for="productPrice">기본 단가</label>
-            <input type="number" id="productPrice" name="productPrice" required placeholder="예: 15000">
+			<!-- 기본 단가 -->
+			<label for="productPrice">기본 단가</label> <input type="number"
+				id="productPrice" name="productPrice" required
+				placeholder="예: 15000">
 
-            <!-- 상품 설명 -->
-            <label for="productDescription">상품 설명</label>
-            <textarea id="productDescription" name="productDescription" rows="4" placeholder="상품에 대한 추가 설명을 입력하세요."></textarea>
+			<!-- 상품 설명 -->
+			<label for="productDescription">상품 설명</label>
+			<textarea id="productDescription" name="productDescription" rows="4"
+				placeholder="상품에 대한 추가 설명을 입력하세요."></textarea>
 
-		    <!-- 버튼 그룹 -->
-		    <div class="button-group">
-		        <button type="submit" class="primary-button">등록</button>
-		    </div>
-		    <div class="button-group">
-		        <button type="reset" class="secondary-button">초기화</button>
-		    </div>
-   		 </div>
-    <script>
+			<!-- 버튼 그룹 -->
+			<div class="button-group">
+				<button type="submit" class="primary-button">등록</button>
+				<button type="reset" class="secondary-button">초기화</button>
+			</div>
+		</form>
+	</div>
+	<script>
 	    function generateEAN13Barcode() {
 	        const countryCode = [8, 8, 0];
 	        const randomDigits = Array.from({ length: 9 }, () => Math.floor(Math.random() * 10));
diff --git a/stockMate/src/main/webapp/WEB-INF/views/stock/list.jsp b/stockMate/src/main/webapp/WEB-INF/views/stock/list.jsp
index 528c824..dde97ad 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/stock/list.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/stock/list.jsp
@@ -6,6 +6,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>재고 리스트</title>
     <link rel="stylesheet" href="<c:url value='/resources/css/stockListStyle.css' />">
 </head>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/stock/register.jsp b/stockMate/src/main/webapp/WEB-INF/views/stock/register.jsp
index db57e1e..c09e31e 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/stock/register.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/stock/register.jsp
@@ -6,12 +6,14 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>재고 등록</title>
-<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"> -->
-<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle.css' />">
+<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle2.css' />">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="<c:url value='/resources/css/modalStyle.css' />">
 </head>
 <body>
-    <div class="container">
+    <div class="container fade-in">
         <button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드로 돌아가기</button>
         <button class="dashboard-btn" onclick="location.href='/stock/list';">재고 리스트</button>
         <h1>재고 등록</h1>
@@ -45,36 +47,49 @@
         </form>
         <div class="spinner" id="globalSpinner"></div>
     </div>
-    <!-- 상품 목록 모달 -->
-    <div class="modal-backdrop" id="productModal">
-        <div class="modal-container">
-            <div class="modal-header">
-                <h5 class="modal-title">상품 선택</h5>
-                <button class="close" id="closeProductModal">&times;</button>
-            </div>
-            <div class="modal-body">
-                <div class="search-field">
-                    <input type="text" id="productSearch" placeholder="상품명 검색...">
-                    <i class="fa fa-search"></i>
-                </div>
-                <div class="spinner" id="productSpinner"></div>
-                <table class="table hidden" id="productTable">
-                    <thead>
-                        <tr>
-                            <th>바코드</th>
-                            <th>상품명</th>
-                            <th>단위</th>
-                            <th>세트크기</th>
-                            <th>단가</th>
-                            <th>선택</th>
-                        </tr>
-                    </thead>
-                    <tbody id="productListBody"></tbody>
-                </table>
-                <div id="noProductMsg" class="hidden" style="text-align:center; margin-top:20px; color:#666;">상품이 없습니다.</div>
-            </div>
-        </div>
-    </div>
+	<!-- 상품 목록 모달 -->
+	<div class="modal-backdrop" id="productModal">
+	    <div class="modal-container">
+	        <!-- 모달 헤더 -->
+	        <div class="modal-header">
+	            <h5 class="modal-title">상품 선택</h5>
+	            <!-- X 버튼: 오른쪽 상단에 배치 -->
+	            <button class="close" id="closeProductModal">&times;</button>
+	        </div>
+	
+	        <!-- 모달 바디 -->
+	        <div class="modal-body">
+	            <!-- 검색 필드: 테이블 우측 상단에 배치 -->
+            	<div class="search-container">
+	                <input type="text" id="productSearch" placeholder="상품명 검색..." class="search-input">
+	                <i class="fa fa-search search-icon"></i>
+	            </div>
+	
+	            <!-- 로딩 스피너 -->
+	            <div class="spinner hidden" id="productSpinner"></div>
+	
+	            <!-- 상품 목록 테이블 -->
+	            <div class="table-container">
+	                <table class="table" id="productTable">
+	                    <thead>
+	                        <tr>
+	                            <th>바코드</th>
+	                            <th>상품명</th>
+	                            <th>단위</th>
+	                            <th>세트크기</th>
+	                            <th>단가</th>
+	                            <th>선택</th>
+	                        </tr>
+	                    </thead>
+	                    <tbody id="productListBody"></tbody>
+	                </table>
+	            </div>
+	
+	            <!-- 상품이 없을 때 메시지 -->
+	            <div id="noProductMsg" class="hidden">상품이 없습니다.</div>
+	        </div>
+	    </div>
+	</div>
 
 	<script>
 	document.addEventListener('DOMContentLoaded', () => {
diff --git a/stockMate/src/main/webapp/WEB-INF/views/warehouse/register.jsp b/stockMate/src/main/webapp/WEB-INF/views/warehouse/register.jsp
index b19b07c..5e7df79 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/warehouse/register.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/warehouse/register.jsp
@@ -3,10 +3,46 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>창고 등록</title>
-    <link rel="stylesheet" href="<c:url value='/resources/css/registerStyle.css' />">
-    <link rel="stylesheet" href="<c:url value='/resources/css/toastStyle.css' />">
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>창고 등록</title>
+<link rel="stylesheet" href="<c:url value='/resources/css/registerStyle2.css' />">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
+<link rel="stylesheet" href="<c:url value='/resources/css/toastStyle.css' />">
+</head>
+<body>
+    <div class="container">
+        <button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드로 돌아가기</button>
+        <h1>창고 등록</h1>
+        <form action="registerWarehouse" method="post">
+            <!-- 사용자 ID와 비즈니스 ID -->
+            <input type="hidden" name="userId" value="${userId}">
+            <input type="hidden" name="businessId" value="${businessId}">
+            
+            <label for="warehouseName">창고 이름</label>
+            <input type="text" id="warehouseName" name="warehouseName" required autofocus>
+			
+            <label for="warehouseRegion">창고 지역</label>
+            <input type="text" id="warehouseRegion" name="warehouseRegion">
+            
+            <label for="warehouseLocation">상세 주소</label>
+            <input type="text" id="warehouseLocation" name="warehouseLocation" required>
+
+            <label for="warehouseCapacity">창고 용량</label>
+            <input type="number" id="warehouseCapacity" name="warehouseCapacity" min="0">
+
+            <label for="warehouseDescription">창고 상세 설명</label>
+            <input type="text" id="warehouseDescription" name="warehouseDescription">
+
+			<!-- 버튼 그룹 -->
+			<div class="button-group">
+				<button type="submit" class="primary-button">등록</button>
+				<button type="reset" class="secondary-button">초기화</button>
+			</div>
+        </form>
+    </div>
     <script>
         document.addEventListener("DOMContentLoaded", function () {
             const form = document.querySelector("form");
@@ -75,39 +111,5 @@
             }, 4000); // 4초 후 사라짐
         }
     </script>
-</head>
-<body>
-    <div class="container">
-        <button class="dashboard-btn" onclick="location.href='/dashboard';">대시보드로 돌아가기</button>
-        <h1>창고 등록</h1>
-        <form action="registerWarehouse" method="post">
-            <!-- 사용자 ID와 비즈니스 ID -->
-            <input type="hidden" name="userId" value="${userId}">
-            <input type="hidden" name="businessId" value="${businessId}">
-            
-            <label for="warehouseName">창고 이름</label>
-            <input type="text" id="warehouseName" name="warehouseName" required autofocus>
-			
-            <label for="warehouseRegion">창고 지역</label>
-            <input type="text" id="warehouseRegion" name="warehouseRegion">
-            
-            <label for="warehouseLocation">상세 주소</label>
-            <input type="text" id="warehouseLocation" name="warehouseLocation" required>
-
-            <label for="warehouseCapacity">창고 용량</label>
-            <input type="number" id="warehouseCapacity" name="warehouseCapacity" min="0">
-
-            <label for="warehouseDescription">창고 상세 설명</label>
-            <input type="text" id="warehouseDescription" name="warehouseDescription">
-
-		    <!-- 버튼 그룹 -->
-		    <div class="button-group">
-		        <button type="submit" class="primary-button">등록</button>
-		    </div>
-		    <div class="button-group">
-		        <button type="reset" class="secondary-button">초기화</button>
-		    </div>
-        </form>
-    </div>
 </body>
 </html>
diff --git a/stockMate/src/main/webapp/resources/css/registerStyle.css b/stockMate/src/main/webapp/resources/css/registerStyle.css
index 2ab5e2d..3332c3d 100644
--- a/stockMate/src/main/webapp/resources/css/registerStyle.css
+++ b/stockMate/src/main/webapp/resources/css/registerStyle.css
@@ -442,3 +442,77 @@ form select:hover,
 form textarea:hover {
     background-color:#fdfdfd;
 }
+
+/* 실시간 입력 검증 스타일 */
+input:invalid, select:invalid {
+    border-color: #ff4d4d;
+    background-color: #fffafa;
+}
+
+input:valid, select:valid {
+    border-color: #28a745;
+}
+
+/* 스피너 스타일 */
+.spinner {
+    display: none;
+    margin: 20px auto;
+    border: 4px solid #f3f3f3;
+    border-top: 4px solid #007bff;
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+/* 입력 필드 실시간 호버 효과 */
+input:hover,
+select:hover {
+    background-color: #fdfdfd;
+    transition: background-color 0.3s ease-in-out;
+}
+
+button {
+    transition: all 0.3s ease;
+}
+
+button:hover {
+    transform: scale(1.02);
+}
+
+/* 로딩 버튼 효과 */
+button.loading {
+    pointer-events: none;
+    opacity: 0.7;
+}
+
+/* 카테고리 리스트 이동 버튼 - 왼쪽 상단 고정 및 스타일 */
+.category-link-button {
+    position: fixed; /* 화면 상단에 고정 */
+    top: 20px; /* 상단 여백 */
+    left: 20px; /* 왼쪽 여백 */
+    background-color: #007bff;
+    color: #fff;
+    padding: 10px 16px;
+    border-radius: 8px;
+    text-decoration: none;
+    font-weight: bold;
+    font-size: 14px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+    transition: background-color 0.3s ease, transform 0.2s ease;
+    z-index: 1000; /* 다른 요소 위에 표시 */
+}
+
+.category-link-button:hover {
+    background-color: #005bb5;
+    transform: translateY(-2px); /* 버튼이 위로 살짝 움직임 */
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+}
+
+
diff --git a/stockMate/src/main/webapp/resources/css/registerStyle2.css b/stockMate/src/main/webapp/resources/css/registerStyle2.css
index 0d445f9..4d3b379 100644
--- a/stockMate/src/main/webapp/resources/css/registerStyle2.css
+++ b/stockMate/src/main/webapp/resources/css/registerStyle2.css
@@ -1,10 +1,17 @@
-<style>
-body {
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-		Helvetica, Arial, sans-serif;
-	background: #f9f9f9;
+@charset "UTF-8";
+
+/* General Reset */
+* {
 	margin: 0;
 	padding: 0;
+	box-sizing: border-box;
+	font-family: 'Roboto', sans-serif;
+}
+
+body {
+	background: linear-gradient(135deg, #f3f4f6, #e2e8f0);
+	color: #333;
+	line-height: 1.6;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -13,238 +20,278 @@ body {
 
 .container {
 	background: #fff;
-	border-radius: 16px;
-	box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
-	padding: 40px;
-	width: 420px;
-	text-align: center;
-	transition: transform 0.3s, box-shadow 0.3s;
-}
-
-.container:hover {
-	transform: translateY(-5px);
-	box-shadow: 0 8px 20px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+	border-radius: 10px;
+	padding: 30px;
+	width: 100%;
+	max-width: 600px;
+	animation: fadeIn 0.8s ease-in-out;
 }
 
-h1 {
-	font-size: 26px;
-	margin-bottom: 20px;
-	color: #333;
-	font-weight: 600;
-	letter-spacing: -0.5px;
+/* Fade-In Animation */
+@keyframes fadeIn {
+	from { opacity:0;
+	transform: translateY(-10px);
 }
 
-.dashboard-btn {
-	margin-bottom: 20px;
-	padding: 12px 0;
-	background-color: #f4f4f4;
-	color: #007aff;
-	font-size: 15px;
-	font-weight: 600;
-	border: 1px solid #e1e4e8;
-	border-radius: 8px;
-	width: 100%;
-	cursor: pointer;
-	transition: all 0.3s ease-in-out;
+to {
+	opacity: 1;
+	transform: translateY(0);
 }
 
-.dashboard-btn:hover {
-	background-color: #007aff;
-	color: #fff;
-	transform: scale(1.02);
 }
-
-.form-group {
-	text-align: left;
+h1 {
+	text-align: center;
+	font-size: 2rem;
+	color: #333;
 	margin-bottom: 20px;
 }
 
-.form-group label {
-	color: #666;
-	font-size: 14px;
+label {
 	font-weight: 500;
-	margin-bottom: 5px;
+	margin-top: 10px;
 	display: block;
+	color: #555;
 }
 
-.form-control {
+input, select, textarea {
 	width: 100%;
-	padding: 12px;
-	border: 1px solid #e1e4e8;
-	border-radius: 8px;
-	font-size: 15px;
-	color: #333;
-	background: #fafafa;
-	transition: border 0.2s, box-shadow 0.2s;
+	padding: 10px;
+	margin: 8px 0 20px;
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	transition: 0.3s;
+	font-size: 1rem;
 }
 
-.form-control:focus {
+input:focus, select:focus, textarea:focus {
 	outline: none;
-	border: 1px solid #007aff;
-	box-shadow: 0 0 4px rgba(0, 122, 255, 0.5);
+	border-color: #6366f1;
+	box-shadow: 0 0 5px rgba(99, 102, 241, 0.5);
 }
 
-.primary-button, .secondary-button {
+button {
+	display: inline-block;
 	width: 100%;
-	padding: 12px;
+	padding: 10px;
+	margin-top: 10px;
+	background: #6366f1;
+	color: #fff;
 	border: none;
-	border-radius: 8px;
-	font-size: 16px;
-	font-weight: bold;
+	border-radius: 5px;
 	cursor: pointer;
-	transition: background-color 0.3s ease-in-out;
+	font-size: 1rem;
+	font-weight: 500;
+	transition: all 0.3s;
 }
 
-.primary-button {
-	background: #007bff;
-	color: #fff;
+button:hover {
+	background: #4f46e5;
 }
 
-.primary-button:hover {
-	background: #005bb5;
+.button-group {
+	display: flex;
+	justify-content: space-between;
 }
 
-.secondary-button {
-	background: #f3f3f3;
-	color: #333;
+.button-group button {
+	width: 48%;
 }
 
-.secondary-button:hover {
-	background: #e1e4e8;
+.category-link {
+	color: #6366f1;
+	text-decoration: none;
+	font-weight: 500;
+	transition: 0.3s;
 }
 
-.mt-2 {
-	margin-top: 10px !important;
+.category-link:hover {
+	color: #4f46e5;
+	text-decoration: underline;
 }
 
-/* 모달(커스텀) */
-.modal-backdrop {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: rgba(0, 0, 0, 0.5);
-	display: none;
-	justify-content: center;
-	align-items: center;
-	z-index: 9999;
+.barcode-btn {
+	background: #6366f1;
+	color: #fff;
+	border: none;
+	border-radius: 5px;
+	padding: 8px 12px;
+	cursor: pointer;
+	transition: background 0.3s ease-in-out;
 }
 
-.modal-backdrop.active {
-	display: flex;
+.barcode-btn:hover {
+	background: #4f46e5;
 }
 
-.modal-container {
-	background: #fff;
-	border-radius: 12px;
-	box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
-	width: 90%;
-	max-width: 600px;
-	max-height: 80%;
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
+/* Fade-In Animation Class */
+.fade-in {
+	animation: fadeIn 0.8s ease-in-out;
 }
 
-.modal-header, .modal-footer {
-	padding: 16px;
-	background: #f5f5f5;
+/* 모달 컨테이너 */
+.modal-container {
+    position: relative;
+    padding: 20px;
+    background: #fff;
+    border-radius: 10px;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
+    max-width: 800px;
+    margin: 50px auto; /* 모달 중앙 배치 */
+    animation: fadeIn 0.5s ease-in-out;
 }
 
+/* 모달 헤더 */
 .modal-header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-
-.modal-header h5 {
-	margin: 0;
-	font-size: 18px;
-	font-weight: bold;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
 }
 
-.modal-header .close {
-	background: none;
-	border: none;
-	font-size: 20px;
-	cursor: pointer;
-	line-height: 1;
+/* 모달 타이틀 */
+.modal-title {
+    font-size: 16px; /* 글자 크기 축소 */
+    font-weight: bold;
+    margin: 0;
+    color: #333;
 }
 
+/* 모달 바디를 relative로 설정 */
 .modal-body {
-	padding: 16px;
-	overflow: auto;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-}
-
-.table {
-	width: 100%;
-	border-collapse: collapse;
-	margin-top: 10px;
-}
-
-.table th, .table td {
-	border: 1px solid #e1e4e8;
-	padding: 8px;
-	font-size: 14px;
-	text-align: left;
+    position: relative;
+    padding: 20px;
+}
+
+/* X 버튼: 오른쪽 상단에 위치 */
+.close {
+    font-size: 18px; /* X 버튼 크기 축소 */
+    width: 24px; /* 버튼 크기 명시적으로 설정 */
+    height: 24px;
+    color: #555;
+    border: none;
+    background: none;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: color 0.3s ease;
+    position: absolute; /* 오른쪽 상단에 배치 */
+    top: 10px;
+    right: 10px;
+}
+
+
+.close:hover {
+    color: #d32f2f;
+}
+
+/* 검색창 스타일 */
+.search-container {
+    display: flex;
+    align-items: center;
+    position: absolute; /* 테이블 상단 우측에 배치 */
+    top: 10px;
+    right: 20px;
+    width: 250px; /* 검색창 너비 */
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 20px; /* 둥근 형태 */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    padding: 5px 10px;
+    z-index: 10;
+}
+
+/* 검색 필드 우측 상단 배치 */
+/* .search-field { */
+/*     position: absolute; 부모를 기준으로 절대 위치 */
+/*     top: 20px; 위에서 20px 여백 */
+/*     right: 30px; 우측 정렬 */
+/*     background-color: #fff; */
+/*     border: 1px solid #ddd; */
+/*     border-radius: 20px; */
+/*     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
+/*     display: flex; */
+/*     align-items: center; */
+/*     padding: 5px 10px; */
+/*     width: 250px; */
+/*     z-index: 10; 다른 요소 위에 표시 */
+/* } */
+
+/* 검색 입력 필드 */
+.search-input {
+    border: none;
+    outline: none;
+    font-size: 14px;
+    flex: 1; /* 너비를 가득 채우도록 설정 */
+    padding: 5px 10px;
+    border-radius: 20px;
+   	background-color: transparent;
+}
+
+/* 검색 필드에 아이콘 추가 스타일 */
+.search-icon {
+    color: #888;
+    margin-left: 5px;
 }
 
-.table tbody tr:hover {
-	background: #f0f8ff;
-	cursor: pointer;
+.search-field input:focus {
+	outline: none;
+	border-color: #6366f1;
+	box-shadow: 0 0 5px rgba(99, 102, 241, 0.5);
 }
 
-/* 로딩 스피너 */
-.spinner {
-	display: none;
-	margin: 0 auto;
-	border: 4px solid #f3f3f3;
-	border-top: 4px solid #007aff;
-	border-radius: 50%;
-	width: 30px;
-	height: 30px;
-	animation: spin 1s linear infinite;
+/* 테이블 스타일 */
+.table-container {
+    margin-top: 50px; /* 검색창과 테이블 간의 간격 */
 }
 
-@
-keyframes spin { 100% {
-	transform: rotate(360deg);
+/* 테이블 스타일 */
+table {
+    width: 100%;
+    border-collapse: collapse;
 }
 
+th, td {
+    text-align: center;
+    padding: 12px 8px;
+    border-bottom: 1px solid #ddd;
+    font-size: 14px;
+    color: #333;
 }
 
-/* 검색 필드 */
-.search-field {
-	display: flex;
-	align-items: center;
-	margin-bottom: 10px;
+th {
+    background: #f9f9f9;
+    font-weight: bold;
+    color: #555;
 }
 
-.search-field input {
-	flex: 1;
-	border-radius: 20px;
-	padding: 10px 15px;
-	border: 1px solid #ddd;
-	transition: 0.3s;
-	font-size: 14px;
+td button {
+    background-color: #28a745;
+    color: #fff;
+    border: none;
+    padding: 5px 10px;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: background-color 0.3s ease;
 }
 
-.search-field input:focus {
-	border-color: #007aff;
-	box-shadow: 0 0 3px rgba(0, 122, 255, 0.5);
+td button:hover {
+    background-color: #218838;
 }
 
-.search-field i {
-	margin-left: 10px;
-	color: #aaa;
+/* 상품 없을 때 메시지 */
+#noProductMsg {
+    text-align: center;
+    margin-top: 20px;
+    color: #888;
+    font-size: 14px;
 }
 
 /* 숨김 클래스 */
 .hidden {
-	display: none !important;
+    display: none;
 }
-</style>
\ No newline at end of file
+