Skip to content

Commit 3712744

Browse files
AnnaSasDevAnnaSasDev
authored
Refactor: Namespaces and solution layout (#14)
* - Rename solution and projects to replace `DirectiveAthena.Website` with `DirectiveAthenaWeb` for consistency. - Refactor namespaces, project references, and paths to align with updated naming convention. - Remove unused components and projects, including `DirectiveAthena.Website.Components`. - Introduce new solution structure and update `.slnx` and dependencies accordingly. - Add missing `Minio` and `Microsoft.Logging` package references. * Rename and restructure solution, projects, and paths to replace `DirectiveAthena.Website` with `DirectiveAthenaWeb` for consistency. Update `.slnx` and `.slnf` files and associated configurations. * Migrate `DirectiveAthenaWeb` to `DirectiveAthenaWeb.Client`: - Renamed the primary project from `DirectiveAthenaWeb` to `DirectiveAthenaWeb.Client`. - Updated associated namespaces, paths, project references, and dependencies for consistency. - Restructured solution file to align with the new project structure. - Adjusted workflows and build targets to reflect updated client project. - Removed unused assets and configurations from the old project folder. * Update output paths in `tsconfig.json` and `webpack.config.js` to reflect `DirectiveAthenaWeb.Client` migration * Update workflow paths to reflect migration from `DirectiveAthena.Website.ClientAssets` to `DirectiveAthenaWeb.Services.Js` * Update project references and resx path to align with restructured solution layout: - Adjust resx resource path in `TagsEditor.razor` to reflect relocation of localization resources. - Fix project reference path in `DirectiveAthenaWeb.DevServer.csproj`. - Update `.slnx` file to include missing projects and reorganize folder structure. * Normalize formatting across project files: - Adjust spacing, indentation, and alignment to align with consistent code style conventions. - Update `<PackageReference />`, `<ProjectReference />`, and related attributes to remove unnecessary spaces. - Reformat TypeScript imports, object literals, and configs for a uniform style. - Normalize HTML attributes' and XML elements' spacing in Razor and SVG files. * Update paths and references to align with `DirectiveAthenaWeb.Client` migration: - Adjust `.gitignore` entries to reflect updated project structure. - Update stylesheet links in `index.html` and `AdminApp.razor` to use `DirectiveAthenaWeb.Client.styles.css`. - Modify solution filter file to account for renamed test project. * Remove `appsettings.local.json` from `DirectiveAthenaWeb.DevServer` configuration. * Add `UserSecretsId` to `DirectiveAthenaWeb.DevServer.csproj` and remove unused `appsettings.local.json` configuration * Remove `appsettings.local.json` from `DirectiveAthenaWeb.Client`. * Remove redundant content inclusion and simplify `DirectiveAthenaWeb.Client.csproj` configuration. * Remove debug-specific handling of `appsettings.local.json` from `DirectiveAthenaWeb.Client`.
1 parent 9ebd6af commit 3712744

216 files changed

Lines changed: 2717 additions & 2450 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ indent_size = 4
1111
csharp_indent_braces = false
1212
csharp_new_line_before_members_in_object_initializers = false
1313
csharp_new_line_before_open_brace = none
14-
csharp_preferred_modifier_order = private, internal, protected, public, required, static, file, new, abstract, override, , virtual, readonly, extern, volatile, unsafe, async:suggestion
14+
csharp_preferred_modifier_order = private, internal, protected, public, required, static, file, new, abstract, override,, virtual, readonly, extern, volatile, unsafe, async:suggestion
1515
csharp_style_prefer_utf8_string_literals = true:suggestion
1616
csharp_style_var_elsewhere = false:none
1717
csharp_style_var_for_built_in_types = false:suggestion
@@ -88,11 +88,11 @@ dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = reado
8888
dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds = readonly_field
8989
dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers = static
9090
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
91-
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
91+
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
9292
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
9393
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
9494
dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_accessibilities = *
95-
dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_kinds =
95+
dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_kinds =
9696
dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_applicable_kinds = unity_serialised_field
9797
dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_required_modifiers = instance
9898
dotnet_sort_system_directives_first = false
@@ -154,7 +154,7 @@ resharper_formatter_tags_enabled = true
154154
resharper_indent_preprocessor_if = usual_indent
155155
resharper_indent_preprocessor_other = do_not_change
156156
resharper_indent_raw_literal_string = indent
157-
resharper_instance_members_qualify_declared_in =
157+
resharper_instance_members_qualify_declared_in =
158158
resharper_keep_existing_attribute_arrangement = true
159159
resharper_keep_existing_declaration_block_arrangement = true
160160
resharper_keep_existing_embedded_block_arrangement = true

‎.github/workflows/lib_testing.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ jobs:
2929

3030
- name: Install npm dependencies
3131
run: npm ci
32-
working-directory: src/DirectiveAthena.Website.ClientAssets
32+
working-directory: src/DirectiveAthenaWeb.Services.Js
3333

3434
- name: Build interop bundle
3535
run: npm run build
36-
working-directory: src/DirectiveAthena.Website.ClientAssets
36+
working-directory: src/DirectiveAthenaWeb.Services.Js
3737

3838
- name: Run TypeScript unit tests
3939
run: npm run test:ts
40-
working-directory: src/DirectiveAthena.Website.ClientAssets
40+
working-directory: src/DirectiveAthenaWeb.Services.Js
4141

4242
- name: Restore dependencies
43-
run: dotnet restore DirectiveAthena.Website.slnx
43+
run: dotnet restore DirectiveAthenaWeb.slnx
4444

4545
- name: Run tests
46-
run: dotnet test --solution DirectiveAthena.Website.slnx --configuration Release --no-restore
46+
run: dotnet test --solution DirectiveAthenaWeb.slnx --configuration Release --no-restore

‎.github/workflows/publishGithubPages.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ jobs:
5656

5757
- name: Install npm dependencies
5858
run: npm ci
59-
working-directory: src/DirectiveAthena.Website.ClientAssets
59+
working-directory: src/DirectiveAthenaWeb.Services.Js
6060

6161
- name: Build interop bundle
6262
run: npm run build
63-
working-directory: src/DirectiveAthena.Website.ClientAssets
63+
working-directory: src/DirectiveAthenaWeb.Services.Js
6464

6565
- name: Run TypeScript unit tests
6666
run: npm run test:ts
67-
working-directory: src/DirectiveAthena.Website.ClientAssets
67+
working-directory: src/DirectiveAthenaWeb.Services.Js
6868

6969
- name: Bump site version
7070
id: version
7171
run: |
72-
version_file="src/DirectiveAthena.Website/wwwroot/version.txt"
72+
version_file="src/DirectiveAthenaWeb.Client/wwwroot/version.txt"
7373
if [ ! -f "$version_file" ]; then
7474
echo "0.0.0" > "$version_file"
7575
fi
@@ -112,19 +112,19 @@ jobs:
112112
fi
113113
git config user.name "github-actions[bot]"
114114
git config user.email "github-actions[bot]@users.noreply.github.com"
115-
git add src/DirectiveAthena.Website/wwwroot/version.txt
115+
git add src/DirectiveAthenaWeb.Client/wwwroot/version.txt
116116
git commit -m "chore: bump version to ${{ steps.version.outputs.version }}"
117117
git tag "v${{ steps.version.outputs.version }}"
118118
git remote set-url origin "https://x-access-token:${CORE_PUSH_TOKEN}@github.com/${{ github.repository }}.git"
119119
git push origin HEAD
120120
git push origin --tags
121121
122122
- name: Restore dependencies
123-
run: dotnet restore DirectiveAthena.Website.GithubPages.slnf
123+
run: dotnet restore DirectiveAthenaWeb.GithubPages.slnf
124124

125125
- name: Publish docs site
126126
run: |
127-
dotnet publish src/DirectiveAthena.Website -c Release -o ./out \
127+
dotnet publish src/DirectiveAthenaWeb.Client -c Release -o ./out \
128128
-p:PublishTrimmed=true \
129129
-p:TrimMode=partial \
130130
-p:DebuggerSupport=false \

‎.github/workflows/rollbackGithubPages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ jobs:
6262

6363
- name: Install npm dependencies
6464
run: npm ci
65-
working-directory: src/DirectiveAthena.Website.ClientAssets
65+
working-directory: src/DirectiveAthenaWeb.Services.Js
6666

6767
- name: Build interop bundle
6868
run: npm run build
69-
working-directory: src/DirectiveAthena.Website.ClientAssets
69+
working-directory: src/DirectiveAthenaWeb.Services.Js
7070

7171
- name: Publish docs site
7272
run: |
73-
dotnet publish src/DirectiveAthena.Website -c Release -o ./out \
73+
dotnet publish src/DirectiveAthenaWeb.Client -c Release -o ./out \
7474
-p:PublishTrimmed=true \
7575
-p:TrimMode=partial \
7676
-p:DebuggerSupport=false \

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,5 +775,5 @@ dist
775775
.temp/
776776

777777
# Local-only config (WASM)
778-
/src/DirectiveAthena.Website/wwwroot/appsettings.local.json
779-
/src/DirectiveAthena.WebsiteDevServer/appsettings.local.json
778+
/src/DirectiveAthenaWeb.Client/wwwroot/appsettings.local.json
779+
/src/DirectiveAthenaWeb.DevServer/appsettings.local.json

.run/DirectiveAthena.Website.DevServer_ https.run.xml renamed to .run/DirectiveAthenaWeb.DevServer_ https.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="DirectiveAthena.Website.DevServer: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
3-
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DirectiveAthena.WebsiteDevServer/DirectiveAthena.WebsiteDevServer.csproj" />
2+
<configuration default="false" name="DirectiveAthenaWeb.DevServer: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
3+
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DirectiveAthenaWeb.DevServer/DirectiveAthenaWeb.DevServer.csproj" />
44
<option name="LAUNCH_PROFILE_TFM" value="net10.0" />
55
<option name="LAUNCH_PROFILE_NAME" value="https" />
66
<option name="USE_MONO" value="0" />

‎DirectiveAthena.Website.GithubPages.slnf‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎DirectiveAthena.Website.slnx‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎DirectiveAthenaWeb.GithubPages.slnf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"solution": {
3+
"path": "DirectiveAthenaWeb.slnx",
4+
"projects": [
5+
"src\\DirectiveAthenaWeb.Client\\DirectiveAthenaWeb.Client.csproj",
6+
"src\\DirectiveAthenaWeb.Components\\DirectiveAthenaWeb.Components.csproj",
7+
"src\\DirectiveAthenaWeb.Services\\DirectiveAthenaWeb.Services.csproj",
8+
"src\\DirectiveAthenaWeb.Services.Js\\DirectiveAthenaWeb.Services.Js.csproj",
9+
"src\\DirectiveAthenaWeb.Services.Localization\\DirectiveAthenaWeb.Services.Localization.csproj",
10+
"src\\DirectiveAthenaWeb.Shared\\DirectiveAthenaWeb.Shared.csproj",
11+
12+
"tests\\DirectiveAthenaWebTests\\DirectiveAthenaWebTests.csproj"
13+
]
14+
}
15+
}

DirectiveAthena.Website.sln.DotSettings renamed to DirectiveAthenaWeb.sln.DotSettings

File renamed without changes.

0 commit comments

Comments
 (0)