Merge pull request #1166 from jhuopensource/rel/2024_11A

Hotfix: Self hosting FontAwesome
jhuopensource · Nov 7, 2024 · 9e58a9b · 9e58a9b
2 parents 007fc7b + d73eb10
commit 9e58a9b
Show file tree

Hide file tree

Showing 2,159 changed files with 378,535 additions and 32 deletions.
diff --git a/agreement/templates/privacypolicy.html b/agreement/templates/privacypolicy.html
@@ -80,10 +80,13 @@
       ga("send", "pageview");
     </script>
 
-    <script
+    <!-- <script
       src="https://kit.fontawesome.com/54815f8287.js"
       crossorigin="anonymous"
-    ></script>
+    ></script> -->
+    <link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/fontawesome.css" rel="stylesheet" />
+    <link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/brands.css" rel="stylesheet" />
+	  <link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/solid.css" rel="stylesheet" /> 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script src="https://malsup.github.io/jquery.cycle2.js"></script>
     <script type="text/javascript" src="/static/js/course-page.js"></script>

diff --git a/agreement/templates/termsofservice.html b/agreement/templates/termsofservice.html
@@ -46,7 +46,10 @@
 		ga('send', 'pageview');
 	</script>
 
-	<script src="https://kit.fontawesome.com/cd2a8cc816.js" crossorigin="anonymous"></script>
+	<!-- <script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script> -->
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/fontawesome.css" rel="stylesheet" />
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/brands.css" rel="stylesheet" />
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/solid.css" rel="stylesheet" />
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 	<script src="https://malsup.github.io/jquery.cycle2.js"></script>
 	<script type='text/javascript' src='/static/js/course-page.js'></script>

diff --git a/semesterly/templates/about.html b/semesterly/templates/about.html
@@ -33,7 +33,10 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
 		integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
 
-	<script src="https://kit.fontawesome.com/cd2a8cc816.js" crossorigin="anonymous"></script>
+	<!-- <script src="https://kit.fontawesome.com/cd2a8cc816.js" crossorigin="anonymous"></script> -->
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/fontawesome.css" rel="stylesheet" />
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/brands.css" rel="stylesheet" />
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/solid.css" rel="stylesheet" />
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
 	<script type="text/javascript" src="{% static 'js/splash.js'%}"></script>
 

diff --git a/semesterly/templates/notice.html b/semesterly/templates/notice.html
@@ -21,7 +21,11 @@
     <link rel="stylesheet"
         href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.3/css/fontawesome.min.css"
         integrity="sha384-wESLQ85D6gbsF459vf1CiZ2+rr+CsxRY0RpiF1tLlQpDnAgg6rwdsUF1+Ics2bni" crossorigin="anonymous">
-    <script src="https://kit.fontawesome.com/cd2a8cc816.js" crossorigin="anonymous"></script>
+    <!-- <script src="https://kit.fontawesome.com/cd2a8cc816.js" crossorigin="anonymous"></script> -->
+    <link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/fontawesome.css" rel="stylesheet" />
+    <link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/brands.css" rel="stylesheet" />
+	<link href="../../static/rest_framework/icons/fontawesome-free-6.6.0-web/css/solid.css" rel="stylesheet" />
+
 </head>
 
 <body>

diff --git a/static/js/redux/__tests__/modals/__snapshots__/terms_of_service_banner.test.jsx.snap b/static/js/redux/__tests__/modals/__snapshots__/terms_of_service_banner.test.jsx.snap
@@ -27,7 +27,7 @@ exports[`TOS Banner Renders As Expected fully if isVisible 1`] = `
       class="tos-banner__close"
     >
       <i
-        class="fa fa-times"
+        class="fa-solid fa-xmark"
       />
     </div>
   </div>
@@ -61,7 +61,7 @@ exports[`TOS Banner Renders As Expected null if not isVisible 1`] = `
       class="tos-banner__close"
     >
       <i
-        class="fa fa-times"
+        class="fa-solid fa-xmark"
       />
     </div>
   </div>

diff --git a/static/js/redux/ui/CustomSlot.tsx b/static/js/redux/ui/CustomSlot.tsx
@@ -165,7 +165,7 @@ const CustomSlot = (props: CustomSlotProps) => {
   };
 
   const removeButton = hovered ? (
-    <i className="fa fa-times" onClick={(event) => removeCustomButtonClicked(event)} />
+    <i className="fa-solid fa-xmark" onClick={(event) => removeCustomButtonClicked(event)} />
   ) : null;
 
   const convertedStart =

diff --git a/static/js/redux/ui/MasterSlot.tsx b/static/js/redux/ui/MasterSlot.tsx
@@ -204,7 +204,7 @@ const MasterSlot = (props: MasterSlotProps) => {
         {shareLink}
         {!props.hideCloseButton ? (
           <i
-            className="fa fa-times"
+            className="fa-solid fa-xmark"
             onClick={(event) => stopPropagation(props.removeCourse, event)}
           />
         ) : null}

diff --git a/static/js/redux/ui/Semesterly.tsx b/static/js/redux/ui/Semesterly.tsx
@@ -275,7 +275,7 @@ const Semesterly = () => {
                   rel="noopener noreferrer"
                   href="https://github.com/jhuopensource/semesterly"
                 >
-                  <i className="fa fa-github" />
+                  <i className="fa-brands fa-github" />
                   Follow
                 </a>
               </li>

diff --git a/static/js/redux/ui/TimeSelector.tsx b/static/js/redux/ui/TimeSelector.tsx
@@ -55,7 +55,7 @@ const TimeSelector = (props: TimeSelectorProps) => {
       />
       <div className="time-selector-day">
         <div style={{ marginRight: "2px" }}>{day.slice(0, 3)}</div>
-        <i className="fa fa-times" onClick={() => remove(day)} />
+        <i className="fa-solid fa-xmark" onClick={() => remove(day)} />
       </div>
     </div>
   );

diff --git a/static/js/redux/ui/advanced_search_filters.jsx b/static/js/redux/ui/advanced_search_filters.jsx
@@ -103,7 +103,7 @@ Filter.propTypes = {
 export const SelectedFilter = ({ name, remove }) => (
   <div className="selected-filter">
     <span style={{ marginRight: "8px" }}>{name}</span>
-    <i className="fa fa-times" onClick={() => remove()} />
+    <i className="fa-solid fa-xmark" onClick={() => remove()} />
   </div>
 );
 

diff --git a/static/js/redux/ui/modals/AdvancedSearchModal.tsx b/static/js/redux/ui/modals/AdvancedSearchModal.tsx
@@ -478,7 +478,7 @@ const AdvancedSearchModal = () => {
               dispatch(advancedSearchActions.hideAdvancedSearchModal())
             }
           >
-            <i className="fa fa-times" />
+            <i className="fa-solid fa-xmark" />
           </div>
         </div>
         <div className="advanced-search-body">

diff --git a/static/js/redux/ui/modals/CourseModal.tsx b/static/js/redux/ui/modals/CourseModal.tsx
@@ -117,7 +117,7 @@ const CourseModal = () => {
           </div>
         </h2>
         <div className="modal-close" onClick={hide}>
-          <i className="fa fa-times" />
+          <i className="fa-solid fa-xmark" />
         </div>
         <div className="modal-share">
           <i className="fa fa-share-alt" onClick={showShareLink} />

diff --git a/static/js/redux/ui/modals/SaveCalendarModal.tsx b/static/js/redux/ui/modals/SaveCalendarModal.tsx
@@ -43,7 +43,7 @@ const SaveCalendarModal = () => {
         className="modal-close"
         onClick={() => dispatch(saveCalendarModalActions.toggleSaveCalendarModal())}
       >
-        <i className="fa fa-times" />
+        <i className="fa-solid fa-xmark" />
       </div>
     </div>
   );

diff --git a/static/js/redux/ui/modals/UserAcquisitionModal.tsx b/static/js/redux/ui/modals/UserAcquisitionModal.tsx
@@ -66,7 +66,7 @@ const UserAcquisitionModal = () => {
           }}
         >
           <span className="img-icon">
-            <i className="fa fa-facebook" />
+            <i className="fa-brands fa-facebook" />
           </span>
           <span>Continue with Facebook</span>
         </button>

diff --git a/static/js/redux/ui/modals/UserSettingsModal.tsx b/static/js/redux/ui/modals/UserSettingsModal.tsx
@@ -312,7 +312,7 @@ const UserSettingsModal = () => {
 
   const cancelButton = (
     <div className="modal-close" onClick={hide}>
-      <i className="fa fa-times" />
+      <i className="fa-solid fa-xmark" />
     </div>
   );
 

diff --git a/static/js/redux/ui/terms_of_service_banner.jsx b/static/js/redux/ui/terms_of_service_banner.jsx
@@ -55,7 +55,7 @@ class TermsOfServiceBanner extends React.Component {
           className="tos-banner__close"
           onClick={() => this.props.dismissTermsOfServiceBanner()}
         >
-          <i className="fa fa-times" />
+          <i className="fa-solid fa-xmark" />
         </div>
       </div>
     );

diff --git a/static/rest_framework/icons/fontawesome-free-6.6.0-web/LICENSE.txt b/static/rest_framework/icons/fontawesome-free-6.6.0-web/LICENSE.txt
@@ -0,0 +1,165 @@
+Fonticons, Inc. (https://fontawesome.com)
+
+--------------------------------------------------------------------------------
+
+Font Awesome Free License
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+--------------------------------------------------------------------------------
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+
+The Font Awesome Free download is licensed under a Creative Commons
+Attribution 4.0 International License and applies to all icons packaged
+as SVG and JS file types.
+
+--------------------------------------------------------------------------------
+
+# Fonts: SIL OFL 1.1 License
+
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+Copyright (c) 2024 Fonticons, Inc. (https://fontawesome.com)
+with Reserved Font Name: "Font Awesome".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+Copyright 2024 Fonticons, Inc.
+
+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.
+
+--------------------------------------------------------------------------------
+
+# Attribution
+
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+--------------------------------------------------------------------------------
+
+# Brand Icons
+
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**