chore(deps): update internal dependencies (#773)

* chore(deps): update internal dependencies * Fix dependencies Removed Maas vanilla tick, as this is already included in Vanilla Added 429 template with search module update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Carlos Wu <[email protected]>
canonical · Mar 8, 2023 · 97f4749 · 97f4749
1 parent a577f38
commit 97f4749
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "postcss": "8.4.20",
     "postcss-cli": "9.1.0",
     "sass": "1.57.1",
-    "vanilla-framework": "3.11.1",
+    "vanilla-framework": "3.12.1",
     "venobox": "2.0.4"
   }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ canonicalwebteam.blog==6.4.0
 canonicalwebteam.discourse-docs==1.0.1
 canonicalwebteam.http==1.0.3
 canonicalwebteam.templatefinder==1.0.0
-canonicalwebteam.search==1.2.7
+canonicalwebteam.search==1.3.0
 canonicalwebteam.image-template==1.3.1
 feedparser==6.0.10
 requests-cache==0.9.7

diff --git a/static/sass/_patterns_lists.scss b/static/sass/_patterns_lists.scss
@@ -1,7 +1,3 @@
-@mixin maas-p-lists {
-  @include maas-p-is-ticked;
-}
-
 // use a different tick
 @function svg-tick($color) {
   @if type-of($color) != 'color' {
@@ -23,24 +19,3 @@
 
   @return url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 14 14'%3E%3Ccircle fill='" + vf-url-friendly-color($color) + "' cx='7' cy='7' r='7'/%3E%3Cpath fill='%23fff' d='M6.1 10.813L2.41 8.105l1.184-1.613L5.9 8.187l4.393-4.394 1.414 1.414z' /%3E%3C/svg%3E");
 }
-
-@mixin maas-p-is-ticked {
-  $color-tick: #38b44a;
-  $color-tick-large: #0a8420;
-
-  .is-ticked {
-    background-image: svg-tick($color-tick);
-    padding-left: 35px;
-  }
-
-  .is-large {
-    background-image: svg-tick-large($color-tick-large);
-    background-size: auto;
-    min-height: 2.3rem;
-    padding-left: 55px;
-
-    @media (max-width: $breakpoint-large) {
-      padding: 0.5rem 0 0.5rem 50px;
-    }
-  }
-}
diff --git a/static/sass/main.scss b/static/sass/main.scss
@@ -18,7 +18,6 @@ $breakpoint-navigation-threshold: 960px;
   "patterns_cards";
 
 // patterns
-@include maas-p-lists;
 @include maas-p-modal;
 @include maas-p-takeunders;
 @include maas-p-tables;

diff --git a/templates/404.html b/templates/404.html
@@ -1,7 +1,7 @@
 {% extends "base_index.html" %}
 
 {% block page_class %}404{% endblock %}
-{% block page_title %}| 404{% endblock %}
+{% block page_title %}Page not found | 404{% endblock %}
 
 {% block content %}
 <section class="p-strip--light is-deep">

diff --git a/templates/429.html b/templates/429.html
@@ -0,0 +1,19 @@
+{% extends "base_index.html" %}
+
+{% block page_class %}429{% endblock %}
+{% block page_title %}Too many requests | 429{% endblock %}
+
+{% block content %}
+<section class="p-strip--light is-deep">
+    <div class="row">
+        <div class="col-6">
+            <h1 >429:</h1>
+            <h2>Too many requests</h2>
+            <p>{{ description }}</p>
+        </div>
+        <div class="col-6">
+            <img src="https://assets.ubuntu.com/v1/93f03c89-404-servers.svg" alt="404 servers">
+        </div>
+    </div>
+</section>
+{% endblock %}
diff --git a/webapp/app.py b/webapp/app.py
@@ -87,6 +87,14 @@
 )
 
 
+@app.errorhandler(429)
+def too_many_requests(error):
+    return (
+        flask.render_template("429.html", description=error.description),
+        429,
+    )
+
+
 @app.errorhandler(404)
 def not_found_error(error):
     return flask.render_template("404.html"), 404

diff --git a/yarn.lock b/yarn.lock
@@ -1359,10 +1359,10 @@ [email protected]:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-[email protected].0:
-  version "1.58.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz#ee8aea3ad5ea5c485c26b3096e2df6087d0bb1cc"
-  integrity sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==
+[email protected].3:
+  version "1.58.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.3.tgz#2348cc052061ba4f00243a208b09c40e031f270d"
+  integrity sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -1680,18 +1680,18 @@ [email protected]:
     postcss-cli "9.1.0"
     sass "1.45.2"
 
-vanilla-framework@3.11.1:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.11.1.tgz#5fbb205ad37d14f6e82e0690d23eb391d621ba70"
-  integrity sha512-1MfCU30SXt56hEL+M4il/nAs3ZvK/ophS1VjL6DgBpo+7geXtS45jUREAvt3mESUvv5GWfhnYN5Mdgo10Nn/Aw==
+vanilla-framework@3.12.1:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.12.1.tgz#b438f76816d1bb558eeea87e56987d755bf264ec"
+  integrity sha512-IbCb7gblPY1A1f89+mcyPvEC+2Zd1z2A0fB+L7tabXuBn/eu6eL8EAq1WY0Jc5hK3hws/YPyrhBzgUVAw2fglg==
   dependencies:
     "@canonical/cookie-policy" "3.4.0"
     "@canonical/latest-news" "1.4.1"
     autoprefixer "10.4.13"
     postcss "8.4.21"
     postcss-cli "9.1.0"
     postcss-scss "4.0.6"
-    sass "1.58.0"
+    sass "1.58.3"
     yaml "1.10.2"
 
 [email protected]: