Skip to content

Commit 59c8822

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents 05bf7a7 + b9faec1 commit 59c8822

File tree

66 files changed

+3802
-590
lines changed

Some content is hidden

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

66 files changed

+3802
-590
lines changed

‎eFormAPI/eFormAPI.Common/Models/Settings/Admin/AdminSettingsModel.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace eFormAPI.Common.Models.Settings.Admin
2+
{
3+
public class AdminSettingsModel
4+
{
5+
public HeaderSettingsModel HeaderSettingsModel { get; set; }
6+
public LoginPageSettingsModel LoginPageSettingsModel { get; set; }
7+
public SMTPSettingsModel SMTPSettingsModel { get; set; }
8+
public string SiteLink { get; set; }
9+
10+
public AdminSettingsModel()
11+
{
12+
HeaderSettingsModel = new HeaderSettingsModel();
13+
LoginPageSettingsModel = new LoginPageSettingsModel();
14+
SMTPSettingsModel = new SMTPSettingsModel();
15+
}
16+
}
17+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Admin/HeaderSettingsModel.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace eFormAPI.Common.Models.Settings.Admin
2+
{
3+
public class HeaderSettingsModel
4+
{
5+
public string MainText { get; set; }
6+
public bool MainTextVisible { get; set; }
7+
public string SecondaryText { get; set; }
8+
public bool SecondaryTextVisible { get; set; }
9+
public string ImageLink { get; set; }
10+
public bool ImageLinkVisible { get; set; }
11+
}
12+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Admin/LoginPageSettingsModel.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace eFormAPI.Common.Models.Settings.Admin
2+
{
3+
public class LoginPageSettingsModel
4+
{
5+
public string MainText { get; set; }
6+
public bool MainTextVisible { get; set; }
7+
public string SecondaryText { get; set; }
8+
public bool SecondaryTextVisible { get; set; }
9+
public string ImageLink { get; set; }
10+
public bool ImageLinkVisible { get; set; }
11+
}
12+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Admin/SMTPSettingsModel.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace eFormAPI.Common.Models.Settings.Admin
2+
{
3+
public class SMTPSettingsModel
4+
{
5+
public string Host { get; set; }
6+
public string Port { get; set; }
7+
public string Login { get; set; }
8+
public string Password { get; set; }
9+
}
10+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Initial/AdminSetupModel.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace eFormAPI.Common.Models.Settings.Initial
2+
{
3+
public class AdminSetupModel
4+
{
5+
public string Email { get; set; }
6+
public string UserName { get; set; }
7+
public string FirstName { get; set; }
8+
public string LastName { get; set; }
9+
public string Password { get; set; }
10+
}
11+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Initial/ConnectionStringMainModel.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.ComponentModel.DataAnnotations;
2+
3+
namespace eFormAPI.Common.Models.Settings.Initial
4+
{
5+
public class ConnectionStringMainModel
6+
{
7+
[Required]
8+
public string Source { get; set; }
9+
[Required]
10+
public string Catalogue { get; set; }
11+
[Required]
12+
public string Auth { get; set; }
13+
}
14+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Initial/ConnectionStringSDKModel.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.ComponentModel.DataAnnotations;
2+
3+
namespace eFormAPI.Common.Models.Settings.Initial
4+
{
5+
public class ConnectionStringSDKModel
6+
{
7+
[Required]
8+
public string Source { get; set; }
9+
[Required]
10+
public string Catalogue { get; set; }
11+
[Required]
12+
public string Auth { get; set; }
13+
[Required]
14+
public string Token { get; set; }
15+
}
16+
}

‎eFormAPI/eFormAPI.Common/Models/Settings/Initial/InitialSettingsModel.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace eFormAPI.Common.Models.Settings.Initial
2+
{
3+
public class InitialSettingsModel
4+
{
5+
public ConnectionStringMainModel ConnectionStringMain { get; set; }
6+
public ConnectionStringSDKModel ConnectionStringSdk { get; set; }
7+
public AdminSetupModel AdminSetupModel { get; set; }
8+
}
9+
}

‎eFormAPI/eFormAPI.Common/Models/WorkerCreateModel.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using eFormShared;
2-
3-
namespace eFormAPI.Common.Models
1+
namespace eFormAPI.Common.Models
42
{
53
public class WorkerCreateModel
64
{

‎eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\AWSSDK.Core.dll</HintPath>
33+
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
34+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\AWSSDK.Core.dll</HintPath>
3535
</Reference>
36-
<Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\AWSSDK.SQS.dll</HintPath>
36+
<Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
37+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\AWSSDK.SQS.dll</HintPath>
3838
</Reference>
39-
<Reference Include="eFormCommunicator, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormCommunicator.dll</HintPath>
39+
<Reference Include="eFormCommunicator, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
40+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormCommunicator.dll</HintPath>
4141
</Reference>
42-
<Reference Include="eFormCore, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormCore.dll</HintPath>
42+
<Reference Include="eFormCore, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
43+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormCore.dll</HintPath>
4444
</Reference>
45-
<Reference Include="eFormData, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormData.dll</HintPath>
45+
<Reference Include="eFormData, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
46+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormData.dll</HintPath>
4747
</Reference>
48-
<Reference Include="eFormShared, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormShared.dll</HintPath>
48+
<Reference Include="eFormShared, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
49+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormShared.dll</HintPath>
5050
</Reference>
51-
<Reference Include="eFormSqlController, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormSqlController.dll</HintPath>
51+
<Reference Include="eFormSqlController, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
52+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormSqlController.dll</HintPath>
5353
</Reference>
54-
<Reference Include="eFormSubscriber, Version=1.6.2.9, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microting.eForm.1.6.2.9\lib\eFormSubscriber.dll</HintPath>
54+
<Reference Include="eFormSubscriber, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
55+
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormSubscriber.dll</HintPath>
5656
</Reference>
5757
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
5858
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -85,7 +85,14 @@
8585
<Compile Include="Models\Auth\ForgotPasswordModel.cs" />
8686
<Compile Include="Models\Auth\ResetPasswordModel.cs" />
8787
<Compile Include="Models\DisplayTemplateColumnsModel.cs" />
88-
<Compile Include="Models\Settings\AdminSettingsModel.cs" />
88+
<Compile Include="Models\Settings\Admin\AdminSettingsModel.cs" />
89+
<Compile Include="Models\Settings\Admin\HeaderSettingsModel.cs" />
90+
<Compile Include="Models\Settings\Admin\LoginPageSettingsModel.cs" />
91+
<Compile Include="Models\Settings\Admin\SMTPSettingsModel.cs" />
92+
<Compile Include="Models\Settings\Initial\AdminSetupModel.cs" />
93+
<Compile Include="Models\Settings\Initial\ConnectionStringMainModel.cs" />
94+
<Compile Include="Models\Settings\Initial\ConnectionStringSDKModel.cs" />
95+
<Compile Include="Models\Settings\Initial\InitialSettingsModel.cs" />
8996
<Compile Include="Models\TemplateColumnModel.cs" />
9097
<Compile Include="Models\UpdateTemplateColumnsModel.cs" />
9198
<Compile Include="Models\User\UserInfoViewModel.cs" />
@@ -95,8 +102,6 @@
95102
<Compile Include="Models\Cases\Request\CaseEditRequestGroupField.cs" />
96103
<Compile Include="Models\Cases\Request\ReplyRequest.cs" />
97104
<Compile Include="Models\PaginationModel.cs" />
98-
<Compile Include="Models\Settings\AdminSetupModel.cs" />
99-
<Compile Include="Models\Settings\SettingsModel.cs" />
100105
<Compile Include="Models\DeployCheckbox.cs" />
101106
<Compile Include="Models\DeployModel.cs" />
102107
<Compile Include="Models\DeployToModel.cs" />
@@ -105,8 +110,6 @@
105110
<Compile Include="Models\SearchableList\AdvEntityGroupImportModel.cs" />
106111
<Compile Include="Models\SearchableList\AdvEntityItemModel.cs" />
107112
<Compile Include="Models\SearchableList\AdvEntityGroupListRequestModel.cs" />
108-
<Compile Include="Models\Settings\ConnectionStringMainModel.cs" />
109-
<Compile Include="Models\Settings\ConnectionStringSDKModel.cs" />
110113
<Compile Include="Models\SimpleSiteModel.cs" />
111114
<Compile Include="Models\SiteNameModel.cs" />
112115
<Compile Include="Models\User\UserInfoModelList.cs" />
@@ -117,19 +120,10 @@
117120
</ItemGroup>
118121
<ItemGroup>
119122
<None Include="App.config" />
120-
<None Include="letsencrypt\letsencrypt.exe.config" />
121123
<None Include="packages.config" />
122124
</ItemGroup>
123125
<ItemGroup>
124126
<Folder Include="Models\Cases\Response\" />
125127
</ItemGroup>
126-
<ItemGroup>
127-
<Content Include="letsencrypt\letsencrypt.exe" />
128-
<Content Include="letsencrypt\Web_Config.xml" />
129-
<Content Include="letsencrypt\x64\libeay32.dll" />
130-
<Content Include="letsencrypt\x64\ssleay32.dll" />
131-
<Content Include="letsencrypt\x86\libeay32.dll" />
132-
<Content Include="letsencrypt\x86\ssleay32.dll" />
133-
</ItemGroup>
134128
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135129
</Project>

0 commit comments

Comments
 (0)