merge: 공동작업자의 PC 및 SW 관리 기능과 서버 자산 관리 기능 통합 (충돌 해결)

This commit is contained in:
2026-04-15 10:10:57 +09:00
11 changed files with 814 additions and 138 deletions

381
src/styles/common.css Normal file
View File

@@ -0,0 +1,381 @@
:root {
--primary-color: #1E5149;
--primary-hover: #153c36;
--primary-light: #edf2f1;
--text-main: #111827;
--text-muted: #6B7280;
--border-color: #E5E7EB;
--bg-color: #F9FAFB;
--sidebar-bg: #ffffff;
--white: #FFFFFF;
--danger: #dc2626;
--dash-primary: #6cc020;
--dash-light: #f2f9ec;
--dash-danger: #cf222e;
}
.shadow-sm {
box-shadow: 0 1px 3px rgba(0,0,0,0.05), 0 1px 2px rgba(0,0,0,0.03);
}
.rounded-lg {
border-radius: 8px;
}
.dashboard-card {
background-color: var(--white);
border: 1px solid var(--border-color);
border-radius: 8px;
box-shadow: none;
padding: 1.5rem;
display: flex;
flex-direction: column;
}
.dashboard-layout-2col {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 1.5rem;
}
@media (max-width: 768px) {
.dashboard-layout-2col {
grid-template-columns: 1fr;
}
}
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
body {
font-family: 'Pretendard Variable', Pretendard, sans-serif;
color: var(--text-main);
background-color: var(--bg-color);
line-height: 1.5;
letter-spacing: -0.02em;
font-size: 14px;
}
/* App Layout - Sidebar & Main Content */
.app-layout {
display: flex;
min-height: 100vh;
width: 100%;
}
.sidebar {
width: 260px;
background-color: var(--sidebar-bg);
border-right: 1px solid var(--border-color);
display: flex;
flex-direction: column;
flex-shrink: 0;
}
.sidebar-header {
padding: 1.5rem;
border-bottom: 1px solid var(--border-color);
}
.sidebar-header h1 {
font-size: 1.5rem;
font-weight: 700;
color: var(--text-main);
}
.sidebar-header h1 span {
color: var(--primary-color);
}
.nav-section {
padding: 1.5rem 0 0.5rem;
}
.nav-section h3 {
padding: 0 1.5rem;
font-size: 0.75rem;
font-weight: 600;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.05em;
margin-bottom: 0.5rem;
display: flex;
align-items: center;
gap: 0.5rem;
}
.nav-section h3 i {
width: 14px;
height: 14px;
}
.nav-list {
list-style: none;
}
.nav-list li {
padding: 0.75rem 1.5rem;
margin: 0.25rem 0.75rem;
border-radius: 6px;
cursor: pointer;
display: flex;
align-items: center;
gap: 0.75rem;
color: var(--text-main);
font-weight: 500;
transition: all 0.2s;
}
.nav-list li i {
width: 18px;
height: 18px;
color: var(--text-muted);
}
.nav-list li:hover {
background-color: var(--bg-color);
}
.nav-list li.active {
background-color: var(--primary-light);
color: var(--primary-color);
}
.nav-list li.active i {
color: var(--primary-color);
}
/* Main Content Wrapper */
.main-wrapper {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
}
/* Header */
.top-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1.5rem 2rem;
background-color: var(--white);
border-bottom: 1px solid var(--border-color);
}
.header-title h2 {
font-size: 1.25rem;
font-weight: 600;
color: var(--text-main);
}
.header-actions {
display: flex;
gap: 0.5rem;
}
.content-area {
padding: 2rem;
flex: 1;
overflow-y: auto;
}
/* Dashboard Grid */
.dashboard-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
gap: 1.5rem;
margin-bottom: 2rem;
}
.stat-card {
background-color: var(--white);
padding: 1.5rem;
border: 1px solid var(--border-color);
border-radius: 8px;
display: flex;
flex-direction: column;
}
.stat-card .title {
font-size: 0.875rem;
color: var(--text-muted);
font-weight: 500;
}
.stat-card .value {
font-size: 2rem;
font-weight: 700;
color: var(--text-main);
margin-top: 0.5rem;
}
/* Buttons */
.btn {
display: inline-flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
font-size: 0.875rem;
font-weight: 500;
border-radius: 4px;
cursor: pointer;
transition: all 0.2s;
line-height: 1;
}
.btn i { width: 16px; height: 16px; }
.btn-primary {
background-color: var(--primary-color);
color: var(--white);
border: 1px solid var(--primary-color);
}
.btn-primary:hover {
background-color: var(--primary-hover);
border-color: var(--primary-hover);
}
.btn-outline {
background-color: transparent;
color: var(--primary-color);
border: 1px solid var(--primary-color);
padding: 0.25rem 0.5rem;
font-size: 0.75rem;
font-weight: 500;
white-space: nowrap;
}
.btn-outline:hover {
background-color: var(--primary-light);
border-color: var(--primary-color);
}
.text-nowrap {
white-space: nowrap;
}
.btn-danger {
color: var(--danger);
border-color: #fca5a5;
}
.btn-danger:hover {
background-color: #fef2f2;
}
.btn-icon {
background: none;
border: none;
color: inherit;
cursor: pointer;
padding: 0.25rem;
}
/* Table */
.table-container {
background-color: var(--white);
border: 1px solid var(--border-color);
border-radius: 8px;
overflow: auto; /* 가로/세로 스크롤 허용 */
max-height: calc(100vh - 180px); /* 화면 높이에 맞춰 제한 (가로 스크롤바 노출용) */
position: relative;
}
table {
width: 100%;
border-collapse: separate; /* sticky border 유지를 위해 separate 설정 */
border-spacing: 0;
text-align: left;
}
th, td {
padding: 1rem 1.25rem;
border-bottom: 1px solid var(--border-color);
}
th {
font-weight: 600;
color: var(--text-muted);
font-size: 0.875rem;
white-space: nowrap;
background-color: #FAFAFA;
position: sticky;
top: 0;
z-index: 10;
box-shadow: inset 0 -1px 0 var(--border-color); /* sticky 시 경계선 유지 */
}
td {
font-size: 0.875rem;
}
tbody tr:last-child td { border-bottom: none; }
tbody tr:hover { background-color: var(--bg-color); }
.empty-row td { text-align: center; padding: 3rem; color: var(--text-muted); }
.sw-table td {
text-align: center;
}
/* Search Filter Bar */
.search-bar {
display: flex;
flex-wrap: wrap;
gap: 1rem;
background-color: var(--white);
padding: 1.25rem;
border: 1px solid var(--border-color);
border-radius: 8px;
margin-bottom: 2rem;
align-items: flex-end;
}
.search-item {
display: flex;
flex-direction: column;
gap: 0.5rem;
min-width: 180px;
}
.search-item.flex-1 {
flex: 1;
min-width: 250px;
}
.search-item label {
font-size: 0.75rem;
font-weight: 600;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.05em;
}
.search-item input,
.search-item select {
padding: 0.5rem 0.75rem;
border: 1px solid var(--border-color);
border-radius: 4px;
font-size: 0.875rem;
outline: none;
transition: all 0.2s;
background-color: var(--white);
}
.search-item input:focus,
.search-item select:focus {
border-color: var(--primary-color);
box-shadow: 0 0 0 2px rgba(30, 81, 73, 0.1);
}
.btn-reset {
height: 36px;
padding: 0 1rem;
display: flex;
align-items: center;
gap: 0.5rem;
font-size: 0.875rem;
color: var(--text-muted);
}

161
src/styles/modal.css Normal file
View File

@@ -0,0 +1,161 @@
/* Modal */
.modal-overlay {
position: fixed;
top: 0; left: 0; right: 0; bottom: 0;
background-color: rgba(0, 0, 0, 0.4);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
opacity: 0;
visibility: hidden;
transition: opacity 0.2s ease, visibility 0.2s ease;
}
.modal-overlay:not(.hidden) { opacity: 1; visibility: visible; }
.modal-content {
background-color: var(--white);
width: 100%; max-width: 600px;
border-radius: 8px;
overflow: hidden;
box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1);
transform: translateY(20px);
transition: transform 0.2s ease;
}
.modal-overlay:not(.hidden) .modal-content { transform: translateY(0); }
.modal-header {
background-color: var(--primary-color);
color: var(--white);
padding: 1rem 1.5rem;
display: flex;
justify-content: space-between;
align-items: center;
}
.modal-header h2 { font-size: 1.125rem; font-weight: 500; }
.modal-body { padding: 1.5rem; }
.grid-form { display: grid; grid-template-columns: 1fr 1fr; gap: 1.25rem; }
.form-group { display: flex; flex-direction: column; gap: 0.375rem; }
.form-group.full-width { grid-column: span 2; }
.form-group label { font-size: 0.875rem; font-weight: 500; }
.form-group input, .form-group textarea {
padding: 0.625rem;
border: 1px solid var(--border-color);
border-radius: 4px;
font-family: inherit; font-size: 0.875rem;
outline: none; transition: border-color 0.2s;
}
.form-group input:focus, .form-group textarea:focus { border-color: var(--primary-color); }
.modal-footer {
padding: 1rem 1.5rem; border-top: 1px solid var(--border-color);
display: flex; justify-content: space-between; align-items: center;
}
.footer-actions { display: flex; gap: 0.5rem; }
/* Wide Modal for History */
.modal-content.wide {
max-width: 950px;
}
.modal-body-split {
display: flex;
gap: 2rem;
min-height: 480px;
}
.modal-form-area {
flex: 1.2;
}
.modal-history-area {
flex: 0.8;
border-left: 1px solid var(--border-color);
padding-left: 1.5rem;
display: flex;
flex-direction: column;
}
.history-header {
margin-bottom: 1rem;
}
.history-header h3 {
font-size: 0.9375rem;
font-weight: 600;
display: flex;
align-items: center;
gap: 0.5rem;
color: var(--text-main);
}
.history-timeline {
flex: 1;
overflow-y: auto;
max-height: 500px;
padding-right: 0.5rem;
}
.history-item {
position: relative;
padding-left: 1.25rem;
padding-bottom: 1.5rem;
border-left: 2px solid var(--border-color);
}
.history-item::before {
content: '';
position: absolute;
left: -7px;
top: 0;
width: 12px;
height: 12px;
border-radius: 50%;
background-color: var(--white);
border: 2px solid var(--primary-color);
}
.history-item:last-child {
border-left: 2px solid transparent;
}
.history-date {
font-size: 0.75rem;
color: var(--text-muted);
font-weight: 500;
margin-bottom: 0.25rem;
}
.history-user {
font-size: 0.75rem;
font-weight: 600;
color: var(--primary-color);
margin-bottom: 0.25rem;
}
.history-details {
font-size: 0.8125rem;
color: var(--text-main);
line-height: 1.4;
white-space: pre-wrap;
word-break: break-all;
}
.empty-history {
padding: 2rem 0;
text-align: center;
color: var(--text-muted);
font-size: 0.8125rem;
}