Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Dev rebase #29

Merged
merged 66 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
86bec71
Update new database
lewis0811 Sep 17, 2023
ead2e19
Merge remote-tracking branch 'upstream/master'
lewis0811 Sep 17, 2023
3ecf283
Merge pull request #20 from pytas0811/master
k-nero Sep 17, 2023
34d4912
fix database
k-nero Sep 17, 2023
98b1ca6
Update Enum, Update Database, Template Command and Query
k-nero Sep 18, 2023
3952191
Migration
k-nero Sep 18, 2023
62cdd93
Migration
k-nero Sep 18, 2023
93bde4e
Update Entities, Building Controller
k-nero Sep 18, 2023
2c54295
Update aws.yml
k-nero Sep 18, 2023
475e5dc
Update
k-nero Sep 18, 2023
aeeb350
Update Payment
k-nero Sep 19, 2023
fced052
Update Entity 2
lewis0811 Sep 19, 2023
7cc9743
Merge branch 'Dev' of https://github.com/thanhplassma/SWD-Laundry-Bac…
lewis0811 Sep 19, 2023
bc4d2ed
Merge pull request #22 from pytas0811/Dev
k-nero Sep 19, 2023
3abd665
Delete src/WebUI/appsettings.json
k-nero Sep 19, 2023
cb5ad40
update
k-nero Sep 19, 2023
0be1ca0
Dev
k-nero Sep 19, 2023
526a09f
UpdateEntity5
lewis0811 Sep 22, 2023
9f42d83
Merge branch 'Dev' into Dev
lewis0811 Sep 22, 2023
b8c0370
Merge pull request #23 from pytas0811/Dev
k-nero Sep 22, 2023
f938a65
Complete remove Domain.Validate
k-nero Sep 22, 2023
d9fa63a
minor update
k-nero Sep 22, 2023
154d75f
Update database5
lewis0811 Sep 26, 2023
97273ad
Update database5
lewis0811 Sep 26, 2023
358ca82
Merge pull request #24 from pytas0811/Dev
k-nero Sep 26, 2023
c319088
Fix Migration
k-nero Sep 26, 2023
63b1132
Rebase project
k-nero Sep 30, 2023
52dc28c
Create Infrastructure
k-nero Sep 30, 2023
4977c86
Core
k-nero Sep 30, 2023
ed44995
Update
k-nero Sep 30, 2023
3a1a017
Finished Base
k-nero Oct 1, 2023
5d0afc3
Update Repository
k-nero Oct 1, 2023
18a0669
UpdateDatabase6
lewis0811 Oct 1, 2023
5f2167a
Fix DI
k-nero Oct 1, 2023
7e4a5b3
Update IBaseRepository.cs
k-nero Oct 1, 2023
0a0c32a
Update BaseRepository.cs
k-nero Oct 1, 2023
8743bd0
Merge pull request #25 from pytas0811/Dev-Rebase
k-nero Oct 1, 2023
2a3071f
Add Migration, Building Repo, Service, Controller
k-nero Oct 1, 2023
cbd68c3
Identity-Update
k-nero Oct 1, 2023
102d2b4
Identity Service
k-nero Oct 1, 2023
40c6260
Update Building Controller
k-nero Oct 2, 2023
b25833f
Create ViewModel for Core Project
lewis0811 Oct 2, 2023
b6dc0d6
Add data for testing
lewis0811 Oct 2, 2023
b7ca32c
Update appsettings.Development.json
k-nero Oct 2, 2023
03a45b7
Merge pull request #26 from pytas0811/Dev-Rebase
k-nero Oct 2, 2023
fff160f
Update TrailingSlash
k-nero Oct 2, 2023
9fa7ff8
Profile
k-nero Oct 2, 2023
d324c46
Add Mapper Profile & Data Script
lewis0811 Oct 2, 2023
7b1e5b3
Merge branch 'Dev-Rebase' into Dev-Rebase
lewis0811 Oct 2, 2023
50c6728
Merge pull request #27 from pytas0811/Dev-Rebase
k-nero Oct 2, 2023
b180a23
Added Cache layer
k-nero Oct 2, 2023
442da80
Building Cache Layer
k-nero Oct 2, 2023
ad9b3bb
refresh entity in cache layer
k-nero Oct 2, 2023
87bc6e9
Try get id from filter
k-nero Oct 2, 2023
ab549cf
Delete src/SWD-Laundry-Backend/appsettings.Development.json
k-nero Oct 3, 2023
c4a68f0
Update
k-nero Oct 3, 2023
4fc3ab8
Update
k-nero Oct 3, 2023
566630e
jwt
k-nero Oct 3, 2023
18beef4
UpdateTimeScheduleController & New SQL Data
lewis0811 Oct 3, 2023
caac92b
Update .gitignore
lewis0811 Oct 3, 2023
32ac3f3
Update .gitignore
k-nero Oct 3, 2023
aaac852
Update appsettings.Development.json
k-nero Oct 3, 2023
77a1c83
Merge pull request #28 from pytas0811/Dev-Rebase
k-nero Oct 3, 2023
5e5b810
update .gitignore
k-nero Oct 4, 2023
be87365
update appsettings
k-nero Oct 4, 2023
d5a0944
Update TimeScheduleRepository.cs
k-nero Oct 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .github/workflows/aws.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# name: Deploy to Amazon EC2
name: Build Test

# on:
# pull_request:
# branches: [ "master" ]
on:
pull_request:
branches: [ "master" ]


# permissions:
# contents: read
permissions:
contents: read

# env:
# DEPLOYMENT_FOLDER: C:\inetpub\wwwroot\SWD-Laundry-Project\

# jobs:
# build:
# name: Publish and Deploy
# runs-on: windows-latest
# environment: production
# steps:
# - name: Checkout
# uses: actions/checkout@v3
jobs:
build:
name: Build
runs-on: windows-latest
environment: production
steps:
- name: Checkout
uses: actions/checkout@v3

# - name: Setup .NET SDK
# uses: actions/setup-dotnet@v3
# with:
# dotnet-version: '7.0.401' # replace with your .NET version
# - name: Install dependencies
# run: dotnet restore
# - name: Build
# run: dotnet build --configuration Release --no-restore
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.401' # replace with your .NET version
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
# - name: Publish
# run: dotnet publish --configuration Release --output ./publish /p:RuntimeIdentifier=win-x64 /p:TargetFramework=net7.0
# - name: Archive Artifacts
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,6 @@ _Pvt_Extensions
/SWD_Laundry_Backend.ndproj
/.mfractor
src/WebUI/ClientApp/package-lock.json
/src/WebUI/appsettings.json
/src/SWD-Laundry-Backend/appsettings.Development.json
/src/SWD-Laundry-Backend/appsettings.Production.json
86 changes: 53 additions & 33 deletions SWD-Laundry-Backend.sln
Original file line number Diff line number Diff line change
@@ -1,58 +1,78 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain", "src\Domain\Domain.csproj", "{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend", "src\SWD-Laundry-Backend\SWD-Laundry-Backend.csproj", "{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application", "src\Application\Application.csproj", "{34C0FACD-F3D9-400C-8945-554DD6B0819A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web API", "Web API", "{36453920-D9F0-4EFF-898D-2CEB9A2217CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure", "src\Infrastructure\Infrastructure.csproj", "{117DA02F-5274-4565-ACC6-DA9B6E568B09}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Repository", "Repository", "{709AF39E-C923-4181-A776-01DBA3C45731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6ED356A7-8B47-4613-AD01-C85CF28491BD}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service", "Service", "{DAF8ABB4-A12C-4E6A-A15D-4F39A67EB1DF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI", "src\WebUI\WebUI.csproj", "{22454EE9-16B3-4B7A-8352-37E59B858155}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{A33BBFB5-1BF2-492E-AD5D-8265E276F60A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E2DA20AA-28D1-455C-BF50-C49A8F831633}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
global.json = global.json
EndProjectSection
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Core", "src\SWD-Laundry-Backend.Core\SWD-Laundry-Backend.Core.csproj", "{A844548E-538A-461F-837F-D0A4243CE03A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Mapper", "src\SWD-Laundry-Backend.Mapper\SWD-Laundry-Backend.Mapper.csproj", "{EC75302B-AB1D-4D22-9957-7CEBF3B7501B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Contract.Repository", "src\SWD-Laundry-Backend.Contract.Repository\SWD-Laundry-Backend.Contract.Repository.csproj", "{A0B198E3-377D-4C83-8235-190B59B7A1AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Repository", "src\SWD-Laundry-Backend.Repository\SWD-Laundry-Backend.Repository.csproj", "{7C9DBA26-6A75-436D-AE3A-919CC7C11061}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Service", "src\SWD-Laundry-Backend.Service\SWD-Laundry-Backend.Service.csproj", "{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SWD-Laundry-Backend.Contract.Service", "src\SWD-Laundry-Backend.Contract.Service\SWD-Laundry-Backend.Contract.Service.csproj", "{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69}.Release|Any CPU.Build.0 = Release|Any CPU
{34C0FACD-F3D9-400C-8945-554DD6B0819A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34C0FACD-F3D9-400C-8945-554DD6B0819A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34C0FACD-F3D9-400C-8945-554DD6B0819A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34C0FACD-F3D9-400C-8945-554DD6B0819A}.Release|Any CPU.Build.0 = Release|Any CPU
{117DA02F-5274-4565-ACC6-DA9B6E568B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{117DA02F-5274-4565-ACC6-DA9B6E568B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{117DA02F-5274-4565-ACC6-DA9B6E568B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{117DA02F-5274-4565-ACC6-DA9B6E568B09}.Release|Any CPU.Build.0 = Release|Any CPU
{22454EE9-16B3-4B7A-8352-37E59B858155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22454EE9-16B3-4B7A-8352-37E59B858155}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.Build.0 = Release|Any CPU
{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4}.Release|Any CPU.Build.0 = Release|Any CPU
{A844548E-538A-461F-837F-D0A4243CE03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A844548E-538A-461F-837F-D0A4243CE03A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A844548E-538A-461F-837F-D0A4243CE03A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A844548E-538A-461F-837F-D0A4243CE03A}.Release|Any CPU.Build.0 = Release|Any CPU
{EC75302B-AB1D-4D22-9957-7CEBF3B7501B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC75302B-AB1D-4D22-9957-7CEBF3B7501B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC75302B-AB1D-4D22-9957-7CEBF3B7501B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC75302B-AB1D-4D22-9957-7CEBF3B7501B}.Release|Any CPU.Build.0 = Release|Any CPU
{A0B198E3-377D-4C83-8235-190B59B7A1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0B198E3-377D-4C83-8235-190B59B7A1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0B198E3-377D-4C83-8235-190B59B7A1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0B198E3-377D-4C83-8235-190B59B7A1AF}.Release|Any CPU.Build.0 = Release|Any CPU
{7C9DBA26-6A75-436D-AE3A-919CC7C11061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C9DBA26-6A75-436D-AE3A-919CC7C11061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C9DBA26-6A75-436D-AE3A-919CC7C11061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C9DBA26-6A75-436D-AE3A-919CC7C11061}.Release|Any CPU.Build.0 = Release|Any CPU
{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8}.Release|Any CPU.Build.0 = Release|Any CPU
{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C7E89A3E-A631-4760-8D61-BD1EAB1C4E69} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
{34C0FACD-F3D9-400C-8945-554DD6B0819A} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
{117DA02F-5274-4565-ACC6-DA9B6E568B09} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
{22454EE9-16B3-4B7A-8352-37E59B858155} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
{AA5AD472-4023-4E4F-A5B6-E0EFFA6183F4} = {36453920-D9F0-4EFF-898D-2CEB9A2217CD}
{A844548E-538A-461F-837F-D0A4243CE03A} = {A33BBFB5-1BF2-492E-AD5D-8265E276F60A}
{EC75302B-AB1D-4D22-9957-7CEBF3B7501B} = {A33BBFB5-1BF2-492E-AD5D-8265E276F60A}
{A0B198E3-377D-4C83-8235-190B59B7A1AF} = {709AF39E-C923-4181-A776-01DBA3C45731}
{7C9DBA26-6A75-436D-AE3A-919CC7C11061} = {709AF39E-C923-4181-A776-01DBA3C45731}
{2DFE5E2D-F533-46B6-BD4C-056A701DEFB8} = {DAF8ABB4-A12C-4E6A-A15D-4F39A67EB1DF}
{A7F4EAFC-1E0C-4DF5-90C1-9D4C70B2D2FE} = {DAF8ABB4-A12C-4E6A-A15D-4F39A67EB1DF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3CB609D9-5D54-4C11-A371-DAAC8B74E430}
SolutionGuid = {D90E09BD-DB96-4CB2-97F2-86C759A1C802}
EndGlobalSection
EndGlobal
Binary file added Script.sql
Binary file not shown.
21 changes: 0 additions & 21 deletions src/Application/Application.csproj

This file was deleted.

80 changes: 0 additions & 80 deletions src/Application/Common/Behaviours/AuthorizationBehaviour.cs

This file was deleted.

34 changes: 0 additions & 34 deletions src/Application/Common/Behaviours/LoggingBehaviour.cs

This file was deleted.

54 changes: 0 additions & 54 deletions src/Application/Common/Behaviours/PerformanceBehaviour.cs

This file was deleted.

30 changes: 0 additions & 30 deletions src/Application/Common/Behaviours/UnhandledExceptionBehaviour.cs

This file was deleted.

Loading