Skip to content
This repository was archived by the owner on May 13, 2023. It is now read-only.

Feature/dotnet5 migration #18

Open
TTA777 wants to merge 57 commits into
base: master
Choose a base branch
from
Open

Feature/dotnet5 migration #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
a85c5b1
First step on the migration to .net5 and a refactoring of the project…
TTA777 Sep 14, 2021
bb6206f
The migrations for efCore
TTA777 Sep 14, 2021
0412756
Updated the .gitignore
TTA777 Sep 14, 2021
7d70045
Authorization is working. Get request have been tested to be working …
TTA777 Sep 17, 2021
99d216a
Moved blazor part of app to a seperate wasm project
TTA777 Sep 20, 2021
bb2c94f
Added exception filter to API and POC for new shifty web app
TTA777 Oct 6, 2021
4e1974e
Better handling of exceptions on the webAPI
TTA777 Oct 7, 2021
1c89d5c
Changed The shifty webApp to use the proper authentication flow, inst…
TTA777 Oct 7, 2021
e787687
Added the jwt token to httpClient headers
TTA777 Oct 7, 2021
5aaf682
MVP for checking into a shift
TTA777 Oct 8, 2021
2da086c
Added initial docker, and docker-compose support
TTA777 Oct 15, 2021
7d88122
Fix GetSemesterStart method
jonasanker Jan 30, 2022
6a138fd
Remove unused menu pages
jonasanker Jan 30, 2022
3add8fa
Allow more CORS origins
jonasanker Jan 30, 2022
0a3ff23
Log to file
jonasanker Jan 30, 2022
369b145
No / in api path
jonasanker Jan 30, 2022
baf26b1
Update path to /app/
jonasanker Jan 30, 2022
7546bba
Minor UI changes
jonasanker Jan 30, 2022
5f70717
Re-enable HttpResponseExceptionFilter
jonasanker Jan 30, 2022
be18fb7
Show invalid credentials alert when login throws 401
jonasanker Jan 30, 2022
4ed8f63
Improve CheckInPanel
jonasanker Jan 30, 2022
4cac4ca
Order shift by Shift Start
jonasanker Jan 31, 2022
8106f2d
Support for PWA
TTA777 Feb 5, 2022
c3ca544
More pwa work
TTA777 Feb 5, 2022
1bc0cd8
service.worker.published.js
jonasanker Feb 5, 2022
f987cfe
Removed some unused files, that should not have been committed
TTA777 Feb 7, 2022
27e4764
Fixed the authentication for httpCLients. Fixed the service-worker.pu…
TTA777 Feb 7, 2022
671da6d
Added very basic styling, and the current shift will now start out be…
TTA777 Feb 7, 2022
0d7ce45
Upgraded Shifty to .Net6
TTA777 Feb 7, 2022
2831730
Github action for shifty docker image
TTA777 Feb 8, 2022
5be08e4
Removed path restriction
TTA777 Feb 8, 2022
ea86bfb
Added debug step to workflow
TTA777 Feb 8, 2022
37e6bfd
Added debug step to workflow
TTA777 Feb 8, 2022
ad5f8e7
Updated path for dockerfile in workflow
TTA777 Feb 8, 2022
350dfe5
Updated dockerfile to .net6
TTA777 Feb 8, 2022
1e7d854
All projects target .NET 6, bumpt NuGet packages
jonasanker Feb 9, 2022
d8e6009
Update projects to .NET 6
jonasanker Feb 10, 2022
e162dc8
Added loading screen while wasm is booting. Added nicer loading scree…
TTA777 Feb 10, 2022
6bd48b4
Slightly more styling
TTA777 Feb 10, 2022
ea4bc78
The checkin action now uses a switch instead of two buttons.
TTA777 Feb 17, 2022
50c51fa
Make Alert bar more visible
jonasanker Feb 17, 2022
8adc9ce
Int to long for podioId in Employee and updated the podio nuget
TTA777 Sep 28, 2022
984e638
Migrations for efcore
TTA777 Sep 28, 2022
011f835
keep file for migrations folder
TTA777 Sep 28, 2022
34d2552
Add Primitives packages, setup cors
jonasanker Sep 28, 2022
e3c18c2
Adding more extensive logging
TTA777 Sep 30, 2022
312e492
Updated backend url for shifty, and a few changes to logging in backend
TTA777 Sep 30, 2022
c4b577f
Chnage CORS url for Shifty
jonasanker Sep 30, 2022
9c647ed
Updated docker file for shiftplanning. Restricted shifty pipeline to …
TTA777 Oct 1, 2022
c5070e9
Fixed a check whether a user is a manager when requesting employee data
TTA777 Oct 11, 2022
faaaf7d
Added an include to the reading of schedules that was needed to avoid…
TTA777 Oct 18, 2022
36f400e
Added better documentation of return types on the controllers
TTA777 Nov 15, 2022
9802168
Updated controllers so ModelStateDictionary is no longer explicitly r…
TTA777 Nov 29, 2022
587ecc2
Add support for nullable photoRefs
TTA777 Nov 30, 2022
1fdad3b
Refactored Shifty app so it no longer references ShiftPlanning directly
TTA777 Nov 30, 2022
6f55c96
Removed Shifty app project, and related projects from solution, since…
TTA777 Nov 30, 2022
df5f09f
Removed unnecesary toList for database call
TTA777 Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 46 additions & 0 deletions .github/workflows/build_shifty_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build and push Docker container

on:
push:
branches: [ feature/dotnet5Migration, master ]
paths:
- "API/ShiftPlanning.Shifty/**"

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Set branch name as env var
id: vars
run: |
trimmed=$(echo ${GITHUB_REF#refs/*/} | tr "/" "-")
echo ::set-output name=branchName::$trimmed
- name: Print branch name
run: |
echo ${{ steps.vars.outputs.branchName }}
- name: Current dir
id: dir
run: |
pwd
ls -Ra
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push container image
uses: docker/build-push-action@v2
with:
context: API/
file: API/Shifty.Dockerfile
platforms: linux/amd64
push: true
tags:
ghcr.io/analogio/shifty:${{ steps.vars.outputs.branchName }}
10 changes: 4 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,7 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
/API/API/connections.config
/API/API/appSettings.config
/API/Data.MSSQL/connections.config
/API/PublicApi/connections.config
/API/PublicApi/appSettings.config
API/Data.MSSQL/connections.config

# Avoid config files
API/ShiftPlanning.WebApi/appsettings.json
API/ShiftPlanning.WebApi/appsettings.Development.json
25 changes: 25 additions & 0 deletions API/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/.idea
**/*.*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
104 changes: 52 additions & 52 deletions API/API.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "API\API.csproj", "{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftPlanning.Common", "ShiftPlanning.Common\ShiftPlanning.Common.csproj", "{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{65C4B72F-3368-439E-BEB5-EBD575953FC3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftPlanning.DTOs", "ShiftPlanning.DTOs\ShiftPlanning.DTOs.csproj", "{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTransferObjects", "DataTransferObjects\DataTransferObjects.csproj", "{678CD23A-DEC4-4130-9F90-A0D7F760B004}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftPlanning.Model", "ShiftPlanning.Model\ShiftPlanning.Model.csproj", "{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.MSSQL", "Data.MSSQL\Data.MSSQL.csproj", "{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftPlanning.WebApi", "ShiftPlanning.WebApi\ShiftPlanning.WebApi.csproj", "{F20BEF1F-8CAD-4C11-9636-50EA073177A1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -21,54 +21,54 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|x64.ActiveCfg = Debug|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|x64.Build.0 = Debug|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|x86.ActiveCfg = Debug|x86
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Debug|x86.Build.0 = Debug|x86
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|Any CPU.Build.0 = Release|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|x64.ActiveCfg = Release|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|x64.Build.0 = Release|Any CPU
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|x86.ActiveCfg = Release|x86
{A79D9C08-A1A3-45D3-B0A0-462A4BB4DB64}.Release|x86.Build.0 = Release|x86
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|x64.ActiveCfg = Debug|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|x64.Build.0 = Debug|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|x86.ActiveCfg = Debug|x86
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Debug|x86.Build.0 = Debug|x86
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|Any CPU.Build.0 = Release|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|x64.ActiveCfg = Release|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|x64.Build.0 = Release|Any CPU
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|x86.ActiveCfg = Release|x86
{65C4B72F-3368-439E-BEB5-EBD575953FC3}.Release|x86.Build.0 = Release|x86
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|Any CPU.Build.0 = Debug|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|x64.ActiveCfg = Debug|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|x64.Build.0 = Debug|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|x86.ActiveCfg = Debug|x86
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Debug|x86.Build.0 = Debug|x86
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|Any CPU.ActiveCfg = Release|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|Any CPU.Build.0 = Release|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|x64.ActiveCfg = Release|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|x64.Build.0 = Release|Any CPU
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|x86.ActiveCfg = Release|x86
{678CD23A-DEC4-4130-9F90-A0D7F760B004}.Release|x86.Build.0 = Release|x86
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|x64.ActiveCfg = Debug|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|x64.Build.0 = Debug|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|x86.ActiveCfg = Debug|x86
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Debug|x86.Build.0 = Debug|x86
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|Any CPU.Build.0 = Release|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|x64.ActiveCfg = Release|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|x64.Build.0 = Release|Any CPU
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|x86.ActiveCfg = Release|x86
{69E98BC8-0B45-4FC8-9659-02BC4F65DC3D}.Release|x86.Build.0 = Release|x86
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|x64.ActiveCfg = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|x64.Build.0 = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|x86.ActiveCfg = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Debug|x86.Build.0 = Debug|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|Any CPU.Build.0 = Release|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|x64.ActiveCfg = Release|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|x64.Build.0 = Release|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|x86.ActiveCfg = Release|Any CPU
{E72980C5-C2F1-4A3A-B7B1-D0158BD5A746}.Release|x86.Build.0 = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|x64.ActiveCfg = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|x64.Build.0 = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|x86.ActiveCfg = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Debug|x86.Build.0 = Debug|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|Any CPU.Build.0 = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|x64.ActiveCfg = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|x64.Build.0 = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|x86.ActiveCfg = Release|Any CPU
{AA6E4175-CF7F-431D-BDA1-1F736BBA9599}.Release|x86.Build.0 = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|x64.Build.0 = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Debug|x86.Build.0 = Debug|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|Any CPU.Build.0 = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|x64.ActiveCfg = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|x64.Build.0 = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|x86.ActiveCfg = Release|Any CPU
{8D297E65-E716-46F1-8823-AAFCDB5BE4DE}.Release|x86.Build.0 = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|x64.ActiveCfg = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|x64.Build.0 = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|x86.ActiveCfg = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Debug|x86.Build.0 = Debug|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|Any CPU.Build.0 = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|x64.ActiveCfg = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|x64.Build.0 = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|x86.ActiveCfg = Release|Any CPU
{F20BEF1F-8CAD-4C11-9636-50EA073177A1}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading