Skip to content

Commit 1af0d37

Browse files
authored
Merge pull request #164 from in27sung/stock_04
Stock 04
2 parents 9154364 + b7076fb commit 1af0d37

File tree

4 files changed

+186
-11
lines changed

4 files changed

+186
-11
lines changed

stockMate/src/main/java/com/stockm8/persistence/StockDAOImpl.java

-5
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,5 @@ public List<StockVO> selectOnlyStockByBusinessId(int businessId) throws Exceptio
5656
public List<CategoryVO> selectAllCategories() throws Exception {
5757
return sqlSession.selectList(NAMESPACE + "selectAllCategories");
5858
}
59-
60-
@Override
61-
public List<CategoryVO> selectAllCategories() throws Exception {
62-
return sqlSession.selectList(NAMESPACE + "selectAllCategories");
63-
}
6459
}
6560

stockMate/src/main/webapp/WEB-INF/views/category/list.jsp

+66-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,74 @@
1-
<%@ page language="java" contentType="text/html; charset=UTF-8"
2-
pageEncoding="UTF-8"%>
1+
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
32
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
3+
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
44
<!DOCTYPE html>
55
<html>
66
<head>
7-
<meta charset="UTF-8">
8-
<title>카테고리 목록</title>
9-
</head>
7+
<meta charset="UTF-8">
8+
<title>카테고리 목록</title>
9+
<style>
10+
body {
11+
font-family: Arial, sans-serif;
12+
margin: 20px;
13+
background-color: #f5f5f5;
14+
}
15+
16+
h1 {
17+
text-align: center;
18+
color: #333;
19+
}
20+
21+
table {
22+
width: 100%;
23+
border-collapse: collapse;
24+
margin: 20px 0;
25+
background-color: #fff;
26+
table-layout: fixed;
27+
}
28+
29+
th, td {
30+
border: 1px solid #ddd;
31+
padding: 10px;
32+
text-align: center;
33+
word-break: break-word;
34+
}
35+
36+
th {
37+
background-color: #007BFF;
38+
color: #fff;
39+
position: sticky;
40+
top: 0;
41+
}
42+
43+
tr:nth-child(even) {
44+
background-color: #f9f9f9;
45+
}
1046
47+
tr:hover {
48+
background-color: #f1f1f1;
49+
}
50+
51+
a {
52+
color: #007BFF;
53+
text-decoration: none;
54+
}
55+
56+
a:hover {
57+
text-decoration: underline;
58+
}
59+
60+
.low-stock {
61+
color: red;
62+
font-weight: bold;
63+
}
64+
65+
.container {
66+
max-width: 1200px;
67+
margin: 0 auto;
68+
padding: 20px;
69+
}
70+
</style>
71+
</head>
1172
<body>
1273
<h1>/views/category/list.jsp</h1>
1374

stockMate/src/main/webapp/WEB-INF/views/category/register.jsp

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
<head>
77
<meta charset="UTF-8">
88
<title>카테고리 등록</title>
9+
<link rel="stylesheet" href="<c:url value='/resources/css/CategoryregistStyle.css' />">
10+
<link rel="stylesheet" href="<c:url value='/resources/css/modalStyle.css' />">
911
</head>
1012
<body>
11-
<h1> /views/category/register.jsp </h1>
1213

1314
<form action="/category/register" method="post">
15+
<h2>카테고리 등록 페이지</h2>
1416
<!-- 상위 카테고리 선택 -->
1517
<label for="parentCategoryId">상위 카테고리:</label>
1618
<select id="parentCategoryId" name="parentId">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
@charset "UTF-8";
2+
3+
/* 전체 페이지 스타일 */
4+
body {
5+
font-family: 'Arial', sans-serif;
6+
background-color: #f8f9fa;
7+
margin: 0;
8+
padding: 0;
9+
display: flex;
10+
justify-content: center;
11+
align-items: flex-start; /* 상단 정렬 */
12+
min-height: 100vh;
13+
padding-top: 50px; /* 상단 여백 추가 */
14+
}
15+
16+
/* 메인 컨테이너 스타일 */
17+
.container {
18+
width: 400px;
19+
background-color: #ffffff;
20+
padding: 20px 30px;
21+
border-radius: 8px;
22+
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
23+
text-align: left;
24+
margin-top: 30px; /* 컨테이너 상단 여백 */
25+
}
26+
27+
/* 제목 스타일 */
28+
h1 {
29+
text-align: center;
30+
color: #333;
31+
font-size: 24px;
32+
margin-bottom: 20px;
33+
}
34+
35+
/* 라벨 스타일 */
36+
label {
37+
font-weight: bold;
38+
color: #555;
39+
display: block;
40+
margin-bottom: 5px;
41+
font-size: 14px;
42+
}
43+
44+
/* 입력 필드 스타일 */
45+
input[type="text"],
46+
textarea,
47+
select {
48+
width: 100%;
49+
padding: 10px;
50+
margin-bottom: 15px;
51+
border: 1px solid #ddd;
52+
border-radius: 5px;
53+
font-size: 14px;
54+
box-sizing: border-box;
55+
transition: border-color 0.2s ease-in-out;
56+
}
57+
58+
input[type="text"]:focus,
59+
textarea:focus,
60+
select:focus {
61+
border-color: #007bff;
62+
outline: none;
63+
}
64+
65+
/* 버튼 스타일 */
66+
button,
67+
a.btn {
68+
display: inline-block;
69+
padding: 10px 15px;
70+
margin-top: 5px;
71+
font-size: 14px;
72+
text-align: center;
73+
color: white;
74+
background-color: #007bff;
75+
border: none;
76+
border-radius: 5px;
77+
cursor: pointer;
78+
text-decoration: none;
79+
transition: background-color 0.3s ease;
80+
}
81+
82+
button:hover,
83+
a.btn:hover {
84+
background-color: #0056b3;
85+
}
86+
87+
/* 자동 생성 버튼 스타일 */
88+
button.auto-generate {
89+
background-color: #17a2b8;
90+
font-size: 12px;
91+
padding: 5px 8px;
92+
display: inline-block;
93+
margin-left: 10px;
94+
}
95+
96+
button.auto-generate:hover {
97+
background-color: #138496;
98+
}
99+
100+
/* 텍스트 영역 스타일 */
101+
textarea {
102+
height: 80px;
103+
resize: none;
104+
}
105+
106+
/* 링크 스타일 */
107+
a {
108+
color: #007bff;
109+
text-decoration: none;
110+
font-size: 14px;
111+
margin-bottom: 15px;
112+
display: inline-block;
113+
}
114+
115+
a:hover {
116+
text-decoration: underline;
117+
}

0 commit comments

Comments
 (0)