Skip to content

Commit 5ceb58d

Browse files
acoumbacoumb
authored
Merge pull request #72 from umbraco/feature/activecampaign-core
Split ActiveCampaign Core functionalities & support for Umbraco 11
2 parents 10ee144 + d0820ca commit 5ceb58d

18 files changed

+77
-32
lines changed

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignComposer.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignComposer.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using Microsoft.Extensions.DependencyInjection;
22

3+
using System;
4+
35
using Umbraco.Cms.Core.Composing;
46
using Umbraco.Cms.Core.DependencyInjection;
5-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
7+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
68

7-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
9+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
810
{
911
public class ActiveCampaignComposer : IComposer
1012
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfiguration.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Umbraco.Cms.Core.PropertyEditors;
22

3-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
3+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
44
{
55
public class ActiveCampaignFormPickerConfiguration
66
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfigurationEditor.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerConfigurationEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Umbraco.Cms.Core.PropertyEditors;
33
using Umbraco.Cms.Core.Services;
44

5-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
5+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
66
{
77
public class ActiveCampaignFormPickerConfigurationEditor : ConfigurationEditor<ActiveCampaignFormPickerConfiguration>
88
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerPropertyEditor.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerPropertyEditor.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using Umbraco.Cms.Core.PropertyEditors;
33
using Umbraco.Cms.Core.Services;
44

5-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
5+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
66
{
77
[DataEditor(
88
alias: Constants.PropertyEditorAlias,
99
name: "ActiveCampaign Form Picker",
1010
view: "~/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/views/formpicker.html",
11-
Group = Core.Constants.PropertyEditors.Groups.Pickers,
11+
Group = Cms.Core.Constants.PropertyEditors.Groups.Pickers,
1212
Icon = "icon-activecampaign")]
1313
public class ActiveCampaignFormPickerPropertyEditor : DataEditor
1414
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Configuration/ActiveCampaignSettings.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Configuration/ActiveCampaignSettings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration
2+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration
33
{
44
public class ActiveCampaignSettings
55
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Constants.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Constants.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
2+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
33
{
44
public class Constants
55
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Controllers/FormsController.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Controllers/FormsController.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
using Microsoft.AspNetCore.Mvc;
22
using Microsoft.Extensions.Options;
33

4+
using System;
5+
using System.Net.Http;
46
using System.Text.Json;
57
using System.Text.Json.Nodes;
8+
using System.Threading.Tasks;
69

7-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
8-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
10+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
11+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos;
912
using Umbraco.Cms.Web.BackOffice.Controllers;
1013
using Umbraco.Cms.Web.Common.Attributes;
1114

12-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Controllers
15+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Controllers
1316
{
1417
[PluginController("UmbracoCmsIntegrationsCrmActiveCampaign")]
1518
public class FormsController : UmbracoAuthorizedApiController

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Editors/ActiveCampaignFormPickerValueConverter.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Editors/ActiveCampaignFormPickerValueConverter.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using Microsoft.Extensions.Options;
2-
using System.Text.Json.Nodes;
2+
3+
using System;
34

45
using Umbraco.Cms.Core.Models.PublishedContent;
56
using Umbraco.Cms.Core.PropertyEditors;
6-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
7-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.ViewModels;
7+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
8+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.ViewModels;
89

9-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Editors
10+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Editors
1011
{
1112
public class ActiveCampaignFormPickerValueConverter : PropertyValueConverterBase
1213
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Helpers/ActiveCampaignHtmlExtensions.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Helpers/ActiveCampaignHtmlExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Microsoft.AspNetCore.Html;
22
using Microsoft.AspNetCore.Mvc.Rendering;
33

4-
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.ViewModels;
4+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.ViewModels;
55

66
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Helpers
77
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/ApiAccessDto.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/ApiAccessDto.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
2+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
33
{
44
public class ApiAccessDto
55
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/BaseResponseDto.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/BaseResponseDto.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Text.Json.Serialization;
22

3-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
3+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
44
{
55
public abstract class BaseResponseDto
66
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/FormCollectionResponseDto.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/FormCollectionResponseDto.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using System.Text.Json.Serialization;
1+
using System.Collections.Generic;
2+
using System.Text.Json.Serialization;
23

3-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
4+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
45
{
56
public class FormCollectionResponseDto : BaseResponseDto
67
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/FormDto.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/FormDto.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Text.Json.Serialization;
22

3-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
3+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
44
{
55
public class FormDto
66
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/FormResponseDto.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/FormResponseDto.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Text.Json.Serialization;
22

3-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
3+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
44
{
55
public class FormResponseDto : BaseResponseDto
66
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/ViewModels/FormViewModel.cs renamed to ‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/ViewModels/FormViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.ViewModels
2+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.ViewModels
33
{
44
public class FormViewModel
55
{

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.csproj

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net60;net70</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<WarningsAsErrors>Nullable</WarningsAsErrors>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<PackageId>Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core</PackageId>
11+
<Title>Umbraco CMS Integrations: CRM - ActiveCampaign.Core</Title>
12+
<Description>Core package for Umbraco CMS integration with ActiveCampaign.</Description>
13+
<PackageIconUrl></PackageIconUrl>
14+
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Crm.ActiveCampaign</PackageProjectUrl>
15+
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16+
<Version>2.0.0</Version>
17+
<Authors>Umbraco HQ</Authors>
18+
<Company>Umbraco</Company>
19+
</PropertyGroup>
20+
21+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
22+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.0.0,11)" />
23+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.0.0,11)" />
24+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[10.0.0,11)" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
28+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12)" />
29+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12)" />
30+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12)" />
31+
</ItemGroup>
32+
33+
</Project>

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Umbraco.Cms.Integrations.Crm.ActiveCampaign.csproj

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net60;net70</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<WarningsAsErrors>Nullable</WarningsAsErrors>
77
</PropertyGroup>
@@ -13,19 +13,13 @@
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Crm.ActiveCampaign</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16-
<Version>1.0.2</Version>
16+
<Version>2.0.0</Version>
1717
<Authors>Umbraco HQ</Authors>
1818
<Company>Umbraco</Company>
1919
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
2020
<PackageIcon>activecampaign.png</PackageIcon>
2121
</PropertyGroup>
2222

23-
<ItemGroup>
24-
<PackageReference Include="Umbraco.Cms.Web.Website" version="10.1.0" />
25-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="10.1.0" />
26-
<PackageReference Include="Umbraco.Cms.Web.Common" version="10.1.0" />
27-
</ItemGroup>
28-
2923
<ItemGroup>
3024
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\ActiveCampaign\**\*.*">
3125
<Pack>true</Pack>
@@ -58,4 +52,8 @@
5852
</Content>
5953
</ItemGroup>
6054

55+
<ItemGroup>
56+
<ProjectReference Include="..\Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core\Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.csproj" />
57+
</ItemGroup>
58+
6159
</Project>

‎src/Umbraco.Cms.Integrations.sln

+8-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Algolia", "Algolia", "{F2CA
6969
EndProject
7070
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Search.Algolia", "Umbraco.Cms.Integrations.Search.Algolia\Umbraco.Cms.Integrations.Search.Algolia.csproj", "{54A624E5-5321-4CC8-B74B-11ABF3605242}"
7171
EndProject
72-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Testsite.V11", "Umbraco.Cms.Integrations.Testsite.V11\Umbraco.Cms.Integrations.Testsite.V11.csproj", "{C3A51214-F058-4864-B0B2-4F788383A5EC}"
72+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Testsite.V11", "Umbraco.Cms.Integrations.Testsite.V11\Umbraco.Cms.Integrations.Testsite.V11.csproj", "{C3A51214-F058-4864-B0B2-4F788383A5EC}"
73+
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core", "Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core\Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.csproj", "{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}"
7375
EndProject
7476
Global
7577
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -137,6 +139,10 @@ Global
137139
{C3A51214-F058-4864-B0B2-4F788383A5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
138140
{C3A51214-F058-4864-B0B2-4F788383A5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
139141
{C3A51214-F058-4864-B0B2-4F788383A5EC}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Release|Any CPU.Build.0 = Release|Any CPU
140146
EndGlobalSection
141147
GlobalSection(SolutionProperties) = preSolution
142148
HideSolutionNode = FALSE
@@ -162,6 +168,7 @@ Global
162168
{8FC3A87F-C10E-4605-9D24-BFF46D472170} = {1A4D3D38-F5B2-4528-92A1-318A7D09949D}
163169
{F2CAA1F7-9BED-4EB6-8875-D176B92D393A} = {F56605AE-2258-4F61-B454-4247334DFC26}
164170
{54A624E5-5321-4CC8-B74B-11ABF3605242} = {F2CAA1F7-9BED-4EB6-8875-D176B92D393A}
171+
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2} = {1A4D3D38-F5B2-4528-92A1-318A7D09949D}
165172
EndGlobalSection
166173
GlobalSection(ExtensibilityGlobals) = postSolution
167174
SolutionGuid = {2FB51E08-A3C8-4DFF-B3CB-E99C2ED021D5}

0 commit comments

Comments
 (0)