Merge pull request #345 from NREL/issue-344

issue-344 add more texts to about page
NREL · Dec 6, 2024 · 6578361 · 6578361
2 parents 78f4a73 + e79456a
commit 6578361
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 6 deletions.
diff --git a/src/app/core-components/about/about.component.html b/src/app/core-components/about/about.component.html
@@ -6,13 +6,17 @@ <h4>
                 About
             </h4>
             <p>
-                The JUSTIFI tool was developed by staff at the National Renewable Energy Laboratory (NREL) and Oak Ridge
-                National Laboratory (ORNL) and in collaboration with the
+                The JUSTIFI tool was developed by staff at Oak Ridge
+                National Laboratory (ORNL) and the National Renewable Energy Laboratory (NREL) and in collaboration with the
                 U.S. Department of Energy. This software tool was funded by the U.S. Department of Energy's Office of
                 Energy Efficiency and Renewable Energy under National Renewable Energy Laboratory Contract No.
                 DE-AC36-08GO28308 and Oak Ridge National Laboratory Contract No.
                 DE-AC05-00OR22725.
             </p>
+            <p>
+                This Software is provided for research purposes only. ORNL and NREL has no obligation to 
+                update, debug, and/or continue to support the Software. Any use of the Software is at your own risk.
+            </p>
         </div>
         <div class="ps-3 pt-2 pe-3 pb-2">
 
@@ -31,14 +35,80 @@ <h4>
                 Backups can be imported back into the Software if needed to restore lost or corrupted data. 
             </p>
             <p>
-                You may voluntarily provide a backup file of your data to NREL and ORNL for use in improving the Software. 
-                By providing such data you are agreeing that NREL and ORNL may use such data without restriction and without 
+                You may voluntarily provide a backup file of your data to ORNL and NREL for use in improving the Software. 
+                By providing such data you are agreeing that ORNL and NREL may use such data without restriction and without 
                 compensation or obligation to you. 
-                To the extent any license would be required to utilize such data, you automatically grant NREL and ORNL, 
+                To the extent any license would be required to utilize such data, you automatically grant ORNL and NREL, 
                 when submitting such data, a worldwide, royalty-free, perpetual, irrevocable, non-exclusive, 
                 transferrable, and sublicensable license under any rights necessary for such use or implementation.
 
             </p>
+            <p>
+                THIS SOFTWARE IS PROVIDED BY ORNL and NREL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+                INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+                FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+                IN NO EVENT SHALL ORNL, NREL, OR CONTRIBUTORS BE LIABLE FOR 
+                ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+                (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+                LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+                AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+                OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+                EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+            </p>
+        </div>
+        <div class="ps-3 pt-2 pe-3 pb-2">
+
+            <h4>
+                <fa-icon [icon]="faScaleBalanced" class="pe-1"></fa-icon>
+                Software license
+            </h4>
+            <p>Copyright 2024, Alliance for Sustainable Energy, LLC and UT-Battelle, LLC</p>
+            <p>JUSTIFI</p>
+            <p>All rights reserved</p>
+
+            <!-- NEB-Tool -->
+
+            <p>OPEN SOURCE LICENSE (Permissive)</p>
+
+            <p>
+                Subject to the conditions of this License, Alliance for Sustainable Energy, LLC 
+                and UT-Battelle, LLC (the "Licensors") hereby grant, free of charge, to any person (the "Licensee") 
+                obtaining a copy of this software and associated documentation files (the "Software"), a perpetual, 
+                worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to use, copy, modify, 
+                merge, publish, distribute, and/or sublicense copies of the Software.
+            </p>
+
+            <p>
+                1. Redistributions of Software must retain the above open source license grant, copyright and license notices, 
+                this list of conditions, and the disclaimer listed below. Changes or modifications to, 
+                or derivative works of the Software must be noted with comments and the contributor and organization's name.
+            </p>
+
+            <p>
+                2. Neither the names of Licensors, the Department of Energy, or their employees may be used 
+                to endorse or promote products derived from this Software without their specific prior written permission.
+            </p>
+
+            <p>
+                3. If the Software is protected by a proprietary trademark owned by either Licensor or 
+                the Department of Energy, then derivative works of the Software may not be distributed 
+                using the trademark without the prior written approval of the trademark owner.
+            </p>
+
+            <hr>
+
+            <p>
+                DISCLAIMER
+                ALLIANCE FOR SUSTAINABLE ENERGY, LLC, UT-BATTELLE, LLC AND THE GOVERNMENT MAKE NO REPRESENTATIONS 
+                AND DISCLAIM ALL WARRANTIES, BOTH EXPRESSED AND IMPLIED. THERE ARE NO EXPRESS OR IMPLIED WARRANTIES 
+                OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR THAT THE USE OF THE SOFTWARE WILL NOT 
+                INFRINGE ANY PATENT, COPYRIGHT, TRADEMARK, OR OTHER PROPRIETARY RIGHTS, 
+                OR THAT THE SOFTWARE WILL ACCOMPLISH THE INTENDED RESULTS OR THAT THE SOFTWARE OR 
+                ITS USE WILL NOT RESULT IN INJURY OR DAMAGE. THE USER ASSUMES RESPONSIBILITY 
+                FOR ALL LIABILITIES, PENALTIES, FINES, CLAIMS, CAUSES OF ACTION, 
+                AND COSTS AND EXPENSES, CAUSED BY, RESULTING FROM OR ARISING OUT OF, IN WHOLE OR IN PART THE USE, 
+                STORAGE OR DISPOSAL OF THE SOFTWARE.
+            </p>
         </div>
     </div>
 </div>
diff --git a/src/app/core-components/about/about.component.ts b/src/app/core-components/about/about.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { faCircleInfo, faInfo, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { faCircleInfo, faInfo, IconDefinition, faScaleBalanced } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
   selector: 'app-about',
@@ -9,4 +9,5 @@ import { faCircleInfo, faInfo, IconDefinition } from '@fortawesome/free-solid-sv
 export class AboutComponent {
 
   faCircleInfo: IconDefinition = faCircleInfo;
+  faScaleBalanced: IconDefinition = faScaleBalanced;
 }