Revert "chore: Apply application layout to the Developer Agreement Programme page (#5053)" (#5057)

This reverts commit 5314e63.

Author: steverydz

static/js/publisher/pages/DeveloperAgreement/DeveloperAgreement.tsx

@@ -14,7 +14,6 @@ import Builds from "./pages/Builds";
 import Build from "./pages/Build";
 import Releases from "./pages/Releases";
 import AccountSnaps from "./pages/AccountSnaps";
-import DeveloperAgreement from "./pages/DeveloperAgreement";
 import RegisterNameDispute from "./pages/RegisterNameDispute";
 
 const router = createBrowserRouter([
@@ -70,10 +69,6 @@ const router = createBrowserRouter([
         path: "/snaps",
         element: <AccountSnaps />,
       },
-      {
-        path: "/account/agreement",
-        element: <DeveloperAgreement />,
-      },
       {
         path: "/register-name-dispute",
         element: <RegisterNameDispute />,

static/js/publisher/pages/DeveloperAgreement/__tests__/DeveloperAgreement.test.tsx

@@ -0,0 +1,61 @@
+{% extends "publisher/_publisher_layout.html" %}
+
+{% block meta_title %}
+    Developer Program Agreement — Linux software in the Snap Store
+{% endblock %}
+
+{% block content %}
+<section class="p-strip">
+  <div class="row">
+    <h1 class="p-heading--2">Developer Programme Agreement</h1>
+  </div>
+
+  <div class="row">
+    <div class="p-card">
+      <h2 class="p-heading--4">Snap Store Terms of Service and Privacy Notice</h2>
+      <p class="p-card__content">
+        <a  href="https://ubuntu.com/legal/terms-and-policies/snap-store-terms" target="_blank">Snap Store Terms of Service</a>
+      </p>
+      <p class="p-card__content">
+        <a  href="https://www.ubuntu.com/legal/data-privacy/snap-store" target="_blank">Privacy Notice</a>
+      </p>
+    </div>
+  </div>
+
+  <div class="row u-no-margin--top">
+    <form method="POST" action="/account/agreement">
+      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+      <div class="row">
+        <div class="col-8">
+          <div class="p-form-validation">
+            <input name="i_agree" id="id_i_agree" class="p-form-validation__input" type="checkbox">
+            <label for="id_i_agree">I agree to the terms and privacy notice</label>
+          </div>
+        </div>
+        <div class="col-4 u-align--right">
+          <a class="p-button" href="/">Cancel</a>
+          <button class="p-button--positive" disabled="disabled" type="submit">Continue</button>
+        </div>
+      </div>
+    </form>
+  </div>
+</section>
+{% endblock %}
+
+{% block scripts %}
+<script>
+  window.addEventListener("DOMContentLoaded", function() {
+   Raven.context(function() {
+     var checkbox = document.querySelector('#id_i_agree');
+     var button = document.querySelector('button[type="submit"]');
+     checkbox.addEventListener('change', function (event) {
+       if (this.checked) {
+         button.removeAttribute('disabled');
+       } else {
+         button.setAttribute('disabled', 'disabled');
+       }
+     });
+   });
+  });
+</script>
+{% endblock %}

static/js/publisher/pages/DeveloperAgreement/index.ts

@@ -13,13 +13,15 @@ def test_agreement_logged_in(self):
         response = self.client.get("/account/agreement")
 
         assert response.status_code == 200
-        self.assert_template_used("store/publisher.html")
+        self.assert_template_used(
+            "publisher/developer_programme_agreement.html"
+        )
 
 
 class PostAgreementPage(BaseTestCases.EndpointLoggedIn):
     def setUp(self):
         api_url = "https://dashboard.snapcraft.io/dev/api/agreement/"
-        data = {"agreed": True}
+        data = {"i_agree": "on"}
         endpoint_url = "/account/agreement"
 
         super().setUp(
@@ -28,23 +30,30 @@ def setUp(self):
             api_url=api_url,
             method_endpoint="POST",
             method_api="POST",
-            json=data,
+            data=data,
         )
 
     @responses.activate
     def test_post_agreement_on(self):
-        responses.add(
-            responses.POST, self.api_url, json={"success": True}, status=200
-        )
+        responses.add(responses.POST, self.api_url, json={}, status=200)
 
-        response = self.client.post(self.endpoint_url, json={"agreed": True})
+        response = self.client.post(self.endpoint_url, data={"i_agree": "on"})
 
         self.assertEqual(1, len(responses.calls))
         called = responses.calls[0]
         self.assertEqual(self.api_url, called.request.url)
         self.assertEqual(
             self.authorization, called.request.headers.get("Authorization")
         )
+        self.assertEqual(called.response.json(), {})
         self.assertEqual(b'{"latest_tos_accepted": true}', called.request.body)
 
-        self.assertEqual(response.json, {"success": True})
+        self.assertEqual(302, response.status_code)
+        self.assertEqual("/account/", response.location)
+
+    @responses.activate
+    def test_post_agreement_off(self):
+        response = self.client.post(self.endpoint_url, data={"i_agree": "off"})
+
+        self.assertEqual(302, response.status_code)
+        self.assertEqual("/account/agreement", response.location)

static/js/publisher/publisher.tsx

@@ -57,15 +57,19 @@ def post_publisher_details():
 
 @account.route("/agreement")
 def get_agreement():
-    return flask.render_template("store/publisher.html")
+    return flask.render_template(
+        "publisher/developer_programme_agreement.html"
+    )
 
 
 @account.route("/agreement", methods=["POST"])
 def post_agreement():
-    agreement = flask.json.loads(flask.request.data)
-    if agreement["agreed"] is True:
+    agreed = flask.request.form.get("i_agree")
+    if agreed == "on":
         dashboard.post_agreement(flask.session, True)
-        return flask.jsonify({"success": True})
+        return flask.redirect(flask.url_for(".get_account"))
+    else:
+        return flask.redirect(flask.url_for(".get_agreement"))
 
 
 @account.route("/username")