Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 752e7fdd90 | |||
| 769477333d |
+18
-40
@@ -42,10 +42,8 @@ jobs:
|
|||||||
BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
||||||
echo "Version: $COMMIT_HASH" > ./publish/web/wwwroot/version.txt
|
echo "Version: $COMMIT_HASH" > ./publish/web/wwwroot/version.txt
|
||||||
echo "Built: $BUILD_TIME" >> ./publish/web/wwwroot/version.txt
|
echo "Built: $BUILD_TIME" >> ./publish/web/wwwroot/version.txt
|
||||||
echo "Version: $COMMIT_HASH" > ./publish/admin/wwwroot/version.txt
|
cp ./publish/web/wwwroot/version.txt ./publish/admin/wwwroot/version.txt
|
||||||
echo "Built: $BUILD_TIME" >> ./publish/admin/wwwroot/version.txt
|
echo "✓ Version files created"
|
||||||
echo "✓ Version files created:"
|
|
||||||
cat ./publish/web/wwwroot/version.txt
|
|
||||||
|
|
||||||
- name: Deploy Web
|
- name: Deploy Web
|
||||||
run: |
|
run: |
|
||||||
@@ -55,25 +53,10 @@ jobs:
|
|||||||
WEB_DEPLOY_DIR="$DEPLOY_HOME/deployments/taxbaik_${WEB_TIMESTAMP}"
|
WEB_DEPLOY_DIR="$DEPLOY_HOME/deployments/taxbaik_${WEB_TIMESTAMP}"
|
||||||
|
|
||||||
echo "=== Deploying Web (v$(git rev-parse --short HEAD)) ==="
|
echo "=== Deploying Web (v$(git rev-parse --short HEAD)) ==="
|
||||||
echo "Deploy dir: $WEB_DEPLOY_DIR"
|
mkdir -p "$WEB_DEPLOY_DIR"
|
||||||
mkdir -p "$WEB_DEPLOY_DIR" || { echo "Failed to mkdir"; exit 1; }
|
cp -r ./publish/web "$WEB_DEPLOY_DIR/"
|
||||||
cp -r ./publish/web "$WEB_DEPLOY_DIR/" || { echo "Failed to copy"; exit 1; }
|
ln -sfn "$WEB_DEPLOY_DIR/web" "$DEPLOY_HOME/taxbaik_active"
|
||||||
ln -sfn "$WEB_DEPLOY_DIR/web" "$DEPLOY_HOME/taxbaik_active" || { echo "Failed to symlink"; exit 1; }
|
echo "✓ Web deployed"
|
||||||
echo "✓ Web deployed to $WEB_DEPLOY_DIR"
|
|
||||||
|
|
||||||
echo "=== Stopping TaxBaik.Web ==="
|
|
||||||
pkill -9 -f "TaxBaik.Web" || echo "No process to kill"
|
|
||||||
sleep 3
|
|
||||||
|
|
||||||
echo "=== Starting TaxBaik.Web ==="
|
|
||||||
cd "$DEPLOY_HOME/taxbaik_active" || { echo "Failed to cd"; exit 1; }
|
|
||||||
export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
|
|
||||||
export ASPNETCORE_ENVIRONMENT=Production
|
|
||||||
export ASPNETCORE_URLS=http://127.0.0.1:5001
|
|
||||||
nohup /usr/local/dotnet/dotnet TaxBaik.Web.dll > web.log 2>&1 &
|
|
||||||
sleep 2
|
|
||||||
echo "✓ Web process started"
|
|
||||||
ps aux | grep TaxBaik.Web | grep -v grep || echo "Process not found"
|
|
||||||
|
|
||||||
- name: Deploy Admin
|
- name: Deploy Admin
|
||||||
run: |
|
run: |
|
||||||
@@ -83,22 +66,17 @@ jobs:
|
|||||||
ADMIN_DEPLOY_DIR="$DEPLOY_HOME/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}"
|
ADMIN_DEPLOY_DIR="$DEPLOY_HOME/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}"
|
||||||
|
|
||||||
echo "=== Deploying Admin (v$(git rev-parse --short HEAD)) ==="
|
echo "=== Deploying Admin (v$(git rev-parse --short HEAD)) ==="
|
||||||
echo "Deploy dir: $ADMIN_DEPLOY_DIR"
|
mkdir -p "$ADMIN_DEPLOY_DIR"
|
||||||
mkdir -p "$ADMIN_DEPLOY_DIR" || { echo "Failed to mkdir"; exit 1; }
|
cp -r ./publish/admin "$ADMIN_DEPLOY_DIR/"
|
||||||
cp -r ./publish/admin "$ADMIN_DEPLOY_DIR/" || { echo "Failed to copy"; exit 1; }
|
ln -sfn "$ADMIN_DEPLOY_DIR/admin" "$DEPLOY_HOME/taxbaik_admin_active"
|
||||||
ln -sfn "$ADMIN_DEPLOY_DIR/admin" "$DEPLOY_HOME/taxbaik_admin_active" || { echo "Failed to symlink"; exit 1; }
|
echo "✓ Admin deployed"
|
||||||
echo "✓ Admin deployed to $ADMIN_DEPLOY_DIR"
|
|
||||||
|
|
||||||
echo "=== Stopping TaxBaik.Admin ==="
|
- name: Restart services
|
||||||
pkill -9 -f "TaxBaik.Admin" || echo "No process to kill"
|
run: |
|
||||||
sleep 3
|
echo "=== Restarting services ==="
|
||||||
|
pkill -9 -f "TaxBaik.Web" || echo "No Web process to kill"
|
||||||
echo "=== Starting TaxBaik.Admin ==="
|
pkill -9 -f "TaxBaik.Admin" || echo "No Admin process to kill"
|
||||||
cd "$DEPLOY_HOME/taxbaik_admin_active" || { echo "Failed to cd"; exit 1; }
|
|
||||||
export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
|
|
||||||
export ASPNETCORE_ENVIRONMENT=Production
|
|
||||||
export ASPNETCORE_URLS=http://127.0.0.1:5002
|
|
||||||
nohup /usr/local/dotnet/dotnet TaxBaik.Admin.dll > admin.log 2>&1 &
|
|
||||||
sleep 2
|
sleep 2
|
||||||
echo "✓ Admin process started"
|
|
||||||
ps aux | grep TaxBaik.Admin | grep -v grep || echo "Process not found"
|
echo "=== Services will restart automatically via systemd ==="
|
||||||
|
echo "✓ Deployment complete"
|
||||||
|
|||||||
@@ -6,14 +6,10 @@
|
|||||||
<title>백원숙 세무회계 - 관리자</title>
|
<title>백원숙 세무회계 - 관리자</title>
|
||||||
<base href="/taxbaik/admin/" />
|
<base href="/taxbaik/admin/" />
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@400;500;700&display=swap" rel="stylesheet" />
|
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@400;500;700&display=swap" rel="stylesheet" />
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" />
|
|
||||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
|
|
||||||
<link rel="stylesheet" href="~/css/admin.css" />
|
|
||||||
<component type="typeof(HeadOutlet)" render-mode="InteractiveServer" />
|
<component type="typeof(HeadOutlet)" render-mode="InteractiveServer" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<Routes />
|
<Routes />
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
|
||||||
<script src="_framework/blazor.web.js"></script>
|
<script src="_framework/blazor.web.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
using System.Text.Encodings.Web;
|
|
||||||
using System.Text.Unicode;
|
|
||||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||||
using MudBlazor.Services;
|
using MudBlazor.Services;
|
||||||
using TaxBaik.Application;
|
using TaxBaik.Application;
|
||||||
@@ -19,10 +17,6 @@ builder.Services.AddRazorComponents()
|
|||||||
.AddInteractiveServerComponents();
|
.AddInteractiveServerComponents();
|
||||||
builder.Services.AddMudServices();
|
builder.Services.AddMudServices();
|
||||||
builder.Services.AddMemoryCache();
|
builder.Services.AddMemoryCache();
|
||||||
|
|
||||||
// 한글 포함 다국어 문자를 유니코드 엔티티로 변환하지 않도록 설정
|
|
||||||
builder.Services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.All));
|
|
||||||
|
|
||||||
builder.Services.AddInfrastructure();
|
builder.Services.AddInfrastructure();
|
||||||
builder.Services.AddApplication();
|
builder.Services.AddApplication();
|
||||||
|
|
||||||
|
|||||||
@@ -1,263 +0,0 @@
|
|||||||
/* TaxBaik Admin — 워밍-프로페셔널 디자인 */
|
|
||||||
|
|
||||||
:root {
|
|
||||||
--color-primary: #C89D6E; /* 따뜻한 골드/브론즈 */
|
|
||||||
--color-primary-dark: #A67C52; /* 진한 브론즈 */
|
|
||||||
--color-secondary: #2E5C4E; /* 따뜻한 초록 */
|
|
||||||
--color-secondary-dark: #1F3A30; /* 어두운 초록 */
|
|
||||||
--color-accent: #E8E4D8; /* 따뜻한 베이지 */
|
|
||||||
--color-bg: #F9F7F3; /* 따뜻한 화이트 */
|
|
||||||
--color-text: #3D2817; /* 따뜻한 갈색 */
|
|
||||||
--color-text-light: #6B5D4F; /* 밝은 갈색 */
|
|
||||||
--color-border: #D9D3C4; /* 경계선 */
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: 'Noto Sans KR', 'Apple SD Gothic Neo', sans-serif;
|
|
||||||
color: var(--color-text);
|
|
||||||
background-color: var(--color-bg);
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1, h2, h3, h4, h5, h6 {
|
|
||||||
font-family: 'Noto Sans KR', 'Apple SD Gothic Neo', sans-serif;
|
|
||||||
color: var(--color-text);
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
color: var(--color-text-light);
|
|
||||||
line-height: 1.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--color-primary);
|
|
||||||
text-decoration: none;
|
|
||||||
transition: color 150ms cubic-bezier(0.4, 0, 0.2, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
color: var(--color-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== MudBlazor 커스터마이징 ===== */
|
|
||||||
|
|
||||||
.mud-appbar {
|
|
||||||
background: linear-gradient(90deg, var(--color-secondary) 0%, #1F3A30 100%) !important;
|
|
||||||
box-shadow: 0 2px 8px rgba(61, 40, 23, 0.12) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-appbar-content {
|
|
||||||
padding: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-appbar .mud-button-root {
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-contained-primary {
|
|
||||||
background: linear-gradient(135deg, var(--color-primary) 0%, var(--color-primary-dark) 100%) !important;
|
|
||||||
box-shadow: 0 2px 8px rgba(61, 40, 23, 0.12) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-contained-primary:hover {
|
|
||||||
background: linear-gradient(135deg, var(--color-primary-dark) 0%, #8B5E3C 100%) !important;
|
|
||||||
box-shadow: 0 4px 12px rgba(61, 40, 23, 0.2) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-outlined-primary {
|
|
||||||
color: var(--color-primary) !important;
|
|
||||||
border-color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-outlined-primary:hover {
|
|
||||||
background-color: rgba(200, 157, 110, 0.1) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-text-primary {
|
|
||||||
color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-button-text-primary:hover {
|
|
||||||
background-color: rgba(200, 157, 110, 0.1) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-card {
|
|
||||||
background-color: white !important;
|
|
||||||
box-shadow: 0 2px 8px rgba(61, 40, 23, 0.08) !important;
|
|
||||||
border: 1px solid var(--color-border) !important;
|
|
||||||
border-radius: 12px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-card:hover {
|
|
||||||
box-shadow: 0 6px 16px rgba(61, 40, 23, 0.12) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-card-header {
|
|
||||||
background-color: var(--color-accent) !important;
|
|
||||||
border-bottom: 1px solid var(--color-border) !important;
|
|
||||||
padding: 1.5rem !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-card-content {
|
|
||||||
padding: 1.5rem !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 테이블 스타일 ===== */
|
|
||||||
|
|
||||||
.mud-table {
|
|
||||||
font-family: 'Noto Sans KR', 'Apple SD Gothic Neo', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-table-cell {
|
|
||||||
border-color: var(--color-border) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-table-head {
|
|
||||||
background-color: var(--color-accent) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-table-head .mud-table-cell {
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-table-body .mud-table-row:hover {
|
|
||||||
background-color: rgba(200, 157, 110, 0.05) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 폼 요소 ===== */
|
|
||||||
|
|
||||||
.mud-input-slot {
|
|
||||||
font-family: 'Noto Sans KR', 'Apple SD Gothic Neo', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined {
|
|
||||||
border-color: var(--color-border) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined:hover {
|
|
||||||
border-color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined .mud-input-slot {
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined .mud-input-slot input,
|
|
||||||
.mud-input-outlined .mud-input-slot textarea {
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined .mud-input-slot input::placeholder {
|
|
||||||
color: var(--color-text-light) !important;
|
|
||||||
opacity: 0.7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-input-outlined.mud-focused {
|
|
||||||
border-color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 토글 & 체크박스 ===== */
|
|
||||||
|
|
||||||
.mud-switch-base {
|
|
||||||
color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-checkbox-base {
|
|
||||||
color: var(--color-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 드롭다운 & 셀렉트 ===== */
|
|
||||||
|
|
||||||
.mud-select-input {
|
|
||||||
border-color: var(--color-border) !important;
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-select-popper-content {
|
|
||||||
background-color: white !important;
|
|
||||||
box-shadow: 0 4px 12px rgba(61, 40, 23, 0.15) !important;
|
|
||||||
border-radius: 8px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-list-item:hover {
|
|
||||||
background-color: rgba(200, 157, 110, 0.1) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 다이얼로그 ===== */
|
|
||||||
|
|
||||||
.mud-dialog {
|
|
||||||
border-radius: 12px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-dialog-container {
|
|
||||||
box-shadow: 0 10px 40px rgba(61, 40, 23, 0.2) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-dialog-title {
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 배지 & 칩 ===== */
|
|
||||||
|
|
||||||
.mud-chip-set {
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-chip {
|
|
||||||
background-color: rgba(200, 157, 110, 0.1) !important;
|
|
||||||
color: var(--color-primary) !important;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-chip-click:hover {
|
|
||||||
background-color: rgba(200, 157, 110, 0.2) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 페이지네이션 & 프로그레스 ===== */
|
|
||||||
|
|
||||||
.mud-pagination-item.selected {
|
|
||||||
background-color: var(--color-primary) !important;
|
|
||||||
color: white !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-pagination-item:hover:not(.selected) {
|
|
||||||
background-color: var(--color-accent) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-progress-linear {
|
|
||||||
background-color: var(--color-accent) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-progress-linear::before {
|
|
||||||
background: linear-gradient(90deg, var(--color-primary) 0%, var(--color-secondary) 100%) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 텍스트 필드 라벨 ===== */
|
|
||||||
|
|
||||||
.mud-field-label {
|
|
||||||
color: var(--color-text) !important;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===== 반응형 ===== */
|
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
body {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-appbar-content {
|
|
||||||
padding: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-card-content {
|
|
||||||
padding: 1rem !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mud-table {
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -54,12 +54,6 @@
|
|||||||
<p>© 2026 백원숙 세무회계. All rights reserved.</p>
|
<p>© 2026 백원숙 세무회계. All rights reserved.</p>
|
||||||
<a href="/taxbaik/privacy" class="text-decoration-none text-muted me-2">개인정보처리방침</a>
|
<a href="/taxbaik/privacy" class="text-decoration-none text-muted me-2">개인정보처리방침</a>
|
||||||
<a href="/taxbaik/terms" class="text-decoration-none text-muted">이용약관</a>
|
<a href="/taxbaik/terms" class="text-decoration-none text-muted">이용약관</a>
|
||||||
@if (Context.RequestServices.GetService(typeof(VersionInfo)) is VersionInfo version)
|
|
||||||
{
|
|
||||||
<div class="mt-2 text-muted" style="font-size: 0.75rem; opacity: 0.6;">
|
|
||||||
v@version.Version · @version.Built
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
@{
|
|
||||||
Layout = "_Layout";
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using System.IO.Compression;
|
using System.IO.Compression;
|
||||||
using System.Text.Encodings.Web;
|
|
||||||
using System.Text.Unicode;
|
|
||||||
using Microsoft.AspNetCore.ResponseCompression;
|
using Microsoft.AspNetCore.ResponseCompression;
|
||||||
using TaxBaik.Application;
|
using TaxBaik.Application;
|
||||||
using TaxBaik.Infrastructure;
|
using TaxBaik.Infrastructure;
|
||||||
@@ -12,10 +10,6 @@ builder.Services.AddMemoryCache();
|
|||||||
builder.Services.AddResponseCompression(opts => {
|
builder.Services.AddResponseCompression(opts => {
|
||||||
opts.Providers.Add<GzipCompressionProvider>();
|
opts.Providers.Add<GzipCompressionProvider>();
|
||||||
});
|
});
|
||||||
|
|
||||||
// 한글 포함 다국어 문자를 유니코드 엔티티로 변환하지 않도록 설정
|
|
||||||
builder.Services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.All));
|
|
||||||
|
|
||||||
builder.Services.AddInfrastructure();
|
builder.Services.AddInfrastructure();
|
||||||
builder.Services.AddApplication();
|
builder.Services.AddApplication();
|
||||||
|
|
||||||
|
|||||||
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB |
Reference in New Issue
Block a user