mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2024-12-27 14:39:54 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Thomas Göttgens 2022-11-09 08:42:01 +01:00 committed by GitHub
parent d3e11aee3e aabb2a716b
commit 9c8dc28899
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 94 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/pages/downloads/_components/FirmwareCard.tsx
View file

@ -27,17 +27,12 @@ export const FirmwareCard = ({
<div className="card__body"> <div className="card__body">
<p>{description}</p> <p>{description}</p>
</div> </div>
<div className="card__footer"> <div className="card__footer mt-auto">
{release?.length ? (
<>
<a
href={release[0].assets[1]?.browser_download_url}
className="button button--secondary button--block"
>
Download
</a>
<div className="margin-top--sm"> <div className="margin-top--sm">
<h3>Older versions</h3> <details>
<summary>
Older Versions
</summary>
{release.slice(1, 6).map((release) => { {release.slice(1, 6).map((release) => {
return ( return (
<div key={release.id}> <div key={release.id}>
@ -47,7 +42,16 @@ export const FirmwareCard = ({
</div> </div>
); );
})} })}
</details>
</div> </div>
{release?.length ? (
<>
<a
href={release[0].assets[1]?.browser_download_url}
className="button button--secondary button--block margin-top--sm"
>
Download {variant}
</a>
</> </>
) : ( ) : (
<button disabled className="button button--secondary button--block"> <button disabled className="button button--secondary button--block">

65
src/pages/downloads/index.tsx
View file

@ -35,7 +35,7 @@ const Firmware = (): JSX.Element => {
> >
<div className="container mt-8 flex flex-col gap-3"> <div className="container mt-8 flex flex-col gap-3">
<h1 className="m-2">Flasher</h1> <h1 className="m-2">Flasher</h1>
<div className="flex w-full overflow-hidden rounded-xl xl:h-64"> <div className="flex w-full overflow-hidden rounded-xl">
<div className="flex w-1/5 bg-gradient-to-r from-green-500 to-primary"> <div className="flex w-1/5 bg-gradient-to-r from-green-500 to-primary">
<BoltIcon className="m-auto h-20" /> <BoltIcon className="m-auto h-20" />
</div> </div>
@ -47,7 +47,7 @@ const Firmware = (): JSX.Element => {
<div className="card__body"> <div className="card__body">
<p>Desktop application to flash fimware to your devices.</p> <p>Desktop application to flash fimware to your devices.</p>
</div> </div>
<div className="card__footer" style={{ marginTop: '1rem' }}> <div className="card__footer mt-auto">
<a <a
href="https://github.com/meshtastic/Meshtastic-gui-installer/releases/latest" href="https://github.com/meshtastic/Meshtastic-gui-installer/releases/latest"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200" className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
@ -68,7 +68,7 @@ const Firmware = (): JSX.Element => {
boards. boards.
</p> </p>
</div> </div>
<div className="card__footer" style={{ marginTop: '1rem' }}> <div className="card__footer mt-auto">
<a <a
href="https://flasher.meshtastic.org/" href="https://flasher.meshtastic.org/"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200" className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
@ -87,12 +87,12 @@ const Firmware = (): JSX.Element => {
Devices such as T-Echo and RAK4631 are flashed via filesystem. Devices such as T-Echo and RAK4631 are flashed via filesystem.
</p> </p>
</div> </div>
<div className="card__footer" style={{ marginTop: '1rem' }}> <div className="card__footer mt-auto">
<a <a
href="/docs/getting-started/flashing-firmware/nrf52/drag-n-drop" href="/docs/getting-started/flashing-firmware/nrf52/drag-n-drop"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200" className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
> >
view Instructions View Instructions
</a> </a>
</div> </div>
</div> </div>
@ -100,18 +100,24 @@ const Firmware = (): JSX.Element => {
</div> </div>
{/* */} {/* */}
<h1 className="m-2">Apps</h1> <h1 className="m-2">Apps</h1>
<div className="flex w-full overflow-hidden rounded-xl lg:h-48"> <div className="flex w-full overflow-hidden rounded-xl">
<div className="flex w-1/5 bg-gradient-to-r from-rose-500 to-primary"> <div className="flex w-1/5 bg-gradient-to-r from-rose-500 to-primary">
<ComputerDesktopIcon className="m-auto h-20" /> <ComputerDesktopIcon className="m-auto h-20" />
</div> </div>
<div className="flex w-full flex-col bg-primary lg:flex-row"> <div className="flex w-full flex-col columns-3 bg-primary lg:flex-row">
<div className="flex p-4 lg:w-1/3"> <div className="card m-4 border-2 border-secondary">
<div className="flex flex-grow rounded-md border-2 border-secondary bg-primary py-4 shadow-md hover:brightness-90 lg:py-0"> <div className="card__header">
<h3>Apple</h3>
</div>
<div className="card__body flex items-center">
<div className="m-auto"> <div className="m-auto">
<FaApple className="h-20 w-20" /> <FaApple className="h-20 w-20" />
</div> </div>
<div className="m-auto flex flex-col gap-3"> </div>
<h2>Apple</h2> <div className="card__body">
Available on MacOS & iOS. Requires MacOS Ventura or iOS 16+.
</div>
<div className="card__footer mt-auto">
<a <a
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
@ -123,19 +129,24 @@ const Firmware = (): JSX.Element => {
</a> </a>
</div> </div>
</div> </div>
<div className="card m-4 border-2 border-secondary">
<div className="card__header">
<h3>Android</h3>
</div> </div>
<div className="flex p-4 lg:w-1/3"> <div className="card__body flex items-center">
<div className="relative flex flex-grow rounded-md border-2 border-secondary bg-primary py-4 shadow-md hover:brightness-90 lg:py-0">
<div className="m-auto"> <div className="m-auto">
<FaAndroid className="h-20 w-20" /> <FaAndroid className="h-20 w-20" />
</div> </div>
<div className="m-auto flex flex-col gap-3"> </div>
<h2>Android</h2> <div className="card__body">
Sideloading also available.
</div>
<div className="card__footer mt-auto">
<a <a
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
href="https://meshtastic.org/docs/software/android/android-installation" href="https://meshtastic.org/docs/software/android/android-installation"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
> >
F-Droid F-Droid
<ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" /> <ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" />
@ -144,35 +155,39 @@ const Firmware = (): JSX.Element => {
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
href="https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source=downloads-page" href="https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source=downloads-page"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200" className="mt-4 flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
> >
Play Store Play Store
<ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" /> <ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" />
</a> </a>
</div> </div>
</div> </div>
<div className="card m-4 border-2 border-secondary">
<div className="card__header">
<h3>Web</h3>
</div> </div>
<div className="flex p-4 lg:w-1/3"> <div className="card__body flex items-center">
<div className="flex flex-grow rounded-md border-2 border-secondary bg-primary py-4 shadow-md hover:brightness-90 lg:py-0">
<div className="m-auto"> <div className="m-auto">
<GlobeAltIcon className="h-20 w-20" /> <GlobeAltIcon className="h-20 w-20" />
</div> </div>
<div className="m-auto flex flex-col gap-3"> </div>
<h2>Web</h2> <div className="card__body">
Requires Chromium based browsers.
</div>
<div className="card__footer mt-auto">
<a <a
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
href="https://client.meshtastic.org" href="https://client.meshtastic.org"
className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200" className="m-auto flex rounded-lg border-4 border-transparent bg-accent p-1 font-semibold text-black shadow-md hover:text-black hover:brightness-110 active:border-green-200"
> >
meshtastic.org client.meshtastic.org
<ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" /> <ArrowTopRightOnSquareIcon className="m-auto ml-2 h-4" />
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
{/* */} {/* */}
<h1 className="m-2">Firmware</h1> <h1 className="m-2">Firmware</h1>
<div className="flex w-full overflow-hidden rounded-xl"> <div className="flex w-full overflow-hidden rounded-xl">
@ -202,12 +217,12 @@ const Firmware = (): JSX.Element => {
things. things.
</p> </p>
</div> </div>
<div className="card__footer" style={{ marginTop: '1rem' }}> <div className="card__footer mt-auto">
<a <a
href="https://nightly.link/meshtastic/firmware/workflows/main/master/built.zip" href="https://nightly.link/meshtastic/firmware/workflows/main/master/built.zip"
className="button button--secondary button--block" className="button button--secondary button--block"
> >
Download Download Bleeding
</a> </a>
</div> </div>
</div> </div>