-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #386 from NielsPilgaard/feature/membership
Feature/membership
- Loading branch information
Showing
95 changed files
with
1,837 additions
and
1,105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| github: NillerMedDild | ||
| github: NielsPilgaard |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
16 changes: 0 additions & 16 deletions
16
src/shared/Jordnaer.AppHost/Properties/launchSettings.json
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 9 additions & 4 deletions
13
src/shared/Jordnaer.Shared/Database/Enums/OwnershipLevel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,17 @@ | ||
| using System.ComponentModel.DataAnnotations; | ||
| using NetEscapades.EnumGenerators; | ||
|
|
||
| namespace Jordnaer.Shared; | ||
|
|
||
| [EnumExtensions] | ||
| public enum OwnershipLevel | ||
| { | ||
| None = 0, | ||
| Member = 1, | ||
| InheritsOwnership = 2, | ||
| Owner = 3 | ||
| [Display(Name = "Ingen")] | ||
| None = 0, | ||
| [Display(Name = "Medlem")] | ||
| Member = 1, | ||
| [Display(Name = "Arver Ejerskab")] | ||
| InheritsOwnership = 2, | ||
| [Display(Name = "Ejer")] | ||
| Owner = 3 | ||
| } |
13 changes: 7 additions & 6 deletions
13
src/shared/Jordnaer.Shared/Database/Enums/PermissionLevel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| using NetEscapades.EnumGenerators; | ||
| using System.ComponentModel.DataAnnotations; | ||
|
|
||
| namespace Jordnaer.Shared; | ||
|
|
||
| [EnumExtensions] | ||
| [Flags] | ||
| public enum PermissionLevel | ||
| { | ||
| None = 1, | ||
| Read = 2, | ||
| Write = 4, | ||
| Moderator = 8, | ||
| Admin = 16 | ||
| [Display(Name = "Ingen")] | ||
| None = 0, | ||
| [Display(Name = "Medlem")] | ||
| Write = 1, | ||
| [Display(Name = "Administrator")] | ||
| Admin = 2 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 48 additions & 35 deletions
83
src/shared/Jordnaer.Shared/UserSearch/DataForsyningenResponses.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,62 @@ | ||
| // ReSharper disable All | ||
| namespace Jordnaer.Shared; | ||
|
|
||
| // ReSharper disable InconsistentNaming | ||
| public readonly record struct AddressAutoCompleteResponse(string? Tekst, Adresse? Adresse) | ||
| { | ||
| public override string ToString() => Tekst ?? string.Empty; | ||
| public override string ToString() => Tekst ?? string.Empty; | ||
| } | ||
|
|
||
| public readonly record struct Adresse( | ||
| string? Id, | ||
| int Status, | ||
| int Darstatus, | ||
| string? Vejkode, | ||
| string? Vejnavn, | ||
| string? Adresseringsvejnavn, | ||
| string? Husnr, | ||
| object? Etage, | ||
| object? Dør, | ||
| object? Supplerendebynavn, | ||
| string? Postnr, | ||
| string? Postnrnavn, | ||
| object? Stormodtagerpostnr, | ||
| object? Stormodtagerpostnrnavn, | ||
| string? Kommunekode, | ||
| string? Adgangsadresseid, | ||
| float X, | ||
| float Y, | ||
| string? Href | ||
| string? Id, | ||
| int Status, | ||
| int Darstatus, | ||
| string? Vejkode, | ||
| string? Vejnavn, | ||
| string? Adresseringsvejnavn, | ||
| string? Husnr, | ||
| object? Etage, | ||
| object? Dør, | ||
| object? Supplerendebynavn, | ||
| string? Postnr, | ||
| string? Postnrnavn, | ||
| object? Stormodtagerpostnr, | ||
| object? Stormodtagerpostnrnavn, | ||
| string? Kommunekode, | ||
| string? Adgangsadresseid, | ||
| float X, | ||
| float Y, | ||
| string? Href | ||
| ); | ||
|
|
||
| public readonly record struct ZipCodeSearchResponse( | ||
| string? Href, | ||
| string? Nr, | ||
| string? Navn, | ||
| object? Stormodtageradresser, | ||
| float[]? Bbox, | ||
| float[]? Visueltcenter, | ||
| Kommuner[]? Kommuner, | ||
| DateTime Ændret, | ||
| DateTime Geo_Ændret, | ||
| int Geo_Version, | ||
| string? Dagi_Id | ||
| string? Href, | ||
| string? Nr, | ||
| string? Navn, | ||
| object? Stormodtageradresser, | ||
| float[]? Bbox, | ||
| float[]? Visueltcenter, | ||
| Kommuner[]? Kommuner, | ||
| DateTime Ændret, | ||
| DateTime Geo_Ændret, | ||
| int Geo_Version, | ||
| string? Dagi_Id | ||
| ); | ||
|
|
||
| public readonly record struct Kommuner( | ||
| string? Href, | ||
| string? Kode, | ||
| string? Navn | ||
| string? Href, | ||
| string? Kode, | ||
| string? Navn | ||
| ); | ||
|
|
||
| public readonly record struct ZipCodeAutoCompleteResponse(string? Tekst, Postnummer? Postnummer) | ||
| { | ||
| public override string ToString() => Tekst ?? string.Empty; | ||
| } | ||
|
|
||
| public readonly record struct Postnummer( | ||
| string? Nr, | ||
| string? Navn, | ||
| bool Stormodtager, | ||
| float Visueltcenter_x, | ||
| float Visueltcenter_y, | ||
| string? Href); |
Oops, something went wrong.