Matthew Sevey
|
67c3fd1cf3
|
refactor functions and address comments
|
2022-04-27 15:40:31 -04:00 |
Matthew Sevey
|
084c12fde4
|
Merge branch 'master' into sevey/add-skylink-health-check
|
2022-04-26 16:50:54 -04:00 |
Matthew Sevey
|
4455c4929b
|
Apply suggestions from code review
Co-authored-by: Karol Wypchło <kwypchlo@gmail.com>
|
2022-04-26 16:50:42 -04:00 |
firyx
|
82cc22f367
|
Fix dashboard-v2 Dockerfile context (#2051)
|
2022-04-26 16:39:35 +02:00 |
Karol Wypchlo
|
1c1615cd5f
|
convert CMD into JSON notation
|
2022-04-22 14:49:58 +02:00 |
Karol Wypchlo
|
5bde83fc19
|
use multi stage build for website to slim down the image
|
2022-04-22 14:45:44 +02:00 |
Ivaylo Novakov
|
36e5cbbdd5
|
Merge pull request #2040 from SkynetLabs/use-dashboard-image
use dashboard dockerhub image
|
2022-04-22 13:36:19 +02:00 |
Karol Wypchlo
|
de7e7879b7
|
use dashboard dockerhub image
|
2022-04-21 10:48:53 +02:00 |
dependabot[bot]
|
abf202ca54
|
build(deps): bump express-jwt from 6.1.1 to 6.1.2 in /packages/dashboard
Bumps [express-jwt](https://github.com/auth0/express-jwt) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/auth0/express-jwt/releases)
- [Changelog](https://github.com/auth0/express-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/express-jwt/compare/v6.1.1...v6.1.2)
---
updated-dependencies:
- dependency-name: express-jwt
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-20 15:05:11 +00:00 |
Matthew Sevey
|
68aa83405f
|
add large file check
|
2022-04-19 16:59:21 -04:00 |
Michał Leszczyk
|
f433287bb6
|
Dashboard v2 - fixes + publishing under /v2 path (#2008)
* fix(dashboard-v2): fix current usage graph on portals without Stripe configured
* ops(dashboard-v2): publish new dashboard under /v2 prefix
* ops(dashboard-v2): fix SkynetClient on multi-server portals
* fix(dashboard-v2): fix skylinks validation for sponsor keys
* ops(dashboard-v2): don't actually launch the new dashboard yet :)
* chore(dashboard-v2): cleanup console.log call
* fix(dashboard-v2): always set portal domain for SkynetClient
|
2022-04-19 13:16:57 +02:00 |
dependabot[bot]
|
fe227f4449
|
build(deps): bump stripe from 8.217.0 to 8.218.0 in /packages/dashboard
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.217.0 to 8.218.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.217.0...v8.218.0)
---
updated-dependencies:
- dependency-name: stripe
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:59:57 +00:00 |
Karol Wypchło
|
a5109404ab
|
Merge pull request #2035 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-transformer-yaml-4.12.1
build(deps): bump gatsby-transformer-yaml from 4.11.0 to 4.12.1 in /packages/website
|
2022-04-19 11:53:51 +02:00 |
dependabot[bot]
|
316eb3bef9
|
build(deps): bump gatsby-source-filesystem in /packages/website
Bumps [gatsby-source-filesystem](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-source-filesystem) from 4.10.1 to 4.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-filesystem/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@4.12.1/packages/gatsby-source-filesystem)
---
updated-dependencies:
- dependency-name: gatsby-source-filesystem
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:47:08 +00:00 |
dependabot[bot]
|
1132429035
|
build(deps): bump gatsby-transformer-yaml in /packages/website
Bumps [gatsby-transformer-yaml](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-transformer-yaml) from 4.11.0 to 4.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-transformer-yaml/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-transformer-yaml@4.12.1/packages/gatsby-transformer-yaml)
---
updated-dependencies:
- dependency-name: gatsby-transformer-yaml
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:46:26 +00:00 |
Karol Wypchło
|
5599ecb61e
|
Merge pull request #2034 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-plugin-sitemap-5.12.1
build(deps): bump gatsby-plugin-sitemap from 5.11.1 to 5.12.1 in /packages/website
|
2022-04-19 11:43:40 +02:00 |
dependabot[bot]
|
3d6f5b57ea
|
build(deps): bump gatsby-plugin-sitemap in /packages/website
Bumps [gatsby-plugin-sitemap](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-plugin-sitemap) from 5.11.1 to 5.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-plugin-sitemap/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-sitemap@5.12.1/packages/gatsby-plugin-sitemap)
---
updated-dependencies:
- dependency-name: gatsby-plugin-sitemap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:39:06 +00:00 |
Karol Wypchło
|
85cb084a77
|
Merge pull request #2029 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-plugin-react-helmet-5.12.1
build(deps): bump gatsby-plugin-react-helmet from 5.10.0 to 5.12.1 in /packages/website
|
2022-04-19 11:36:49 +02:00 |
Karol Wypchło
|
a91c5d9dc7
|
Merge pull request #2031 from SkynetLabs/dependabot/npm_and_yarn/packages/website/swr-1.3.0
build(deps): bump swr from 1.2.2 to 1.3.0 in /packages/website
|
2022-04-19 11:36:38 +02:00 |
Karol Wypchło
|
75752862db
|
Merge pull request #2033 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-transformer-sharp-4.12.1
build(deps): bump gatsby-transformer-sharp from 4.10.0 to 4.12.1 in /packages/website
|
2022-04-19 11:36:02 +02:00 |
Karol Wypchło
|
85209e02e8
|
Merge pull request #2030 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-plugin-manifest-4.12.1
build(deps): bump gatsby-plugin-manifest from 4.11.1 to 4.12.1 in /packages/website
|
2022-04-19 11:35:51 +02:00 |
dependabot[bot]
|
8736e1ff31
|
build(deps): bump gatsby-transformer-sharp in /packages/website
Bumps [gatsby-transformer-sharp](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-transformer-sharp) from 4.10.0 to 4.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-transformer-sharp/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-transformer-sharp@4.12.1/packages/gatsby-transformer-sharp)
---
updated-dependencies:
- dependency-name: gatsby-transformer-sharp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:29:59 +00:00 |
dependabot[bot]
|
8dca68f154
|
build(deps-dev): bump cypress from 9.5.2 to 9.5.4 in /packages/website
Bumps [cypress](https://github.com/cypress-io/cypress) from 9.5.2 to 9.5.4.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js)
- [Commits](https://github.com/cypress-io/cypress/compare/v9.5.2...v9.5.4)
---
updated-dependencies:
- dependency-name: cypress
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:28:59 +00:00 |
dependabot[bot]
|
409406832f
|
build(deps): bump swr from 1.2.2 to 1.3.0 in /packages/website
Bumps [swr](https://github.com/vercel/swr) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/vercel/swr/releases)
- [Commits](https://github.com/vercel/swr/compare/1.2.2...1.3.0)
---
updated-dependencies:
- dependency-name: swr
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:28:42 +00:00 |
dependabot[bot]
|
455fce5511
|
build(deps): bump gatsby-plugin-manifest in /packages/website
Bumps [gatsby-plugin-manifest](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-plugin-manifest) from 4.11.1 to 4.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-plugin-manifest/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-manifest@4.12.1/packages/gatsby-plugin-manifest)
---
updated-dependencies:
- dependency-name: gatsby-plugin-manifest
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:28:30 +00:00 |
dependabot[bot]
|
3973cfc057
|
build(deps): bump gatsby-plugin-react-helmet in /packages/website
Bumps [gatsby-plugin-react-helmet](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-plugin-react-helmet) from 5.10.0 to 5.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-plugin-react-helmet/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-react-helmet@5.12.1/packages/gatsby-plugin-react-helmet)
---
updated-dependencies:
- dependency-name: gatsby-plugin-react-helmet
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:27:29 +00:00 |
Karol Wypchło
|
218b0046cf
|
Merge pull request #2019 from SkynetLabs/dependabot/npm_and_yarn/packages/website/skynet-js-4.1.0
build(deps): bump skynet-js from 4.0.26-beta to 4.1.0 in /packages/website
|
2022-04-19 11:15:35 +02:00 |
Karol Wypchło
|
04110bce0a
|
Merge pull request #2014 from SkynetLabs/dependabot/npm_and_yarn/packages/health-check/skynet-js-4.1.0
build(deps): bump skynet-js from 4.0.19-beta to 4.1.0 in /packages/health-check
|
2022-04-19 11:15:24 +02:00 |
dependabot[bot]
|
9441c6d2e8
|
build(deps): bump skynet-js in /packages/website
Bumps [skynet-js](https://github.com/SkynetLabs/skynet-js) from 4.0.26-beta to 4.1.0.
- [Release notes](https://github.com/SkynetLabs/skynet-js/releases)
- [Changelog](https://github.com/SkynetLabs/skynet-js/blob/master/CHANGELOG-BETA.md)
- [Commits](https://github.com/SkynetLabs/skynet-js/compare/v4.0.26-beta...v4.1.0)
---
updated-dependencies:
- dependency-name: skynet-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:10:53 +00:00 |
Karol Wypchło
|
4b49d8a84f
|
Merge pull request #2026 from SkynetLabs/dependabot/npm_and_yarn/packages/dashboard/stripe/react-stripe-js-1.7.2
build(deps): bump @stripe/react-stripe-js from 1.7.1 to 1.7.2 in /packages/dashboard
|
2022-04-19 11:09:54 +02:00 |
Karol Wypchło
|
7bf00b27ea
|
Merge pull request #2027 from SkynetLabs/dependabot/npm_and_yarn/packages/dashboard/tailwindcss-3.0.24
build(deps-dev): bump tailwindcss from 3.0.23 to 3.0.24 in /packages/dashboard
|
2022-04-19 11:09:43 +02:00 |
dependabot[bot]
|
31cf7445b6
|
build(deps): bump skynet-js in /packages/health-check
Bumps [skynet-js](https://github.com/SkynetLabs/skynet-js) from 4.0.19-beta to 4.1.0.
- [Release notes](https://github.com/SkynetLabs/skynet-js/releases)
- [Changelog](https://github.com/SkynetLabs/skynet-js/blob/master/CHANGELOG-BETA.md)
- [Commits](https://github.com/SkynetLabs/skynet-js/compare/v4.0.19-beta...v4.1.0)
---
updated-dependencies:
- dependency-name: skynet-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:07:55 +00:00 |
Karol Wypchło
|
8201536e65
|
Merge pull request #2020 from SkynetLabs/dependabot/npm_and_yarn/packages/dashboard/next-12.1.5
build(deps): bump next from 12.1.4 to 12.1.5 in /packages/dashboard
|
2022-04-19 11:07:14 +02:00 |
dependabot[bot]
|
07f56fad02
|
build(deps-dev): bump tailwindcss in /packages/dashboard
Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.23 to 3.0.24.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.0.23...v3.0.24)
---
updated-dependencies:
- dependency-name: tailwindcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:07:12 +00:00 |
Karol Wypchło
|
1288e4cb91
|
Merge pull request #2021 from SkynetLabs/dependabot/npm_and_yarn/packages/dashboard/dayjs-1.11.1
build(deps): bump dayjs from 1.11.0 to 1.11.1 in /packages/dashboard
|
2022-04-19 11:07:01 +02:00 |
Karol Wypchło
|
b1d9698974
|
Merge pull request #2016 from SkynetLabs/dependabot/npm_and_yarn/packages/website/nanoid-3.3.3
build(deps): bump nanoid from 3.3.2 to 3.3.3 in /packages/website
|
2022-04-19 11:06:53 +02:00 |
dependabot[bot]
|
35df124ccc
|
build(deps): bump @stripe/react-stripe-js in /packages/dashboard
Bumps [@stripe/react-stripe-js](https://github.com/stripe/react-stripe-js) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/stripe/react-stripe-js/releases)
- [Changelog](https://github.com/stripe/react-stripe-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/react-stripe-js/compare/v1.7.1...v1.7.2)
---
updated-dependencies:
- dependency-name: "@stripe/react-stripe-js"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-19 09:06:51 +00:00 |
Karol Wypchło
|
19a87b44ef
|
Merge pull request #2017 from SkynetLabs/dependabot/npm_and_yarn/packages/website/framer-motion-6.3.0
build(deps): bump framer-motion from 6.2.10 to 6.3.0 in /packages/website
|
2022-04-19 11:06:43 +02:00 |
Karol Wypchło
|
570914253e
|
Merge pull request #2015 from SkynetLabs/dependabot/npm_and_yarn/packages/website/gatsby-plugin-image-2.12.1
build(deps): bump gatsby-plugin-image from 2.11.1 to 2.12.1 in /packages/website
|
2022-04-19 11:06:25 +02:00 |
Karol Wypchło
|
cb5a9bd12b
|
Merge pull request #2018 from SkynetLabs/dependabot/npm_and_yarn/packages/website/polished-4.2.2
build(deps): bump polished from 4.2.1 to 4.2.2 in /packages/website
|
2022-04-19 11:06:11 +02:00 |
Karol Wypchło
|
3ebb4383a0
|
Merge pull request #2022 from SkynetLabs/dependabot/npm_and_yarn/packages/dashboard/eslint-config-next-12.1.5
build(deps-dev): bump eslint-config-next from 12.1.4 to 12.1.5 in /packages/dashboard
|
2022-04-19 11:06:02 +02:00 |
dependabot[bot]
|
dac20c400c
|
build(deps): bump stripe from 8.216.0 to 8.217.0 in /packages/dashboard
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.216.0 to 8.217.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.216.0...v8.217.0)
---
updated-dependencies:
- dependency-name: stripe
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:16:06 +00:00 |
dependabot[bot]
|
67f798a0dd
|
build(deps-dev): bump eslint-config-next in /packages/dashboard
Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 12.1.4 to 12.1.5.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/commits/v12.1.5/packages/eslint-config-next)
---
updated-dependencies:
- dependency-name: eslint-config-next
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:15:44 +00:00 |
dependabot[bot]
|
de824d5c35
|
build(deps): bump dayjs from 1.11.0 to 1.11.1 in /packages/dashboard
Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/iamkun/dayjs/releases)
- [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/iamkun/dayjs/compare/v1.11.0...v1.11.1)
---
updated-dependencies:
- dependency-name: dayjs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:15:28 +00:00 |
dependabot[bot]
|
075f1aa113
|
build(deps): bump next from 12.1.4 to 12.1.5 in /packages/dashboard
Bumps [next](https://github.com/vercel/next.js) from 12.1.4 to 12.1.5.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v12.1.4...v12.1.5)
---
updated-dependencies:
- dependency-name: next
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:15:15 +00:00 |
dependabot[bot]
|
48067ac101
|
build(deps): bump polished from 4.2.1 to 4.2.2 in /packages/website
Bumps [polished](https://github.com/styled-components/polished) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/styled-components/polished/releases)
- [Commits](https://github.com/styled-components/polished/compare/v4.2.1...v4.2.2)
---
updated-dependencies:
- dependency-name: polished
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:14:13 +00:00 |
dependabot[bot]
|
4eb5683168
|
build(deps): bump framer-motion in /packages/website
Bumps [framer-motion](https://github.com/framer/motion) from 6.2.10 to 6.3.0.
- [Release notes](https://github.com/framer/motion/releases)
- [Changelog](https://github.com/framer/motion/blob/main/CHANGELOG.md)
- [Commits](https://github.com/framer/motion/compare/v6.2.10...v6.3.0)
---
updated-dependencies:
- dependency-name: framer-motion
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:14:02 +00:00 |
dependabot[bot]
|
b9046189e2
|
build(deps): bump nanoid from 3.3.2 to 3.3.3 in /packages/website
Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.3.2...3.3.3)
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:13:50 +00:00 |
dependabot[bot]
|
7863faa701
|
build(deps): bump gatsby-plugin-image in /packages/website
Bumps [gatsby-plugin-image](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/gatsby-plugin-image) from 2.11.1 to 2.12.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-plugin-image/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-image@2.12.1/packages/gatsby-plugin-image)
---
updated-dependencies:
- dependency-name: gatsby-plugin-image
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-18 12:13:40 +00:00 |
Matthew Sevey
|
ec7c31ff76
|
Add some comments
|
2022-04-15 14:43:39 -04:00 |