Add new cookie policy

canonical · Oct 5, 2020 · 6ca4c4d · 6ca4c4d
1 parent 513c7bd
commit 6ca4c4d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 0 deletions.
diff --git a/.webpack/entry.js b/.webpack/entry.js
@@ -1,4 +1,5 @@
 module.exports = {
   "global-nav": "./static/js/global-nav.js",
+  "cookie-policy": "./static/js/cookie-policy.js",
   main: ["./static/js/tabs.js", "./static/js/copytoclipboard.js"],
 };
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "test-js": "jest"
   },
   "dependencies": {
+    "@canonical/cookie-policy": "3.0.2",
     "@canonical/global-nav": "2.4.3",
     "autoprefixer": "9.8.6",
     "babel-eslint": "10.1.0",

diff --git a/static/js/cookie-policy.js b/static/js/cookie-policy.js
@@ -0,0 +1,2 @@
+import { cookiePolicy } from "@canonical/cookie-policy";
+cookiePolicy();
diff --git a/static/sass/styles.scss b/static/sass/styles.scss
@@ -7,6 +7,9 @@
 
 @include microk8s-l-docs;
 
+// import cookie policy
+@import "@canonical/cookie-policy/build/css/cookie-policy";
+
 // import additional styles
 @import "sidebar";
 @import "blockquote";

diff --git a/templates/base_layout.html b/templates/base_layout.html
@@ -92,6 +92,7 @@
 
   <script src="{{ versioned_static('js/dist/global-nav.js') }}"></script>
   <script src="{{ versioned_static('js/dist/main.js') }}"></script>
+  <script src="{{ versioned_static('js/dist/cookie-policy.js') }}"></script>
 
 </body>
 

diff --git a/templates/partial/_footer.html b/templates/partial/_footer.html
@@ -9,6 +9,9 @@
           <li class="p-inline-list__item">
             <a href="https://www.ubuntu.com/legal">Legal information</a>
           </li>
+          <li class="p-inline-list__item">
+            <a href="" class="js-revoke-cookie-manager">Manage your tracker settings</a>
+          </li>
           <li class="p-inline-list__item">
             <a class="p-footer__link" href="https://github.com/canonical-websites/microk8s.io/issues/new">Report a bug on this site</a>
           </li>

diff --git a/yarn.lock b/yarn.lock
@@ -1167,6 +1167,11 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@canonical/[email protected]":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.0.2.tgz#5a6a3d5f02c2fc139e38749e25e14254d4b3cdd8"
+  integrity sha512-xe25hHA9jrfgWTs+pVjO4UL/INnM1Pp0ukYgolMYTc+kwSguAmnXXDN3vhoSOToS6DPU5E6yh7U/wQqXVqos7g==
+
 "@canonical/[email protected]":
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/@canonical/global-nav/-/global-nav-2.4.3.tgz#9d552bad1968537c4b952747b27d5d3db21cf327"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import { cookiePolicy } from "@canonical/cookie-policy";
		cookiePolicy();
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,7 @@ @@
       <script src="{{ versioned_static('js/dist/global-nav.js') }}"></script>
       <script src="{{ versioned_static('js/dist/main.js') }}"></script>
+      <script src="{{ versioned_static('js/dist/cookie-policy.js') }}"></script>
     </body>
@@ Expand Down @@