Match figma and move components into templates

src/registrar/registrar_middleware.py

@@ -36,6 +36,16 @@ class CheckUserProfileMiddleware:
 
         # Check if setup is not finished
         finished_setup = hasattr(request.user, "finished_setup") and request.user.finished_setup
+        if hasattr(request.user, "finished_setup"):
+            user_values = [
+                request.user.contact.first_name,
+                request.user.contact.last_name,
+                request.user.contact.title,
+                request.user.contact.phone
+            ]
+            if None in user_values:
+                finished_setup = False
+
         if request.user.is_authenticated and not finished_setup:
             return self._handle_setup_not_finished(request)
 

src/registrar/templates/finish_profile_setup.html

@@ -1,4 +1,5 @@
-{% extends "base.html" %}
+{% extends "profile.html" %}
+
 {% load static form_helpers url_helpers field_helpers %}
 {% block title %} Finish setting up your profile | {% endblock %}
 
@@ -12,10 +13,7 @@
     <div class="grid-row grid-gap">
         <div class="tablet:grid-col">
             <main id="main-content" class="grid-container">
-
+                {# messages block is under the back breadcrumb link #}
-                {% comment %}
-                Form success messages.
-                {% endcomment %}
                 {% if messages %}
                 {% for message in messages %}
                 <div class="usa-alert usa-alert--{{ message.tags }} usa-alert--slim margin-bottom-3">
@@ -25,98 +23,25 @@
                 </div>
                 {% endfor %}
                 {% endif %}
-                
-                {% comment %}
-                Repurposed from domain_request_form.html.
-                Form errors.
-                {% endcomment %}
                 {% include "includes/form_errors.html" with form=form %}
-                {% for outer in forms %}
-                    {% if outer|isformset %}
-                        {% for inner in outer.forms %}
-                            {% include "includes/form_errors.html" with form=inner %}
-                        {% endfor %}
-                    {% else %}
-                        {% include "includes/form_errors.html" with form=outer %}
-                    {% endif %}
-                {% endfor %}
 
-                <h1>Finish setting up your profile</h1>
+                {% if confirm_changes and not going_to_specific_page %}
+                <a href="{% url 'home' %}" class="breadcrumb__back">
+                    <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                    <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
+                    </svg>
                 
-                <p>
+                    <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
-                    We <a class="usa-link" href="{% public_site_url 'domains/requirements/#what-.gov-domain-registrants-must-do' %}"  target="_blank">require</a> 
+                    Back to manage your domains
-                    that you maintain accurate contact information.
-                    The details you provide will only be used to support the administration of .gov and won’t be made public. 
                     </p>
-
+                </a>
-                <h2>What contact information should we use to reach you?</h2>
-                <p>
-                    Review the details below and update any required information. 
-                    Note that editing this information won’t affect your Login.gov account information.
-                </p>
-                {# We use a var called 'remove_margin_top' rather than 'add_margin_top' because most fields use this #}
-                {% include "includes/required_fields.html" with remove_margin_top=True %}
-                <form id="finish-profile-setup-form" class="usa-form usa-form--largest" method="post" novalidate>
-                    {% csrf_token %}
-                    <fieldset class="usa-fieldset">
-                        <legend class="usa-sr-only">
-                            Your contact information
-                        </legend>
-
-                        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly usa-form-readonly--no-border padding-top-2" %}
-                            {% input_with_errors form.full_name %}
-                        {% endwith %}
-                        
-                        <div id="profile-name-fieldset" class="display-none" role="group">
-                            {% with group_classes="usa-form-readonly usa-form-readonly--no-border padding-top-2" %}
-                                {% input_with_errors form.first_name %}
-                            {% endwith %}
-                            
-                            {% with  group_classes="usa-form-readonly padding-top-2" %}
-                                {% input_with_errors form.middle_name %}
-                            {% endwith %}
-                            
-                            {% with  group_classes="usa-form-readonly padding-top-2" %}
-                                {% input_with_errors form.last_name %}
-                            {% endwith %}
-                        </div>
-
-                        {# This field doesn't have the readonly button but it has common design elements from it #}
-                        {% with show_readonly=True group_classes="usa-form-readonly padding-top-2 bold-usa-label" %}
-                            {% with target_blank="true" sublabel_text=email_sublabel_text add_class="display-none" %}
-                                {% input_with_errors form.email %}
-                            {% endwith %}
-                        {% endwith %}
-
-                        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly padding-top-2" %}
-                            {% input_with_errors form.title %}
-                        {% endwith %}
-
-                        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly padding-top-2" %}
-                            {% with add_class="usa-input--medium" %}
-                                {% input_with_errors form.phone %}
-                            {% endwith %}
-                        {% endwith %}
-
-                    </fieldset>
-                    <div>
-
-                        {% if confirm_changes %}
-                            <button type="submit" name="contact_setup_submit_button" class="usa-button">
-                                Save and continue
-                            </button>
-                        {% else %}
-                            <button type="submit" name="contact_setup_save_button" class="usa-button usa-button--outline">
-                                Save
-                            </button>
                 {% endif %}
-                    </div>
+
-                {% block form_fields %}{% endblock %}
+                {% include "includes/finish_profile_form.html" with form=form %}
             </main>
         </div>
     </div>
 </div>
-
 {% endblock content %}
 
 {% block footer %}

src/registrar/templates/includes/finish_profile_form.html

@@ -0,0 +1,85 @@
+{% extends 'includes/profile_form.html' %}
+
+{% load static url_helpers %}
+{% load field_helpers %}
+
+{% block profile_header %}
+<h1>Finish setting up your profile</h1>
+{% endblock profile_header %}
+
+{% block profile_blurb %}
+<p>
+    We <a class="usa-link" href="{% public_site_url 'domains/requirements/#what-.gov-domain-registrants-must-do' %}"  target="_blank">require</a> 
+    that you maintain accurate contact information.
+    The details you provide will only be used to support the administration of .gov and won’t be made public. 
+</p>
+
+<h2>What contact information should we use to reach you?</h2>
+<p>
+    Review the details below and update any required information. 
+    Note that editing this information won’t affect your Login.gov account information.
+</p>
+
+{# We use a var called 'remove_margin_top' rather than 'add_margin_top' because most fields use this #}
+{% include "includes/required_fields.html" with remove_margin_top=True %}
+
+{% endblock profile_blurb %}
+
+{% block profile_form %}
+<form id="finish-profile-setup-form" class="usa-form usa-form--largest" method="post" novalidate>
+    {% csrf_token %}
+    <fieldset class="usa-fieldset">
+        <legend class="usa-sr-only">
+            Your contact information
+        </legend>
+
+        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly usa-form-readonly--no-border padding-top-2" %}
+            {% input_with_errors form.full_name %}
+        {% endwith %}
+        
+        <div id="profile-name-fieldset" class="display-none" role="group">
+            {% with group_classes="usa-form-readonly usa-form-readonly--no-border padding-top-2" %}
+                {% input_with_errors form.first_name %}
+            {% endwith %}
+            
+            {% with  group_classes="usa-form-readonly padding-top-2" %}
+                {% input_with_errors form.middle_name %}
+            {% endwith %}
+            
+            {% with  group_classes="usa-form-readonly padding-top-2" %}
+                {% input_with_errors form.last_name %}
+            {% endwith %}
+        </div>
+
+        {# This field doesn't have the readonly button but it has common design elements from it #}
+        {% with show_readonly=True group_classes="usa-form-readonly padding-top-2 bold-usa-label" %}
+            {% with target_blank="true" sublabel_text=email_sublabel_text add_class="display-none" %}
+                {% input_with_errors form.email %}
+            {% endwith %}
+        {% endwith %}
+
+        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly padding-top-2" %}
+            {% input_with_errors form.title %}
+        {% endwith %}
+
+        {% with show_edit_button=True show_readonly=True group_classes="usa-form-readonly padding-top-2" %}
+            {% with add_class="usa-input--medium" %}
+                {% input_with_errors form.phone %}
+            {% endwith %}
+        {% endwith %}
+
+    </fieldset>
+    <div>
+
+        <button type="submit" name="contact_setup_save_button" class="usa-button ">
+            Save
+        </button>
+        {% if confirm_changes and going_to_specific_page %}
+            <button type="submit" name="contact_setup_submit_button" class="usa-button usa-button--outline">
+                {{redirect_button_text }}
+            </button>
+        {% endif %}
+    </div>
+</form>
+
+{% endblock profile_form %}

src/registrar/templates/includes/profile_form.html

@@ -0,0 +1,51 @@
+{% load static url_helpers %}
+{% load field_helpers %}
+
+{% block profile_header %}
+<h1>Your profile</h1>
+{% endblock profile_header %}
+
+{% block profile_blurb %}
+<p>We <a href="https://get.gov/domains/requirements/#what-.gov-domain-registrants-must-do" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
+
+<h2>Contact information</h2>
+<p>Review the details below and update any required information. Note that editing this information won’t affect your Login.gov account information.</p>
+{% include "includes/required_fields.html" %}
+{% endblock profile_blurb %}
+
+
+{% block profile_form %}
+<form class="usa-form usa-form--large" method="post" novalidate>
+    {% csrf_token %}
+    <fieldset class="usa-fieldset">
+
+    {% input_with_errors form.first_name %}
+
+    {% input_with_errors form.middle_name %}
+
+    {% input_with_errors form.last_name %}
+
+    {% input_with_errors form.title %}
+
+    {% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
+
+    {% with link_href=login_help_url %}
+        {% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
+        {% with link_text="Get help with your Login.gov account" %}
+            {% with target_blank=True %}
+            {% with do_not_show_max_chars=True %}
+                {% input_with_errors form.email %}
+            {% endwith %}
+            {% endwith %}
+        {% endwith %}
+        {% endwith %}
+    {% endwith %}
+
+    {% with add_class="usa-input--medium" %}
+        {% input_with_errors form.phone %}
+    {% endwith %}
+
+</fieldset>
+<button type="submit" class="usa-button">Save</button>
+</form>
+{% endblock profile_form %}

src/registrar/templates/profile.html

@@ -1,11 +1,9 @@
 {% extends 'base.html' %}
 
-
 {% block title %}
 Edit your User Profile |
 {% endblock title %}
 {% load static url_helpers %}
-{% load field_helpers %}
 
 {% block content %}
 <main id="main-content" class="grid-container">
@@ -16,7 +14,7 @@ Edit your User Profile |
       </svg>
   
       <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
-      Back to manage your domains
+      Go to manage your domains
       </p>
     </a>
     {# messages block is under the back breadcrumb link #}
@@ -30,48 +28,7 @@ Edit your User Profile |
     {% endfor %}
     {% endif %}
     {% include "includes/form_errors.html" with form=form %}
-
+    {% include "includes/profile_form.html" with form=form %}
-    <h1>Your profile</h1>
+  </div>
-    <p>We <a href="https://get.gov/domains/requirements/#what-.gov-domain-registrants-must-do" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
-    
-    <h2>Contact information</h2>
-    <p>Review the details below and update any required information. Note that editing this information won’t affect your Login.gov account information.</p>
-
-    {% include "includes/required_fields.html" %}
-
-    <form class="usa-form usa-form--large" method="post" novalidate>
-      {% csrf_token %}
-      <fieldset class="usa-fieldset">
-
-        {% input_with_errors form.first_name %}
-
-        {% input_with_errors form.middle_name %}
-    
-        {% input_with_errors form.last_name %}
-    
-        {% input_with_errors form.title %}
-
-        {% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
-
-        {% with link_href=login_help_url %}
-          {% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
-            {% with link_text="Get help with your Login.gov account" %}
-              {% with target_blank=True %}
-                {% with do_not_show_max_chars=True %}
-                  {% input_with_errors form.email %}
-                {% endwith %}
-              {% endwith %}
-            {% endwith %}
-          {% endwith %}
-        {% endwith %}
-    
-        {% with add_class="usa-input--medium" %}
-          {% input_with_errors form.phone %}
-        {% endwith %}
-
-      </fieldset>
-      <button type="submit" class="usa-button">Save</button>
-    </form>
 </main>
 {% endblock content %}
-

src/registrar/views/user_profile.py

@@ -124,6 +124,10 @@ class FinishProfileSetupView(UserProfileView):
         if self.redirect_type == self.RedirectType.COMPLETE_SETUP:
             context["confirm_changes"] = True
         
+        if "redirect_viewname" in self.session:
+            context["going_to_specific_page"] = True
+            context["redirect_button_text"] = "Continue to your request"
+
         return context
 
     def _email_sublabel_text(self):