From edce627b70dd21ff3053e4868732325ce92722ba Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez Date: Mon, 10 Jun 2024 11:46:02 +0800 Subject: [PATCH 1/6] Upgrade to net8 --- .../BlazorTemplater.Tests.csproj | 10 ++--- BlazorTemplater/BlazorTemplater.csproj | 40 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/BlazorTemplater.Tests/BlazorTemplater.Tests.csproj b/BlazorTemplater.Tests/BlazorTemplater.Tests.csproj index 078eb8e..7b0660b 100644 --- a/BlazorTemplater.Tests/BlazorTemplater.Tests.csproj +++ b/BlazorTemplater.Tests/BlazorTemplater.Tests.csproj @@ -1,15 +1,15 @@ - netcoreapp3.1 + net8.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BlazorTemplater/BlazorTemplater.csproj b/BlazorTemplater/BlazorTemplater.csproj index f85bc72..4bf33da 100644 --- a/BlazorTemplater/BlazorTemplater.csproj +++ b/BlazorTemplater/BlazorTemplater.csproj @@ -1,24 +1,26 @@  - - netstandard2.0;net5.0 - 3.0 - conficient, PhotoAtomic - conficient - A HTML templating engine using Razor Components (.razor) files instead of .cshtml - https://github.com/conficient/BlazorTemplater - https://github.com/conficient/BlazorTemplater - Blazor RazorComponents HTML Email Templating - 1.5.1 - Added test for comment rendering - Latest - + + netstandard2.0;net5.0;net8.0 + 3.0 + conficient, PhotoAtomic + conficient + A HTML templating engine using Razor Components (.razor) files instead of .cshtml + https://github.com/conficient/BlazorTemplater + https://github.com/conficient/BlazorTemplater + Blazor RazorComponents HTML Email Templating + 1.6.2 + Added css isolated when rendering + Latest + - - - - - - + + + + + + + + From 01af594f7e7102ace606c6406a7d3dde1b6987dc Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez Date: Mon, 10 Jun 2024 11:48:57 +0800 Subject: [PATCH 2/6] Add CSS isolated based on the idea from cjbush in about issue #20 --- BlazorTemplater/Templater.cs | 71 +++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/BlazorTemplater/Templater.cs b/BlazorTemplater/Templater.cs index ce33000..5b92d9a 100644 --- a/BlazorTemplater/Templater.cs +++ b/BlazorTemplater/Templater.cs @@ -5,7 +5,10 @@ using Microsoft.Extensions.Logging.Abstractions; using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Reflection; +using System.Text; namespace BlazorTemplater { @@ -51,6 +54,11 @@ public Templater() /// private readonly Lazy _serviceProvider; + /// + /// Store the Scoped CSS. Css Isolated. + /// + private StringBuilder _style = null; + /// /// Services provided by Dependency Injection /// @@ -99,6 +107,48 @@ public void AddServiceProvider(IServiceProvider serviceProvider) _serviceCollection.Add(serviceProvider); } + /// + /// Add additional isolated CSS from a nested components + /// + /// + public Templater AddScoppedCss() + { + Type type = typeof(TComponent); + AddScoppedCss(type); + return this; + } + + private void AddScoppedCss(Type componentType) + { + if (componentType != null) + { + string cssFile = $@"{componentType.FullName}.razor.css"; + StringBuilder css = new StringBuilder(); + try + { + Assembly assembly = componentType.Assembly; + using Stream stream = assembly.GetManifestResourceStream(cssFile); + using StreamReader sr = new StreamReader(stream!); + string content = sr.ReadToEndAsync().GetAwaiter().GetResult(); + if (!string.IsNullOrEmpty(content)) + { + css.Append(content); + } + } + catch (Exception ex) + { + Console.WriteLine($"Component = {componentType.Name} => Exception: {ex.Message}"); + css.Clear(); + } + finally + { + if (_style == null) + _style = new(); + _style.Append(css); + } + } + } + /// /// Render a component to HTML /// @@ -127,17 +177,28 @@ public string RenderComponent(Type componentType, IDictionary pa { ValidateComponentType(componentType); var layout = GetLayout(componentType); + AddScoppedCss(layout); + AddScoppedCss(componentType); // create a RenderFragment from the component - var childContent = (RenderFragment)(builder => + RenderFragment childContent = builder => { - builder.OpenComponent(0, componentType); - + int componentId = 0; + if (_style != null && _style.Length > 0) + { + builder.AddMarkupContent(componentId, $@""); + componentId++; + } + builder.OpenComponent(componentId, componentType); // add parameters if any if (parameters != null && parameters.Any()) - builder.AddMultipleAttributes(1, parameters); + { + componentId++; + builder.AddMultipleAttributes(componentId, parameters); + } + // add scoped css if any builder.CloseComponent(); - }); + }; // render a LayoutView and use the TComponent as the child content var layoutView = new RenderedComponent(Renderer); From 193fba5abd25d49d0757581727d5d9781e01af15 Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez Date: Mon, 10 Jun 2024 11:49:26 +0800 Subject: [PATCH 3/6] Add testing new Issolated posibilitiy --- .../BlazorTemplater.Library.csproj | 10 +- .../ComponentWithCss.razor | 3 + .../ComponentWithCss.razor.css | 12 ++ .../LayoutComponentWithCss.razor | 17 +++ .../LayoutComponentWithCss.razor.css | 7 ++ .../MultipleComponentsWithCss.razor | 5 + .../MultipleComponentsWithCss.razor.css | 8 ++ BlazorTemplater.Library/SimpleWithCss.razor | 3 + .../SimpleWithCss.razor.css | 8 ++ .../TemplatedSimpleWithCss.razor | 4 + .../TemplatedSimpleWithCss.razor.css | 7 ++ BlazorTemplater.Tests/Templater_Tests.cs | 106 ++++++++++++++++++ 12 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 BlazorTemplater.Library/ComponentWithCss.razor create mode 100644 BlazorTemplater.Library/ComponentWithCss.razor.css create mode 100644 BlazorTemplater.Library/LayoutComponentWithCss.razor create mode 100644 BlazorTemplater.Library/LayoutComponentWithCss.razor.css create mode 100644 BlazorTemplater.Library/MultipleComponentsWithCss.razor create mode 100644 BlazorTemplater.Library/MultipleComponentsWithCss.razor.css create mode 100644 BlazorTemplater.Library/SimpleWithCss.razor create mode 100644 BlazorTemplater.Library/SimpleWithCss.razor.css create mode 100644 BlazorTemplater.Library/TemplatedSimpleWithCss.razor create mode 100644 BlazorTemplater.Library/TemplatedSimpleWithCss.razor.css diff --git a/BlazorTemplater.Library/BlazorTemplater.Library.csproj b/BlazorTemplater.Library/BlazorTemplater.Library.csproj index 224e4c1..7199dfe 100644 --- a/BlazorTemplater.Library/BlazorTemplater.Library.csproj +++ b/BlazorTemplater.Library/BlazorTemplater.Library.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -9,6 +9,14 @@ BlazorTemplater + + + + + + + + diff --git a/BlazorTemplater.Library/ComponentWithCss.razor b/BlazorTemplater.Library/ComponentWithCss.razor new file mode 100644 index 0000000..745d1eb --- /dev/null +++ b/BlazorTemplater.Library/ComponentWithCss.razor @@ -0,0 +1,3 @@ +

+ This component has owned CSS +

\ No newline at end of file diff --git a/BlazorTemplater.Library/ComponentWithCss.razor.css b/BlazorTemplater.Library/ComponentWithCss.razor.css new file mode 100644 index 0000000..bf4caca --- /dev/null +++ b/BlazorTemplater.Library/ComponentWithCss.razor.css @@ -0,0 +1,12 @@ +.nested { + font-size: large; + color: darkblue; + width: 100%; + padding: 1rem; + text-align: center; +} + +.nested strong{ + color: darkred; + font-style: italic; +} \ No newline at end of file diff --git a/BlazorTemplater.Library/LayoutComponentWithCss.razor b/BlazorTemplater.Library/LayoutComponentWithCss.razor new file mode 100644 index 0000000..910e60b --- /dev/null +++ b/BlazorTemplater.Library/LayoutComponentWithCss.razor @@ -0,0 +1,17 @@ +@inherits LayoutComponentBase + + + + LayoutFile + + +
+
+

This is a layout component that should be rendered components!

+
+ @Body +
+
+
+ + \ No newline at end of file diff --git a/BlazorTemplater.Library/LayoutComponentWithCss.razor.css b/BlazorTemplater.Library/LayoutComponentWithCss.razor.css new file mode 100644 index 0000000..450d033 --- /dev/null +++ b/BlazorTemplater.Library/LayoutComponentWithCss.razor.css @@ -0,0 +1,7 @@ +p { + font-size: large; + color: darkgreen; + width: 100%; + padding: 1rem; + text-align: center; +} \ No newline at end of file diff --git a/BlazorTemplater.Library/MultipleComponentsWithCss.razor b/BlazorTemplater.Library/MultipleComponentsWithCss.razor new file mode 100644 index 0000000..529d3ab --- /dev/null +++ b/BlazorTemplater.Library/MultipleComponentsWithCss.razor @@ -0,0 +1,5 @@ +@layout LayoutComponentWithCss +

+ Jan 1st is @(new DateTime(2021,1,1).ToString("yyyy-MM-dd")) +

+ \ No newline at end of file diff --git a/BlazorTemplater.Library/MultipleComponentsWithCss.razor.css b/BlazorTemplater.Library/MultipleComponentsWithCss.razor.css new file mode 100644 index 0000000..d4b8713 --- /dev/null +++ b/BlazorTemplater.Library/MultipleComponentsWithCss.razor.css @@ -0,0 +1,8 @@ +p +{ + font-size: large; + color: darkblue; + width: 100%; + padding: 1rem; + text-align: center; +} \ No newline at end of file diff --git a/BlazorTemplater.Library/SimpleWithCss.razor b/BlazorTemplater.Library/SimpleWithCss.razor new file mode 100644 index 0000000..24d6a59 --- /dev/null +++ b/BlazorTemplater.Library/SimpleWithCss.razor @@ -0,0 +1,3 @@ +

+ Jan 1st is @(new DateTime(2021,1,1).ToString("yyyy-MM-dd")) +

\ No newline at end of file diff --git a/BlazorTemplater.Library/SimpleWithCss.razor.css b/BlazorTemplater.Library/SimpleWithCss.razor.css new file mode 100644 index 0000000..d4b8713 --- /dev/null +++ b/BlazorTemplater.Library/SimpleWithCss.razor.css @@ -0,0 +1,8 @@ +p +{ + font-size: large; + color: darkblue; + width: 100%; + padding: 1rem; + text-align: center; +} \ No newline at end of file diff --git a/BlazorTemplater.Library/TemplatedSimpleWithCss.razor b/BlazorTemplater.Library/TemplatedSimpleWithCss.razor new file mode 100644 index 0000000..adfbbe6 --- /dev/null +++ b/BlazorTemplater.Library/TemplatedSimpleWithCss.razor @@ -0,0 +1,4 @@ +@layout LayoutComponentWithCss +

+ Jan 1st is @(new DateTime(2021,1,1).ToString("yyyy-MM-dd")) +

\ No newline at end of file diff --git a/BlazorTemplater.Library/TemplatedSimpleWithCss.razor.css b/BlazorTemplater.Library/TemplatedSimpleWithCss.razor.css new file mode 100644 index 0000000..ff414a9 --- /dev/null +++ b/BlazorTemplater.Library/TemplatedSimpleWithCss.razor.css @@ -0,0 +1,7 @@ +p.child { + font-size: medium; + color: darkblue; + width: 100%; + padding: 1rem; + text-align: center; +} \ No newline at end of file diff --git a/BlazorTemplater.Tests/Templater_Tests.cs b/BlazorTemplater.Tests/Templater_Tests.cs index 9ae284a..db34c70 100644 --- a/BlazorTemplater.Tests/Templater_Tests.cs +++ b/BlazorTemplater.Tests/Templater_Tests.cs @@ -427,5 +427,111 @@ public void GetLayoutFromAttribute_TestWhenNotPresent() } #endregion + + #region Css Isolated + /// + /// Test a SimpleWithCss component with no parameters + /// + [TestMethod] + public void RenderComponent_SimpleWithCss_Test() + { + const string expected = @"

+ Jan 1st is 2021-01-01 +

"; + + var templater = new Templater(); + var actual = templater.RenderComponent(); + + Console.WriteLine(actual); + Assert.AreEqual(expected, actual); + } + + /// + /// Test a SimpleWithCss component with no parameters + /// + [TestMethod] + public void RenderComponent_TemplatedSimpleWithCss_Test() + { + const string expected = @" +

This is a layout component that should be rendered components!

+
+

+ Jan 1st is 2021-01-01 +

"; + + var templater = new Templater(); + var actual = templater.RenderComponent(); + + Console.WriteLine(actual); + StringAssert.Contains(actual, expected, "Content not found"); + } + + /// + /// Test a SimpleWithCss component with no parameters + /// + [TestMethod] + public void RenderComponent_MultipleComponentsWithCss_Test() + { + const string expected = @"

This is a layout component that should be rendered components!

+
+

+ Jan 1st is 2021-01-01 +

+

+ This component has owned CSS +

"; + + var templater = new Templater(); + var actual = templater + .AddScoppedCss() + .RenderComponent(); + + Console.WriteLine(actual); + StringAssert.Contains(actual, expected, "Content not found"); + } + #endregion Simple render } } \ No newline at end of file From 180694f545db83e65872939a89b24cbc00852a74 Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez Date: Mon, 10 Jun 2024 11:51:18 +0800 Subject: [PATCH 4/6] Add documentation about how to use Isolated CSS --- BlazorTemplater.sln | 5 +++-- Docs/CssIsolated.md | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Docs/CssIsolated.md diff --git a/BlazorTemplater.sln b/BlazorTemplater.sln index 1579ad5..0246b3a 100644 --- a/BlazorTemplater.sln +++ b/BlazorTemplater.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.34928.147 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{C0365D75-5C0A-4E88-BC0F-FF595B731B6B}" ProjectSection(SolutionItems) = preProject @@ -18,6 +18,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B0E3EF40-CE74-4196-993F-D65E256F52FB}" ProjectSection(SolutionItems) = preProject Docs\AddRazorSupport.md = Docs\AddRazorSupport.md + Docs\CssIsolated.md = Docs\CssIsolated.md Docs\Layouts.md = Docs\Layouts.md Docs\Templater.md = Docs\Templater.md Docs\Usage.md = Docs\Usage.md diff --git a/Docs/CssIsolated.md b/Docs/CssIsolated.md new file mode 100644 index 0000000..0b4b236 --- /dev/null +++ b/Docs/CssIsolated.md @@ -0,0 +1,48 @@ +# Issolating Css + +CSS Isolated, or CSS scope, it's and adventage to create components with with own CSS. + +Templater with add automatically the CSS scoped from the Layout and from the component is pretend to eb rendered. If you have child components must be add also the compoent type while adding the component. + +CSS Isolated you can add like. + +``` +LayoutComponentWithCss.razor +LayoutComponentWithCss.razor.css +ComponentWithCss.razor +ComponentWithCss.razor.css +``` + +## Considerations + +* CSS must be add to the assembly like a Embedded Resource +* Because component internal ID is not in the Embedded Resource recomendation is have a container wrapper to identify the component css when all is merged + +```xaml + + + + +``` + + +### Usage + +#### Normal Component with or without layout +When the component is rendered issolated css is automatically added between ```html ``` tags before render de component. + +So you can still using as a normal: +```c# +string html = new ComponentRenderer() + .Render(); +``` + +#### Component With Child component also with scoped CSS +If the component has also child or childs components with CSS isolated, then must to add this component type before rendering for the css can be added: +```c# +string html = new ComponentRenderer() + .AddScoppedCss() + .AddScoppedCss() + .Render(); +``` + From f5cf94b2701f84ce81d3249e22207eb767d24ad2 Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez <70047765+drualcman@users.noreply.github.com> Date: Sun, 25 May 2025 11:21:43 +0800 Subject: [PATCH 5/6] Update LICENSE --- LICENSE | 222 ++++++-------------------------------------------------- 1 file changed, 21 insertions(+), 201 deletions(-) diff --git a/LICENSE b/LICENSE index 261eeb9..3bff1eb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,21 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +MIT License + +Copyright (c) 2024 Sergi Ortiz Gomez + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From a2e5d380118074f8817735cb875985655073dcf4 Mon Sep 17 00:00:00 2001 From: Sergi Ortiz Gomez Date: Sun, 25 May 2025 11:32:46 +0800 Subject: [PATCH 6/6] Revert "Update LICENSE" This reverts commit f5cf94b2701f84ce81d3249e22207eb767d24ad2. --- LICENSE | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 201 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index 3bff1eb..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License - -Copyright (c) 2024 Sergi Ortiz Gomez - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.