Skip to content

Commit

Permalink
Move download-python-package.js to src/pages/download/ and update to …
Browse files Browse the repository at this point in the history
…use package instead of cdn
  • Loading branch information
YayunHuang committed Aug 27, 2024
1 parent b1f836d commit cc09d5b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 13 deletions.
2 changes: 2 additions & 0 deletions src/pages/download/_autoDownload.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { generateZIP } from "./_downloadPythonPackage";

export function readyForAutoDownload(fn: () => void): void {
if (document.readyState != "loading") {
fn();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import JSZip from "jszip";
import localforage from "localforage";
import { saveAs } from "file-saver";

async function allStorage() {
var values = new Map(),
keys = Object.keys(localStorage),
Expand Down Expand Up @@ -31,14 +35,15 @@ function getJSZipDateWithOffset() {

return dateWithOffset;
}
async function generateZIP(deviceId) {

export async function generateZIP(deviceId) {
var zip = new JSZip();
var count = 0;
const zipFilename = !!deviceId ? `${deviceId}-mockup.zip` : "mockup.zip";
var images = new Map();
dataurlkey = await allStorage();
var dataurlkey = await allStorage();
dataurlkey.forEach(function (value, key) {
file = dataURLtoFile(value, key.substring(3, key.length) + ".png");
var file = dataURLtoFile(value, key.substring(3, key.length) + ".png");
images.set(key, URL.createObjectURL(file));
});
images.forEach(async function (imgURL, k) {
Expand Down
22 changes: 12 additions & 10 deletions src/pages/download/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import "./index.css";
<script>
import localforage from "localforage";
import { readyForAutoDownload, mainForAutoDownload } from "./_autoDownload";
import { generateZIP } from "./_downloadPythonPackage";

const isMockupGenerated = async () => {
return localforage.getItem("pictureArray").then(function (pictureArray) {
Expand Down Expand Up @@ -41,8 +42,17 @@ import "./index.css";
}
};

const handleDownloadButton = () => {
const downloadButton = document.querySelector(".download-btn");
downloadButton?.addEventListener("click", () => {
// @ts-expect-error // Inject deviceId into window
generateZIP(window.targetDeviceId);
});
};

hideUnuseScreen();
handleDeviceIdSearchParams();
handleDownloadButton();
readyForAutoDownload(mainForAutoDownload);
</script>

Expand All @@ -52,13 +62,7 @@ import "./index.css";
name="description"
content="I've just used MockUPhone to wrap my app screenshots. It supports lots of devices including iPhone mockup, iPad mockup, Android mockup and TV mockup."
/>
<script type="text/javascript" src="/scripts/jszip.js"></script>
<script
type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.8/FileSaver.js"
></script>
<script type="text/javascript" src="/scripts/download-python-package.js"
></script>
<script src="./_downloadPythonPackage.js"></script>
<div class="download-content">
<h1 class="completed">Completed!</h1>

Expand All @@ -71,9 +75,7 @@ import "./index.css";
<img class="formxai-ad__image" src="/images/oursky/formxai-ad.png" />
</a>

<button class="download-btn" onclick="generateZIP(window.targetDeviceId)"
>Download again</button
>
<button class="download-btn">Download again</button>

<section class="share">
<h2 class="share__heading">
Expand Down

0 comments on commit cc09d5b

Please sign in to comment.