diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..fe1152b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,30 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md +!**/.gitignore +!.git/HEAD +!.git/config +!.git/packed-refs +!.git/refs/heads/** \ No newline at end of file diff --git a/WorkManagementTool.slnx b/WorkManagementTool.slnx index 6b97fb0..8cdd1bd 100644 --- a/WorkManagementTool.slnx +++ b/WorkManagementTool.slnx @@ -1,3 +1,6 @@ + + + diff --git a/WorkManagementTool/Components/Layout/NavMenu.razor b/WorkManagementTool/Components/Layout/NavMenu.razor index 9fe43a8..e5ef83d 100644 --- a/WorkManagementTool/Components/Layout/NavMenu.razor +++ b/WorkManagementTool/Components/Layout/NavMenu.razor @@ -18,12 +18,6 @@ -
- - Auth Required - -
-
School Subjects diff --git a/WorkManagementTool/Components/Pages/Auth.razor b/WorkManagementTool/Components/Pages/Auth.razor deleted file mode 100644 index b7bbe6e..0000000 --- a/WorkManagementTool/Components/Pages/Auth.razor +++ /dev/null @@ -1,13 +0,0 @@ -@page "/auth" - -@using Microsoft.AspNetCore.Authorization - -@attribute [Authorize] - -Auth - -

You are authenticated

- - - Hello @context.User.Identity?.Name! - diff --git a/WorkManagementTool/Components/Pages/Home.razor b/WorkManagementTool/Components/Pages/Home.razor index 9001e0b..6960465 100644 --- a/WorkManagementTool/Components/Pages/Home.razor +++ b/WorkManagementTool/Components/Pages/Home.razor @@ -2,6 +2,6 @@ Home -

Hello, world!

+

Welcome to Work Management tool

-Welcome to your new app. +This application aims to help you with your work by managing task, homework and more ! diff --git a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor index fdcfee6..a8bf36d 100644 --- a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor +++ b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor @@ -15,20 +15,18 @@ } else { -
- Name -
@schoolSubject.Name
+
+ Name +
@schoolSubject.Name
@if (!string.IsNullOrWhiteSpace(schoolSubject.Description)) { - Description: -
@schoolSubject.Description
+ Description: +
@schoolSubject.Description
} - Created At -
@schoolSubject.CreatedAt.ToLocalTime()
- - Actions + Created At +
@schoolSubject.CreatedAt.ToLocalTime()
} @@ -41,6 +39,5 @@ else protected override async Task OnInitializedAsync() { schoolSubject = await SchoolSubjectService.GetSchoolSubjectByIdAsync(Id); - } } diff --git a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor index f79aa30..3ddd51f 100644 --- a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor +++ b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor @@ -11,7 +11,7 @@

SchoolSubjectListing

- + Create
@@ -22,10 +22,10 @@ } else { -
    +
      @foreach (var schoolSubject in schoolSubjects) { -
    • +
    • diff --git a/WorkManagementTool/Dockerfile b/WorkManagementTool/Dockerfile new file mode 100644 index 0000000..93c2529 --- /dev/null +++ b/WorkManagementTool/Dockerfile @@ -0,0 +1,30 @@ +# Consultez https://aka.ms/customizecontainer pour savoir comment personnaliser votre conteneur de débogage et comment Visual Studio utilise ce Dockerfile pour générer vos images afin d’accélérer le débogage. + +# Cet index est utilisé lors de l’exécution à partir de VS en mode rapide (par défaut pour la configuration de débogage) +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base +USER $APP_UID +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + + +# Cette phase est utilisée pour générer le projet de service +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["WorkManagementTool/WorkManagementTool.csproj", "WorkManagementTool/"] +RUN dotnet restore "./WorkManagementTool/WorkManagementTool.csproj" +COPY . . +WORKDIR "/src/WorkManagementTool" +RUN dotnet build "./WorkManagementTool.csproj" -c $BUILD_CONFIGURATION -o /app/build + +# Cette étape permet de publier le projet de service à copier dans la phase finale +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./WorkManagementTool.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +# Cette phase est utilisée en production ou lors de l’exécution à partir de VS en mode normal (par défaut quand la configuration de débogage n’est pas utilisée) +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "WorkManagementTool.dll"] \ No newline at end of file diff --git a/WorkManagementTool/Properties/launchSettings.json b/WorkManagementTool/Properties/launchSettings.json index 4a88e3e..cbe364b 100644 --- a/WorkManagementTool/Properties/launchSettings.json +++ b/WorkManagementTool/Properties/launchSettings.json @@ -1,23 +1,34 @@ { - "$schema": "https://json.schemastore.org/launchsettings.json", - "profiles": { - "http": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:5244", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "profiles": { + "http": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" }, - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "https://localhost:7148;http://localhost:5244", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5244" + }, + "https": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "dotnetRunMessages": true, + "applicationUrl": "https://localhost:7148;http://localhost:5244" + }, + "Container (Dockerfile)": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", + "environmentVariables": { + "ASPNETCORE_HTTPS_PORTS": "8081", + "ASPNETCORE_HTTP_PORTS": "8080" + }, + "publishAllPorts": true, + "useSSL": true } - } + }, + "$schema": "https://json.schemastore.org/launchsettings.json" +} \ No newline at end of file diff --git a/WorkManagementTool/WorkManagementTool.csproj b/WorkManagementTool/WorkManagementTool.csproj index f9a8304..8f96da1 100644 --- a/WorkManagementTool/WorkManagementTool.csproj +++ b/WorkManagementTool/WorkManagementTool.csproj @@ -6,6 +6,8 @@ enable aspnet-WorkManagementTool-90e0550e-5565-441a-8092-c4b9b07d34cf true + Linux + ..\docker-compose.dcproj @@ -15,6 +17,7 @@ + diff --git a/WorkManagementTool/work_management.db b/WorkManagementTool/work_management.db index b4c2b83..eb4ffef 100644 Binary files a/WorkManagementTool/work_management.db and b/WorkManagementTool/work_management.db differ diff --git a/WorkManagementTool/work_management.db-shm b/WorkManagementTool/work_management.db-shm index 1757335..8f88064 100644 Binary files a/WorkManagementTool/work_management.db-shm and b/WorkManagementTool/work_management.db-shm differ diff --git a/WorkManagementTool/work_management.db-wal b/WorkManagementTool/work_management.db-wal index ea492d6..ebebe21 100644 Binary files a/WorkManagementTool/work_management.db-wal and b/WorkManagementTool/work_management.db-wal differ diff --git a/docker-compose.dcproj b/docker-compose.dcproj new file mode 100644 index 0000000..365ffea --- /dev/null +++ b/docker-compose.dcproj @@ -0,0 +1,18 @@ + + + + 2.1 + Linux + 81dded9d-158b-e303-5f62-77a2896d2a5a + LaunchBrowser + {Scheme}://localhost:{ServicePort} + workmanagementtool + + + + docker-compose.yml + + + + + \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 0000000..4e46293 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,14 @@ +services: + workmanagementtool: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_HTTP_PORTS=8080 + - ASPNETCORE_HTTPS_PORTS=8081 + ports: + - "8080" + - "8081" + volumes: + - ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro + - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro + - ${APPDATA}/ASP.NET/Https:/home/app/.aspnet/https:ro + - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3d59a99 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,6 @@ +services: + workmanagementtool: + image: ${DOCKER_REGISTRY-}workmanagementtool + build: + context: . + dockerfile: WorkManagementTool/Dockerfile diff --git a/launchSettings.json b/launchSettings.json new file mode 100644 index 0000000..e4e7548 --- /dev/null +++ b/launchSettings.json @@ -0,0 +1,11 @@ +{ + "profiles": { + "Docker Compose": { + "commandName": "DockerCompose", + "commandVersion": "1.0", + "serviceActions": { + "workmanagementtool": "StartDebugging" + } + } + } +} \ No newline at end of file