From 12b46ff281fa1fb9a464651dea473504e6abad87 Mon Sep 17 00:00:00 2001 From: "sfarriss@sourcellc.net" Date: Tue, 11 Feb 2020 17:18:52 -0500 Subject: [PATCH] First commit --- .cds/solutionMap.json | 2 +- .../CodeExample}/Other/Customizations.xml | 0 .../CodeExample}/Other/Relationships.xml | 0 .../CodeExample}/Other/Solution.xml | 52 ++++++++++--------- .../Resources/template_resources.resx | 18 ++++--- .../new_css/app.e0a8d0d77e1c22b7be75.css | 0 .../app.e0a8d0d77e1c22b7be75.css.data.xml | 10 ++-- .../WebResources/new_pages/example.html | 6 +-- .../new_pages/example.html.data.xml | 15 ++++++ .../WebResources/new_scripts}/app.bundle.js | 0 .../new_scripts}/app.bundle.js.data.xml | 11 ++-- .../WebResources/new_scripts}/react.bundle.js | 0 .../new_scripts}/react.bundle.js.data.xml | 11 ++-- .../cs_pages/react-test.html.data.xml | 15 ------ webresources/webpack.prod.conf.js | 4 +- 15 files changed, 77 insertions(+), 67 deletions(-) rename {solutions/CSDemoSolution => Solutions/CodeExample}/Other/Customizations.xml (100%) rename {solutions/CSDemoSolution => Solutions/CodeExample}/Other/Relationships.xml (100%) rename {solutions/CSDemoSolution => Solutions/CodeExample}/Other/Solution.xml (60%) rename {solutions/CSDemoSolution => Solutions/CodeExample}/Resources/template_resources.resx (90%) rename solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css => Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css (100%) rename solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css.data.xml => Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css.data.xml (51%) rename solutions/CSDemoSolution/WebResources/cs_pages/react-test.html => Solutions/CodeExample/WebResources/new_pages/example.html (54%) create mode 100644 Solutions/CodeExample/WebResources/new_pages/example.html.data.xml rename {solutions/CSDemoSolution/WebResources/cs_scripts => Solutions/CodeExample/WebResources/new_scripts}/app.bundle.js (100%) rename {solutions/CSDemoSolution/WebResources/cs_scripts => Solutions/CodeExample/WebResources/new_scripts}/app.bundle.js.data.xml (52%) rename {solutions/CSDemoSolution/WebResources/cs_scripts => Solutions/CodeExample/WebResources/new_scripts}/react.bundle.js (100%) rename {solutions/CSDemoSolution/WebResources/cs_scripts => Solutions/CodeExample/WebResources/new_scripts}/react.bundle.js.data.xml (52%) delete mode 100644 solutions/CSDemoSolution/WebResources/cs_pages/react-test.html.data.xml diff --git a/.cds/solutionMap.json b/.cds/solutionMap.json index 05c8c4d..e28fad4 100644 --- a/.cds/solutionMap.json +++ b/.cds/solutionMap.json @@ -1 +1 @@ -{"mappings":[{"organizationId":"cf7d2607-493c-45ee-b427-b906dc01527d","solutionId":"9b63f280-a943-ea11-a812-000d3a55df44","path":"c:\\Dev\\Public\\cds-webdev-sample\\solutions\\CSDemoSolution"}]} \ No newline at end of file +{"mappings":[{"organizationId":"cf7d2607-493c-45ee-b427-b906dc01527d","solutionId":"9b63f280-a943-ea11-a812-000d3a55df44","path":"c:\\Dev\\Public\\cds-webdev-sample\\solutions\\CSDemoSolution"},{"organizationId":"948e8f97-2482-44d7-8d25-1d3c426f7880","solutionId":"a170b9bf-184d-ea11-a81e-000d3a7d21f0","path":"c:\\Projects\\cds-webdev-sample\\Solutions\\CodeExample"}]} \ No newline at end of file diff --git a/solutions/CSDemoSolution/Other/Customizations.xml b/Solutions/CodeExample/Other/Customizations.xml similarity index 100% rename from solutions/CSDemoSolution/Other/Customizations.xml rename to Solutions/CodeExample/Other/Customizations.xml diff --git a/solutions/CSDemoSolution/Other/Relationships.xml b/Solutions/CodeExample/Other/Relationships.xml similarity index 100% rename from solutions/CSDemoSolution/Other/Relationships.xml rename to Solutions/CodeExample/Other/Relationships.xml diff --git a/solutions/CSDemoSolution/Other/Solution.xml b/Solutions/CodeExample/Other/Solution.xml similarity index 60% rename from solutions/CSDemoSolution/Other/Solution.xml rename to Solutions/CodeExample/Other/Solution.xml index e8bfc81..8c1aeb4 100644 --- a/solutions/CSDemoSolution/Other/Solution.xml +++ b/Solutions/CodeExample/Other/Solution.xml @@ -1,45 +1,47 @@  - + - CSDemoSolution + CodeExample - + 1.0.0.0 0 - CloudSmith + DefaultPublishertest - + - - sales@cloudsmithconsulting.com - https://www.cloudsmithconsulting.com - cs - 71764 + + + + + + new + 10000
1 - 1 - Valrico + + - USA + - 3433 Lithia Pinecrest Road - Suite 283 + + - 33596 + - 1 - FL - 813-375-0682 + + + @@ -49,7 +51,7 @@
2 - 1 + @@ -65,7 +67,7 @@ - 1 + @@ -78,10 +80,10 @@ - - - - + + + + diff --git a/solutions/CSDemoSolution/Resources/template_resources.resx b/Solutions/CodeExample/Resources/template_resources.resx similarity index 90% rename from solutions/CSDemoSolution/Resources/template_resources.resx rename to Solutions/CodeExample/Resources/template_resources.resx index bf07435..f60f8c8 100644 --- a/solutions/CSDemoSolution/Resources/template_resources.resx +++ b/Solutions/CodeExample/Resources/template_resources.resx @@ -121,7 +121,7 @@ 1033 - CSDemoSolution_temp.zip + CodeExample_temp.zip Unmanaged @@ -132,12 +132,16 @@ bGQJX1JldmlzaW9uAAAAAAgICAgJAAAAAAAAAAAAAAAAAAAACw== - - CloudSmith Consulting LLC - 'CloudSmith' : LocalizedName for Solution Publisher + + Default publisher for this organization + 'DefaultPublishertest' : Description for Solution Publisher - - CSDemoSolution - 'CSDemoSolution' : LocalizedName for Solution + + CodeExample + 'CodeExample' : LocalizedName for Solution + + + Default Publisher for test + 'DefaultPublishertest' : LocalizedName for Solution Publisher \ No newline at end of file diff --git a/solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css b/Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css similarity index 100% rename from solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css rename to Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css diff --git a/solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css.data.xml b/Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css.data.xml similarity index 51% rename from solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css.data.xml rename to Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css.data.xml index be5ca28..7e77855 100644 --- a/solutions/CSDemoSolution/WebResources/cs_styles/app.a4c254b1dd46f0e718e3.css.data.xml +++ b/Solutions/CodeExample/WebResources/new_css/app.e0a8d0d77e1c22b7be75.css.data.xml @@ -1,13 +1,15 @@  - {ef6d3f53-ef4f-40b4-be23-70a9c76a4fb5} - cs_styles/app.a4c254b1dd46f0e718e3.css + {85b0eaba-a206-4ee6-810d-944c6390f478} + new_css/app.e0a8d0d77e1c22b7be75.css + Example CDS CSS + Desc 2 1.0 - 1 + 0 0 1 1 0 - /WebResources/cs_stylesappa4c254b1dd46f0e718e3cssEF6D3F53-EF4F-40B4-BE23-70A9C76A4FB5 + /WebResources/new_cssappe0a8d0d77e1c22b7be75css85B0EABA-A206-4EE6-810D-944C6390F478 \ No newline at end of file diff --git a/solutions/CSDemoSolution/WebResources/cs_pages/react-test.html b/Solutions/CodeExample/WebResources/new_pages/example.html similarity index 54% rename from solutions/CSDemoSolution/WebResources/cs_pages/react-test.html rename to Solutions/CodeExample/WebResources/new_pages/example.html index 0d72448..c16a5ad 100644 --- a/solutions/CSDemoSolution/WebResources/cs_pages/react-test.html +++ b/Solutions/CodeExample/WebResources/new_pages/example.html @@ -6,13 +6,13 @@ ReactTS - +
- - + + \ No newline at end of file diff --git a/Solutions/CodeExample/WebResources/new_pages/example.html.data.xml b/Solutions/CodeExample/WebResources/new_pages/example.html.data.xml new file mode 100644 index 0000000..5f533c5 --- /dev/null +++ b/Solutions/CodeExample/WebResources/new_pages/example.html.data.xml @@ -0,0 +1,15 @@ + + + {0d210144-0919-4f76-8c6a-c431bc4d4f74} + new_pages/example.html + Example CDS Webres + Desc + 1 + 1.0 + 0 + 0 + 1 + 1 + 0 + /WebResources/new_pagesexamplehtml0D210144-0919-4F76-8C6A-C431BC4D4F74 + \ No newline at end of file diff --git a/solutions/CSDemoSolution/WebResources/cs_scripts/app.bundle.js b/Solutions/CodeExample/WebResources/new_scripts/app.bundle.js similarity index 100% rename from solutions/CSDemoSolution/WebResources/cs_scripts/app.bundle.js rename to Solutions/CodeExample/WebResources/new_scripts/app.bundle.js diff --git a/solutions/CSDemoSolution/WebResources/cs_scripts/app.bundle.js.data.xml b/Solutions/CodeExample/WebResources/new_scripts/app.bundle.js.data.xml similarity index 52% rename from solutions/CSDemoSolution/WebResources/cs_scripts/app.bundle.js.data.xml rename to Solutions/CodeExample/WebResources/new_scripts/app.bundle.js.data.xml index 2a4ae4a..532fcf1 100644 --- a/solutions/CSDemoSolution/WebResources/cs_scripts/app.bundle.js.data.xml +++ b/Solutions/CodeExample/WebResources/new_scripts/app.bundle.js.data.xml @@ -1,14 +1,15 @@  - {ccfeee6b-3fb0-43e4-9dc7-6e2fb33b617a} - cs_scripts/app.bundle.js - React App Bundle + {3e6a68f0-8492-4d7a-85e3-a9507f42ab4f} + new_scripts/app.bundle.js + Example App Bundle CDS + Desc 3 1.0 - 1 + 0 0 1 1 0 - /WebResources/cs_scriptsappbundlejsCCFEEE6B-3FB0-43E4-9DC7-6E2FB33B617A + /WebResources/new_scriptsappbundlejs3E6A68F0-8492-4D7A-85E3-A9507F42AB4F \ No newline at end of file diff --git a/solutions/CSDemoSolution/WebResources/cs_scripts/react.bundle.js b/Solutions/CodeExample/WebResources/new_scripts/react.bundle.js similarity index 100% rename from solutions/CSDemoSolution/WebResources/cs_scripts/react.bundle.js rename to Solutions/CodeExample/WebResources/new_scripts/react.bundle.js diff --git a/solutions/CSDemoSolution/WebResources/cs_scripts/react.bundle.js.data.xml b/Solutions/CodeExample/WebResources/new_scripts/react.bundle.js.data.xml similarity index 52% rename from solutions/CSDemoSolution/WebResources/cs_scripts/react.bundle.js.data.xml rename to Solutions/CodeExample/WebResources/new_scripts/react.bundle.js.data.xml index 25d00a6..ea7dfe8 100644 --- a/solutions/CSDemoSolution/WebResources/cs_scripts/react.bundle.js.data.xml +++ b/Solutions/CodeExample/WebResources/new_scripts/react.bundle.js.data.xml @@ -1,14 +1,15 @@  - {253d5bd4-9726-4be9-be63-b856a469b90a} - cs_scripts/react.bundle.js - React core script + {b15bdff0-6ed8-4a90-afe6-3578166fec72} + new_scripts/react.bundle.js + Example React CDS + Desc 3 1.0 - 1 + 0 0 1 1 0 - /WebResources/cs_scriptsreactbundlejs253D5BD4-9726-4BE9-BE63-B856A469B90A + /WebResources/new_scriptsreactbundlejsB15BDFF0-6ED8-4A90-AFE6-3578166FEC72 \ No newline at end of file diff --git a/solutions/CSDemoSolution/WebResources/cs_pages/react-test.html.data.xml b/solutions/CSDemoSolution/WebResources/cs_pages/react-test.html.data.xml deleted file mode 100644 index 90d49f9..0000000 --- a/solutions/CSDemoSolution/WebResources/cs_pages/react-test.html.data.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - {2bf02dbf-6af5-4164-8f38-634816037a10} - cs_pages/react-test.html - Test React Page - ReactJs is a framework for delivering modern web experiences - 1 - 1.0 - 1 - 0 - 1 - 1 - 0 - /WebResources/cs_pagesreact-testhtml2BF02DBF-6AF5-4164-8F38-634816037A10 - \ No newline at end of file diff --git a/webresources/webpack.prod.conf.js b/webresources/webpack.prod.conf.js index e2b9a82..d85df57 100644 --- a/webresources/webpack.prod.conf.js +++ b/webresources/webpack.prod.conf.js @@ -115,8 +115,8 @@ module.exports = { chunkFilename: '[id].[hash].css' }), new CopyPlugin([ - { from: '../dist/release/js', to: '../../solutions/CSDemoSolution/WebResources/cs_scripts' }, - { from: '../dist/*.css', to: '../../solutions/CSDemoSolution/WebResources/cs_styles' }, + { from: '../dist/release/js', to: '../../solutions/CodeExample/WebResources/new_scripts' }, + { from: '../dist/release/**/*.css', to: '../../solutions/CodeExample/WebResources/new_css', flatten: true }, ]) ],