diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e2a30b2d..596a7045 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -34,9 +34,6 @@ jobs: - name: Build assets run: dotrun build - - name: Pull the dashboard - run: yarn extract-dashboard-templates - - name: Test site run: dotrun serve & curl --head --fail --retry-delay 1 --retry 30 --retry-connrefused http://localhost:8029 diff --git a/.gitignore b/.gitignore index 47fb949a..56b9e8ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -# juju-dashboard local development -templates/dashboard -static/js/main.*.js -static/js/main.*.js.LICENSE.txt -static/media - # [generated] Bracketed sections updated by Yeoman generator # generator-canonical-webteam@3.4.1 diff --git a/.stylelintrc b/.stylelintrc index 41d359ea..4245296e 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -6,7 +6,7 @@ "rules": { "order/properties-alphabetical-order": true, "at-rule-no-unknown": [ true, { - "ignoreAtRules": ["extend", "include"] - } ], + "ignoreAtRules": ["extend", "include", "mixin"] + } ] } } diff --git a/Dockerfile b/Dockerfile index 532accc1..88850e3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,14 +17,6 @@ ADD package.json . RUN --mount=type=cache,target=/usr/local/share/.cache/yarn yarn install --production -# Build stage: Build dashboard -# === -FROM ubuntu:jammy AS build-dashboard -WORKDIR /srv/build -# extract the dashboard archive -ADD *.tar.bz2 . - - # Build stage: Run "yarn run build-js" # === FROM yarn-dependencies AS build-js @@ -59,13 +51,8 @@ ENV PATH="/root/.local/bin:${PATH}" # Import code, build assets and mirror list ADD . . RUN rm -rf package.json yarn.lock .babelrc webpack.config.js .git/index -COPY --from=build-dashboard /srv/build templates/dashboard COPY --from=build-js /srv/static/js static/js COPY --from=build-css /srv/static/css static/css -RUN cp templates/dashboard/static/js/* static/js/. -RUN cp templates/dashboard/static/css/* static/css/. -RUN cp -r templates/dashboard/static/media static/. -RUN rm -r templates/dashboard/static # Set build ID ARG BUILD_ID diff --git a/README.md b/README.md index dc29b3d2..407c12f4 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,4 @@ Once it's installed, run the project with: dotrun ``` -Once the server has started, you can visit in your browser. - -### Upgrade the dashboard - -Update the current installed dashboard: - -```bash -yarn run pull-jaas-dashboard -``` - -That's it! when the next time the project runs, it will regenerate the local files based on the new dashboard archive. +Once the server has started, you can visit in your browser. That's it! diff --git a/package.json b/package.json index fa5bd357..2f55e574 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,10 @@ { "scripts": { - "start": "yarn run build && yarn run extract-dashboard-templates && yarn run serve", + "start": "yarn run build && yarn run serve", "build": "yarn run build-css && yarn run build-js", - "extract-dashboard-templates": "./scripts/extract-jaas-dashboard.sh templates/dashboard ./static", - "pull-jaas-dashboard": "./scripts/pull-jaas-dashboard.sh", "build-css": "sass static/sass/styles.scss static/css/styles.css --load-path=node_modules --style=compressed && postcss --map false --use autoprefixer --replace 'static/css/**/*.css'", - "prebuild-js": "yarn run copy-3rd-party-libs", "build-js": "webpack", "clean": "rm -rf node_modules yarn-error.log css static/css *.log *.sqlite _site/ build/ .jekyll-metadata .bundle", - "copy-3rd-party-libs": "yarn run copy-global-nav && yarn run copy-instant-page", - "copy-global-nav": "mkdir -p static/js/src/libs/global-nav && cp node_modules/@canonical/global-nav/dist/global-nav.js static/js/src/libs/global-nav", - "copy-instant-page": "mkdir -p static/js/src/libs/instant-page && cp node_modules/instant.page/instantpage.js static/js/src/libs/instant-page", "format-python": "black --line-length 79 tests webapp", "check-prettier": "prettier --check ./static/**.*", "lint-js": "eslint static/js/src/**/*.js", @@ -29,22 +23,20 @@ "@babel/core": "7.20.12", "@babel/preset-env": "7.20.2", "@canonical/cookie-policy": "3.4.0", - "@canonical/global-nav": "2.7.0", - "@canonical/latest-news": "1.4.1", + "@canonical/global-nav": "3.6.0", "@sentry/browser": "5.30.0", "autoprefixer": "10.4.13", "babel-loader": "8.3.0", "braces": "3.0.2", "concurrently": "5.3.0", - "instant.page": "5.1.1", "postcss": "8.4.21", "postcss-cli": "8.3.1", "sass": "1.57.1", - "vanilla-framework": "2.37.1", + "terser-webpack-plugin": "5.3.6", + "vanilla-framework": "^4.3.0", "watch-cli": "0.2.3", "webpack": "5.75.0", - "webpack-cli": "4.10.0", - "terser-webpack-plugin": "5.3.6" + "webpack-cli": "4.10.0" }, "devDependencies": { "eslint": "7.32.0", diff --git a/requirements.txt b/requirements.txt index 3a0ffbeb..362271a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,4 @@ -canonicalwebteam.flask_base==1.0.6 -canonicalwebteam.blog==6.4.0 -canonicalwebteam.yaml-responses==1.2.0 -canonicalwebteam.discourse-docs==1.0.1 +canonicalwebteam.flask_base==1.1.0 canonicalwebteam.image-template==1.3.1 -feedparser==6.0.10 Flask-Testing==0.8.1 -requests==2.28.2 +requests==2.31.0 \ No newline at end of file diff --git a/scripts/extract-jaas-dashboard.sh b/scripts/extract-jaas-dashboard.sh deleted file mode 100755 index 0b1d6b91..00000000 --- a/scripts/extract-jaas-dashboard.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash - -dest=$1 -assets_folder=$2 -# remove the existing dashboard -if [[ -d $dest ]]; then - rm -rf $dest -fi - -# extract -mkdir $dest -tar -xf *.tar.bz2 -C $dest - -# copy /js/main.abcde.js to /static/js/main.abcde.js ... -# , the juju-dashboard app will depend on these -if [[ $# -eq 2 ]]; then - # avoid failure if these destination folder are missing - mkdir -p $assets_folder/js $assets_folder/css - cp $dest/static/js/* $assets_folder/js - cp $dest/static/css/* $assets_folder/css - cp -r $dest/static/media $assets_folder - rm -r $dest/static -fi diff --git a/scripts/pull-jaas-dashboard.sh b/scripts/pull-jaas-dashboard.sh deleted file mode 100755 index 6ded8d7e..00000000 --- a/scripts/pull-jaas-dashboard.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/bash - -# delete existing version -rm *.tar.bz2 - -# download latest release -wget -qO- https://api.github.com/repos/canonical/jaas-dashboard/releases/latest \ -| grep tar.bz2 \ -| cut -d : -f 2,3 \ -| tr -d \" \ -| wget -qi - diff --git a/static/js/accordion.js b/static/js/accordion.js deleted file mode 100644 index e179f9b2..00000000 --- a/static/js/accordion.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - Accordion to show config of bundles in bundles template -* */ -window.app.accordion = (accordionList) => { - /** - Attaches event listeners for the accordion open and close click events. - @param {String} accordionContainerSelector The selector of the accordion container. - */ - function setupAccordionListener(accordionContainerSelector) { - /** - Toggles the necessary values on the accordion panels and handles to show or - hide depending on the supplied values. - @param {HTMLElement} element The tab that acts as the handles for the - accordion panes. - @param {Boolean} show Whether to show or hide the accordion panel. - */ - const toggle = (element, show) => { - element.setAttribute('aria-expanded', show); - ariaControls = document.querySelector(element.getAttribute('aria-controls')); - - if (ariaControls) { - ariaControls.setAttribute('aria-hidden', !show); - } - }; - // Set up an event listener on the container so that panels can be added - // and removed and events do not need to be managed separately. - document.querySelector(accordionContainerSelector).addEventListener('click', (e) => { - const {target} = e; - panelAlreadyOpen = e.target.getAttribute('aria-expanded'); - if (panelAlreadyOpen === 'false') { - toggle(target, true); - } else { - toggle(target, false); - } - }); - } - - setupAccordionListener(accordionList); -}; diff --git a/static/js/cli-typer.js b/static/js/cli-typer.js deleted file mode 100644 index a833fd30..00000000 --- a/static/js/cli-typer.js +++ /dev/null @@ -1,219 +0,0 @@ -/** - Initialize the typer - @param {HTMLElement} container The main container to type in - @param {HTMLElement} commentContainer the container to add comments -*/ -window.app.cliTyper = function (container, commentContainer) { - const cli = [ - 'juju clouds', - 'juju add-credential aws-personal', - 'juju add-credential aws-work', - 'juju bootstrap aws', - 'juju status', - 'juju deploy mariadb', - 'juju deploy mariadb --constraints cores=8 mem=16G', - 'juju config mariadb dataset-size=80%', - 'juju add-model prod-california us-west-1', - 'juju add-model prod-tokyo ap-northeast-1', - 'juju list-models', - 'juju deploy jenkins', - 'juju deploy', - 'juju deploy jenkins-slave', - 'juju relate jenkins jenkins-slave', - 'juju add-unit jenkins-slave -n 3', - 'juju add-user sarah', - 'juju grant sarah read prod-california', - 'juju add-cloud mystack mystack-config.yaml', - ]; - - // For future decorations of the CLI - const comments = [ - 'Choose a cloud to work with', - 'Juju manages multiple cloud credentials', - false, - "Let's set up a controller on a public cloud", - "What's happening?", - 'Juju deploys applications with a single command', - 'Need more power?', - 'Tune the application', - 'Build and manage many models', - false, - false, - 'Want continuous integration?', - false, - false, - 'Configure your applications to work together. Juju charms handle connections', - 'Increased demand? Bring up 3 more nodes...', - 'Juju is multi-user', - false, - 'Use your own private cloud - including OpenStack', - ]; - - const RESET_SPEED = 1000; - const BASE_SPEED = 50; - const SPEED_MODIFIER = 100; - const DELETE_PAUSE = 250; - const NEXT_PAUSE = 2000; - - const cliEle = container; - const commentEle = commentContainer; - let current = ''; - - /** - Get the difference between two strings - - @param {String} orig The source string - @param {String} next The target string - */ - function getDiff(orig, next) { - let changes = []; - let matchTo = 0; - const toAdd = []; - let i = 0; - - for (i = orig.length; i > -1; i -= 1) { - if (next[i] !== orig[i]) { - matchTo = i; - } - } - - if (matchTo > 0) { - for (i = 0; i < orig.length - matchTo; i += 1) { - changes.push(-1); - } - changes.push(DELETE_PAUSE); - } - - i = matchTo; - for (let ii = next.length; i < ii; i += 1) { - toAdd.push(next[i]); - } - - changes = changes.concat(toAdd); - - changes.push(NEXT_PAUSE); - - return changes; - } - - /** - Add a comment based on the decorator - - @param {Boolean} hide whether the element should be hidden - @param {HTMLElement} _comment the string to display - @param {Function} cb Callback if waiting for transition - */ - function comment(hide, _comment, cb) { - if (!hide) { - commentEle.innerHTML = _comment; - commentEle.classList.add('fade-in'); - } else { - commentEle.classList.remove('fade-in'); - } - - setTimeout(cb, 500); - } - - /** - Type out all the changes in order with delays and randomness - to simulate someone typing. - - @param {Array} changes The change list (get's modified) - @param {Array} original The original change list - */ - function typeIt(changes, original) { - const change = changes.shift(); - let speed = BASE_SPEED + Math.ceil(Math.random() * SPEED_MODIFIER); - let currentText = current; - if (typeof change === 'string' && change.indexOf('#') === 0) { - comment(true, false, function () { - comment(false, change.substr(1)); - }); - } else if (change === -1) { - currentText = currentText.substr(0, current.length - 1); - speed = BASE_SPEED; - } else if (typeof change === 'number' && change >= 0) { - speed = change; - } else { - currentText += change; - } - - const html = `${ currentText.split(' ').join(' ') }`; - - current = currentText; - - cliEle.innerHTML = html; - - const next = (function () { - const _changes = changes; - - return function () { - typeIt(_changes, original); - }; - })(); - - if (changes.length > 0) { - setTimeout(next, speed); - } else { - typeIt(original.slice(0), original); - } - } - - /** - Get the changes in an array. - - @param {Array} arr the array - @param {Boolean} resetAtEnd Start again? - */ - function changesInArray(arr, resetAtEnd) { - const changes = []; - let i; - let current; - let previous; - - for (i = 0, ii = arr.length; i < ii; i += 1) { - current = arr[i]; - previous = arr[i - 1] || ''; - - changes.push(getDiff(previous, current)); - } - - if (resetAtEnd) { - const reset = []; - for (i = 0, ii = current.length; i < ii; i += 1) { - reset.push(-1); - } - reset.push(RESET_SPEED); - changes.push(reset); - } - - return changes; - } - - /** - Flatten a multidimensional array - - @param {Array} arr the original array - */ - function flattenArray(arr) { - let newArr = []; - - for (let i = 0, ii = arr.length; i < ii; i += 1) { - newArr = newArr.concat(arr[i]); - } - - return newArr; - } - - const changeList = changesInArray(cli, true); - - // Decorate with comments - for (var i = 0, ii = changeList.length; i < ii; i += 1) { - if (comments[i]) { - changeList[i].unshift(`#${ comments[i]}`); - } - } - - const changes = flattenArray(changeList); - typeIt(changes.slice(0), changes); -}; diff --git a/static/js/highlight.pack.js b/static/js/highlight.pack.js deleted file mode 100644 index 9081997e..00000000 --- a/static/js/highlight.pack.js +++ /dev/null @@ -1,1570 +0,0 @@ -/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ -!(function (e) { - const n = (typeof window === 'object' && window) || (typeof self === 'object' && self); - typeof exports !== 'undefined' - ? e(exports) - : n && - ((n.hljs = e({})), - typeof define === 'function' && - define.amd && - define([], function () { - return n.hljs; - })); -})(function (e) { - function n(e) { - return e.replace(/&/g, '&').replace(//g, '>'); - } - function t(e) { - return e.nodeName.toLowerCase(); - } - function r(e, n) { - const t = e && e.exec(n); - return t && t.index === 0; - } - function a(e) { - return k.test(e); - } - function i(e) { - let n; - let t; - let r; - let i; - let o = `${e.className } `; - if (((o += e.parentNode ? e.parentNode.className : ''), (t = B.exec(o)))) - return w(t[1]) ? t[1] : 'no-highlight'; - for (o = o.split(/\s+/), n = 0, r = o.length; r > n; n++) - if (((i = o[n]), a(i) || w(i))) return i; - } - function o(e) { - let n; - const t = {}; - const r = Array.prototype.slice.call(arguments, 1); - for (n in e) t[n] = e[n]; - return ( - r.forEach(function (e) { - for (n in e) t[n] = e[n]; - }), - t - ); - } - function u(e) { - const n = []; - return ( - (function r(e, a) { - for (let i = e.firstChild; i; i = i.nextSibling) - i.nodeType === 3 - ? (a += i.nodeValue.length) - : i.nodeType === 1 && - (n.push({event: 'start', offset: a, node: i}), - (a = r(i, a)), - t(i).match(/br|hr|img|input/) || n.push({event: 'stop', offset: a, node: i})); - return a; - })(e, 0), - n - ); - } - function c(e, r, a) { - function i() { - return e.length && r.length - ? e[0].offset !== r[0].offset - ? e[0].offset < r[0].offset - ? e - : r - : r[0].event === 'start' - ? e - : r - : e.length - ? e - : r; - } - function o(e) { - function r(e) { - return ` ${ e.nodeName }="${ n(e.value).replace('"', '"') }"`; - } - s += `<${ t(e) }${E.map.call(e.attributes, r).join('') }>`; - } - function u(e) { - s += ``; - } - function c(e) { - (e.event === 'start' ? o : u)(e.node); - } - for (var l = 0, s = '', f = []; e.length || r.length; ) { - let g = i(); - if (((s += n(a.substring(l, g[0].offset))), (l = g[0].offset), g === e)) { - f.reverse().forEach(u); - do c(g.splice(0, 1)[0]), (g = i()); - while (g === e && g.length && g[0].offset === l); - f.reverse().forEach(o); - } else g[0].event === 'start' ? f.push(g[0].node) : f.pop(), c(g.splice(0, 1)[0]); - } - return s + n(a.substr(l)); - } - function l(e) { - return ( - e.v && - !e.cached_variants && - (e.cached_variants = e.v.map(function (n) { - return o(e, {v: null}, n); - })), - e.cached_variants || (e.eW && [o(e)]) || [e] - ); - } - function s(e) { - function n(e) { - return (e && e.source) || e; - } - function t(t, r) { - return new RegExp(n(t), `m${ e.cI ? 'i' : '' }${r ? 'g' : ''}`); - } - function r(a, i) { - if (!a.compiled) { - if (((a.compiled = !0), (a.k = a.k || a.bK), a.k)) { - const o = {}; - const u = function (n, t) { - e.cI && (t = t.toLowerCase()), - t.split(' ').forEach(function (e) { - const t = e.split('|'); - o[t[0]] = [n, t[1] ? Number(t[1]) : 1]; - }); - }; - typeof a.k === 'string' - ? u('keyword', a.k) - : x(a.k).forEach(function (e) { - u(e, a.k[e]); - }), - (a.k = o); - } - (a.lR = t(a.l || /\w+/, !0)), - i && - (a.bK && (a.b = `\\b(${ a.bK.split(' ').join('|') })\\b`), - a.b || (a.b = /\B|\b/), - (a.bR = t(a.b)), - a.e || a.eW || (a.e = /\B|\b/), - a.e && (a.eR = t(a.e)), - (a.tE = n(a.e) || ''), - a.eW && i.tE && (a.tE += (a.e ? '|' : '') + i.tE)), - a.i && (a.iR = t(a.i)), - a.r == null && (a.r = 1), - a.c || (a.c = []), - (a.c = Array.prototype.concat.apply( - [], - a.c.map(function (e) { - return l(e === 'self' ? a : e); - }) - )), - a.c.forEach(function (e) { - r(e, a); - }), - a.starts && r(a.starts, i); - const c = a.c - .map(function (e) { - return e.bK ? `\\.?(${ e.b })\\.?` : e.b; - }) - .concat([a.tE, a.i]) - .map(n) - .filter(Boolean); - a.t = c.length - ? t(c.join('|'), !0) - : { - exec () { - return null; - }, - }; - } - } - r(e); - } - function f(e, t, a, i) { - function o(e, n) { - let t; let a; - for (t = 0, a = n.c.length; a > t; t++) if (r(n.c[t].bR, e)) return n.c[t]; - } - function u(e, n) { - if (r(e.eR, n)) { - for (; e.endsParent && e.parent; ) e = e.parent; - return e; - } - return e.eW ? u(e.parent, n) : void 0; - } - function c(e, n) { - return !a && r(n.iR, e); - } - function l(e, n) { - const t = N.cI ? n[0].toLowerCase() : n[0]; - return e.k.hasOwnProperty(t) && e.k[t]; - } - function p(e, n, t, r) { - const a = r ? '' : I.classPrefix; - let i = ``), i + n + o; - } - function h() { - let e; let t; let r; let a; - if (!E.k) return n(k); - for (a = '', t = 0, E.lR.lastIndex = 0, r = E.lR.exec(k); r; ) - (a += n(k.substring(t, r.index))), - (e = l(E, r)), - e ? ((B += e[1]), (a += p(e[0], n(r[0])))) : (a += n(r[0])), - (t = E.lR.lastIndex), - (r = E.lR.exec(k)); - return a + n(k.substr(t)); - } - function d() { - const e = typeof E.sL === 'string'; - if (e && !y[E.sL]) return n(k); - const t = e ? f(E.sL, k, !0, x[E.sL]) : g(k, E.sL.length ? E.sL : void 0); - return E.r > 0 && (B += t.r), e && (x[E.sL] = t.top), p(t.language, t.value, !1, !0); - } - function b() { - (L += E.sL != null ? d() : h()), (k = ''); - } - function v(e) { - (L += e.cN ? p(e.cN, '', !0) : ''), (E = Object.create(e, {parent: {value: E}})); - } - function m(e, n) { - if (((k += e), n == null)) return b(), 0; - const t = o(n, E); - if (t) - return ( - t.skip ? (k += n) : (t.eB && (k += n), b(), t.rB || t.eB || (k = n)), - v(t, n), - t.rB ? 0 : n.length - ); - const r = u(E, n); - if (r) { - const a = E; - a.skip ? (k += n) : (a.rE || a.eE || (k += n), b(), a.eE && (k = n)); - do E.cN && (L += C), E.skip || (B += E.r), (E = E.parent); - while (E !== r.parent); - return r.starts && v(r.starts, ''), a.rE ? 0 : n.length; - } - if (c(n, E)) - throw new Error(`Illegal lexeme "${ n }" for mode "${ E.cN || '' }"`); - return (k += n), n.length || 1; - } - var N = w(e); - if (!N) throw new Error(`Unknown language: "${ e }"`); - s(N); - let R; - var E = i || N; - var x = {}; - var L = ''; - for (R = E; R !== N; R = R.parent) R.cN && (L = p(R.cN, '', !0) + L); - var k = ''; - var B = 0; - try { - for (var M, j, O = 0; ; ) { - if (((E.t.lastIndex = O), (M = E.t.exec(t)), !M)) break; - (j = m(t.substring(O, M.index), M[0])), (O = M.index + j); - } - for (m(t.substr(O)), R = E; R.parent; R = R.parent) R.cN && (L += C); - return {r: B, value: L, language: e, top: E}; - } catch (T) { - if (T.message && T.message.indexOf('Illegal') !== -1) return {r: 0, value: n(t)}; - throw T; - } - } - function g(e, t) { - t = t || I.languages || x(y); - let r = {r: 0, value: n(e)}; - let a = r; - return ( - t.filter(w).forEach(function (n) { - const t = f(n, e, !1); - (t.language = n), t.r > a.r && (a = t), t.r > r.r && ((a = r), (r = t)); - }), - a.language && (r.second_best = a), - r - ); - } - function p(e) { - return I.tabReplace || I.useBR - ? e.replace(M, function (e, n) { - return I.useBR && e === '\n' - ? '
' - : I.tabReplace - ? n.replace(/\t/g, I.tabReplace) - : ''; - }) - : e; - } - function h(e, n, t) { - const r = n ? L[n] : t; - const a = [e.trim()]; - return ( - e.match(/\bhljs\b/) || a.push('hljs'), - e.indexOf(r) === -1 && a.push(r), - a.join(' ').trim() - ); - } - function d(e) { - let n; - let t; - let r; - let o; - let l; - const s = i(e); - a(s) || - (I.useBR - ? ((n = document.createElementNS('http://www.w3.org/1999/xhtml', 'div')), - (n.innerHTML = e.innerHTML.replace(/\n/g, '').replace(//g, '\n'))) - : (n = e), - (l = n.textContent), - (r = s ? f(s, l, !0) : g(l)), - (t = u(n)), - t.length && - ((o = document.createElementNS('http://www.w3.org/1999/xhtml', 'div')), - (o.innerHTML = r.value), - (r.value = c(t, u(o), l))), - (r.value = p(r.value)), - (e.innerHTML = r.value), - (e.className = h(e.className, s, r.language)), - (e.result = {language: r.language, re: r.r}), - r.second_best && - (e.second_best = {language: r.second_best.language, re: r.second_best.r})); - } - function b(e) { - I = o(I, e); - } - function v() { - if (!v.called) { - v.called = !0; - const e = document.querySelectorAll('pre code'); - E.forEach.call(e, d); - } - } - function m() { - addEventListener('DOMContentLoaded', v, !1), addEventListener('load', v, !1); - } - function N(n, t) { - const r = (y[n] = t(e)); - r.aliases && - r.aliases.forEach(function (e) { - L[e] = n; - }); - } - function R() { - return x(y); - } - function w(e) { - return (e = (e || '').toLowerCase()), y[e] || y[L[e]]; - } - var E = []; - var x = Object.keys; - var y = {}; - var L = {}; - var k = /^(no-?highlight|plain|text)$/i; - var B = /\blang(?:uage)?-([\w-]+)\b/i; - var M = /((^(<[^>]+>|\t|)+|(?:\n)))/gm; - var C = ''; - var I = {classPrefix: 'hljs-', tabReplace: null, useBR: !1, languages: void 0}; - return ( - (e.highlight = f), - (e.highlightAuto = g), - (e.fixMarkup = p), - (e.highlightBlock = d), - (e.configure = b), - (e.initHighlighting = v), - (e.initHighlightingOnLoad = m), - (e.registerLanguage = N), - (e.listLanguages = R), - (e.getLanguage = w), - (e.inherit = o), - (e.IR = '[a-zA-Z]\\w*'), - (e.UIR = '[a-zA-Z_]\\w*'), - (e.NR = '\\b\\d+(\\.\\d+)?'), - (e.CNR = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'), - (e.BNR = '\\b(0b[01]+)'), - (e.RSR = - '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~'), - (e.BE = {b: '\\\\[\\s\\S]', r: 0}), - (e.ASM = {cN: 'string', b: "'", e: "'", i: '\\n', c: [e.BE]}), - (e.QSM = {cN: 'string', b: '"', e: '"', i: '\\n', c: [e.BE]}), - (e.PWM = { - b: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/, - }), - (e.C = function (n, t, r) { - const a = e.inherit({cN: 'comment', b: n, e: t, c: []}, r || {}); - return ( - a.c.push(e.PWM), a.c.push({cN: 'doctag', b: '(?:TODO|FIXME|NOTE|BUG|XXX):', r: 0}), a - ); - }), - (e.CLCM = e.C('//', '$')), - (e.CBCM = e.C('/\\*', '\\*/')), - (e.HCM = e.C('#', '$')), - (e.NM = {cN: 'number', b: e.NR, r: 0}), - (e.CNM = {cN: 'number', b: e.CNR, r: 0}), - (e.BNM = {cN: 'number', b: e.BNR, r: 0}), - (e.CSSNM = { - cN: 'number', - b: - `${e.NR - }(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?`, - r: 0, - }), - (e.RM = { - cN: 'regexp', - b: /\//, - e: /\/[gimuy]*/, - i: /\n/, - c: [e.BE, {b: /\[/, e: /\]/, r: 0, c: [e.BE]}], - }), - (e.TM = {cN: 'title', b: e.IR, r: 0}), - (e.UTM = {cN: 'title', b: e.UIR, r: 0}), - (e.METHOD_GUARD = {b: `\\.\\s*${ e.UIR}`, r: 0}), - e - ); -}); -hljs.registerLanguage('xml', function (s) { - const e = '[A-Za-z0-9\\._:-]+'; - const t = { - eW: !0, - i: /`]+/}], - }, - ], - }, - ], - }; - return { - aliases: ['html', 'xhtml', 'rss', 'atom', 'xjb', 'xsd', 'xsl', 'plist'], - cI: !0, - c: [ - {cN: 'meta', b: '', r: 10, c: [{b: '\\[', e: '\\]'}]}, - s.C('', {r: 10}), - {b: '<\\!\\[CDATA\\[', e: '\\]\\]>', r: 10}, - {b: /<\?(php)?/, e: /\?>/, sL: 'php', c: [{b: '/\\*', e: '\\*/', skip: !0}]}, - { - cN: 'tag', - b: '|$)', - e: '>', - k: {name: 'style'}, - c: [t], - starts: {e: '', rE: !0, sL: ['css', 'xml']}, - }, - { - cN: 'tag', - b: '|$)', - e: '>', - k: {name: 'script'}, - c: [t], - starts: { - e: '', - rE: !0, - sL: ['actionscript', 'javascript', 'handlebars', 'xml'], - }, - }, - { - cN: 'meta', - v: [ - {b: /<\?xml/, e: /\?>/, r: 10}, - {b: /<\?\w+/, e: /\?>/}, - ], - }, - {cN: 'tag', b: '', c: [{cN: 'name', b: /[^\/><\s]+/, r: 0}, t]}, - ], - }; -}); -hljs.registerLanguage('markdown', function (e) { - return { - aliases: ['md', 'mkdown', 'mkd'], - c: [ - {cN: 'section', v: [{b: '^#{1,6}', e: '$'}, {b: '^.+?\\n[=-]{2,}$'}]}, - {b: '<', e: '>', sL: 'xml', r: 0}, - {cN: 'bullet', b: '^([*+-]|(\\d+\\.))\\s+'}, - {cN: 'strong', b: '[*_]{2}.+?[*_]{2}'}, - {cN: 'emphasis', v: [{b: '\\*.+?\\*'}, {b: '_.+?_', r: 0}]}, - {cN: 'quote', b: '^>\\s+', e: '$'}, - { - cN: 'code', - v: [{b: '^```w*s*$', e: '^```s*$'}, {b: '`.+?`'}, {b: '^( {4}| )', e: '$', r: 0}], - }, - {b: '^[-\\*]{3,}', e: '$'}, - { - b: '\\[.+?\\][\\(\\[].*?[\\)\\]]', - rB: !0, - c: [ - {cN: 'string', b: '\\[', e: '\\]', eB: !0, rE: !0, r: 0}, - {cN: 'link', b: '\\]\\(', e: '\\)', eB: !0, eE: !0}, - {cN: 'symbol', b: '\\]\\[', e: '\\]', eB: !0, eE: !0}, - ], - r: 10, - }, - { - b: /^\[[^\n]+\]:/, - rB: !0, - c: [ - {cN: 'symbol', b: /\[/, e: /\]/, eB: !0, eE: !0}, - {cN: 'link', b: /:\s*/, e: /$/, eB: !0}, - ], - }, - ], - }; -}); -hljs.registerLanguage('javascript', function (e) { - const r = '[A-Za-z$_][0-9A-Za-z$_]*'; - const t = { - keyword: - 'in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as', - literal: 'true false null undefined NaN Infinity', - built_in: - 'eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise', - }; - const a = {cN: 'number', v: [{b: '\\b(0[bB][01]+)'}, {b: '\\b(0[oO][0-7]+)'}, {b: e.CNR}], r: 0}; - const n = {cN: 'subst', b: '\\$\\{', e: '\\}', k: t, c: []}; - const c = {cN: 'string', b: '`', e: '`', c: [e.BE, n]}; - n.c = [e.ASM, e.QSM, c, a, e.RM]; - const s = n.c.concat([e.CBCM, e.CLCM]); - return { - aliases: ['js', 'jsx'], - k: t, - c: [ - {cN: 'meta', r: 10, b: /^\s*['"]use (strict|asm)['"]/}, - {cN: 'meta', b: /^#!/, e: /$/}, - e.ASM, - e.QSM, - c, - e.CLCM, - e.CBCM, - a, - {b: /[{,]\s*/, r: 0, c: [{b: `${r }\\s*:`, rB: !0, r: 0, c: [{cN: 'attr', b: r, r: 0}]}]}, - { - b: `(${ e.RSR }|\\b(case|return|throw)\\b)\\s*`, - k: 'return throw case', - c: [ - e.CLCM, - e.CBCM, - e.RM, - { - cN: 'function', - b: `(\\(.*?\\)|${ r })\\s*=>`, - rB: !0, - e: '\\s*=>', - c: [ - { - cN: 'params', - v: [{b: r}, {b: /\(\s*\)/}, {b: /\(/, e: /\)/, eB: !0, eE: !0, k: t, c: s}], - }, - ], - }, - { - b: //, - sL: 'xml', - c: [ - {b: /<\w+\s*\/>/, skip: !0}, - { - b: /<\w+/, - e: /(\/\w+|\w+\/)>/, - skip: !0, - c: [{b: /<\w+\s*\/>/, skip: !0}, 'self'], - }, - ], - }, - ], - r: 0, - }, - { - cN: 'function', - bK: 'function', - e: /\{/, - eE: !0, - c: [e.inherit(e.TM, {b: r}), {cN: 'params', b: /\(/, e: /\)/, eB: !0, eE: !0, c: s}], - i: /\[|%/, - }, - {b: /\$[(.]/}, - e.METHOD_GUARD, - { - cN: 'class', - bK: 'class', - e: /[{;=]/, - eE: !0, - i: /[:"\[\]]/, - c: [{bK: 'extends'}, e.UTM], - }, - {bK: 'constructor', e: /\{/, eE: !0}, - ], - i: /#(?!!)/, - }; -}); -hljs.registerLanguage('diff', function (e) { - return { - aliases: ['patch'], - c: [ - { - cN: 'meta', - r: 10, - v: [ - {b: /^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/}, - {b: /^\*\*\* +\d+,\d+ +\*\*\*\*$/}, - {b: /^\-\-\- +\d+,\d+ +\-\-\-\-$/}, - ], - }, - { - cN: 'comment', - v: [ - {b: /Index: /, e: /$/}, - {b: /={3,}/, e: /$/}, - {b: /^\-{3}/, e: /$/}, - {b: /^\*{3} /, e: /$/}, - {b: /^\+{3}/, e: /$/}, - {b: /\*{5}/, e: /\*{5}$/}, - ], - }, - {cN: 'addition', b: '^\\+', e: '$'}, - {cN: 'deletion', b: '^\\-', e: '$'}, - {cN: 'addition', b: '^\\!', e: '$'}, - ], - }; -}); -hljs.registerLanguage('nginx', function (e) { - const r = {cN: 'variable', v: [{b: /\$\d+/}, {b: /\$\{/, e: /}/}, {b: `[\\$\\@]${ e.UIR}`}]}; - const b = { - eW: !0, - l: '[a-z/_]+', - k: { - literal: - 'on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll', - }, - r: 0, - i: '=>', - c: [ - e.HCM, - { - cN: 'string', - c: [e.BE, r], - v: [ - {b: /"/, e: /"/}, - {b: /'/, e: /'/}, - ], - }, - {b: '([a-z]+):/', e: '\\s', eW: !0, eE: !0, c: [r]}, - { - cN: 'regexp', - c: [e.BE, r], - v: [ - {b: '\\s\\^', e: '\\s|{|;', rE: !0}, - {b: '~\\*?\\s+', e: '\\s|{|;', rE: !0}, - {b: '\\*(\\.[a-z\\-]+)+'}, - {b: '([a-z\\-]+\\.)+\\*'}, - ], - }, - {cN: 'number', b: '\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b'}, - {cN: 'number', b: '\\b\\d+[kKmMgGdshdwy]*\\b', r: 0}, - r, - ], - }; - return { - aliases: ['nginxconf'], - c: [ - e.HCM, - {b: `${e.UIR }\\s+{`, rB: !0, e: '{', c: [{cN: 'section', b: e.UIR}], r: 0}, - {b: `${e.UIR }\\s`, e: ';|{', rB: !0, c: [{cN: 'attribute', b: e.UIR, starts: b}], r: 0}, - ], - i: '[^\\s\\}]', - }; -}); -hljs.registerLanguage('bash', function (e) { - const t = {cN: 'variable', v: [{b: /\$[\w\d#@][\w\d_]*/}, {b: /\$\{(.*?)}/}]}; - const s = { - cN: 'string', - b: /"/, - e: /"/, - c: [e.BE, t, {cN: 'variable', b: /\$\(/, e: /\)/, c: [e.BE]}], - }; - const a = {cN: 'string', b: /'/, e: /'/}; - return { - aliases: ['sh', 'zsh'], - l: /\b-?[a-z\._]+\b/, - k: { - keyword: 'if then else elif fi for while in do done case esac function', - literal: 'true false', - built_in: - 'break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp', - _: '-ne -eq -lt -gt -f -d -e -s -l -a', - }, - c: [ - {cN: 'meta', b: /^#![^\n]+sh\s*$/, r: 10}, - { - cN: 'function', - b: /\w[\w\d_]*\s*\(\s*\)\s*\{/, - rB: !0, - c: [e.inherit(e.TM, {b: /\w[\w\d_]*/})], - r: 0, - }, - e.HCM, - s, - a, - t, - ], - }; -}); -hljs.registerLanguage('java', function (e) { - const a = '[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*'; - const t = `${a }(<${ a }(\\s*,\\s*${ a })*>)?`; - const r = - 'false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do'; - const s = - '\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?'; - const c = {cN: 'number', b: s, r: 0}; - return { - aliases: ['jsp'], - k: r, - i: /<\/|#/, - c: [ - e.C('/\\*\\*', '\\*/', { - r: 0, - c: [ - {b: /\w+@/, r: 0}, - {cN: 'doctag', b: '@[A-Za-z]+'}, - ], - }), - e.CLCM, - e.CBCM, - e.ASM, - e.QSM, - { - cN: 'class', - bK: 'class interface', - e: /[{;=]/, - eE: !0, - k: 'class interface', - i: /[:"\[\]]/, - c: [{bK: 'extends implements'}, e.UTM], - }, - {bK: 'new throw return else', r: 0}, - { - cN: 'function', - b: `(${ t }\\s+)+${ e.UIR }\\s*\\(`, - rB: !0, - e: /[{;=]/, - eE: !0, - k: r, - c: [ - {b: `${e.UIR }\\s*\\(`, rB: !0, r: 0, c: [e.UTM]}, - {cN: 'params', b: /\(/, e: /\)/, k: r, r: 0, c: [e.ASM, e.QSM, e.CNM, e.CBCM]}, - e.CLCM, - e.CBCM, - ], - }, - c, - {cN: 'meta', b: '@[A-Za-z]+'}, - ], - }; -}); -hljs.registerLanguage('perl', function (e) { - const t = - 'getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when'; - const r = {cN: 'subst', b: '[$@]\\{', e: '\\}', k: t}; - const s = {b: '->{', e: '}'}; - const n = { - v: [ - {b: /\$\d/}, - {b: /[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/}, - {b: /[\$%@][^\s\w{]/, r: 0}, - ], - }; - const i = [e.BE, r, n]; - const o = [ - n, - e.HCM, - e.C('^\\=\\w', '\\=cut', {eW: !0}), - s, - { - cN: 'string', - c: i, - v: [ - {b: 'q[qwxr]?\\s*\\(', e: '\\)', r: 5}, - {b: 'q[qwxr]?\\s*\\[', e: '\\]', r: 5}, - {b: 'q[qwxr]?\\s*\\{', e: '\\}', r: 5}, - {b: 'q[qwxr]?\\s*\\|', e: '\\|', r: 5}, - {b: 'q[qwxr]?\\s*\\<', e: '\\>', r: 5}, - {b: 'qw\\s+q', e: 'q', r: 5}, - {b: "'", e: "'", c: [e.BE]}, - {b: '"', e: '"'}, - {b: '`', e: '`', c: [e.BE]}, - {b: '{\\w+}', c: [], r: 0}, - {b: '-?\\w+\\s*\\=\\>', c: [], r: 0}, - ], - }, - { - cN: 'number', - b: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b', - r: 0, - }, - { - b: `(\\/\\/|${ e.RSR }|\\b(split|return|print|reverse|grep)\\b)\\s*`, - k: 'split return print reverse grep', - r: 0, - c: [ - e.HCM, - {cN: 'regexp', b: '(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*', r: 10}, - {cN: 'regexp', b: '(m|qr)?/', e: '/[a-z]*', c: [e.BE], r: 0}, - ], - }, - {cN: 'function', bK: 'sub', e: '(\\s*\\(.*?\\))?[;{]', eE: !0, r: 5, c: [e.TM]}, - {b: '-\\w\\b', r: 0}, - { - b: '^__DATA__$', - e: '^__END__$', - sL: 'mojolicious', - c: [{b: '^@@.*', e: '$', cN: 'comment'}], - }, - ]; - return (r.c = o), (s.c = o), {aliases: ['pl', 'pm'], l: /[\w\.]+/, k: t, c: o}; -}); -hljs.registerLanguage('coffeescript', function (e) { - const c = { - keyword: - 'in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not', - literal: 'true false null undefined yes no on off', - built_in: 'npm require console print module global window document', - }; - const n = '[A-Za-z$_][0-9A-Za-z$_]*'; - const r = {cN: 'subst', b: /#\{/, e: /}/, k: c}; - const i = [ - e.BNM, - e.inherit(e.CNM, {starts: {e: '(\\s*/)?', r: 0}}), - { - cN: 'string', - v: [ - {b: /'''/, e: /'''/, c: [e.BE]}, - {b: /'/, e: /'/, c: [e.BE]}, - {b: /"""/, e: /"""/, c: [e.BE, r]}, - {b: /"/, e: /"/, c: [e.BE, r]}, - ], - }, - { - cN: 'regexp', - v: [ - {b: '///', e: '///', c: [r, e.HCM]}, - {b: '//[gim]*', r: 0}, - {b: /\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}, - ], - }, - {b: `@${ n}`}, - { - sL: 'javascript', - eB: !0, - eE: !0, - v: [ - {b: '```', e: '```'}, - {b: '`', e: '`'}, - ], - }, - ]; - r.c = i; - const s = e.inherit(e.TM, {b: n}); - const t = '(\\(.*\\))?\\s*\\B[-=]>'; - const o = { - cN: 'params', - b: '\\([^\\(]', - rB: !0, - c: [{b: /\(/, e: /\)/, k: c, c: ['self'].concat(i)}], - }; - return { - aliases: ['coffee', 'cson', 'iced'], - k: c, - i: /\/\*/, - c: i.concat([ - e.C('###', '###'), - e.HCM, - {cN: 'function', b: `^\\s*${ n }\\s*=\\s*${ t}`, e: '[-=]>', rB: !0, c: [s, o]}, - {b: /[:\(,=]\s*/, r: 0, c: [{cN: 'function', b: t, e: '[-=]>', rB: !0, c: [o]}]}, - { - cN: 'class', - bK: 'class', - e: '$', - i: /[:="\[\]]/, - c: [{bK: 'extends', eW: !0, i: /[:="\[\]]/, c: [s]}, s], - }, - {b: `${n }:`, e: ':', rB: !0, rE: !0, r: 0}, - ]), - }; -}); -hljs.registerLanguage('ruby', function (e) { - const b = '[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?'; - const r = { - keyword: - 'and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor', - literal: 'true false nil', - }; - const c = {cN: 'doctag', b: '@[A-Za-z]+'}; - const a = {b: '#<', e: '>'}; - const s = [ - e.C('#', '$', {c: [c]}), - e.C('^\\=begin', '^\\=end', {c: [c], r: 10}), - e.C('^__END__', '\\n$'), - ]; - const n = {cN: 'subst', b: '#\\{', e: '}', k: r}; - const t = { - cN: 'string', - c: [e.BE, n], - v: [ - {b: /'/, e: /'/}, - {b: /"/, e: /"/}, - {b: /`/, e: /`/}, - {b: '%[qQwWx]?\\(', e: '\\)'}, - {b: '%[qQwWx]?\\[', e: '\\]'}, - {b: '%[qQwWx]?{', e: '}'}, - {b: '%[qQwWx]?<', e: '>'}, - {b: '%[qQwWx]?/', e: '/'}, - {b: '%[qQwWx]?%', e: '%'}, - {b: '%[qQwWx]?-', e: '-'}, - {b: '%[qQwWx]?\\|', e: '\\|'}, - {b: /\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}, - {b: /<<(-?)\w+$/, e: /^\s*\w+$/}, - ], - }; - const i = {cN: 'params', b: '\\(', e: '\\)', endsParent: !0, k: r}; - const d = [ - t, - a, - { - cN: 'class', - bK: 'class module', - e: '$|;', - i: /=/, - c: [ - e.inherit(e.TM, {b: '[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?'}), - {b: '<\\s*', c: [{b: `(${ e.IR }::)?${ e.IR}`}]}, - ].concat(s), - }, - {cN: 'function', bK: 'def', e: '$|;', c: [e.inherit(e.TM, {b}), i].concat(s)}, - {b: `${e.IR }::`}, - {cN: 'symbol', b: `${e.UIR }(\\!|\\?)?:`, r: 0}, - {cN: 'symbol', b: ':(?!\\s)', c: [t, {b}], r: 0}, - { - cN: 'number', - b: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b', - r: 0, - }, - {b: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))'}, - {cN: 'params', b: /\|/, e: /\|/, k: r}, - { - b: `(${ e.RSR }|unless)\\s*`, - k: 'unless', - c: [ - a, - { - cN: 'regexp', - c: [e.BE, n], - i: /\n/, - v: [ - {b: '/', e: '/[a-z]*'}, - {b: '%r{', e: '}[a-z]*'}, - {b: '%r\\(', e: '\\)[a-z]*'}, - {b: '%r!', e: '![a-z]*'}, - {b: '%r\\[', e: '\\][a-z]*'}, - ], - }, - ].concat(s), - r: 0, - }, - ].concat(s); - (n.c = d), (i.c = d); - const l = '[>?]>'; - const o = '[\\w#]+\\(\\w+\\):\\d+:\\d+>'; - const u = '(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>'; - const w = [ - {b: /^\s*=>/, starts: {e: '$', c: d}}, - {cN: 'meta', b: `^(${ l }|${ o }|${ u })`, starts: {e: '$', c: d}}, - ]; - return { - aliases: ['rb', 'gemspec', 'podspec', 'thor', 'irb'], - k: r, - i: /\/\*/, - c: s.concat(w).concat(d), - }; -}); -hljs.registerLanguage('css', function (e) { - const c = '[a-zA-Z-][a-zA-Z0-9_-]*'; - const t = { - b: /[A-Z\_\.\-]+\s*:/, - rB: !0, - e: ';', - eW: !0, - c: [ - { - cN: 'attribute', - b: /\S/, - e: ':', - eE: !0, - starts: { - eW: !0, - eE: !0, - c: [ - { - b: /[\w-]+\(/, - rB: !0, - c: [ - {cN: 'built_in', b: /[\w-]+/}, - {b: /\(/, e: /\)/, c: [e.ASM, e.QSM]}, - ], - }, - e.CSSNM, - e.QSM, - e.ASM, - e.CBCM, - {cN: 'number', b: '#[0-9A-Fa-f]+'}, - {cN: 'meta', b: '!important'}, - ], - }, - }, - ], - }; - return { - cI: !0, - i: /[=\/|'\$]/, - c: [ - e.CBCM, - {cN: 'selector-id', b: /#[A-Za-z0-9_-]+/}, - {cN: 'selector-class', b: /\.[A-Za-z0-9_-]+/}, - {cN: 'selector-attr', b: /\[/, e: /\]/, i: '$'}, - {cN: 'selector-pseudo', b: /:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/}, - {b: '@(font-face|page)', l: '[a-z-]+', k: 'font-face page'}, - { - b: '@', - e: '[{;]', - i: /:/, - c: [ - {cN: 'keyword', b: /\w+/}, - {b: /\s/, eW: !0, eE: !0, r: 0, c: [e.ASM, e.QSM, e.CSSNM]}, - ], - }, - {cN: 'selector-tag', b: c, r: 0}, - {b: '{', e: '}', i: /\S/, c: [e.CBCM, t]}, - ], - }; -}); -hljs.registerLanguage('cpp', function (t) { - const e = {cN: 'keyword', b: '\\b[a-z\\d_]*_t\\b'}; - const r = { - cN: 'string', - v: [ - {b: '(u8?|U)?L?"', e: '"', i: '\\n', c: [t.BE]}, - {b: '(u8?|U)?R"', e: '"', c: [t.BE]}, - {b: "'\\\\?.", e: "'", i: '.'}, - ], - }; - const s = { - cN: 'number', - v: [ - {b: "\\b(0b[01']+)"}, - {b: "(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"}, - { - b: - "(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)", - }, - ], - r: 0, - }; - const i = { - cN: 'meta', - b: /#\s*[a-z]+\b/, - e: /$/, - k: { - 'meta-keyword': - 'if else elif endif define undef warning error line pragma ifdef ifndef include', - }, - c: [ - {b: /\\\n/, r: 0}, - t.inherit(r, {cN: 'meta-string'}), - {cN: 'meta-string', b: /<[^\n>]*>/, e: /$/, i: '\\n'}, - t.CLCM, - t.CBCM, - ], - }; - const a = `${t.IR }\\s*\\(`; - const c = { - keyword: - 'int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and or not', - built_in: - 'std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr', - literal: 'true false nullptr NULL', - }; - const n = [e, t.CLCM, t.CBCM, s, r]; - return { - aliases: ['c', 'cc', 'h', 'c++', 'h++', 'hpp'], - k: c, - i: '', - k: c, - c: ['self', e], - }, - {b: `${t.IR }::`, k: c}, - { - v: [ - {b: /=/, e: /;/}, - {b: /\(/, e: /\)/}, - {bK: 'new throw return else', e: /;/}, - ], - k: c, - c: n.concat([{b: /\(/, e: /\)/, k: c, c: n.concat(['self']), r: 0}]), - r: 0, - }, - { - cN: 'function', - b: `(${ t.IR }[\\*&\\s]+)+${ a}`, - rB: !0, - e: /[{;=]/, - eE: !0, - k: c, - i: /[^\w\s\*&]/, - c: [ - {b: a, rB: !0, c: [t.TM], r: 0}, - {cN: 'params', b: /\(/, e: /\)/, k: c, r: 0, c: [t.CLCM, t.CBCM, r, s, e]}, - t.CLCM, - t.CBCM, - i, - ], - }, - {cN: 'class', bK: 'class struct', e: /[{;:]/, c: [{b: //, c: ['self']}, t.TM]}, - ]), - exports: {preprocessor: i, strings: r, k: c}, - }; -}); -hljs.registerLanguage('shell', function (s) { - return { - aliases: ['console'], - c: [{cN: 'meta', b: '^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]', starts: {e: '$', sL: 'bash'}}], - }; -}); -hljs.registerLanguage('objectivec', function (e) { - const t = { - cN: 'built_in', - b: '\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+', - }; - const _ = { - keyword: - 'int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN', - literal: 'false true FALSE TRUE nil YES NO NULL', - built_in: - 'BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once', - }; - const i = /[a-zA-Z@][a-zA-Z0-9_]*/; - const n = '@interface @class @protocol @implementation'; - return { - aliases: ['mm', 'objc', 'obj-c'], - k: _, - l: i, - i: ''}, - ], - }, - ], - }, - { - cN: 'class', - b: `(${ n.split(' ').join('|') })\\b`, - e: '({|$)', - eE: !0, - k: n, - l: i, - c: [e.UTM], - }, - {b: `\\.${ e.UIR}`, r: 0}, - ], - }; -}); -hljs.registerLanguage('ini', function (e) { - const b = { - cN: 'string', - c: [e.BE], - v: [ - {b: "'''", e: "'''", r: 10}, - {b: '"""', e: '"""', r: 10}, - {b: '"', e: '"'}, - {b: "'", e: "'"}, - ], - }; - return { - aliases: ['toml'], - cI: !0, - i: /\S/, - c: [ - e.C(';', '$'), - e.HCM, - {cN: 'section', b: /^\s*\[+/, e: /\]+/}, - { - b: /^[a-z0-9\[\]_-]+\s*=\s*/, - e: '$', - rB: !0, - c: [ - {cN: 'attr', b: /[a-z0-9\[\]_-]+/}, - { - b: /=/, - eW: !0, - r: 0, - c: [ - {cN: 'literal', b: /\bon|off|true|false|yes|no\b/}, - {cN: 'variable', v: [{b: /\$[\w\d"][\w\d_]*/}, {b: /\$\{(.*?)}/}]}, - b, - {cN: 'number', b: /([\+\-]+)?[\d]+_[\d_]+/}, - e.NM, - ], - }, - ], - }, - ], - }; -}); -hljs.registerLanguage('makefile', function (e) { - const i = { - cN: 'variable', - v: [{b: `\\$\\(${ e.UIR }\\)`, c: [e.BE]}, {b: /\$[@%>>|\.\.\.) /}; - const c = {cN: 'subst', b: /\{/, e: /\}/, k: r, i: /#/}; - const a = { - cN: 'string', - c: [e.BE], - v: [ - {b: /(u|b)?r?'''/, e: /'''/, c: [b], r: 10}, - {b: /(u|b)?r?"""/, e: /"""/, c: [b], r: 10}, - {b: /(fr|rf|f)'''/, e: /'''/, c: [b, c]}, - {b: /(fr|rf|f)"""/, e: /"""/, c: [b, c]}, - {b: /(u|r|ur)'/, e: /'/, r: 10}, - {b: /(u|r|ur)"/, e: /"/, r: 10}, - {b: /(b|br)'/, e: /'/}, - {b: /(b|br)"/, e: /"/}, - {b: /(fr|rf|f)'/, e: /'/, c: [c]}, - {b: /(fr|rf|f)"/, e: /"/, c: [c]}, - e.ASM, - e.QSM, - ], - }; - const s = { - cN: 'number', - r: 0, - v: [{b: `${e.BNR }[lLjJ]?`}, {b: '\\b(0o[0-7]+)[lLjJ]?'}, {b: `${e.CNR }[lLjJ]?`}], - }; - const i = {cN: 'params', b: /\(/, e: /\)/, c: ['self', b, s, a]}; - return ( - (c.c = [a, s, b]), - { - aliases: ['py', 'gyp'], - k: r, - i: /(<\/|->|\?)|=>/, - c: [ - b, - s, - a, - e.HCM, - { - v: [ - {cN: 'function', bK: 'def'}, - {cN: 'class', bK: 'class'}, - ], - e: /:/, - i: /[${=;\n,]/, - c: [e.UTM, i, {b: /->/, eW: !0, k: 'None'}], - }, - {cN: 'meta', b: /^[\t ]*@/, e: /$/}, - {b: /\b(print|exec)\(/}, - ], - } - ); -}); -hljs.registerLanguage('json', function (e) { - const i = {literal: 'true false null'}; - const n = [e.QSM, e.CNM]; - const r = {e: ',', eW: !0, eE: !0, c: n, k: i}; - const t = { - b: '{', - e: '}', - c: [{cN: 'attr', b: /"/, e: /"/, c: [e.BE], i: '\\n'}, e.inherit(r, {b: /:/})], - i: '\\S', - }; - const c = {b: '\\[', e: '\\]', c: [e.inherit(r)], i: '\\S'}; - return n.splice(n.length, 0, t, c), {c: n, k: i, i: '\\S'}; -}); -hljs.registerLanguage('apache', function (e) { - const r = {cN: 'number', b: '[\\$%]\\d+'}; - return { - aliases: ['apacheconf'], - cI: !0, - c: [ - e.HCM, - {cN: 'section', b: ''}, - { - cN: 'attribute', - b: /\w+/, - r: 0, - k: { - nomarkup: - 'order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername', - }, - starts: { - e: /$/, - r: 0, - k: {literal: 'on off all'}, - c: [ - {cN: 'meta', b: '\\s\\[', e: '\\]$'}, - {cN: 'variable', b: '[\\$%]\\{', e: '\\}', c: ['self', r]}, - r, - e.QSM, - ], - }, - }, - ], - i: /\S/, - }; -}); -hljs.registerLanguage('cs', function (e) { - const i = { - keyword: - 'abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long nameof object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield', - literal: 'null false true', - }; - const t = {cN: 'string', b: '@"', e: '"', c: [{b: '""'}]}; - const r = e.inherit(t, {i: /\n/}); - const a = {cN: 'subst', b: '{', e: '}', k: i}; - const c = e.inherit(a, {i: /\n/}); - const n = {cN: 'string', b: /\$"/, e: '"', i: /\n/, c: [{b: '{{'}, {b: '}}'}, e.BE, c]}; - const s = {cN: 'string', b: /\$@"/, e: '"', c: [{b: '{{'}, {b: '}}'}, {b: '""'}, a]}; - const o = e.inherit(s, {i: /\n/, c: [{b: '{{'}, {b: '}}'}, {b: '""'}, c]}); - (a.c = [s, n, t, e.ASM, e.QSM, e.CNM, e.CBCM]), - (c.c = [o, n, r, e.ASM, e.QSM, e.CNM, e.inherit(e.CBCM, {i: /\n/})]); - const l = {v: [s, n, t, e.ASM, e.QSM]}; - const b = `${e.IR }(<${ e.IR }(\\s*,\\s*${ e.IR })*>)?(\\[\\])?`; - return { - aliases: ['csharp'], - k: i, - i: /::/, - c: [ - e.C('///', '$', { - rB: !0, - c: [{cN: 'doctag', v: [{b: '///', r: 0}, {b: ''}, {b: ''}]}], - }), - e.CLCM, - e.CBCM, - { - cN: 'meta', - b: '#', - e: '$', - k: { - 'meta-keyword': - 'if else elif endif define undef warning error line region endregion pragma checksum', - }, - }, - l, - e.CNM, - {bK: 'class interface', e: /[{;=]/, i: /[^\s:]/, c: [e.TM, e.CLCM, e.CBCM]}, - { - bK: 'namespace', - e: /[{;=]/, - i: /[^\s:]/, - c: [e.inherit(e.TM, {b: '[a-zA-Z](\\.?\\w)*'}), e.CLCM, e.CBCM], - }, - { - cN: 'meta', - b: '^\\s*\\[', - eB: !0, - e: '\\]', - eE: !0, - c: [{cN: 'meta-string', b: /"/, e: /"/}], - }, - {bK: 'new return throw await else', r: 0}, - { - cN: 'function', - b: `(${ b }\\s+)+${ e.IR }\\s*\\(`, - rB: !0, - e: /[{;=]/, - eE: !0, - k: i, - c: [ - {b: `${e.IR }\\s*\\(`, rB: !0, c: [e.TM], r: 0}, - {cN: 'params', b: /\(/, e: /\)/, eB: !0, eE: !0, k: i, r: 0, c: [l, e.CNM, e.CBCM]}, - e.CLCM, - e.CBCM, - ], - }, - ], - }; -}); -hljs.registerLanguage('sql', function (e) { - const t = e.C('--', '$'); - return { - cI: !0, - i: /[<>{}*#]/, - c: [ - { - bK: - 'begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment', - e: /;/, - eW: !0, - l: /[\w\.]+/, - k: { - keyword: - 'abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek', - literal: 'true false null', - built_in: - 'array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void', - }, - c: [ - {cN: 'string', b: "'", e: "'", c: [e.BE, {b: "''"}]}, - {cN: 'string', b: '"', e: '"', c: [e.BE, {b: '""'}]}, - {cN: 'string', b: '`', e: '`', c: [e.BE]}, - e.CNM, - e.CBCM, - t, - ], - }, - e.CBCM, - t, - ], - }; -}); -hljs.registerLanguage('php', function (e) { - const c = {b: '\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*'}; - const i = {cN: 'meta', b: /<\?(php)?|\?>/}; - const t = { - cN: 'string', - c: [e.BE, i], - v: [ - {b: 'b"', e: '"'}, - {b: "b'", e: "'"}, - e.inherit(e.ASM, {i: null}), - e.inherit(e.QSM, {i: null}), - ], - }; - const a = {v: [e.BNM, e.CNM]}; - return { - aliases: ['php3', 'php4', 'php5', 'php6'], - cI: !0, - k: - 'and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally', - c: [ - e.HCM, - e.C('//', '$', {c: [i]}), - e.C('/\\*', '\\*/', {c: [{cN: 'doctag', b: '@[A-Za-z]+'}]}), - e.C('__halt_compiler.+?;', !1, {eW: !0, k: '__halt_compiler', l: e.UIR}), - { - cN: 'string', - b: /<<<['"]?\w+['"]?$/, - e: /^\w+;?$/, - c: [e.BE, {cN: 'subst', v: [{b: /\$\w+/}, {b: /\{\$/, e: /\}/}]}], - }, - i, - {cN: 'keyword', b: /\$this\b/}, - c, - {b: /(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/}, - { - cN: 'function', - bK: 'function', - e: /[;{]/, - eE: !0, - i: '\\$|\\[|%', - c: [e.UTM, {cN: 'params', b: '\\(', e: '\\)', c: ['self', c, e.CBCM, t, a]}], - }, - { - cN: 'class', - bK: 'class interface', - e: '{', - eE: !0, - i: /[:\(\$"]/, - c: [{bK: 'extends implements'}, e.UTM], - }, - {bK: 'namespace', e: ';', i: /[\.']/, c: [e.UTM]}, - {bK: 'use', e: ';', c: [e.UTM]}, - {b: '=>'}, - t, - a, - ], - }; -}); -hljs.registerLanguage('http', function (e) { - const t = 'HTTP/[0-9\\.]+'; - return { - aliases: ['https'], - i: '\\S', - c: [ - {b: `^${ t}`, e: '$', c: [{cN: 'number', b: '\\b\\d{3}\\b'}]}, - { - b: `^[A-Z]+ (.*?) ${ t }$`, - rB: !0, - e: '$', - c: [ - {cN: 'string', b: ' ', e: ' ', eB: !0, eE: !0}, - {b: t}, - {cN: 'keyword', b: '[A-Z]+'}, - ], - }, - {cN: 'attribute', b: '^\\w', e: ': ', eE: !0, i: '\\n|\\s|=', starts: {e: '$', r: 0}}, - {b: '\\n\\n', starts: {sL: [], eW: !0}}, - ], - }; -}); diff --git a/static/js/navigation.js b/static/js/navigation.js new file mode 100644 index 00000000..206b0f22 --- /dev/null +++ b/static/js/navigation.js @@ -0,0 +1,50 @@ +function toggleDropdown(toggle, open) { + const parentElement = toggle.parentNode; + const dropdown = document.getElementById( + toggle.getAttribute("aria-controls") + ); + dropdown.setAttribute("aria-hidden", !open); + + if (open) { + parentElement.classList.add("is-active", "is-selected"); + } else { + parentElement.classList.remove("is-active", "is-selected"); + } +} + +function closeAllDropdowns(toggles) { + toggles.forEach((toggle) => { + toggleDropdown(toggle, false); + }); +} + +function handleClickOutside(toggles, containerClass) { + document.addEventListener("click", (event) => { + const {target} = event; + + if (target.closest) { + if (!target.closest(containerClass)) { + closeAllDropdowns(toggles); + } + } + }); +} + +function initNavDropdowns(containerClass) { + const toggles = [].slice.call( + document.querySelectorAll(`${containerClass } [aria-controls]`) + ); + + handleClickOutside(toggles, containerClass); + + toggles.forEach((toggle) => { + toggle.addEventListener("click", (e) => { + e.preventDefault(); + + const isOpen = e.target.parentNode.classList.contains("is-active"); + + closeAllDropdowns(toggles); + toggleDropdown(toggle, !isOpen); + }); + }); +} diff --git a/static/js/src/app.js b/static/js/src/app.js index d7cb8541..4aa6d601 100644 --- a/static/js/src/app.js +++ b/static/js/src/app.js @@ -2,8 +2,6 @@ import * as Sentry from '@sentry/browser'; import {createNav} from '@canonical/global-nav'; import {cookiePolicy} from '@canonical/cookie-policy'; -import showContactDetails from './modules/show-contact-details'; -import copySnippet from './modules/copy-snippet'; import modal from './modules/modal'; // Init Sentry JS tracking @@ -12,12 +10,6 @@ Sentry.init({dsn: 'https://5b54e6946be34749935c4dd2d9d01cb8@sentry.is.canonical. // Global nav strip createNav({maxWidth: '72rem', showLogins: false, hiring: 'https://juju.is/careers'}); -// Contact CTA for /experts -showContactDetails(); - -// Copy deploy script to clipboard in entity header -copySnippet(); - // Show modal windows modal(); diff --git a/static/js/src/latest-news.js b/static/js/src/latest-news.js deleted file mode 100644 index 40daeec5..00000000 --- a/static/js/src/latest-news.js +++ /dev/null @@ -1,10 +0,0 @@ -import {fetchLatestNews} from '@canonical/latest-news'; - -// Pull latest news from blog feed -fetchLatestNews({ - articlesContainerSelector: '#latest-news-container', - articleTemplateSelector: '#articles-template', - limit: 2, - tagId: 1286, - hostname: 'ubuntu.com', -}); diff --git a/static/js/src/modules/copy-snippet.js b/static/js/src/modules/copy-snippet.js deleted file mode 100644 index 8c6913b1..00000000 --- a/static/js/src/modules/copy-snippet.js +++ /dev/null @@ -1,61 +0,0 @@ -/** - Allows users to click button on code snippet pattern to copy contents to clipboard -* */ -const copySnippet = () => { - /** - Copies string to clipboard - @method copySnippet.copyToClipboard - @param str {String} String to be copied to clipboard - @static - * */ - const copyToClipboard = (str) => { - const el = document.createElement('textarea'); // Create a + +

+ In submitting this form, I confirm that I have read and agree to Canonical's Privacy Notice and Privacy Policy. +

+ + + + + + + + + + + + + + + + + + +{% endblock content %} diff --git a/templates/jaasai/community.html b/templates/jaasai/community.html deleted file mode 100644 index 7b71bd5a..00000000 --- a/templates/jaasai/community.html +++ /dev/null @@ -1,196 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Community{% endblock %} -{% block description %}The Juju community provides a strong support network that can help you get going with Juju, Charms and help solve your cloud deployment and scaling challenges. Join in, share your knowledge and help get the word out.{% endblock %} - -{% block content %} -
-
-
-

Community

-

Pioneers in service modelling. Deploy your solution, charm your software, or discuss your ideas. Contribute to the community and help push the line.

-

Join us in Discourse ›

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/8adead61-picto-community-orange.svg", - alt="", - width="300", - height="300", - hi_def=True, - loading="eager", - ) | safe - }} -
-
-
- -
-
-
-
-

OpenStack solutions

-
- {{ - image( - url="https://assets.ubuntu.com/v1/c598e6a4-james-page.jpg", - alt="James Page's profile picture", - width="48", - height="48", - hi_def=True, - attrs={"class": "p-media-object__image is-round",}, - loading="eager", - ) | safe - }} -
-

- James Page -

-

Affiliation: Canonical Ltd

-
-
-

James is one of the first Juju charmers in the community and was the original author of the OpenStack charms. His charms allow an initial deployment of a base cloud and allows users to add metering and Landscape afterwards. James is currently working on adding high-availability bundles to this, and resides in Norwich, UK.

- Contribute -
-
-

PaaS Solutions

-
- {{ - image( - url="https://assets.ubuntu.com/v1/ba7b418f-chris-donati.jpg", - alt="Chris Donati's profile picture", - width="48", - height="48", - hi_def=True, - attrs={"class": "p-media-object__image is-round"}, - loading="auto", - ) | safe - }} -
-

- Chris Donati -

-

Affiliation: AppScale

-
-
-

Chris Donati has been working on improving the AppScale platform, which lets you deploy your Google App Engine application on any cloud, public or private. He lives in Santa Barbara, California, where he’s been trying to get better at the game of Go.

- Contribute -
-
-
-
-

Benchmarking solutions

-
- {{ - image( - url="https://assets.ubuntu.com/v1/547a6844-adam-israel.jpg", - alt="Adam Israel's profile picture", - width="48", - height="48", - hi_def=True, - attrs={"class": "p-media-object__image is-round"}, - loading="eager", - ) | safe - }} -
-

- Adam Israel -

-

Affiliation: Canonical Ltd

-
-
-

Adam is working on benchmarking with Juju, and has published a comprehensive Python library named charms.benchmark to ease the development of benchmark charms. Adam lives in Southwest Ontario, Canada with his lovely wife and writing partner, three dogs, and more cats than he’ll admit to.

- Contribute -
-
-

Database Solutions

-
- {{ - image( - url="https://assets.ubuntu.com/v1/9b80d0de-philip-stoev.jpg", - alt="Philip Sotev's profile picture", - width="48", - height="48", - hi_def=True, - attrs={"class": "p-media-object__image is-round"}, - loading="auto", - ) | safe - }} -
-

- Philip Stoev -

-

Affiliation: Galera Cluster

-
-
-

Philip Stoev is a QA and Release Manager with Galera Cluster. He's worked for more than a decade at Oracle, MariaDB & NuoDB. His database testing framework, the RQG, is widely used in the MySQL ecosystem and won the Application of the Year MySQL Community Award in 2014.

- Contribute -
-
-
-
- -
-
-
-

Or talk to us about starting your own “subcommunity”, there are hundreds of solutions available; want to be that champion?

-

Join us in Discourse ›

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/02297f92-picto-discussion-orange.svg", - alt="", - width="100", - height="100", - hi_def=True, - loading="lazy", - ) | safe - }} -
-
-
- -
-
-
-

Latest from the blog

-
- Loading... -
- -

View all blog posts ›

-
-
-
- -
-
-
-

Support

-
-
-
-
-
Discourse
-

Join the Juju community on our Discourse forum.

-
-
-
Freenode
-

Find out more, get help or ask any question on our Freenode IRC channel.

-
-
-
- - - -{% endblock content %} diff --git a/templates/jaasai/community/partners.html b/templates/jaasai/community/partners.html deleted file mode 100644 index e5624915..00000000 --- a/templates/jaasai/community/partners.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju Partner Programmes{% endblock %} - -{% block content %} -
-
-
-

Charm Partner Programme

-

The Charm Partner Programme will help you to get your solution into the Charm Store, giving new benefits to your current customers, as well as accessing new potential users. You will receive training and support, as well as co marketing opportunities to help promote your solution to the Ubuntu Cloud Ecosystem.

-
-
- Juju partners pictogram -
-
-
- -
-
-
-

Benefits of the programme include:

-
-
-
-
-
    -
  • Revenue opportunities: Charms enable deployment on a huge range of platforms including most public clouds such as AWS, Azure, Google Cloud, IBM Cloud, Joyent and more, plus bare metal x86, IBM POWER8 and ARM servers.
    • -
  • More efficient sales cycle: By using a charm to deploy software, gaining access to enterprise accounts is easier, as potential clients can spin up and kick the tires
    • -
  • Re-usability: Best practice is built into the charm, resulting in higher quality deployments, every time
    • -
  • Reduced costs: Charms are reusable, easy to deploy, and provide immediate integration with other charmed applications
    • -
-
-
-
    -
  • Improved DevOps: Juju enables quick dev-test-production pipeline, as the same charm can be used in each model
    • -
  • Reduced complexity: Simplify big, distributed system through the use of charms
    • -
  • Support and training: Learn how to write charms, and ensure that your charms meet quality standards
    • -
  • Inclusion in our partner site and other co-marketing opportunities
    • -
  • Co-marketing opportunities: Placement in the Charm Store, entry into our partner portal pages, logo usage, participation in events and joint revenue opportunities
    • -
-
-
-
-
- Find out more -
-
-
- -
-
-
-

Canonical partners

-
    -
  • - AMD logo -
    • -
  • - Cisco logo -
    • -
  • - Dell logo -
    • -
  • - HP logo -
    • -
  • - IBM logo -
    • -
  • - Intel logo -
    • -
  • - Lenovo logo -
    • -
-
-
-
- -{% endblock content %} diff --git a/templates/jaasai/experts.html b/templates/jaasai/experts.html deleted file mode 100644 index 59fd56d2..00000000 --- a/templates/jaasai/experts.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju experts{% endblock %} -{% block description %}Canonical partners with selected companies to provide specialised supported solutions.{% endblock %} - -{% block content %} -
-
-
- Juju Expert Partners -

Managed solutions from Canonical’s partner network

-

Canonical partners with selected companies to provide specialised supported solutions.

-
-
-
- Become a partner -
-

We'd love to have you join us as a partner.

-

If you are an independent software vendor or bundle author, it's easy to apply. You can find out more below.

-

We can't wait to talk.

- Join us… -
-
-
- -
-
-
-

- Partners supported -

-
-
-
- {% for expert_id, expert in context.experts.items() %} -
-
- -
- -
-
-
    - {% for highlight in expert.highlights %} -
  • {{ highlight|safe }}
    • - {% endfor %} -
- -
-
- {% endfor %} -
-
- -{% endblock content %} diff --git a/templates/jaasai/experts/omnivector.html b/templates/jaasai/experts/omnivector.html deleted file mode 100644 index 5bbe395a..00000000 --- a/templates/jaasai/experts/omnivector.html +++ /dev/null @@ -1,139 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju expert - Omnivector{% endblock %} -{% block description %}Omnivector is committed to delivering the highest quality hardware, software, and data services{% endblock %} - -{% block content %} -
-
-
- Juju Expert Partners -

Scalable, Cloud Agnostic Software and Data Services

-

Omnivector is committed to delivering the highest quality hardware, software, and data services. Using the industry's best practices and agile delivery frameworks we ensure that our solutions are modern, scalable and maintainable.

-
-
-
- {% include "shared/contact-card/_expert-page.html" %} -
-
-
-
- -
-
-
-

Supported

-
-
-
-
-

Apache Spark Singleton Stack

-

Ominvector’s Spark Core bundle provides a single Spark instance alongside a Jupyter notebook. This enables rapid Spark application development and data processing at the push of a button.

-
- -
-
    -
  • 2 Node; Spark + Jupyter Notebook.
    • -
  • Integrates with Omnivector's custom storage solutions.
    • -
  • Scale this bundle up to 1000s of nodes!
    • -
- -
-
-

- SLURM Core bundle -

-

Ominvector’s SLURM Core bundle provides the key components of the SLURM workload manager including 1x - slurm-controller, 1 x slurm-node, 1 x slurm-dbd.

-
- -
-
    -
  • 4 Node SLURM starter bundle.
    • -
  • Get up and running by deploying this bundle on your local machine, then deploy to your - favourite cloud when you are ready to take your solution live.
    • -
  • SLURM packaging experts.
    • -
-
-
-
-
-

- Big-data processing, real-time monitoring. -

-

Ominvector’s Spark Extended bundle provides a complete data processing solution at the push of a button.

-
- -
-
    -
  • Enhanced Spark Operations
    • -
  • Integrated CEPH Storage
    • -
  • Enterprise Grade Monitoring
    • -
-
-
-

- Custom HPC Solutions -

-

Omnivector’s SLURM + OpenFOAM bundle exemplifies our experience automating operational solutions for HPC workloads.

-
- -
-
    -
  • SLURM Core + OpenFOAM
    • -
  • Easily integrate your OpenFOAM based solutions.
    • -
  • Custom SLURM application packaging!
    • -
-
-
-
- -
-
-
-

About us

-

Omnivector Solutions Limited is a Service-Disabled Veteran-Owned Small Business based in Portland, OR.

-

Omnivector provides services to deploy, manage and scale software and interconnected services on premise and in the cloud. With over 40 years combined experience, our founders bring a wealth of knowledge and insights that enable business intelligently to grow and maintain their software offerings.

-

In addition to hardware and software solutions, OSL also maintains a current dataset of resume, contact, social, and demographic information for over 1.5 Billion unique individuals, delivered to you at the scale you need it.

-

Omnivector home

-
-
-

Skills

-
    -
  • Workflow solutions that enable enterprise processing at scale
    • -
  • Distributed processing and storage platform architecture
    • -
  • DevOPS/DataOPS design and implementation
    • -
  • Data Services
    • -
  • Data processing and batch enrichment
    • -
-
-
-

People

-
- James Beedy -
-

- James Beedy -

-

President

-
-
-
- Cory Zimmerman -
-

- Cory Zimmerman -

-

CEO, CSM, CSPO

-
-
-
-
-
- -{% include "shared/_expert_partner_cta_strip.html" %} - -{% endblock content %} diff --git a/templates/jaasai/experts/spicule.html b/templates/jaasai/experts/spicule.html deleted file mode 100644 index 8fde48ce..00000000 --- a/templates/jaasai/experts/spicule.html +++ /dev/null @@ -1,117 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju expert - Spicule{% endblock %} -{% block description %}At Spicule we take great pride in developing easy to use, customisable, flexible data platforms.{% endblock %} - -{% block content %} -
-
-
- Juju Expert Partners -

Analyse, reveal patterns, and gain insights

-

At Spicule we take great pride in developing easy to use, customisable, flexible data platforms.

-
-
-
- {% include "shared/contact-card/_expert-page.html" %} -
-
-
-
- -
-
-
-

Supported

-
-
-
-
-

Anssr Data-Engine

-

The reference implementation of the Anssr Data Platform, developed by the Juju experts at Spicule.

-
-
-
- -
-
-
-
-
-

Druid Hadoop

-

Running interactive analytics at scale can be a challenge. The supported Druid Hadoop bundle from Spicule allows companies to investigate data both in real time and over huge amounts of historical data, by levering the power of Apache Druid.

- -
-
-
- -
-
-
-
- - -
-
-
-

About us

-

Spicule is an industry-leading Big Data consultancy by providing agile Big Data platforms for enterprises of all sizes.

-

Spicule have developed Anssr, a collection of Big Data applications that provide an architecture for businesses to process, analyse, reveal patterns and gain insights into their company data.

-

Getting started with Anssr

-

Spicule home

-
-
-

Skills

-
    -
  • Data analytics
    • -
  • Streaming data platforms
    • -
  • Enterprise search
    • -
  • Scalable systems designs
    • -
  • Data service deployments
    • -
  • Automation processes
    • -
-
-
-

People

-
- Tom Barber -
-

- Tom Barber -

-

Founder & CEO

-
-
-
- Breno Polanski -
-

- Breno Polanski -

-

Head of development

-
-
-
- Stephen Downie -
-

- Stephen Downie -

-

Technical project manager

-
-
-
-
-
- -{% include "shared/_expert_partner_cta_strip.html" %} - -{% endblock content %} diff --git a/templates/jaasai/experts/tengu.html b/templates/jaasai/experts/tengu.html deleted file mode 100644 index 06e75efc..00000000 --- a/templates/jaasai/experts/tengu.html +++ /dev/null @@ -1,108 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju expert - Tengu{% endblock %} -{% block description %}We are a generic and open-source data science hub powered by Juju, offering professionals complete freedom to choose the tools that best suit each of their big data driven applications.{% endblock %} - -{% block content %} -
-
-
- Juju Expert Partners -

Analyse, reveal patterns, and gain insights

-

We are a generic and open-source data science hub powered by Juju, offering professionals complete freedom to choose the tools that best suit each of their big data driven applications.

-
-
-
- {% include "shared/contact-card/_expert-page.html" %} -
-
-
-
- -
-
-
-

Supported

-
-
-
-
-

Automate Spark Jobs

-

Deploy a small Spark cluster together with exemplary Python Spark Jobs and an integrated Zeppelin Notebook to ease into big data processing.

-
-
- -
-
    -
  • Small standalone Spark cluster
    • -
  • Integrated Python Spark Jobs
    • -
  • Integrated Zeppelin Notebook
    • -
-
-
-
-

Create custom data flow

-

Get started with stream processing in Node-RED. We guide the way with a small example receiving StackOverflow posts and filter them into a MongoDB data store.

-
-
- -
-
    -
  • Receive data on ActiveMQ
    • -
  • Create custom data flows in Node-RED
    • -
  • Store the info in MongoDB
    • -
-
-
-
-
- -
-
-
-

About us

-

Thomas & Gregory founded Tengu at Ghent University, Belgium, when working with several data science tools.

-

With Tengu, it’s their mission to help companies navigate the complexity of building and operating a data-driven business through self-supporting tools and the democratization of technical knowledge.

-

https://www.tengu.io

-
-
-

Skills

-
    -
  • Big Data
    • -
  • NoSQL Storage
    • -
  • Parallel Processing
    • -
  • Scalable Systems Design
    • -
  • Cloud Computing
    • -
  • Internet of Things
    • -
  • Machine Learning
    • -
  • Microservices
    • -
  • DataOps
    • -
-
-
-

People

-
- Gregory Van Seghbroec -
-

- Gregory Van Seghbroeck -

-

CTO

-
-
-
- Daphné De Troch -
-

- Daphné De Troch -

-

Growth Marketer

-
-
-
-
-
- -{% include "shared/_expert_partner_cta_strip.html" %} - -{% endblock content %} diff --git a/templates/jaasai/experts/thanks.html b/templates/jaasai/experts/thanks.html deleted file mode 100644 index 87472e4e..00000000 --- a/templates/jaasai/experts/thanks.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Juju expert - Your message has been successfully sent.{% endblock %} - -{% block content %} -
-
-
-

Thank you.

-

Your message has been successfully sent - we'll get back to you as soon as possible.

-
-
-
-
-

Return to the homepage.

-
-
-
- -{% endblock content %} diff --git a/templates/jaasai/how-it-works.html b/templates/jaasai/how-it-works.html deleted file mode 100644 index 787c1f2d..00000000 --- a/templates/jaasai/how-it-works.html +++ /dev/null @@ -1,382 +0,0 @@ -{% extends "_layout.html" %} - -{% set active_section = "how-it-works" %} - -{% block title %}How it works{% endblock %} - -{% block content %} -
-
-
-

How it works

-

Juju controller: the heart of Juju

-

Juju's controller manages all the machines in your running models, responding to the events that are triggered throughout the system.

-

It also manages scale out, configuration and placement of all your models and applications.

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/ea562d47-how-it-works-2x.png", - alt="How it works overview pictogram", - width="495", - height="268", - hi_def=True, - loading="eager", - attrs={"class": "u-image-position--right u-hide--small"}, - ) | safe - }} -
-
-
- -
-
-
-

Application modelling for every cloud

-
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/6cef4a88-charms-bundles-2x.png", - alt="Juju charms/bundles diagram", - width="662", - height="665", - hi_def=True, - loading="eager", - attrs={"class": "u-image-position--right u-hide--small"}, - ) | safe - }} -
-
-
-

Charms

-

Charms are sets of scripts for deploying and operating software. With event handling built in, they can declare interfaces that fit charms for other services, so relationships can be formed.

-

Bundles

-

Bundles are collections of charms that link services together, so you can deploy whole chunks of app infrastructure in one go.

-

What they do:

-
    -
  • Install
    • -
  • Configure
    • -
  • Connect
    • -
  • Upgrade and update
    • -
  • Scale out and scale back
    • -
  • Perform health checks
    • -
  • Undertake operational actions
    • -
  • Benchmark
    • -
-
-
-
-
-
- -
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/1f45d01c-provision-2x.png", - alt="Juju provision overview", - width="585", - height="212", - hi_def=True, - ) | safe - }} -
-
-
-

Provision

-

Specify the number of machines you want and how you want them to be deployed, or let Juju do it automatically.

-
-
-
-
-
- -
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/4115af81-how-it-works-deploy.png", - alt="Logo cloud", - width="618", - height="132", - hi_def=True, - ) | safe - }} -
-
-
-

Deploy

-

Deploy your services with a few clicks of your mouse or re-deploy your entire app infrastructure to another cloud.

-
-
-
-
-
- -
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/b3df0e4d-monitor-manage-2x.png", - alt="How it works overview pictogram", - width="441", - height="315", - hi_def=True, - ) | safe - }} -
-
-
-

Monitor and manage

-

The Juju controller will manage:

-
    -
  • Multiple models
    • -
  • All VMs in all your running models
    • -
  • Scale out, config and placement
    • -
  • User accounts and identification
    • -
  • Sharing and access
    • -
-
-
-
-
- -
-
-
-

Frequently asked questions

-
-
-
-
-
-

What is Juju?

-

- Juju is an open source application modelling tool that allows you - to deploy, configure, scale and operate cloud infrastructures - quickly and efficiently on public clouds such as AWS, GCE, and - Azure along with private ones such as MAAS, OpenStack, and VSphere. -

-

- Its store allows access to a wide range of best practice solutions - which you can deploy with a single command. You can use Juju from - the command line or through its powerful graphical representation - of the model in the GUI. -

-

- - Visit the docs to install Juju - -

-
-
-

What is JAAS?

-

- JAAS is Juju as a Service, managed by Canonical, the makers of - Ubuntu. It introduces a common controller that operates all the - machines in your running models. -

-

- JAAS enables you to quickly build, configure, manage and deploy - your applications to the public cloud directly from your browser - or the command line. It also allows you to share your models and - easily collaborate with other users. -

-

- - Visit the docs to get started with JAAS › - -

-
-
-

What is the difference between Juju and JAAS?

-

- Juju as a Service (JAAS) is a hosted service for using Juju to - operate your applications. JAAS is the fastest way to operate your - workloads on supported clouds with the fewest instances required. - You can use JAAS alongside your other self-hosted Juju - infrastructure with the same CLI and GUI. -

-

- Juju is a full release. JAAS is currently in public beta. -

-

- - Try the JAAS beta › - -

-
-
-

What are charms?

-

- Charms are collections of scripts that contain all the operations - necessary to deploy, configure, scale, and maintain cloud - applications easily with Juju. Charms encapsulate a single - application and all the code and know-how it takes to operate it, - such as how to combine and work with other related applications or - how to upgrade it. -

-

- - Learn more about charms - -

-
-
-

How do I know charms are safe to use?

-

- Charms deployed from the charm store are community vetted and open - source (even though the software they encapsulate may not be). -

-

- ‘Recommended’ charms have also met additional criteria - and have been vetted by the Juju Charmers team. -

-
-
-

Are Juju and JAAS free to use?

-

- Juju is free to use. It is an open source application that you - install on your own hardware. -

-

- JAAS is a hosted service. During the beta period, it is free to use. -

-

- You will incur a separate fee from your cloud provider for any - resources used. Calculators for - AWS, - GCE and - Azure - can help you understand these charges. -

-
-
-
-
-

What are bundles?

-

- Bundles are ready-to-run collections of applications which have - been modelled to work together — this can include particular - configurations and relations between the software to be deployed. -

-

- Bundles may also be optimised for different deployment scenarios - of the same software — for example, a scale-out production - ready version like Charmed - Kubernetes, or a development friendly test - version like Kubernetes Core. -

-
-
-

What is application modelling?

-

- Application modelling is a simple way of describing what software - should actually do, specified from the top down (services and how - they relate) rather than built from the bottom up, making for a - clean and portable expression of intent rather than a complicated - recipe. Juju delivers the tools to describe your model and then to - turn it into reality in a repeatable fashion on any cloud or - computing resource. -

-

- All the operational hard work is automated, connecting your - services so they can work together and provision the - appropriate machines. You can scale up, scale down, or even - re-deploy the same model on another cloud. -

-

- - View how to start modelling with Juju as a Service [video] - -

-
-
-

How does it compare to Puppet and Chef?

-

Puppet and Chef are great tools for configuration management.

-

- Juju provides a higher level of abstraction, supplying the tools - to manage the full scope of operations beyond deployment and - configuration management, regardless of the machine on which it - runs. -

-

- One of the main advantages of Juju is its dynamic configuration - ability, which allows you to re-configure services on the fly, - add, remove, or change relationships between services, and scale - in or out with ease, sharing the operational knowledge and making - the most of the wider community. -

-
-
-

What kind of applications can I deploy?

-

- Charms are available for hundreds of common and popular - cloud-oriented applications such as Kubernetes, Apache Hadoop, - Big Data solutions, OpenStack, or even your own software, with new - ones being added every day. -

-

- - Check out the public charm store for an up to the minute list - of charms › - -

-
-
-

Can I develop a charm for my own software?

-

- Yes! You can integrate your existing Chef, Puppet, Docker or other - scripts with custom charms for your own use, or make use of the - Juju store and the existing ecosystem of charm developers to - package and promote your application to a wider audience. There are - tools and documentation to help you get started. -

-

- - Learn more about writing charms - -

-
-
-

Where can I find more detailed information?

-

- For further information, read our more detailed guidance in the - documentation. The - Ubuntu - website includes an overview of Canonical’s cloud - products, showing how Juju fits in. -

-

- The Juju community pages include - documentation with more technical detail on charms and using Juju, - written by people using Juju in production environments. -

-
-
-
-
-
- - Visit the docs to install Juju - - - Your models - -
-
-
- -{% endblock content %} diff --git a/templates/jaasai/index.html b/templates/jaasai/index.html deleted file mode 100644 index 6bf833a9..00000000 --- a/templates/jaasai/index.html +++ /dev/null @@ -1,570 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}JAAS - Juju as a Service{% endblock %} -{% block description %}Juju is an open source, application and service modelling tool from Ubuntu that helps you deploy, manage and scale your applications on any cloud.{% endblock %} - -{% block content %} - -
-
-
-
-

Big software tamed

-

Juju simplifies how you configure, scale and operate todays’ complex software. Juju deploys everywhere: to public or private clouds.

-
-
-
-
    -
  • JUJU IN ACTION:
    • -
  • Production-grade Kubernetes
    • -
-
-
-
    -
  • Scalable 11 node cluster
    • -
  • Latest upstream version
    • -
-
-
- -
-
- Deploy Kubernetes - - Or watch the video - Play icon - -
-
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/d1f2108a-Slide+-+Jaas.svg", - alt="", - width="534", - height="374", - hi_def=True, - ) | safe - }} -
-
-
- -
-
-
-

Managed solutions from Canonical’s partners

-

Canonical partners with selected companies to provide specialised supported solutions. If you are an independent software vendor or bundle author, it's easy to apply.

- Join the programme - Managed solutions -
-
- {{ - image( - url="https://assets.ubuntu.com/v1/87827c6f-Slide+-+experts.svg", - alt="", - width="534", - height="374", - hi_def=True, - ) | safe - }} -
-
-
- -
-
-
-

Juju solutions for OpenStack

-

Juju makes it easy to deploy OpenStack at scale. Quickly and reliably build an enterprise-scale cloud run on Ubuntu – the most popular operating system for OpenStack.

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/c8038e7d-Slide+-+openstack.svg", - alt="", - width="534", - height="374", - hi_def=True, - ) | safe - }} -
-
-
- -
-
-
-

Juju solutions for big data

-

The setup and configuration of big data tools can be very complex and daunting – Juju frees you to explore, test and evaluate big data solutions to choose the one that works best for you.

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/bc700bb6-Slide+-+big+data.svg", - alt="", - width="485", - height="374", - hi_def=True, - ) | safe - }} -
-
-
- -
-
- - - - -
-
-
- -
-
-
- {% include "shared/store-card/_random.html" %} -
-
-
Or build it yourself
-

Create your own solution in the GUI or browse the store to get started

-
- {{ - image( - url="https://assets.ubuntu.com/v1/a728511e-build-it-yourself.png", - alt="Build it yourself example", - width="326", - height="108", - hi_def=True, - ) | safe - }} -
-

Add a new model

-
-
-
JAAS is Juju as a service
-

Managed Juju infrastructure, hosted by Canonical, the makers of Ubuntu.

-
- {{ - image( - url="https://assets.ubuntu.com/v1/5a2091ba-image+%281%29.svg", - alt="JAAS logo", - width="114", - height="64", - hi_def=True, - ) | safe - }} -
- About JAAS -
-
-
- -
-
-
-

Juju at your command

-
-
-
-
-
$
-
-
-
- - - -
-
-
- -
-
-

Choose

-
-
-

Bundles are collections of charms that link services together, so you can deploy whole chunks of infrastructure in one go.

- -
-
-

Charms contain scripts that simplify the deployment and management of a service.

- -
-
-
-
-

Model

-
-
-

With Juju, relationships between linked charms are formed automatically.

-

- {{ - image( - url="https://assets.ubuntu.com/v1/fc0ccef5-model-canvas-2x.png", - alt="Linked charms", - width="300", - height="235", - hi_def=True, - ) | safe - }} -

-
-
-

Easily configure charms via the inspector.

-

- {{ - image( - url="https://assets.ubuntu.com/v1/8d6efbaa-model-config-2x.png", - alt="Inspector screenshot", - width="307", - height="247", - hi_def=True, - ) | safe - }} -

-
-
-
-
-

Deploy

-
-
-

Deploy and redeploy to all major public clouds or locally on your own hardware.

-

- {{ - image( - url="https://assets.ubuntu.com/v1/78c1ad70-deploy-logos-2x.png", - alt="Public cloud logos", - width="326", - height="235", - hi_def=True, - ) | safe - }} -

-
-
-

Monitor, maintain and scale on demand.

-

- {{ - image( - url="https://assets.ubuntu.com/v1/ff83e81e-deploy-new-units-2x.png", - alt="New units screenshot", - width="326", - height="235", - hi_def=True, - ) | safe - }} -

-
-
-
-
-
-
-

Browse the store

-
-
-
- -
-
-
-

Why use Juju?

-
-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/4c62db97-why-use-juju-diagram-left.svg", - alt="Diagram on 'Why use Juju (Part 1)", - width="440", - height="789", - hi_def=True, - ) | safe - }} -
-
- {{ - image( - url="https://assets.ubuntu.com/v1/a018d25e-why-use-juju-diagram-right.svg", - alt="Diagram on 'Why use Juju (Part 2)", - width="440", - height="779", - hi_def=True, - ) | safe - }} -
-
-
-
-
-

Whether it involves deep learning, container orchestration, real-time big data or stream processing, big software needs operations to be open source and automated.

-

Juju is the best way to encapsulate all the ops knowledge required to automate the behaviour of your application.

-
-
-
-
-

How it works

-
-
-
-
- -
-
-
-

Join the movement

-
-
-
-
-

Connect

-

Join the Juju community on our Discourse forum.

-
-
-

Collaborate

-
-
-
- GitHub logo -

- - Juju on GitHub - -

-
-
-
-
-
-

Ask the community

-

Find out more, get help or ask any question on our Discourse

-
-
-
- -
-
-
-

What people are saying about Juju

-
-
-
- -
-
-
-
- Spicule logo -

Using the modelling ethos brought by Juju allows me to quickly run big data - applications in a multitude of places. Be it locally on my laptop, on bare metal or in the Cloud, Juju lets me reuse - the same models and code without changing any aspects of my deployment.

- Tom Barber, Spicule LTD -
-
-
-
- Ghent University logo -

Juju enables you to encapsulate each different part of your infrastructure and lets everything talk to each other. So if you have a web server that's managed by Chef and a database that's deployed by a Docker container, you can have - the web server talk to the database and the relations between these two very easily.

- Merlijn Sebrechts, Ghent University -
-
-
-
- Epam logo -

Juju acts as a thin layer on top of your infrastructure that allows all your operational code to talk to each other. And because of this communication layer, a lot of the problems that conventional configuration management systems have just don't exist anymore.

- Konstantin Boudnik, EPAM Systems -
-
-
-
- -
-
-
-

Our case studies show how people are using Juju and JAAS

-

Read our case studies about Juju and JAAS on big data, containers, Kubernetes, public and private clouds.

- -
-
- {{ - image( - url="https://assets.ubuntu.com/v1/1d18743d-SpiculeWebinar.png", - alt="How to harness big data promo", - width="630", - height="355", - hi_def=True, - ) | safe - }} -
-
-
- - -
-
-
-

Users and contributors

-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
-
-
- - - -{% endblock content %} diff --git a/templates/jaasai/jaas.html b/templates/jaasai/jaas.html deleted file mode 100644 index 4b7ced2c..00000000 --- a/templates/jaasai/jaas.html +++ /dev/null @@ -1,169 +0,0 @@ -{% extends "_layout.html" %} - -{% set active_section = "about" %} - -{% block title %}JAAS{% endblock %} -{% block description %}JAAS gives you Juju, as a service{% endblock %} - -{% block content %} -
-
-
-

JAAS gives you Juju, as a service

-

JAAS is the best way to quickly model and deploy your cloud-based applications. Concentrate on your software and solutions with a fully managed Juju infrastructure.

- -
-
- {{ - image( - url="https://assets.ubuntu.com/v1/e7ae18b9-jaas-logos.svg", - alt="", - width="294", - height="212", - hi_def=True, - loading="eager", - ) | safe - }} -
-
-
- -
-
-
-

Hosted Juju controllers

-
    -
  • Managed by Canonical, the company behind Ubuntu
    • -
  • Highly-available, secure, multi-region infrastructure
    • -
  • 24/7 monitoring and alerting
    • -
-

Share and collaborate

-
    -
  • Identity management across all models
    • -
  • Read only mode available
    • -
-

Deploy to public clouds

-
    -
  • Use your existing credentials to deploy to any cloud
    • -
-
-
-

Pre-configured open source software

-
    -
  • All the ops knowledge required to automate the behaviour of your application
    • -
  • Reusable and repeatable workloads
    • -
  • Portable solutions across clouds
    • -
-

One view of all clouds and models

-
    -
  • All models shared and owned by you in one place
    • -
  • Monitor the status of your models at a glance
    • -
-
-
-
- -
-
-
-

Deploy Kubernetes in minutes

-

In partnership with Google, Canonical delivers a ‘pure K8s’ experience, tested across a wide range of clouds and integrated with modern metrics and monitoring.

-

The Charmed Kubernetes is for full production usage. Start using Kubernetes today.

-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/c45bb1aa-jaas5.gif", - alt="Kubernetes overview GIF", - height="354", - width="630", - hi_def=True, - attrs={"class": "p-image--shadowed"}, - loading="lazy" - ) | safe - }} -
-
-
- -
-
-
-

- Getting started -

-
-
-
-
-
    -
  • -

    - Create an Ubuntu Single Sign On identity -

    -

    JAAS uses Ubuntu SSO for identity management, so if you don’t already have an account create one at https://login.ubuntu.com

    -
    • -
  • -

    - Get cloud credentials from your provider -

    -

    JAAS deploys your workload to your - cloud of choice, so you must provide your cloud credentials for JAAS - to create and access virtual machines on your behalf. We recommend - that users generate a new set of credentials exclusively for use with - JAAS via the public cloud's IAM tools. For instructions on getting - your credentials see our credentials documentation page.

    -
    • -
  • -

    - Start modelling -

    -
    -
    On the command line:
    -
    1. Install
    -

    If you haven't installed Juju yet follow these instructions to get it running on your system.

    -
    2. Register
    -

    Register the JAAS controller with:

    -

    - 

    juju register jimm.jujucharms.com
    -

    -

    With Juju 2.2 beta and later, registration is not required. Simply:

    -

    - 

    juju login jaas
    -

    -
    -
    • -
  • -

    - Find solutions to deploy -

    -

    Hundreds of popular cloud-oriented applications such as Kubernetes, Apache Hadoop, Big Data solutions and OpenStack are available in the store as charms and bundles. New ones are added nearly every day and are regularly reviewed and updated.

    -
    • -
-
-
-
-

Visit the store

-
-
- -
-
-
-

Alternatively, you can test and deploy models on your own hardware

-

Use Juju for private cloud infrastructure or deploying onto bare metal, including:

-
    -
  • MAAS
    • -
  • Openstack
    • -
  • LXD
    • -
-

You can also deploy to public clouds including Amazon Web Services, Google Cloud Platform, Microsoft Azure, Digital Ocean and Joyent.

- Install Juju -
-
-
- -{% endblock content %} diff --git a/templates/jaasai/support.html b/templates/jaasai/support.html deleted file mode 100644 index a57e10df..00000000 --- a/templates/jaasai/support.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "_layout.html" %} - -{% block title %}Support{% endblock %} - -{% block content %} -
-
-
-

Get support

-

There are three key ways you can get help with JAAS.

-
-
-
-
-
-
-

Documention icon - Consult the documentation

-

Everything from installing, configuring and bootstrapping Juju, to writing your first charm.

-
-
-

Community icon - Ask the community

-

Post a question on our Discourse and get real-world solutions from the Juju community.

-
-
-
-
-
-
-

Issues icon - Check for known issues -

-

See if your issue has already been reported - and if it has, add more detail to get it fixed faster.

-
-
-
-{% endblock content %} diff --git a/templates/shared/_expert_partner_cta_strip.html b/templates/shared/_expert_partner_cta_strip.html deleted file mode 100644 index 78442901..00000000 --- a/templates/shared/_expert_partner_cta_strip.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
-
- Juju Expert Partners -

- If you are building your own solutions we would love to have you join us as a partner. We can’t wait to talk. -

-
-
-

Become a Partner

-
- - Join us… - -
-
-
-
diff --git a/templates/shared/_omnivector_lead-gen-form.html b/templates/shared/_omnivector_lead-gen-form.html deleted file mode 100644 index 7a68d9b1..00000000 --- a/templates/shared/_omnivector_lead-gen-form.html +++ /dev/null @@ -1,86 +0,0 @@ -
-
- -
-
- diff --git a/templates/shared/_plan-card.html b/templates/shared/_plan-card.html deleted file mode 100644 index 3ca7d1d8..00000000 --- a/templates/shared/_plan-card.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
- Managed solution -
-

Approx ${{ context.entity.supported_price }}\m

-

Default plan with standard support

-
-

{{ context.entity.supported_description|safe }}

-

Learn more about {{ context.expert.name }} support

-
diff --git a/templates/shared/_spicule_lead-gen-form.html b/templates/shared/_spicule_lead-gen-form.html deleted file mode 100644 index 91581487..00000000 --- a/templates/shared/_spicule_lead-gen-form.html +++ /dev/null @@ -1,92 +0,0 @@ -
-
- -
-
- diff --git a/templates/shared/_tengu_lead-gen-form.html b/templates/shared/_tengu_lead-gen-form.html deleted file mode 100644 index af63ee95..00000000 --- a/templates/shared/_tengu_lead-gen-form.html +++ /dev/null @@ -1,86 +0,0 @@ -
-
- -
-
- diff --git a/templates/shared/contact-card/_card.html b/templates/shared/contact-card/_card.html deleted file mode 100644 index f3988311..00000000 --- a/templates/shared/contact-card/_card.html +++ /dev/null @@ -1,65 +0,0 @@ - -
- {% block initial %}{% endblock %} -
-
-
- {% if context.expert.username == "spiculecharms" %} - - {% include "shared/_spicule_lead-gen-form.html" %} - {% elif context.expert.username == "omnivector" %} - - {% include "shared/_omnivector_lead-gen-form.html" %} - {% elif context.expert.username == "tengu-team" %} - - {% include "shared/_tengu_lead-gen-form.html" %} - {% else %} - - Show contact details… - -
- {% block contact_description %}{% endblock %} -

- - - Email icon - - {{ context.expert.website }} - -

-

- - - Email icon - - {{ context.expert.email }} - -

-

- {% for phone in context.expert.phone_numbers %} - - - Telephone icon - - {{ phone.location }} {{ phone.display }} - - {% endfor %} -

-
- {% endif %} -
-
diff --git a/templates/shared/contact-card/_entity-page.html b/templates/shared/contact-card/_entity-page.html deleted file mode 100644 index fdc928e3..00000000 --- a/templates/shared/contact-card/_entity-page.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "shared/contact-card/_card.html" %} - -{% block initial %} -
    - {% for highlight in context.expert.highlights %} -
  • {{ highlight|safe }}
    • - {% endfor %} -
-{% endblock %} - -{% block contact_description %} -

Please let us know if you have a question, or would like further information about {{ context.expert.name }}.

-{% endblock %} diff --git a/templates/shared/contact-card/_expert-page.html b/templates/shared/contact-card/_expert-page.html deleted file mode 100644 index 73b380b6..00000000 --- a/templates/shared/contact-card/_expert-page.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "shared/contact-card/_card.html" %} - -{% block initial %} -
-

Please let us know if you have a question, or would like further information about {{ context.expert.name }}.

-{% endblock %} diff --git a/templates/shared/header.html b/templates/shared/header.html deleted file mode 100644 index c8273b3b..00000000 --- a/templates/shared/header.html +++ /dev/null @@ -1,46 +0,0 @@ - diff --git a/templates/shared/store-card/_card.html b/templates/shared/store-card/_card.html deleted file mode 100644 index d4ff857f..00000000 --- a/templates/shared/store-card/_card.html +++ /dev/null @@ -1,48 +0,0 @@ -{% if not expert_card %} - {% set expert_card = {} %} -{% endif %} -
-
- {% if expert_card.invert_logo %} - {% set url = expert.logo_invert %} - {% set alt = expert.name + " logo" %} - {{ - image( - url=url, - alt=alt, - width="160", - height="80", - hi_def=False, - loading="eager", - attrs={"style": "padding: 1rem 0;"}, - ) | safe - }} - {% else %} - {% set url = expert.logo %} - {% set alt = expert.name + " logo" %} - {{ - image( - url=url, - alt=alt, - width="160", - height="80", - hi_def=False, - loading="eager", - attrs={"style": "padding: 1rem 0;"}, - ) | safe - }} - {% endif %} -
-
-
- Juju expert partners -
-

{{ expert.store_card.heading|safe }}

- diff --git a/templates/shared/store-card/_random.html b/templates/shared/store-card/_random.html deleted file mode 100644 index 56e9d20c..00000000 --- a/templates/shared/store-card/_random.html +++ /dev/null @@ -1,7 +0,0 @@ -{% set random_promo = range(1, 3) | random %} -{% if random_promo == 1 %} - {% set expert = context.experts['spiculecharms'] %} -{% elif random_promo == 2 %} - {% set expert = context.experts['omnivector'] %} -{% endif %} -{% include "shared/store-card/_card.html" %} diff --git a/tests/jaasai/test_views.py b/tests/jaasai/test_views.py index f62ce1a7..68d1f27b 100644 --- a/tests/jaasai/test_views.py +++ b/tests/jaasai/test_views.py @@ -1,7 +1,5 @@ -import json from flask import url_for from flask_testing import TestCase -from unittest.mock import patch, MagicMock from webapp.app import create_app @@ -16,17 +14,7 @@ def create_app(self): def test_static_pages(self): pages = [ - "community_partners", - "community", - "experts_spicule", - "experts_tengu", - "experts_thanks", - "experts", - "getting_started", - "how_it_works", "index", - "jaas", - "support", ] for page in pages: url = url_for("jaasai.{}".format(page)) @@ -34,29 +22,3 @@ def test_static_pages(self): self.assertEqual( response.status_code, 200, "For page: {}".format(url) ) - - @patch("webapp.jaasai.views.session.get") - def test_blog_feed(self, mock_get): - feed = "Post" - mock_get.return_value = MagicMock(text=feed) - response = self.client.get(url_for("jaasai.blog_feed")) - posts = json.loads(response.data) - self.assertEqual(len(posts), 1) - self.assertEqual(posts[0]["title"], "Post") - - @patch("webapp.jaasai.views.session.get") - def test_blog_feed_limit_results(self, mock_get): - feed = ( - "Post" - "Post" - "Post" - ) - mock_get.return_value = MagicMock(text=feed) - response = self.client.get(url_for("jaasai.blog_feed")) - self.assertEqual(len(json.loads(response.data)), 2) - - @patch("webapp.jaasai.views.session.get") - def test_blog_feed_invalid(self, mock_get): - mock_get.return_value = MagicMock(text="") - response = self.client.get(url_for("jaasai.blog_feed")) - self.assertEqual(json.loads(response.data), []) diff --git a/webapp/app.py b/webapp/app.py index ae3c2bfd..01a82460 100644 --- a/webapp/app.py +++ b/webapp/app.py @@ -2,7 +2,6 @@ import datetime import talisker -from canonicalwebteam.blog import build_blueprint, BlogViews, BlogAPI from canonicalwebteam.flask_base.app import FlaskBase from canonicalwebteam.yaml_responses.flask_helpers import ( prepare_deleted, @@ -10,7 +9,6 @@ ) from canonicalwebteam import image_template -from webapp.external_urls import external_urls from webapp.handlers import add_headers from webapp.jaasai.views import jaasai from webapp.template_utils import current_url_with_query, static_url @@ -34,20 +32,6 @@ def create_app(testing=False): ) app.before_request(prepare_deleted()) - blog_views = BlogViews( - api=BlogAPI( - session=session, - thumbnail_width=354, - thumbnail_height=180, - ), - blog_title="JAAS Case Studies", - tag_ids=[3513], - feed_description="Case Studies from happy JAAS users", - ) - app.register_blueprint( - build_blueprint(blog_views), url_prefix="/case-studies" - ) - # Handlers # === @app.errorhandler(404) @@ -81,32 +65,6 @@ def gone(error): # === app.register_blueprint(jaasai) - # Dashboard and redirect views - # === - @app.route("/models") - @app.route("/models/") - @app.route("/controllers") - @app.route("/controllers/") - def dashboard_index(path=None): - """ - Send /models and /controllers to the index page - """ - - return flask.render_template("dashboard/index.html") - - @app.route("/config.js") - @app.route("/manifest.json") - @app.route("/version.json") - @app.route("/ghost-bundle.svg") - def dashboard_files(): - """ - Load dashboard files directly - """ - return flask.send_from_directory( - "../templates/dashboard", - flask.request.path.strip("/"), - ) - @app.route("/q/") @app.route("/q/") def search_redirect(path=None): @@ -148,7 +106,6 @@ def pluralize_filter(count): def inject_utilities(): return { "current_url_with_query": current_url_with_query, - "external_urls": external_urls, "static_url": static_url, } diff --git a/webapp/experts.py b/webapp/experts.py deleted file mode 100644 index 0a51bdf5..00000000 --- a/webapp/experts.py +++ /dev/null @@ -1,89 +0,0 @@ -from flask import url_for - - -def get_experts(expert=None): - """Generate the expert definitions. This needs to be done in a function so - that it can be called when the app context is available. This is so - that the url_for() methods work. - :param expert: A optional expert. If provided this method will only - return that expert. - :returns: One or all experts. - """ - experts = { - "omnivector": { - "name": "Omnivector", - "username": "omnivector", - "page_url": url_for("jaasai.experts_omnivector"), - "logo": ( - "https://assets.ubuntu.com/v1/" - "9681b99c-OV+Logo+Horiz+3color.svg" - ), - "logo_invert": ( - "https://assets.ubuntu.com/v1/" - "9681b99c-OV+Logo+Horiz+3color.svg" - ), - "highlights": [ - "Workflow solutions that enable enterprise processing" - + " at scale", - "Distributed processing and storage platform architecture", - "DevOPS/DataOPS design and implementation", - "Data processing and batch enrichment", - ], - "website": "https://www.omnivector.solutions", - "email": "info@omnivector.solutions", - "phone_numbers": [ - { - "number": "+14134897005", - "display": "+1 (413) 489 7005", - "location": "USA", - } - ], - "store_card": { - "heading": ("Smart, Flexible, Scalable. No strings attached."), - "button_label": "Big data experts", - }, - }, - "spiculecharms": { - "name": "Spicule", - "username": "spiculecharms", - "page_url": url_for("jaasai.experts_spicule"), - "logo": ( - "https://assets.ubuntu.com/v1/" - "c7881d6c-spiculelogo-spacingx2-01.svg" - ), - "logo_invert": ( - "https://assets.ubuntu.com/v1/" - "cdad8056-spiculelogo-white.svg" - ), - "highlights": [ - "Spicule’s solutions can solve your Big Data challenges", - "Supported analytics", - "Streaming data platforms", - ], - "website": "http://www.spicule.co.uk", - "email": "info@spicule.co.uk", - "phone_numbers": [ - { - "number": "+441603327762", - "display": "+44 (0) 1603 327762", - "location": "UK", - }, - { - "number": "+18448141689", - "display": "+1 (0) 8448 141689", - "location": "USA", - }, - ], - "store_card": { - "heading": ( - "Spicule’s solutions can solve your Big Data " - "challenge." - ), - "button_label": "Big data experts", - }, - }, - } - if expert: - return experts.get(expert) - else: - return experts diff --git a/webapp/external_urls.py b/webapp/external_urls.py index 6bd2c8c7..23744950 100644 --- a/webapp/external_urls.py +++ b/webapp/external_urls.py @@ -1,9 +1,4 @@ external_urls = { - "discourse": "https://discourse.charmhub.io/", - "blog": "https://juju.is/blog", - "charmstore": "https://api.jujucharms.com/charmstore/v5/", - "gui": "https://jujucharms.com/new/", - "issues": "https://github.com/canonical-web-and-design/jaas.ai/issues", - "freenode": "http://webchat.freenode.net/?channels=%23juju", + "issues": "https://github.com/canonical/jaas.ai/issues", "docs": "https://juju.is/docs", } diff --git a/webapp/jaasai/views.py b/webapp/jaasai/views.py index d578d79b..807dec35 100644 --- a/webapp/jaasai/views.py +++ b/webapp/jaasai/views.py @@ -1,17 +1,12 @@ -import feedparser -import os - import talisker.requests from flask import ( Blueprint, current_app, - jsonify, make_response, render_template, request, send_from_directory, ) -from webapp.experts import get_experts jaasai = Blueprint( "jaasai", __name__, template_folder="/templates", static_folder="/static" @@ -22,100 +17,7 @@ @jaasai.route("/") def index(): - return render_template( - "jaasai/index.html", context={"experts": get_experts()} - ) - - -@jaasai.route("/how-it-works") -def how_it_works(): - return render_template("jaasai/how-it-works.html") - - -@jaasai.route("/getting-started") -def getting_started(): - return render_template("jaasai/jaas.html") - - -@jaasai.route("/jaas") -def jaas(): - return render_template("jaasai/jaas.html") - - -@jaasai.route("/experts") -def experts(): - return render_template( - "jaasai/experts.html", context={"experts": get_experts()} - ) - - -@jaasai.route("/experts/spicule") -def experts_spicule(): - EXPERTS_RETURN = os.environ.get( - "EXPERTS_RETURN", default="https://jaas.ai" - ) - return render_template( - "jaasai/experts/spicule.html", - expertThanksPage=EXPERTS_RETURN, - context={"expert": get_experts("spiculecharms")}, - ) - - -@jaasai.route("/experts/tengu") -def experts_tengu(): - EXPERTS_RETURN = os.environ.get( - "EXPERTS_RETURN", default="https://jaas.ai" - ) - return render_template( - "jaasai/experts/tengu.html", - expertThanksPage=EXPERTS_RETURN, - context={"expert": get_experts("tengu-team")}, - ) - - -@jaasai.route("/experts/omnivector") -def experts_omnivector(): - EXPERTS_RETURN = os.environ.get( - "EXPERTS_RETURN", default="https://jaas.ai" - ) - return render_template( - "jaasai/experts/omnivector.html", - expertThanksPage=EXPERTS_RETURN, - context={"expert": get_experts("omnivector")}, - ) - - -@jaasai.route("/experts/thanks") -def experts_thanks(): - return render_template("jaasai/experts/thanks.html") - - -@jaasai.route("/community") -def community(): - return render_template("jaasai/community.html") - - -@jaasai.route("/community/partners") -def community_partners(): - return render_template("jaasai/community/partners.html") - - -@jaasai.route("/support") -def support(): - return render_template("jaasai/support.html") - - -@jaasai.route("/blog/feed") -def blog_feed(): - feed_url = "https://admin.insights.ubuntu.com/tag/juju/feed" - response = session.get(feed_url) - feed = feedparser.parse(response.text) - response = None - if feed.bozo == 1: - response = {"error": feed.bozo_exception.getMessage()} - else: - response = feed.entries[:2] - return jsonify(response) + return render_template("index.html") @jaasai.route("/robots.txt") @@ -125,7 +27,6 @@ def assets_from_root(): def set_xml_content_type(path, context={}): - print(context) xml = render_template(path, context=context) response = make_response(xml) response.headers["Content-Type"] = "application/xml" @@ -139,20 +40,7 @@ def sitemap(): @jaasai.route("/sitemap-base.xml") def sitemap_base(): - context = { - "pages": [ - "jaasai.community_partners", - "jaasai.community", - "jaasai.experts_spicule", - "jaasai.experts_tengu", - "jaasai.experts_thanks", - "jaasai.experts", - "jaasai.getting_started", - "jaasai.how_it_works", - "jaasai.jaas", - "jaasai.support", - ] - } + context = {"pages": []} return set_xml_content_type("sitemaps/sitemap-base.xml", context) diff --git a/webpack.config.entry.js b/webpack.config.entry.js index 9198f9b7..b3d27a13 100644 --- a/webpack.config.entry.js +++ b/webpack.config.entry.js @@ -1,5 +1,3 @@ module.exports = { - app: './static/js/src/app.js', - 'instant-page': './static/js/src/libs/instant-page/instantpage.js', - 'latest-news': './static/js/src/latest-news.js', + app: './static/js/src/app.js' }; diff --git a/yarn.lock b/yarn.lock index 9cf3b2ca..4b221733 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1534,32 +1534,17 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@canonical/cookie-policy@3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.3.0.tgz#99df0aad2bf01c43e0a6d524b062ebc6066a3121" - integrity sha512-G4u2dr04t138BoIsdbnVsL5i2vBl3supgqkAG03AfvAIbbkt1QlIlodGtrv0s3sczmUTEiSNfmT3iC70GY0Suw== - "@canonical/cookie-policy@3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.4.0.tgz#0d6708da340df5867fd2cc9dbd95538c46f20cf8" integrity sha512-cdVqxQmGu+j+Q86UobihWWVFzGzHlekFeMFxlbRpm+yqxEOUCrLkA9/t/RsMfLNDToP2ECPgsMbS20aPlA2tIg== -"@canonical/global-nav@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@canonical/global-nav/-/global-nav-2.7.0.tgz#6a61cba769a367c984b89bb7c4286a674f88354a" - integrity sha512-jepwipTPIlceeHMvLSC8mafziknvhefr0SNCvSWMOdkPnZC28Rd45wBahfnEJ7THi4qt9xkZ99I+xHuJVKfpOA== +"@canonical/global-nav@3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@canonical/global-nav/-/global-nav-3.6.0.tgz#5edf3b0fb51c18ab6a3df533ce60f03596fab28a" + integrity sha512-QkuKIZTrZemW9gQRKCSBjdFkL+iHH/yHyIGIk5F9u+6yuvFZO8d6RkzjxyhBMuT22ljlLqv8E1naYjHp449cvg== dependencies: - vanilla-framework "3.0.1" - -"@canonical/latest-news@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@canonical/latest-news/-/latest-news-1.3.0.tgz#14fcd8a80051eb65fb274a0cec086e9aca3f19f0" - integrity sha512-VwGcZo9LGzdeQ/sKt+5TQttIibTxjZEpsEtuWbbsacbqqzqVfqZhDsZkkg/7WNxKQ2lpnyq+4mLT70u9YbYSYA== - -"@canonical/latest-news@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@canonical/latest-news/-/latest-news-1.4.1.tgz#dcdd445ac2268a54cf60f2f8c725b6bdeb285d71" - integrity sha512-lwrikCj0Y11X8Ln8D+elp6Ri3mYjMjsAOJtadNEFzhBrgmg8TVGYJjOdwy8TvRaxy7fHnvVajIKAYWX44Tfj6w== + vanilla-framework "4.0.0" "@cnakazawa/watch@^1.0.3": version "1.0.4" @@ -2452,11 +2437,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" @@ -2524,18 +2504,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@10.4.1: - version "10.4.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.1.tgz#1735959d6462420569bc42408016acbc56861c12" - integrity sha512-B3ZEG7wtzXDRCEFsan7HmR2AeNsxdJB0+sEC0Hc5/c2NbhJqPwuZm+tn233GBVw82L+6CtD6IPSfVruwKjfV3A== - dependencies: - browserslist "^4.19.1" - caniuse-lite "^1.0.30001294" - fraction.js "^4.1.2" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - autoprefixer@10.4.13: version "10.4.13" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" @@ -2763,7 +2731,7 @@ browserslist@^4.12.0, browserslist@^4.14.5: escalade "^3.1.1" node-releases "^1.1.71" -browserslist@^4.19.1, browserslist@^4.21.3, browserslist@^4.21.4: +browserslist@^4.21.3, browserslist@^4.21.4: version "4.21.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== @@ -2845,7 +2813,7 @@ caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz#d9250155c91e872186671c523f3ae50cfc94a3aa" integrity sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA== -caniuse-lite@^1.0.30001294, caniuse-lite@^1.0.30001400: +caniuse-lite@^1.0.30001400: version "1.0.30001418" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz#5f459215192a024c99e3e3a53aac310fc7cf24e6" integrity sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg== @@ -3005,15 +2973,6 @@ cliui@^7.0.0: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -3335,11 +3294,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -dependency-graph@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" - integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== - dependency-graph@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.9.0.tgz#11aed7e203bc8b00f48356d92db27b265c445318" @@ -3978,7 +3932,7 @@ fast-glob@^3.2.5: micromatch "^4.0.2" picomatch "^2.2.1" -fast-glob@^3.2.7, fast-glob@^3.2.9: +fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -4105,7 +4059,7 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -fraction.js@^4.1.2, fraction.js@^4.2.0: +fraction.js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== @@ -4117,15 +4071,6 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fs-extra@^10.0.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" @@ -4231,11 +4176,6 @@ get-stdin@^8.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== -get-stdin@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575" - integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA== - get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -4362,18 +4302,6 @@ globby@^11.0.3: merge2 "^1.4.1" slash "^3.0.0" -globby@^12.0.0: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== - dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" - merge2 "^1.4.1" - slash "^4.0.0" - globjoin@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" @@ -4614,7 +4542,7 @@ ignore@^5.1.8: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -ignore@^5.1.9, ignore@^5.2.0: +ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -4692,11 +4620,6 @@ ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -instant.page@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/instant.page/-/instant.page-5.1.1.tgz#4d8e25a8a6f119f1b76db4e759ffb94976ff71a0" - integrity sha512-7FhcXQ+FSUjN8pqBFVDbwJwcXsV6mPLmQosdb1FYbZGaL9TWUPg08yHaK2RdmgnkJ6lPzEp4T3Opx/HcFDUbRQ== - internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -6057,7 +5980,7 @@ ms@2.1.2, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nanoid@^3.1.30, nanoid@^3.3.4: +nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -6506,24 +6429,6 @@ postcss-cli@8.3.1: slash "^3.0.0" yargs "^16.0.0" -postcss-cli@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-9.1.0.tgz#1a86404cbe848e370127b4bdf5cd2be83bc45ebe" - integrity sha512-zvDN2ADbWfza42sAnj+O2uUWyL0eRL1V+6giM2vi4SqTR3gTYy8XzcpfwccayF2szcUif0HMmXiEaDv9iEhcpw== - dependencies: - chokidar "^3.3.0" - dependency-graph "^0.11.0" - fs-extra "^10.0.0" - get-stdin "^9.0.0" - globby "^12.0.0" - picocolors "^1.0.0" - postcss-load-config "^3.0.0" - postcss-reporter "^7.0.0" - pretty-hrtime "^1.0.3" - read-cache "^1.0.0" - slash "^4.0.0" - yargs "^17.0.0" - postcss-html@^0.36.0: version "0.36.0" resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204" @@ -6631,15 +6536,6 @@ postcss@8.4.21: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@8.4.5: - version "8.4.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" - integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== - dependencies: - nanoid "^3.1.30" - picocolors "^1.0.0" - source-map-js "^1.0.1" - postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" @@ -7144,15 +7040,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass@1.45.2: - version "1.45.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.2.tgz#130b428c1692201cfa181139835d6fc378a33323" - integrity sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - sass@1.57.1: version "1.57.1" resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5" @@ -7285,11 +7172,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - slice-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" @@ -7329,7 +7211,7 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -8123,11 +8005,6 @@ universalify@^1.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -8203,22 +8080,15 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vanilla-framework@2.37.1: - version "2.37.1" - resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-2.37.1.tgz#4063fb21aa3b9c99e0ada4a052326b24df1ee06e" - integrity sha512-GEV/9BHfGnCeTpycdrT976uX0WGdKHnDOAwtaTuZZW6zwM+M/Za+E2q0yTpvoldzWtpksiFIIAk2VCuKjfjaqA== +vanilla-framework@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.0.0.tgz#a2fee9bd9763ebd6932b764f9d66484dc177d4cc" + integrity sha512-fiPnmaTUe15l5MRNJ6IsiJ8qiunfmgtLETOFltaYiE/bQKL7xTI+riBak2iygBKeF1y0Gi/GxUNt4hyb6xDPKA== -vanilla-framework@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.0.1.tgz#16a7f19ccb24f6b3885b6d176b5754113e4d9c0d" - integrity sha512-KwZ0wZCbNhEjuTb50BkAX2frWwNjtgmKRcQEDHOQFNuEweDUT2O1E0ps2GLHv7lSOVxli1jQv56VvIBEr0+lqw== - dependencies: - "@canonical/cookie-policy" "3.3.0" - "@canonical/latest-news" "1.3.0" - autoprefixer "10.4.1" - postcss "8.4.5" - postcss-cli "9.1.0" - sass "1.45.2" +vanilla-framework@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.3.0.tgz#44850ba1e568646bd1144de25628f63758d749ce" + integrity sha512-CDFgUX7MMp3ZJoiE8nif/uSPD3YPaK0lWm8iru9tgIO/SloWzkGvG2G5NPllDnwF4cMMi7YxsK/ylz7mH7OgZA== verbalize@^0.1.2: version "0.1.2" @@ -8506,11 +8376,6 @@ y18n@^5.0.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.2.tgz#48218df5da2731b4403115c39a1af709c873f829" integrity sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA== -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" @@ -8552,11 +8417,6 @@ yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@^21.0.0: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -8603,19 +8463,6 @@ yargs@^16.0.0: y18n "^5.0.1" yargs-parser "^20.0.0" -yargs@^17.0.0: - version "17.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" - integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.0.0" - zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"