diff --git a/Projects/eCIA/Config/eCIAConfig.json b/Projects/eCIA/Config/eCIAConfig.json new file mode 100644 index 0000000..0532c14 --- /dev/null +++ b/Projects/eCIA/Config/eCIAConfig.json @@ -0,0 +1,3 @@ +{ + "ProjectName": "eCIA v2 by SystemX3" +} \ No newline at end of file diff --git a/Projects/eCIA/eCIA.sln b/Projects/eCIA/eCIA.sln index 372f831..b5decec 100644 --- a/Projects/eCIA/eCIA.sln +++ b/Projects/eCIA/eCIA.sln @@ -11,6 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eCIA.Web", "eCIA\eCIA.Web\e EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eCIA.Web.Client", "eCIA\eCIA.Web.Client\eCIA.Web.Client.csproj", "{D063E7B3-9858-4E4D-9937-E2A4166A3AE9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{C8D5274F-AC00-46C7-1F8D-E88E81087A52}" + ProjectSection(SolutionItems) = preProject + Config\eCIAConfig.json = Config\eCIAConfig.json + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,6 +24,7 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {9F8F2087-866B-4030-A272-4621446093E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F8F2087-866B-4030-A272-4621446093E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9F8F2087-866B-4030-A272-4621446093E4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {9F8F2087-866B-4030-A272-4621446093E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F8F2087-866B-4030-A272-4621446093E4}.Release|Any CPU.Build.0 = Release|Any CPU {FA9BF72A-E305-4285-88BE-720DF9EB6F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Layout/MainLayout.razor b/Projects/eCIA/eCIA/eCIA.Shared/Layout/MainLayout.razor index 0b1ea55..29f376c 100644 --- a/Projects/eCIA/eCIA/eCIA.Shared/Layout/MainLayout.razor +++ b/Projects/eCIA/eCIA/eCIA.Shared/Layout/MainLayout.razor @@ -1,10 +1,11 @@ -@inherits LayoutComponentBase +@using eCIA.Shared.Services +@inherits LayoutComponentBase +@inject ConfigService _configService;
- @* *@ - +
@Body @@ -17,3 +18,11 @@ + +@code { + protected override void OnInitialized() + { + base.OnInitialized(); + _configService?.ReadConfig(); + } +} \ No newline at end of file diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor b/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor deleted file mode 100644 index fe4c7bd..0000000 --- a/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor +++ /dev/null @@ -1,30 +0,0 @@ -
-
- eCIA -
-
- - - -
- -
- diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor.css b/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor.css deleted file mode 100644 index 4e15395..0000000 --- a/Projects/eCIA/eCIA/eCIA.Shared/Layout/NavMenu.razor.css +++ /dev/null @@ -1,105 +0,0 @@ -.navbar-toggler { - appearance: none; - cursor: pointer; - width: 3.5rem; - height: 2.5rem; - color: white; - position: absolute; - top: 0.5rem; - right: 1rem; - border: 1px solid rgba(255, 255, 255, 0.1); - background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); -} - -.navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep .nav-link { - color: #d7d7d7; - background: none; - border: none; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - width: 100%; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep .nav-link:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -.nav-scrollable { - display: none; -} - -.navbar-toggler:checked ~ .nav-scrollable { - display: block; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .nav-scrollable { - /* Never collapse the sidebar for wide screens */ - display: block; - - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Models/eCIAConfig.cs b/Projects/eCIA/eCIA/eCIA.Shared/Models/eCIAConfig.cs new file mode 100644 index 0000000..c49c7c4 --- /dev/null +++ b/Projects/eCIA/eCIA/eCIA.Shared/Models/eCIAConfig.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace eCIA.Shared.Models +{ + public class eCIAConfig + { + public string ProjectName { get; set; } = string.Empty; + } +} diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Counter.razor b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Counter.razor index ef23cb3..3097dc5 100644 --- a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Counter.razor +++ b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Counter.razor @@ -1,6 +1,4 @@ -@page "/counter" - -Counter +Counter

Counter

diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Home.razor b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Home.razor deleted file mode 100644 index ae704aa..0000000 --- a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Home.razor +++ /dev/null @@ -1,21 +0,0 @@ -@page "/" -@using eCIA.Shared.Services -@inject IFormFactor FormFactor - -Home - -

Hello, world!

- -Welcome to your new app running on @factor using @platform. - - - -@code { - private string factor => FormFactor.GetFormFactor(); - private string platform => FormFactor.GetPlatform(); - - void ButtonClicked() - { - // Handle the Click event of RadzenButton - } -} diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Main.razor b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Main.razor new file mode 100644 index 0000000..e960241 --- /dev/null +++ b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Main.razor @@ -0,0 +1,26 @@ +@page "/" +@using eCIA.Shared.Services +@inject IFormFactor FormFactor + +
+ + + + + + + + + + + + + + + + +
+ +@code { + +} diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Weather.razor b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Weather.razor index 8eca4cc..9b406d4 100644 --- a/Projects/eCIA/eCIA/eCIA.Shared/Pages/Weather.razor +++ b/Projects/eCIA/eCIA/eCIA.Shared/Pages/Weather.razor @@ -1,6 +1,4 @@ -@page "/weather" - -Weather +Weather

Weather

diff --git a/Projects/eCIA/eCIA/eCIA.Shared/Services/ConfigService.cs b/Projects/eCIA/eCIA/eCIA.Shared/Services/ConfigService.cs new file mode 100644 index 0000000..4e41ee3 --- /dev/null +++ b/Projects/eCIA/eCIA/eCIA.Shared/Services/ConfigService.cs @@ -0,0 +1,63 @@ +using eCIA.Shared.Models; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace eCIA.Shared.Services +{ + public class ConfigService + { + private eCIAConfig? config = new eCIAConfig(); + + public void ReadConfig() + { + string projectDir = Path.Combine(AppContext.BaseDirectory, @"..\..\..\"); + + //Web프로젝트와 Windows프로젝트간 1뎁스 차이가 있어서 체크후 없으면 경로변경 + if (Directory.Exists($"{projectDir}../../Config") == false) + projectDir = Path.Combine(projectDir, @"..\"); + + string sourceDir = $"{projectDir}../../Config/"; + string targetDir = $"{projectDir}/bin/Config/"; + + CopyDirectory(sourceDir, targetDir); + + string readJson = File.ReadAllText($"{targetDir}/eCIAConfig.json"); + config = JsonConvert.DeserializeObject(readJson); + } + + public static void CopyDirectory(string sourceDir, string targetDir, bool overwrite = true) + { + if (!Directory.Exists(sourceDir)) + { + throw new DirectoryNotFoundException($"원본 디렉토리를 찾을 수 없습니다: {sourceDir}"); + } + + // 대상 디렉토리 생성 + Directory.CreateDirectory(targetDir); + + // 파일 복사 + foreach (string file in Directory.GetFiles(sourceDir)) + { + string destFile = Path.Combine(targetDir, Path.GetFileName(file)); + File.Copy(file, destFile, overwrite); + } + + // 하위 디렉토리 재귀적으로 복사 + foreach (string subDir in Directory.GetDirectories(sourceDir)) + { + string subDirName = Path.GetFileName(subDir); + string destSubDir = Path.Combine(targetDir, subDirName); + CopyDirectory(subDir, destSubDir, overwrite); + } + } + + public eCIAConfig? GetConfig() + { + return config; + } + } +} diff --git a/Projects/eCIA/eCIA/eCIA.Shared/_Imports.razor b/Projects/eCIA/eCIA/eCIA.Shared/_Imports.razor index aee1adf..db9ddba 100644 --- a/Projects/eCIA/eCIA/eCIA.Shared/_Imports.razor +++ b/Projects/eCIA/eCIA/eCIA.Shared/_Imports.razor @@ -8,4 +8,6 @@ @using Microsoft.JSInterop @using Radzen -@using Radzen.Blazor \ No newline at end of file +@using Radzen.Blazor + +@using eCIA.Shared.Services \ No newline at end of file diff --git a/Projects/eCIA/eCIA/eCIA.Shared/eCIA.Shared.csproj b/Projects/eCIA/eCIA/eCIA.Shared/eCIA.Shared.csproj index 8e5268c..0f0195d 100644 --- a/Projects/eCIA/eCIA/eCIA.Shared/eCIA.Shared.csproj +++ b/Projects/eCIA/eCIA/eCIA.Shared/eCIA.Shared.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -12,6 +12,7 @@ + diff --git a/Projects/eCIA/eCIA/eCIA.Web/Program.cs b/Projects/eCIA/eCIA/eCIA.Web/Program.cs index 3bea45c..71fbcc5 100644 --- a/Projects/eCIA/eCIA/eCIA.Web/Program.cs +++ b/Projects/eCIA/eCIA/eCIA.Web/Program.cs @@ -16,6 +16,9 @@ builder.Services.AddSingleton(); //radzen builder.Services.AddRadzenComponents(); +// +builder.Services.AddSingleton(); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/Projects/eCIA/eCIA/eCIA/MauiProgram.cs b/Projects/eCIA/eCIA/eCIA/MauiProgram.cs index 7828fd2..358c263 100644 --- a/Projects/eCIA/eCIA/eCIA/MauiProgram.cs +++ b/Projects/eCIA/eCIA/eCIA/MauiProgram.cs @@ -26,6 +26,8 @@ namespace eCIA builder.Services.AddRadzenComponents(); builder.Services.AddMauiBlazorWebView(); + builder.Services.AddSingleton(); + #if DEBUG builder.Services.AddBlazorWebViewDeveloperTools(); builder.Logging.AddDebug();