Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shopify and Xperience by Kentico integration #7

Merged
merged 128 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
ea6ace4
Add all shopify integration files to repo
martinkyjac Apr 23, 2024
6b204d5
Add ecommerce-common git submodule with ecommerce common library
martinkyjac Apr 23, 2024
a5eb9c1
Clone code from xperience-by-kentico-ecommerce branch feat/shopify_in…
martinkyjac Apr 23, 2024
d89e622
Change appsettings properties names to match integration settings pro…
martinkyjac Apr 23, 2024
6052045
Create ShopifyConfig class to get settings from appsettings.json
martinkyjac Apr 23, 2024
143c108
Create IOptionsMonitor for ShopifyConfig
martinkyjac Apr 23, 2024
b53712d
Use data from IOptionsMonitor instead of IntegrationSettings
martinkyjac Apr 23, 2024
eabde96
Extend ShoppingCart GraphQL object - add buyer identity and product v…
martinkyjac Apr 24, 2024
5f669dc
Create shopping cart page view models
martinkyjac Apr 24, 2024
8e699e1
Add FormatPrice method overload with CurrencyCode parameter instead o…
martinkyjac Apr 24, 2024
b2afe47
Add shopping cart page view models
martinkyjac Apr 24, 2024
f825159
Add shopping cart page views
martinkyjac Apr 24, 2024
13a7495
Create shopping cart page controller
martinkyjac Apr 24, 2024
02d1164
Add ShopifyProductID to VariantSynchronizationItem
martinkyjac Apr 24, 2024
739449b
Add shopping cart styles
martinkyjac Apr 24, 2024
c74d2f1
Fix UpdateCartModel enum values
martinkyjac Apr 24, 2024
a7ac265
Use constant shopping cart URL in minicart view component
martinkyjac Apr 24, 2024
7bd2a67
Update shopping cart page views
martinkyjac Apr 24, 2024
9867ccd
Add ShoppingCart controller
martinkyjac Apr 24, 2024
bc7af3b
Add coupon methods to ShoppingService
martinkyjac Apr 24, 2024
5e5c357
Create update discount code response model
martinkyjac Apr 24, 2024
3d4b2a5
Add coupon code form into CartcontentTotalsView.cshtml
martinkyjac Apr 24, 2024
ae46900
Add endpoints to update coupon codes to shopping cart controller
martinkyjac Apr 24, 2024
4ad3182
Rename discount coupon names to discount codes to unify the names wit…
martinkyjac Apr 24, 2024
48f1198
Add custom activity code names into new class
martinkyjac Apr 26, 2024
fac64ec
Add EcommerceActivityLogger class with implementation
martinkyjac Apr 26, 2024
1826b2b
Add interface IEcommerceActivityLogger
martinkyjac Apr 26, 2024
86a90f6
Add IEcommerceActivityLogger to service collection
martinkyjac Apr 26, 2024
a23f8ff
Use EcommerceActivityLogger in ShoppingService to log ecommerce acti…
martinkyjac Apr 26, 2024
d816eec
Remove warning from generated classes
martinkyjac Apr 29, 2024
c51b8f1
Update README.md
martinkyjac Apr 29, 2024
2a0c0b9
Use inject service IInfoProvider<CurrencyFormatInfo>
martinkyjac Apr 29, 2024
3d8d84b
Use IInfoProvider<IntegrationSettingsInfo>
martinkyjac Apr 29, 2024
552cd78
Add content hub screenshot to README.md
martinkyjac Apr 29, 2024
560758e
Update README.md
martinkyjac Apr 29, 2024
ca0e10a
Merge pull request #1 from Kentico/feat/shopify_integration_refactorig
martinkyjac Apr 29, 2024
c11763e
Update common library and remove incorrect usings
martinkyjac Apr 29, 2024
3f13494
Merge remote-tracking branch 'origin/feat/XbyK_Shopify_integration' i…
martinfbluesoftcz Apr 29, 2024
1503854
Create shopify order service
martinkyjac Apr 29, 2024
8b04a9a
Add IShopifyOrderService to service collection
martinkyjac Apr 29, 2024
cce548d
Add generated ThankYouPage class
martinkyjac Apr 29, 2024
be6a533
Add Thank you page controller and view
martinkyjac Apr 29, 2024
e9f8e36
Remove unused method in ShopifyCartViewComponent
martinkyjac Apr 29, 2024
04e7803
Rename folder from ShopifyCartWidget to ShopifyCartViewComponent
martinkyjac Apr 29, 2024
7a49396
Rename folder ShopifyCartViewComponent to ShopifyCart
martinkyjac Apr 29, 2024
bd8329b
Move ViewData PageClass setting from controller to view
martinkyjac Apr 29, 2024
c25cf8b
Remove unnecessary view path in ShopifyShoppingCartController
martinkyjac Apr 29, 2024
28afee3
Remove TODO
martinkyjac Apr 29, 2024
f53b4a3
Merge pull request #2 from Kentico/feat/shopify_shopping_cart_page
martinkyjac Apr 29, 2024
eb071bd
Update common library
martinkyjac Apr 29, 2024
b5e1690
Merge branch 'feat/XbyK_Shopify_integration' of https://github.com/Ke…
martinkyjac Apr 29, 2024
1fbd3d1
Make ShopifyOrderService return whole Order instead of only Customer …
martinkyjac Apr 29, 2024
eafa56f
Fix typo in ShopifyThankYouController
martinkyjac Apr 29, 2024
3682450
Update EcommerceActivityLogger method parameters
martinkyjac Apr 29, 2024
cf44a66
Create Thank you page view
martinkyjac Apr 29, 2024
4717b18
Rename order service method
martinkyjac Apr 30, 2024
ae6775f
Generate shopify related data to the conitnuous integration repository
martinkyjac Apr 30, 2024
70c40b7
Add empty lines between methods
martinkyjac Apr 30, 2024
3f28e96
Merge branch 'feat/XbyK_Shopify_integration' into feat/custom_activit…
martinkyjac Apr 30, 2024
2aeae2f
Remove unused method
martinkyjac Apr 30, 2024
8ccd5fb
Add user guide
martinkyjac May 2, 2024
cd8dfec
Update Usage-Guide.md
martinkyjac May 2, 2024
01d0b6e
Update anchor name in user guide
martinkyjac May 2, 2024
d5bc3d2
Update Xperience nuget packages
martinkyjac May 2, 2024
8479e02
Rename ProductListItemViewModel to ShopifyProductListItemViewModel
martinkyjac May 6, 2024
9879fd4
Update DancingGoat store
martinkyjac May 6, 2024
0ebb7c2
Merge branch 'feat/XbyK_Shopify_integration' into update/XbyK_29_0_2
martinkyjac May 6, 2024
3bd1c8d
Move orders fields to constant
martinkyjac May 6, 2024
ca444bb
Merge pull request #3 from Kentico/feat/custom_activity_logging
martinkyjac May 6, 2024
28950a1
Move services.AddSession() into RegisterShopifyServices method extension
martinkyjac May 6, 2024
560ff55
Update Usage-Guide.md
martinkyjac May 6, 2024
5b26e5e
Fix order numbers in Usage-Guide.md
martinkyjac May 6, 2024
da997b2
Update README.md
martinkyjac May 6, 2024
b10c0e6
Add publishing profile files to .gitignore
martinkyjac May 6, 2024
0fc1c8b
Merge branch 'feat/XbyK_Shopify_integration' of https://github.com/Ke…
martinkyjac May 6, 2024
49cead1
Remove caching product variant prices on product detail page
martinkyjac May 9, 2024
8a87569
Add fields to store pagetype
martinkyjac May 9, 2024
5112e20
Regenerate all content type classes
martinkyjac May 9, 2024
b128421
Add hot tips and bestsellers to storepage
martinkyjac May 9, 2024
6ca6b2b
Fix displaying products in Store page
martinkyjac May 10, 2024
5f52f79
Hide variant selector if only 1 variant available
martinkyjac May 10, 2024
250b68d
Fix shopping cart page HTTP 500 error when cart not exist
martinkyjac May 10, 2024
cfcc057
Display error message when updating/adding cart products
martinkyjac May 10, 2024
94c149e
Update Shopify.StorePage content type scheme
martinkyjac May 10, 2024
14578b3
Add inverted css class to product detail page
martinkyjac May 10, 2024
c3c283c
Add message `gift cards can be applied in checkout` to shopping cart …
martinkyjac May 13, 2024
1da13fd
Use HtmlLocalizer instead of raw text in cshtml views
martinkyjac May 13, 2024
0c4c0a9
Add Continue shopping link into shopping cart page
martinkyjac May 13, 2024
83d68d4
Add HTTP Redirect to ProductDetailController after cart items update …
martinkyjac May 13, 2024
6d6dc65
Add default URL if Request.Path has no value
martinkyjac May 13, 2024
245e6bc
Add set dotnet_separate_import_directive_groups to True in .editorconfig
martinkyjac May 13, 2024
88fee6b
Run code cleanup in Kentico.Xperience.Shopify project
martinkyjac May 13, 2024
4ee7262
Code cleanup in DancingGoat-Shopify project
martinkyjac May 13, 2024
4b3f4a8
Remove warnings from projects
martinkyjac May 13, 2024
9e45faa
Fix typo in ProductDetailViewModel
martinkyjac May 13, 2024
fcff077
Merge pull request #4 from Kentico/feat/bugfixes
martinkyjac May 13, 2024
955c2de
Update README.md
martinkyjac May 14, 2024
bb18d97
Update XByK version matrix in README.md
martinkyjac May 14, 2024
5c36c65
Product detail page - set default quantity for add to cart to 1
martinkyjac May 15, 2024
5c24c86
Check if quantity to add to cart is greater than 0
martinkyjac May 15, 2024
bb8645c
Fix quantity in add/remove from cart activity log in shopping cart page
martinkyjac May 15, 2024
4beb80b
Add custom activity types to CI repository
martinkyjac May 15, 2024
0332fea
Move shopify config from appsettings.json to user secrets
martinkyjac May 15, 2024
bf843aa
Check if shopping cart is null when logging purchase activity
martinkyjac May 15, 2024
99c9b70
ShoppingService unit tests (#5)
martinkyjac May 16, 2024
4b9a09c
Add IEcommerceActivityLogger mock for unit tests
martinkyjac May 16, 2024
aee2b88
Use ShoppingCartCacheService to remove shopping cart in thank you page
martinkyjac May 16, 2024
eb2f6d6
Add method to remove shopping cart to shopping service
martinkyjac May 16, 2024
61382cd
Add unit test for shopping cart remove method
martinkyjac May 16, 2024
a406864
Update ci.yml
May 16, 2024
fdcf499
Removing dotnet format job - we need to integrate it in ecommerce com…
May 16, 2024
cc05af7
Update packages.lock.json in Kentico.Xperience.Shopify.Tests
martinkyjac May 16, 2024
4d4ed49
Merge branch 'feat/XbyK_Shopify_integration' of https://github.com/Ke…
martinkyjac May 16, 2024
82d6e88
Use main branch in xperience-by-kentico-ecommerce-common submodule
martinkyjac May 17, 2024
5fec823
Update PackageProjectUrl and PackageReleaseNotes URL in Directory.Bui…
martinkyjac May 17, 2024
59e64e9
Add shopify to PackageTags
martinkyjac May 17, 2024
38df5dd
Enable 1591 warning for all projects but DancingGoat
martinkyjac May 17, 2024
5ecddb0
Add docs to all public classes and properties
martinkyjac May 17, 2024
6dd2f1b
Add params description to IShoppingService methods
martinkyjac May 17, 2024
b0d6865
Add info about return value
martinkyjac May 17, 2024
601e609
Move classes into separate files
martinkyjac May 17, 2024
4fbed78
Add all missing documentation comments
martinkyjac May 17, 2024
2425146
Remove unused packages.lock.json file
martinkyjac May 17, 2024
09a6f7d
Add documentation comments to unit test methods
martinkyjac May 17, 2024
2e52e0f
Add error message if cart operation does not exist
martinkyjac May 17, 2024
11b7305
Remove documentation
martinkyjac May 20, 2024
8e10fc1
Replaced RepoTemplate placeholder to correct name
martinkyjac May 20, 2024
468456c
Remove npm tasks
martinkyjac May 20, 2024
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
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .azuredevops/pipelines/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ parameters:
type: string
default: " "


resources:
repositories:
- repository: self
Expand Down
88 changes: 57 additions & 31 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ csharp_preserve_single_line_statements = fals
csharp_preserve_single_line_blocks = true

### Using directive options
csharp_using_directive_placement = outside_namespace : error
csharp_using_directive_placement = outside_namespace:error
dotnet_diagnostic.IDE0065.severity = error

# Code Style Rules
Expand Down Expand Up @@ -213,32 +213,32 @@ dotnet_diagnostic.IDE0018.severity = erro
csharp_style_var_elsewhere = true : error
csharp_style_var_for_built_in_types = false : error
csharp_style_var_when_type_is_apparent = true : error
dotnet_diagnostic.IDE0007.severity = error
dotnet_diagnostic.IDE0008.severity = error
dotnet_diagnostic.IDE0007.severity = suggestion
dotnet_diagnostic.IDE0008.severity = suggestion

csharp_style_expression_bodied_constructors = true : error
dotnet_diagnostic.IDE0021.severity = error
csharp_style_expression_bodied_constructors = true:suggestion
dotnet_diagnostic.IDE0021.severity = suggestion

csharp_style_expression_bodied_methods = true : error
dotnet_diagnostic.IDE0022.severity = error
csharp_style_expression_bodied_methods = true:suggestion
dotnet_diagnostic.IDE0022.severity = suggestion

csharp_style_expression_bodied_operators = true : error
csharp_style_expression_bodied_operators = true:error
dotnet_diagnostic.IDE0023.severity = error
dotnet_diagnostic.IDE0024.severity = error

csharp_style_expression_bodied_properties = true : error
csharp_style_expression_bodied_properties = true:error
dotnet_diagnostic.IDE0025.severity = error

csharp_style_expression_bodied_indexers = true : error
csharp_style_expression_bodied_indexers = true:error
dotnet_diagnostic.IDE0026.severity = error

csharp_style_expression_bodied_accessors = true : error
csharp_style_expression_bodied_accessors = true:error
dotnet_diagnostic.IDE0027.severity = error

csharp_style_expression_bodied_lambdas = true : error
dotnet_diagnostic.IDE0053.severity = error
csharp_style_expression_bodied_lambdas = true:error
dotnet_diagnostic.IDE0053.severity = suggestion

csharp_style_expression_bodied_local_functions = true : error
csharp_style_expression_bodied_local_functions = true:error
dotnet_diagnostic.IDE0061.severity = error

csharp_style_pattern_matching_over_as_with_null_check = true : error
Expand All @@ -256,10 +256,10 @@ dotnet_diagnostic.IDE0078.severity = erro
csharp_style_prefer_not_pattern = true : error
dotnet_diagnostic.IDE0083.severity = error

csharp_prefer_braces = true : error
csharp_prefer_braces = true:error
dotnet_diagnostic.IDE0011.severity = error

csharp_prefer_simple_using_statement = true : error
csharp_prefer_simple_using_statement = true:error
dotnet_diagnostic.IDE0063.severity = error

csharp_style_prefer_index_operator = true : warning
Expand Down Expand Up @@ -289,53 +289,79 @@ dotnet_diagnostic.IDE0080.severity = erro
dotnet_diagnostic.IDE0110.severity = warning

# IDE1006: Naming Styles
dotnet_diagnostic.IDE1006.severity = error
dotnet_diagnostic.IDE1006.severity = suggestion

# Naming Conventions
dotnet_naming_symbols.const_field_symbols.applicable_kinds = field
dotnet_naming_symbols.const_field_symbols.required_modifiers = const
dotnet_naming_symbols.const_field_symbols.applicable_accessibilities = *
dotnet_naming_style.const_field_symbols.capitalization = pascal_case

dotnet_naming_rule.const_fields_must_be_pascal_case.severity = error
dotnet_naming_rule.const_fields_must_be_pascal_case.severity = error
dotnet_naming_rule.const_fields_must_be_pascal_case.symbols = const_field_symbols
dotnet_naming_rule.const_fields_must_be_pascal_case.style = const_field_symbols
dotnet_naming_rule.const_fields_must_be_pascal_case.style = const_field_symbols

dotnet_naming_symbols.private_field_symbol.applicable_kinds = field
dotnet_naming_symbols.private_field_symbol.applicable_accessibilities = private
dotnet_naming_style.private_field_style.capitalization = camel_case
dotnet_naming_rule.private_fields_are_camel_case.severity = warning
dotnet_naming_rule.private_fields_are_camel_case.severity = warning
dotnet_naming_rule.private_fields_are_camel_case.symbols = private_field_symbol
dotnet_naming_rule.private_fields_are_camel_case.style = private_field_style
dotnet_naming_rule.private_fields_are_camel_case.style = private_field_style

dotnet_naming_symbols.non_private_field_symbol.applicable_kinds = field
dotnet_naming_symbols.non_private_field_symbol.applicable_accessibilities = public,internal,friend,protected,protected_internal,protected_friend
dotnet_naming_style.non_private_field_style.capitalization = pascal_case
dotnet_naming_rule.non_private_fields_are_pascal_case.severity = warning
dotnet_naming_rule.non_private_fields_are_pascal_case.severity = warning
dotnet_naming_rule.non_private_fields_are_pascal_case.symbols = non_private_field_symbol
dotnet_naming_rule.non_private_fields_are_pascal_case.style = non_private_field_style
dotnet_naming_rule.non_private_fields_are_pascal_case.style = const_field_symbols

dotnet_naming_symbols.parameter_symbol.applicable_kinds = parameter
dotnet_naming_style.parameter_style.capitalization = camel_case
dotnet_naming_rule.parameters_are_camel_case.severity = warning
dotnet_naming_rule.parameters_are_camel_case.severity = warning
dotnet_naming_rule.parameters_are_camel_case.symbols = parameter_symbol
dotnet_naming_rule.parameters_are_camel_case.style = parameter_style
dotnet_naming_rule.parameters_are_camel_case.style = private_field_style

dotnet_naming_symbols.non_interface_type_symbol.applicable_kinds = class,struct,enum,delegate
dotnet_naming_style.non_interface_type_style.capitalization = pascal_case
dotnet_naming_rule.non_interface_types_are_pascal_case.severity = error
dotnet_naming_rule.non_interface_types_are_pascal_case.severity = error
dotnet_naming_rule.non_interface_types_are_pascal_case.symbols = non_interface_type_symbol
dotnet_naming_rule.non_interface_types_are_pascal_case.style = non_interface_type_style
dotnet_naming_rule.non_interface_types_are_pascal_case.style = const_field_symbols

dotnet_naming_symbols.interface_type_symbol.applicable_kinds = interface
dotnet_naming_style.interface_type_style.capitalization = pascal_case
dotnet_naming_style.interface_type_style.required_prefix = I
dotnet_naming_rule.interface_types_must_be_prefixed_with_I.severity = error
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = error
dotnet_naming_rule.interface_types_must_be_prefixed_with_I.symbols = interface_type_symbol
dotnet_naming_rule.interface_types_must_be_prefixed_with_I.style = interface_type_style
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = interface_type_style

dotnet_naming_symbols.member_symbol.applicable_kinds = method,property,event
dotnet_naming_style.member_style.capitalization = pascal_case
dotnet_naming_rule.members_are_pascal_case.severity = error
dotnet_naming_rule.members_are_pascal_case.severity = error
dotnet_naming_rule.members_are_pascal_case.symbols = member_symbol
dotnet_naming_rule.members_are_pascal_case.style = member_style
dotnet_naming_rule.members_are_pascal_case.style = const_field_symbols
csharp_style_namespace_declarations = block_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
csharp_style_prefer_primary_constructors = true:suggestion

[*.{cs,vb}]
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 4
end_of_line = crlf
dotnet_style_coalesce_expression = true:error
dotnet_style_null_propagation = true:error
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
dotnet_style_prefer_auto_properties = true:warning
dotnet_style_object_initializer = true:error
dotnet_style_collection_initializer = true:error
dotnet_style_prefer_simplified_boolean_expressions = true:warning
dotnet_style_prefer_conditional_expression_over_assignment = true:error
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_explicit_tuple_names = true:error
dotnet_style_prefer_inferred_tuple_names = true:error
dotnet_style_prefer_inferred_anonymous_type_member_names = true:error
dotnet_style_prefer_compound_assignment = true:error
dotnet_style_prefer_simplified_interpolation = true:error
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
dotnet_style_namespace_match_folder = true:suggestion
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
name: "CI: Build and Test"

on:
push:
branches: [main]
paths:
- "**.cs"
- "**.tsx"
- "**.js"
- "**.csproj"
- "**.props"
- "**.targets"
- "**.sln"
- "**/Client/**/*.json"
pull_request:
branches: [main]
paths:
Expand Down Expand Up @@ -29,10 +40,12 @@ jobs:
DOTNET_NOLOGO: 1

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,10 @@ segments_2i
**/CMSModules/WebFarm/*

# Files Generated by this integration
**/App_Data/RepoTemplate/*
**/App_Data/Kentico.Xperience.Shopify/*
**/App_Data/CMSModules/SmartSearch/*
/examples/DancingGoat-Shopify/assets/ContentItems

# Publishing profiles
*.pubxml
*.pubxml.user
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "submodules/xperience-by-kentico-ecommerce-common"]
path = submodules/xperience-by-kentico-ecommerce-common
url = https://github.com/Kentico/xperience-by-kentico-ecommerce-common.git
branch = main
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Kentico.Xperience.RepoTemplate.Sample/bin/Debug/net6.0/DancingGoat.dll",
"preLaunchTask": "dotnet: build",
"program": "${workspaceFolder}/examples/DancingGoat-Shopify/bin/Debug/net8.0/DancingGoat.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Kentico.Xperience.RepoTemplate.Sample",
"cwd": "${workspaceFolder}/examples/DancingGoat-Shopify",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
Expand All @@ -21,7 +21,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
"/Views": "${workspaceFolder}/examples/DancingGoat-Shopify/Views"
}
},
{
Expand Down
6 changes: 1 addition & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@
"editor.defaultFormatter": "ms-dotnettools.csharp"
},

"dotnet.defaultSolution": "Kentico.Xperience.RepoTemplate.sln",

"eslint.workingDirectories": [
"./src/Kentico.Xperience.RepoTemplate/Admin/Client"
],
"dotnet.defaultSolution": "Kentico.Xperience.Shopify.sln",

"files.associations": {
".azuredevops/**/*.yml": "azure-pipelines"
Expand Down
39 changes: 2 additions & 37 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "install",
"path": "src/Kentico.Xperience.RepoTemplate/Admin/Client",
"group": "clean",
"problemMatcher": [],
"label": "npm: install - src/Kentico.Xperience.RepoTemplate/Admin/Client",
"detail": "install dependencies from package"
},
{
"type": "dotnet",
"task": "build",
Expand All @@ -24,7 +15,7 @@
"problemMatcher": ["$msCompile"],
"group": "none",
"options": {
"cwd": "${workspaceFolder}/src/Kentico.Xperience.RepoTemplate/"
"cwd": "${workspaceFolder}/examples/DancingGoat-Shopify"
},
"label": "dotnet: format"
},
Expand All @@ -35,32 +26,6 @@
"group": "clean",
"label": "dotnet: clean"
},
{
"type": "npm",
"script": "build",
"path": "src/Kentico.Xperience.RepoTemplate/Admin/Client",
"group": "build",
"problemMatcher": [],
"label": "npm: build - src/Kentico.Xperience.RepoTemplate/Admin/Client",
"detail": "webpack --mode=production"
},
{
"type": "npm",
"script": "build:dev",
"path": "src/Kentico.Xperience.RepoTemplate/Admin/Client",
"group": "build",
"problemMatcher": [],
"label": "npm: build:dev - src/Kentico.Xperience.RepoTemplate/Admin/Client",
"detail": "webpack --mode=development"
},
{
"type": "npm",
"script": "start",
"path": "src/Kentico.Xperience.RepoTemplate/Admin/Client",
"problemMatcher": [],
"label": "npm: start - src/Kentico.Xperience.RepoTemplate/Admin/Client",
"detail": "webpack serve --mode development"
},
{
"label": "dotnet: watch DancingGoat",
"command": "dotnet",
Expand All @@ -69,7 +34,7 @@
"watch",
"run",
"--project",
"${workspaceFolder}/src/Kentico.Xperience.RepoTemplate.Sample/DancingGoat.csproj"
"${workspaceFolder}/examples/DancingGoat-Shopify/DancingGoat.csproj"
],
"options": {
"env": {
Expand Down
15 changes: 6 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
<VersionSuffix>prerelease-1</VersionSuffix>
<PackageLicenseExpression>MIT</PackageLicenseExpression>

<PackageProjectUrl>https://github.com/Kentico/REPOSITORY_NAME</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/Kentico/REPOSITORY_NAME/releases</PackageReleaseNotes>
<PackageProjectUrl>https://github.com/Kentico/xperience-by-kentico-shopify</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/Kentico/xperience-by-kentico-shopify/releases</PackageReleaseNotes>
<PackageIcon>logo.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>xperience;kentico;aspnetcore</PackageTags>
<PackageTags>xperience;kentico;aspnetcore;shopify</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\images\logo.png" Pack="true" Visible="false" PackagePath="" />
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>

<PropertyGroup>
Expand All @@ -29,22 +29,19 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<CopyDocumentationFilesFromPackages>true</CopyDocumentationFilesFromPackages>
<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
<NoWarn>$(NoWarn);1591</NoWarn>
<RootNamespace>Kentico.Xperience.RepoTemplate</RootNamespace>
<NoWarn>$(NoWarn);S101;S1121</NoWarn>

<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<TimestampServerUrl>http://timestamp.digicert.com</TimestampServerUrl>
</PropertyGroup>

<PropertyGroup Condition=" $(Configuration) == 'Release' ">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup Label="StaticCodeAnalysis">
<ItemGroup Label="StaticCodeAnalysis" Condition=" $(DisableCodeAnalysis) != 'True' ">
<PackageReference Include="SonarAnalyzer.CSharp">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Loading