Merge branch 'production' into staging

GSA · Dec 30, 2024 · dd91b95 · dd91b95
2 parents efe7738 + 827862d
commit dd91b95
Show file tree

Hide file tree

Showing 21 changed files with 722 additions and 694 deletions.
diff --git a/assets/client/src/components/ChallengeDetails.js b/assets/client/src/components/ChallengeDetails.js
@@ -121,7 +121,7 @@ export const ChallengeDetails = ({challenge, challengePhases, preview, print, ta
           <div className="follow-tooltip__section">
             <h4>Follow challenge as guest</h4>
             <p>Receive challenge updates to your email. No sign-in required</p>
-            <a href={preview ? "#" : `${encodeURIComponent(challenge.gov_delivery_topic_subscribe_link)}`}>
+            <a href={preview ? null : challenge.gov_delivery_topic_subscribe_link}>
               <button className="follow-tooltip__button">Follow challenge</button>
             </a>
           </div>
@@ -350,7 +350,7 @@ export const ChallengeDetails = ({challenge, challengePhases, preview, print, ta
                   <div className="logos">
                     <img
                       className="agency-logo"
-                      src={`${imageBase}${encodeURIComponent(challenge.agency_logo)}`}
+                      src={imageBase + challenge.agency_logo}
                       alt={`Agency logo for ${challenge.agency_name}`}                    
                     />
 
@@ -404,7 +404,7 @@ export const ChallengeDetails = ({challenge, challengePhases, preview, print, ta
                 </div>
               }
               {!print &&
-                <a className="follow__btn" href={`${apiUrl}/public/previews/challenges?challenge=${encodeURIComponent(challenge.uuid)}&print=true`} target="_blank" rel="noopener noreferrer">
+                <a className="follow__btn" href={apiUrl + `/public/previews/challenges?challenge=${challenge.uuid}&print=true`} target="_blank">
                   <span className="details__btn">
                       <svg className="usa-icon" aria-hidden="true" focusable="false" role="img"
                            style={{fill: "#FA9441", height: "21px", width: "21px", position: "relative", top: "5px", right: "5px"}}>

diff --git a/assets/client/src/components/ChallengeTile.js b/assets/client/src/components/ChallengeTile.js
@@ -115,7 +115,7 @@ export const ChallengeTile = ({challenge, preview}) => {
         <div className="agency_image_wrapper">
           <img
             className="agency-logo"
-            src={`${imageBase}${encodeURIComponent(challenge.agency_logo)}`}
+            src={imageBase + challenge.agency_logo}
             alt={truncateString(`Agency Logo: ${challenge.agency_name}`, 90)}
           />
         </div>
@@ -134,7 +134,7 @@ export const ChallengeTile = ({challenge, preview}) => {
       <div className="image_wrapper">
         <img
             className="agency-logo"
-            src={`${imageBase}${encodeURIComponent(challenge.agency_logo)}`}
+            src={imageBase + challenge.agency_logo}
             alt={truncateString(`Agency Logo: ${challenge.agency_name}`, 90)}
         />
       </div>
@@ -144,7 +144,7 @@ export const ChallengeTile = ({challenge, preview}) => {
   return (
     challenge ? (
       <div key={challenge.id} className="challenge-tile card">
-        <a href={encodeURI(challengeTileUrl(challenge, preview))} target={challenge.external_url ? "_blank" : ""} aria-label="">
+        <a href={challengeTileUrl(challenge, preview)} target={challenge.external_url ? "_blank" : ""} aria-label="">
           {renderTileLogo()}
           <div className="challenge-tile__text-wrapper">
             <h2 className="challenge-tile__title test" aria-label="" style={{ textAlign: 'left', paddingLeft: '20px', paddingTop: '20px', lineHeight: '30px' }}>{truncateString(challenge.title, 90)}</h2>

diff --git a/assets/client/src/components/PreviewBanner.js b/assets/client/src/components/PreviewBanner.js
@@ -37,9 +37,9 @@ export const PreviewBanner = ({challenge}) => {
             <div>
               <span className="me-3">Preview generated on {formatDateToLLLL()}</span>
               <a className="me-3" href={window.location.href}>Refresh page</a>
-              {!challenge.external_url && (
-                <a href={`${apiUrl}/public/previews/challenges?challenge=${encodeURIComponent(challenge.uuid)}&print=true`} target="_blank">Print</a>
-              )}
+              {!challenge.external_url &&
+                <a href={apiUrl + `/public/previews/challenges?challenge=${challenge.uuid}&print=true`} target="_blank">Print</a>
+              }
             </div> 
             <br/>
             <div>Link to share for internal agency review:</div>

diff --git a/assets/client/src/components/challenge_tabs/Winners.js b/assets/client/src/components/challenge_tabs/Winners.js
@@ -9,7 +9,7 @@ export const Winners = ({challenge, challengePhases, print}) => {
     if (phaseWinner.overview_image_path) {
       return (
         <img
-          src={`${imageBase}${encodeURIComponent(phaseWinner.overview_image_path)}`}
+          src={imageBase + phaseWinner.overview_image_path}
           alt="Phase Winner image"
           title="Phase Winner image"
           className="phase-winner-image mt-3"
@@ -23,7 +23,7 @@ export const Winners = ({challenge, challengePhases, print}) => {
       const {id, image_path, name, place_title} = winner
       return (
         <div key={id} className="d-flex flex-row align-items-center usa-tbm-1rem">
-          {image_path && (<img src={`${imageBase}${encodeURIComponent(winner.image_path)}`} alt="winner image" title="winner image" className="phase-winner-image me-3" />)}
+          {image_path && <img src={imageBase + winner.image_path} alt="winner image" title="winner image" className="phase-winner-image me-3" />}
           {name && <p>{name}</p>}
           {place_title && <p>{` - ${place_title}`}</p>}
         </div>

diff --git a/assets/client/src/index.js b/assets/client/src/index.js
@@ -60,9 +60,9 @@ const renderRouter = () => (
 )
 
 const rootElement = document.getElementById('challenge-gov-react-app')
-const apiUrl = encodeURI(rootElement.getAttribute('data-api-url'))
+const apiUrl = rootElement.getAttribute('data-api-url')
 const publicUrl = rootElement.getAttribute('data-public-url')
-const imageBase = encodeURI(rootElement.getAttribute('data-image-base'))
+const imageBase = rootElement.getAttribute('data-image-base')
 const bridgeApplyBlocked = rootElement.getAttribute('data-bridge-apply-blocked') != 'false'
 
 ReactDOM.render(renderRouter(), rootElement);

diff --git a/assets/client/src/preview.js b/assets/client/src/preview.js
@@ -51,7 +51,7 @@ const renderPreview = () => (
 )
 
 const rootElement = document.getElementById('preview');
-const imageBase = encodeURI(rootElement.getAttribute('data-image-base'));
+const imageBase = rootElement.getAttribute('data-image-base');
 ReactDOM.render(renderPreview(), rootElement);
 
 // If you want your app to work offline and load faster, you can change

diff --git a/assets/js/app/_custom_url_generator.js b/assets/js/app/_custom_url_generator.js
@@ -18,10 +18,10 @@ function set_custom_url_example() {
   if (custom_url_example_text.length > 0) {
     if (custom_url_input_value != "") {
       challenge_title_slug = title_to_url_slug(custom_url_input_value)
-      custom_url_example_text.text(challenge_title_slug)
+      custom_url_example_text.html(challenge_title_slug)
     } else {
       challenge_title_slug = title_to_url_slug(challenge_title_input_value)
-      custom_url_example_text.text(challenge_title_slug)
+      custom_url_example_text.html(challenge_title_slug)
     }
   }
 }

diff --git a/assets/package.json b/assets/package.json
@@ -18,7 +18,7 @@
     "chokidar": "^3.3.1",
     "file-loader": "^6.2.0",
     "inputmask": "^5.0.5",
-    "jquery": "^3.7.1",
+    "jquery": "^3.3.1",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
     "node-sass": "^8.0.0",
@@ -57,4 +57,4 @@
     "webpack": "^5.76.0",
     "webpack-cli": "^4.7.0"
   }
-}
+}