Skip to content
Merged

2.1 #55

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"@tailwindcss/vite": "^4.0.17",
"astro": "^5.7.13",
"hls.js": "^1.5.20",
"js-confetti": "^0.13.1",
"lucide-static": "^0.473.0",
"remark-github-blockquote-alert": "^1.3.1",
"sass": "^1.84.0",
Expand Down
Binary file modified src/assets/instruction.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/logos/Discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 2 additions & 11 deletions src/pages/_download/PlatformSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export default function PlatformSelection(props: { "data-links": any, microsoftL
/>
</div>
<div class={props.fullInfo ? "flex items-center justify-center min-h-[150px]" : "flex items-center justify-center h-[80px]"}>
{(!selectedOption().startsWith("macOS") || !props.fullInfo) &&
(
{

<div>
<a href={getDownloadUrlForOption(selectedOption())} class="px-button-soft block w-full max-w-xs mx-auto text-xl py-3">
<SolidLucide data="download" class="align-middle me-1" />
Expand All @@ -76,15 +76,6 @@ export default function PlatformSelection(props: { "data-links": any, microsoftL
</div>
{props.fullInfo ? <a class="text-sm text-neutral-400 underline" href="https://github.com/PixiEditor/PixiEditor/releases" target="_blank">Download archive versions from GitHub <SolidLucide data="external-link" /> </a> : null}
</div>
)}
{selectedOption().startsWith("macOS") && props.fullInfo &&
(
<div class="w-full max-w-d text-center flex flex-col min-h-[150px] gap-4">
<p>Building for MacOS is expensive for us, so for now the MacOS version is only available if you purchase Founder's Bundle. This might change in the future.</p>
<p class="mt-auto">Already own Founder's Bundle? <a href={getDownloadUrlForOption(selectedOption())} class="underline">Download</a></p>
<p class="text-sm text-neutral-400 mt-auto">You can still <a href="/docs/contribution/compileguide" class="underline">build from source</a></p>
</div>
)
}
</div>

Expand Down
11 changes: 5 additions & 6 deletions src/pages/_index/Newsletter.astro
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ const { hideMushy = false } = Astro.props;
Join newsletter
</button>
</div>
<label class="flex items-center mt-3 text-sm text-zinc-400">
<input type="checkbox" class="mr-2 accent-indigo-500" required />
I agree to PixiEditor’s
<a href="/docs/privacy-policy" class="ml-1 underline hover:text-white"
>privacy policy</a
>.
<label class="text-sm text-zinc-400">
<input type="checkbox" class="mr-2 mt-4 accent-indigo-500" required />
I agree to receive commercial and marketing information about new products and promotions {hideMushy ? null : <br/>} offered by Pixi Labs sp. z o.o., to the e-mail address provided by me. In addition. I have read the{hideMushy ? " " : <br/>}<a href="/docs/newsletter-regulations" target="_blank" class="underline hover:text-white"
>Newsletter Regulations</a> and <a target="_blank" href="/docs/privacy-policy" class="underline hover:text-white"
>Privacy Policy</a> and accept their provisions.
</label>
</form>

Expand Down
5 changes: 1 addition & 4 deletions src/pages/download.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import FoundersPackLogoMobile from "@assets/founders-pack-mobile.svg";
import { steam, flathub } from "@assets/links";
import PlatformSelectionCardContent from "./_download/PlatformSelectionCardContent.astro";

const basePricePLN = 100;
const basePricePLN = 120;
---

<Layout title="Download">
Expand Down Expand Up @@ -149,9 +149,6 @@ const basePricePLN = 100;
>

<span class="text-sm text-right mt-4" id="unavailable-info">You can still buy Founder's Pack for Windows and Linux on <a class="underline" target="_blank" href="https://store.steampowered.com/app/2435860/PixiEditor__Founders_Pack/">Steam</a></span>
<span class="text-neutral-500 text-sm text-left mt-4"
>Lowest price in the past 30 days: 100 PLN. Prices shown in other currency than PLN are estimated, final price in checkout may vary.</span
>
</div>
</div>
</section>
Expand Down
79 changes: 45 additions & 34 deletions src/pages/purchaseSuccess.astro
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import Instruction from "@assets/instruction.png";
import { Image } from "astro:assets";

import SteamLogo from "@assets/icons/steam.svg";
import MicrosoftStoreLogoGrey from "@assets/logos/MicrosoftStoreLogoGrey.svg";
import AppleLogo from "@assets/logos/AppleLogo.svg";
import FlathubLogo from "@assets/icons/flathub.svg";
import PlatformSelectionCardContent from "./_download/PlatformSelectionCardContent.astro";
import FoundersImg from "@assets/founders-pack-mobile.svg";
import Lucide from "../components/Lucide.astro";
import DiscordLogo from "@assets/logos/Discord.svg";

import { steam, microsoft } from "@assets/links";
import { forum, discordInvites } from "@assets/links";

import { steam, flathub } from "@assets/links";
---

<Layout fullTitle="Purchase Successful!" class="bg-neutral-900">
Expand All @@ -20,17 +22,11 @@ import { steam, microsoft } from "@assets/links";
Thank you for your purchase! <br />
</h1>

<p class="text-3xl">
You have successfully purchased <span
class="founders-gradient font-bold">Founder's Bundle</span
>
</p>
<p class="text-3xl">What's next?</p>
<div class="flex justify-around flex-row w-full gap-4 flex-wrap">
<div class="flex flex-col items-center gap-4">
<h3 class="purple text-lg font-bold">STEP 1</h3>
<p class="text-2xl">
Download PixiEditor
</p>
<p class="text-2xl">Download PixiEditor</p>
<div class="bg-neutral-800 p-2 rounded h-[150px] w-[350px]">
<PlatformSelectionCardContent fullInfo={false} />
</div>
Expand All @@ -40,16 +36,17 @@ import { steam, microsoft } from "@assets/links";
<div class="flex justify-center">
<a
class="flex flex-col items-center w-24"
href={steam.store}
href={flathub.store}
target="_blank"
>
<Image
src={SteamLogo}
src={FlathubLogo}
class="block h-8 w-8"
alt=""
alt="Flathub logo"
/>
<p>Steam</p>
<p>Flathub</p>
</a>
<!-- <a
<!-- <a
class="flex flex-col items-center w-24"
href={microsoft.store}
>
Expand All @@ -72,11 +69,8 @@ import { steam, microsoft } from "@assets/links";
</div>
</div>
<div class="flex flex-col items-center gap-4">

<h3 class="purple text-lg font-bold">STEP 2</h3>
<p class="text-2xl">
Log in with your email address
</p>
<p class="text-2xl">Use the top-right icon to view your library</p>

<Image
src={Instruction}
Expand All @@ -85,22 +79,31 @@ import { steam, microsoft } from "@assets/links";
loading="eager"
/>

<p class="text-2xl">
To log in, follow the onboarding steps or click <span
class="purple">the account <br /> icon</span
> in the top-right corner of the PixiEditor app.
</p>
</div>
<div class="flex flex-col items-center gap-4">
<h3 class="purple text-lg font-bold">STEP 3</h3>
<p class="text-2xl">
Enjoy your purchase!
</p>

<Image
src={FoundersImg}
alt="Founders Pack"
loading="eager"/>
<p class="text-2xl">Install & Enjoy!</p>

<div class="w-[250px]">
<a
class="bg-pc-softpixired block mt-6 px-6 py-3 font-bold rounded flex items-center justify-center gap-3"
href={forum.index}
target="_blank"
>
<Lucide
data="messages-square"
class="text-xl font-normal"
/>
Join the Forum
</a>
<a class="bg-[#5865f2] block mt-3 px-6 py-3 font-bold rounded flex items-center justify-center gap-3" href={discordInvites.projectChannel} target="_blank">
<Image
src={DiscordLogo}
class="block"
alt="Discord logo"/>
Connect on Discord
</a>
</div>
</div>
</div>
</section>
Expand All @@ -111,3 +114,11 @@ import { steam, microsoft } from "@assets/links";
color: #c58bff;
}
</style>

<script>
import JSConfetti from "js-confetti";

const jsConfetti = new JSConfetti();

jsConfetti.addConfetti();
</script>
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3208,6 +3208,13 @@ __metadata:
languageName: node
linkType: hard

"js-confetti@npm:^0.13.1":
version: 0.13.1
resolution: "js-confetti@npm:0.13.1"
checksum: 10c0/2b60985bff6b33b6b02762e434c59dbaccc7ab0474987b738d8887de863d01a0f3ed52c1772c352f64d4905329e68384bd2fc15c90653e3689bbfec2f8bb2753
languageName: node
linkType: hard

"js-tokens@npm:^4.0.0":
version: 4.0.0
resolution: "js-tokens@npm:4.0.0"
Expand Down Expand Up @@ -4577,6 +4584,7 @@ __metadata:
"@tailwindcss/vite": "npm:^4.0.17"
astro: "npm:^5.7.13"
hls.js: "npm:^1.5.20"
js-confetti: "npm:^0.13.1"
lucide-static: "npm:^0.473.0"
remark-github-blockquote-alert: "npm:^1.3.1"
sass: "npm:^1.84.0"
Expand Down
Loading