Merge branch 'main' into chore/delete-backup-code-for-deleted-snippet

TACC · Jul 10, 2024 · 2f96b7f · 2f96b7f
2 parents 9a76715 + ff93a75
commit 2f96b7f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 27 deletions.
diff --git a/apps/tup-cms/src/apps/portal/apps.py b/apps/tup-cms/src/apps/portal/apps.py
@@ -44,18 +44,21 @@ def submit_ticket(form_data):
 
 
 def send_confirmation_email(form_name, form_data):
-    email_body = """
+    email_body = f"""
             <p>Greetings,</p>
             <p>
-                You have successfully submitted a form on the TACC website. Thank you for your submission.
+                Thank you for reaching out to TACC and completing the {form_name}.
             </p>
             <p>
-                Business hours are Monday - Friday, 8AM to 5PM Central. We will respond to your submission
-                according to the information provided on the form webpage.
+                <ul>
+                    <li>For training registration requests, you will be contacted within one week to confirm registration. For additional help please contact Lauren Bruce ([email protected]).</li>
+                    <li>For tour requests, a tour coordinator will contact you within two business days to complete your reservation. For additional assistance please reach out to [email protected].</li>
+                    <li>For all other issues, a TACC support person will be in contact shortly. For additional assistance please reach out to [email protected].</li>
+                </ul>
             </p>
             <p>
-            Sincerely,<br>
-            TACC Communications
+            Thank you for your time,<br>
+            TACC Support
             </p>
             """
     send_mail(

diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html
@@ -28,24 +28,24 @@
     aria-haspopup="true"
     aria-expanded="false"
   >
-    <i class="icon icon-user"></i>
+    <i class="icon icon-user" role="presentation"></i>
     <span>{{ user.get_username }}</span>
     <span class="sr-only">Toggle Dropdown</span>
   </a>
   <nav class="dropdown-menu dropdown-menu-right">
     <a class="dropdown-item" href="/portal">
-      <i class="icon icon-dashboard"></i> My Dashboard
+      <i class="icon icon-dashboard" role="presentation"></i> My Dashboard
     </a>
     <a class="dropdown-item" href="/portal/account">
-      <i class="icon icon-user"></i> Manage Account
+      <i class="icon icon-user" role="presentation"></i> Manage Account
     </a>
     {% if show_impersonation %}
     <a class="dropdown-item" href="/portal/impersonation">
-      <i class="icon icon-user"></i> Impersonate User
+      <i class="icon icon-user" role="presentation"></i> Impersonate User
     </a>
     {% endif %}
     <a class="dropdown-item" href="/portal/logout">
-      <i class="icon icon-exit"></i> Log Out
+      <i class="icon icon-exit" role="presentation"></i> Log Out
     </a>
   </nav>
 </li>

diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/logos-social-media.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/logos-social-media.html
@@ -2,27 +2,32 @@
 <!-- SEE: https://github.com/TACC/Core-CMS/blob/v4.8.0/taccsite_cms/templates/share_on_social.html -->
 <p class="logos--social">
   <a href="https://www.facebook.com/tacc.utexas" target="_blank" class="logos__facebook">
-    <svg viewbox="0 0 25 25">
+    <svg viewbox="0 0 25 25" role="img">
+      <title>Facebook</title>
       <use href="/static/site_cms/img/org_logos/facebook.svg#facebook-icon"></use>
     </svg>
   </a>
   <a href="https://www.youtube.com/user/TACCutexas" target="_blank" class="logos__youtube">
-    <svg viewbox="0 0 25 25">
+    <svg viewbox="0 0 25 25" role="img">
+      <title>YouTube</title>
       <use href="/static/site_cms/img/org_logos/youtube.svg#youtube-icon"></use>
     </svg>
   </a>
   <a href="https://www.linkedin.com/company/texas-advanced-computing-center-tacc" target="_blank" class="logos__linkedin">
-    <svg viewbox="0 0 25 25">
+    <svg viewbox="0 0 25 25" role="img">
+      <title>LinkedIn</title>
       <use href="/static/site_cms/img/org_logos/linkedin.svg#linkedin-icon"></use>
     </svg>
   </a>
   <a href="https://www.instagram.com/taccutexas/" target="_blank" class="logos__instagram">
-    <svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-        <path d="M160,128a32,32,0,1,1-32-32A32.03667,32.03667,0,0,1,160,128Zm68-44v88a56.06353,56.06353,0,0,1-56,56H84a56.06353,56.06353,0,0,1-56-56V84A56.06353,56.06353,0,0,1,84,28h88A56.06353,56.06353,0,0,1,228,84Zm-52,44a48,48,0,1,0-48,48A48.05436,48.05436,0,0,0,176,128Zm16-52a12,12,0,1,0-12,12A12,12,0,0,0,192,76Z" />
+    <svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" role="img">
+      <title>Instagram</title>
+      <path d="M160,128a32,32,0,1,1-32-32A32.03667,32.03667,0,0,1,160,128Zm68-44v88a56.06353,56.06353,0,0,1-56,56H84a56.06353,56.06353,0,0,1-56-56V84A56.06353,56.06353,0,0,1,84,28h88A56.06353,56.06353,0,0,1,228,84Zm-52,44a48,48,0,1,0-48,48A48.05436,48.05436,0,0,0,176,128Zm16-52a12,12,0,1,0-12,12A12,12,0,0,0,192,76Z" />
     </svg>
   </a>
   <a href="https://staging.bsky.app/profile/taccutexas.bsky.social" target="_blank" class="logos__bluesky">
-    <svg viewBox="0 0 64 57" xmlns="http://www.w3.org/2000/svg">
+    <svg viewBox="0 0 64 57" xmlns="http://www.w3.org/2000/svg" role="img">
+      <title>Bluesky</title>
       <path d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"></path>
     </svg>
   </a>

diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx
@@ -93,19 +93,25 @@ describe('LoginComponent', () => {
       ).toEqual(1)
     );
   });
-  it('should link to TAS Create Account if Create Account clicked', async () => {
+  it('should link to TAM', async () => {
     const { getByText, getAllByRole } = testRender(<LoginComponent />);
     await waitFor(() => getAllByRole('link'));
     const links: HTMLElement[] = getAllByRole('link');
     expect(getByText('Create Account')).toBeDefined();
     expect(links[0].getAttribute('href')).toEqual(
       'https://accounts.tacc.utexas.edu/register'
     );
-    expect(getByText('Reset Password')).toBeDefined();
+    expect(getByText('Account Help')).toBeDefined();
     expect(links[1].getAttribute('href')).toEqual(
+      'https://accounts.tacc.utexas.edu/login_support'
+    );
+    expect(getByText('Forgot Password')).toBeDefined();
+    expect(links[2].getAttribute('href')).toEqual(
       'https://accounts.tacc.utexas.edu/forgot_password'
     );
-    expect(getByText('Account Help')).toBeDefined();
-    expect(links[2].getAttribute('href')).toEqual('/about/help/');
+    expect(getByText('Recover Username')).toBeDefined();
+    expect(links[3].getAttribute('href')).toEqual(
+      'https://accounts.tacc.utexas.edu/forgot_username'
+    );
   });
 });
diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx
@@ -29,7 +29,15 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({
       <div className="c-form__errors">
         Sorry, we can't find an account matching those credentials.
         <br />
-        Please try again or <a href="/account/create">create a new account</a>.
+        Please try again or{' '}
+        <a
+          rel="noopener noreferrer"
+          target="_blank"
+          href="https://accounts.tacc.utexas.edu/register"
+        >
+          create a new account
+        </a>
+        .
       </div>
     );
   }
@@ -52,18 +60,32 @@ const CreateAccountLink = () => (
 );
 
 const AccountHelpLink = () => (
-  <a href="/about/help/" target="_blank" rel="noreferrer">
+  <a
+    href="https://accounts.tacc.utexas.edu/login_support"
+    target="_blank"
+    rel="noreferrer"
+  >
     Account Help
   </a>
 );
 
-const ResetPasswordLink = () => (
+const ForgotPasswordLink = () => (
   <a
     href="https://accounts.tacc.utexas.edu/forgot_password"
     target="_blank"
     rel="noreferrer"
   >
-    Reset Password
+    Forgot Password
+  </a>
+);
+
+const ForgotUsernameLink = () => (
+  <a
+    href="https://accounts.tacc.utexas.edu/forgot_username"
+    target="_blank"
+    rel="noreferrer"
+  >
+    Recover Username
   </a>
 );
 
@@ -145,8 +167,10 @@ const LoginComponent: React.FC<LoginProps> = ({ className }) => {
       </Formik>
       <div className="c-form__nav">
         <p>Having trouble logging in?</p>
-        <ResetPasswordLink />
+        {/* CAUTION: Do not exceed three links. If more needed, ask design. */}
         <AccountHelpLink />
+        <ForgotPasswordLink />
+        <ForgotUsernameLink />
       </div>
     </div>
   );

diff --git a/libs/tup-components/src/news/UserNews.module.css b/libs/tup-components/src/news/UserNews.module.css
@@ -1,5 +1,5 @@
 .news-list {
-  font-size: var(--global-font-size--x-small);
+  font-size: var(--global-font-size--small);
 }
 
 .news-list-item {