diff --git a/package.json b/package.json index b6c9857d..cf813a9c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@docusaurus/preset-classic": "2.1.0", "@headlessui/react": "^1.7.3", "@heroicons/react": "^2.0.12", + "@leenguyen/react-flip-clock-countdown": "^1.3.1", "@mdx-js/react": "^1.6.22", "autoprefixer": "^10.4.12", "dotenv": "^16.0.3", @@ -26,7 +27,7 @@ "postcss": "^8.4.18", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-icons": "^4.4.0", + "react-icons": "^4.6.0", "react-responsive-carousel": "^3.2.23", "swr": "^1.3.0", "tailwindcss": "^3.1.8", @@ -38,10 +39,9 @@ "@meshtastic/eslint-config": "^1.0.8", "@tailwindcss/typography": "^0.5.7", "@tsconfig/docusaurus": "^1.0.6", - "@types/node": "^18.8.5", + "@types/node": "^18.11.0", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", - "@types/w3c-web-serial": "^1.0.2", "prettier": "^2.7.1", "typescript": "^4.8.4" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8691c8f6..be376f1a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,14 +8,14 @@ specifiers: '@docusaurus/preset-classic': 2.1.0 '@headlessui/react': ^1.7.3 '@heroicons/react': ^2.0.12 + '@leenguyen/react-flip-clock-countdown': ^1.3.1 '@mdx-js/react': ^1.6.22 '@meshtastic/eslint-config': ^1.0.8 '@tailwindcss/typography': ^0.5.7 '@tsconfig/docusaurus': ^1.0.6 - '@types/node': ^18.8.5 + '@types/node': ^18.11.0 '@types/react': ^18.0.21 '@types/react-dom': ^18.0.6 - '@types/w3c-web-serial': ^1.0.2 autoprefixer: ^10.4.12 dotenv: ^16.0.3 framer-motion: ^6.5.1 @@ -23,7 +23,7 @@ specifiers: prettier: ^2.7.1 react: ^17.0.2 react-dom: ^17.0.2 - react-icons: ^4.4.0 + react-icons: ^4.6.0 react-responsive-carousel: ^3.2.23 swr: ^1.3.0 tailwindcss: ^3.1.8 @@ -38,6 +38,7 @@ dependencies: '@docusaurus/preset-classic': 2.1.0_mbw5h45gof7hn3hp3pa63yclza '@headlessui/react': 1.7.3_sfoxds7t5ydpegc3knd667wn6m '@heroicons/react': 2.0.12_react@17.0.2 + '@leenguyen/react-flip-clock-countdown': 1.3.1_react@17.0.2 '@mdx-js/react': 1.6.22_react@17.0.2 autoprefixer: 10.4.12_postcss@8.4.18 dotenv: 16.0.3 @@ -45,7 +46,7 @@ dependencies: postcss: 8.4.18 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 - react-icons: 4.4.0_react@17.0.2 + react-icons: 4.6.0_react@17.0.2 react-responsive-carousel: 3.2.23 swr: 1.3.0_react@17.0.2 tailwindcss: 3.1.8_postcss@8.4.18 @@ -57,10 +58,9 @@ devDependencies: '@meshtastic/eslint-config': 1.0.8 '@tailwindcss/typography': 0.5.7_tailwindcss@3.1.8 '@tsconfig/docusaurus': 1.0.6 - '@types/node': 18.8.5 + '@types/node': 18.11.0 '@types/react': 18.0.21 '@types/react-dom': 18.0.6 - '@types/w3c-web-serial': 1.0.2 prettier: 2.7.1 typescript: 4.8.4 @@ -2580,6 +2580,16 @@ packages: '@jridgewell/resolve-uri': 3.0.5 '@jridgewell/sourcemap-codec': 1.4.11 + /@leenguyen/react-flip-clock-countdown/1.3.1_react@17.0.2: + resolution: {integrity: sha512-iEJOVXxfUXs2wZrmcY39JN5pJKnRv/mqqaD1w9eMWvhpwnBqsTi1xUClke2G5b+mj84BXrVlAV46jvZphmbq3Q==} + engines: {node: '>=12'} + peerDependencies: + react: '>= 16.13.0' + dependencies: + clsx: 1.2.1 + react: 17.0.2 + dev: false + /@leichtgewicht/ip-codec/2.0.3: resolution: {integrity: sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==} dev: false @@ -2919,26 +2929,26 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/bonjour/3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/connect-history-api-fallback/1.3.5: resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==} dependencies: '@types/express-serve-static-core': 4.17.28 - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/eslint-scope/3.7.3: @@ -2959,7 +2969,7 @@ packages: /@types/express-serve-static-core/4.17.28: resolution: {integrity: sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 dev: false @@ -2989,7 +2999,7 @@ packages: /@types/http-proxy/1.17.8: resolution: {integrity: sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/json-schema/7.0.11: @@ -3002,7 +3012,7 @@ packages: /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/mdast/3.0.10: @@ -3019,8 +3029,8 @@ packages: resolution: {integrity: sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==} dev: false - /@types/node/18.8.5: - resolution: {integrity: sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q==} + /@types/node/18.11.0: + resolution: {integrity: sha512-IOXCvVRToe7e0ny7HpT/X9Rb2RYtElG1a+VshjwT00HxrM2dWBApHQoqsI6WiY7Q03vdf2bCrIGzVrkF/5t10w==} /@types/parse-json/4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} @@ -3077,7 +3087,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/retry/0.12.1: @@ -3087,7 +3097,7 @@ packages: /@types/sax/1.2.4: resolution: {integrity: sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/scheduler/0.16.2: @@ -3103,27 +3113,23 @@ packages: resolution: {integrity: sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==} dependencies: '@types/mime': 1.3.2 - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/sockjs/0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@types/unist/2.0.6: resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==} dev: false - /@types/w3c-web-serial/1.0.2: - resolution: {integrity: sha512-Ftx4BtLxgAnel7V7GbHylCYjSq827A+jeEE3SnTS7huCGUN0pSwUn+CchTCT9TkZj9w+NVMUq4Bk2R0GvUNmAQ==} - dev: true - /@types/ws/8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 dev: false /@typescript-eslint/eslint-plugin/5.22.0_4bcn5aatkhkr3q2dzj4ewaqjbe: @@ -5067,7 +5073,7 @@ packages: resolution: {integrity: sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==} engines: {node: '>= 0.8'} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 require-like: 0.1.2 dev: false @@ -6242,7 +6248,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.8.5 + '@types/node': 18.11.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -7811,8 +7817,8 @@ packages: react-fast-compare: 3.2.0 shallowequal: 1.1.0 - /react-icons/4.4.0_react@17.0.2: - resolution: {integrity: sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==} + /react-icons/4.6.0_react@17.0.2: + resolution: {integrity: sha512-rR/L9m9340yO8yv1QT1QurxWQvWpbNHqVX0fzMln2HEb9TEIrQRGsqiNFQfiv9/JEUbyHmHPlNTB2LWm2Ttz0g==} peerDependencies: react: '*' dependencies: diff --git a/protobufs b/protobufs index d3dfaa63..a7298399 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit d3dfaa63a5108c1da7571cd780efaf561b99cc74 +Subproject commit a72983993ccd9c2dabb1ef9e17b2fe79bd94d671 diff --git a/src/pages/2.0/index.tsx b/src/pages/2.0/index.tsx new file mode 100644 index 00000000..19b61fd6 --- /dev/null +++ b/src/pages/2.0/index.tsx @@ -0,0 +1,418 @@ +import '@leenguyen/react-flip-clock-countdown/dist/index.css'; + +import React from 'react'; + +import { ChevronRightIcon } from '@heroicons/react/20/solid'; +import FlipClockCountdown from '@leenguyen/react-flip-clock-countdown'; +import Layout from '@theme/Layout'; + +const TwoPointZero = (): JSX.Element => { + const stats = [ + { label: 'Active Nodes', value: 'xx+' }, + { label: 'Community Members', value: '4000+' }, + { label: 'Total Commits', value: '4800+' }, + { label: 'Community Donations', value: '$5700+' }, + ]; + const logos = [ + { + name: 'Vercel', + url: '/2.0/vercel-logotype-dark.svg', + }, + { + name: 'Cloudflare', + url: '/2.0/CF_logo_horizontal_blktype.svg', + }, + { + name: 'RAK Wireless', + url: '/2.0/RAK-blue-main.svg', + }, + { + name: 'Open Collective', + url: '/2.0/opencollectivelogo.svg', + }, + { + name: 'LILYGO', + url: '/', + }, + { + name: 'Discord', + url: '/2.0/discord.svg', + }, + ]; + return ( + +
+
+ {/* Hero section */} +
+
+
+
+ Your Company +
+
+ +
+

+ Meshtastic 2.0 🎉🎉🎉 +

+

+ After 9 months in the making we present to you the next + milestone for the Meshtastic project. +

+
+
+

+ As a part of the launch event, we are running a number of + giveaways, so jump in and win some prizes. +

+ +
+
+
+
+ +
+
+
+
+ + + + + + + + +
+
+ Web UI + Android + IOS +
+
+
+
+ + {/* Testimonial/stats section */} +
+
+
+ + + {/* Logo cloud section */} +
+
+
+
+

+ All made possible by the amazing companies that support us. +

+

+ Running a project of this scale is no easy feat, without the + generosity of many of our vendors and providers, none of + this would be possible. +

+
+
+ {logos.map((logo) => ( +
+ {logo.name} +
+ ))} +
+
+
+
+ + {/* CTA section */} +
+ +
+
+
+ ); +}; + +export default TwoPointZero; diff --git a/static/2.0/New folder/CF_logo_horizontal_blktype.svg b/static/2.0/New folder/CF_logo_horizontal_blktype.svg new file mode 100644 index 00000000..0f8d74e0 --- /dev/null +++ b/static/2.0/New folder/CF_logo_horizontal_blktype.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/2.0/New folder/blue-tagline-official.svg b/static/2.0/New folder/blue-tagline-official.svg new file mode 100644 index 00000000..d1e8a586 --- /dev/null +++ b/static/2.0/New folder/blue-tagline-official.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/2.0/New folder/opencollective-ar21.svg b/static/2.0/New folder/opencollective-ar21.svg new file mode 100644 index 00000000..9e7e18bf --- /dev/null +++ b/static/2.0/New folder/opencollective-ar21.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/2.0/New folder/vercel-logotype-dark.svg b/static/2.0/New folder/vercel-logotype-dark.svg new file mode 100644 index 00000000..bb5a15a2 --- /dev/null +++ b/static/2.0/New folder/vercel-logotype-dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/2.0/android.jpg b/static/2.0/android.jpg new file mode 100644 index 00000000..79587380 Binary files /dev/null and b/static/2.0/android.jpg differ diff --git a/static/2.0/background.png b/static/2.0/background.png new file mode 100644 index 00000000..6f1fecac Binary files /dev/null and b/static/2.0/background.png differ diff --git a/static/2.0/discord.svg b/static/2.0/discord.svg new file mode 100644 index 00000000..1f483fe8 --- /dev/null +++ b/static/2.0/discord.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/2.0/ios.png b/static/2.0/ios.png new file mode 100644 index 00000000..af3fc932 Binary files /dev/null and b/static/2.0/ios.png differ diff --git a/static/2.0/typelogo.svg b/static/2.0/typelogo.svg new file mode 100644 index 00000000..f30f2755 --- /dev/null +++ b/static/2.0/typelogo.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + ESHT + + + + + + + + + ST + + + C + + + + diff --git a/static/2.0/webUI.png b/static/2.0/webUI.png new file mode 100644 index 00000000..93e7f0c1 Binary files /dev/null and b/static/2.0/webUI.png differ