minor refactoring, fix type error

unyt-org · Sep 16, 2023 · fcecd03 · fcecd03
1 parent 23c8738
commit fcecd03
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 298 deletions.
diff --git a/backend/Capture.ts b/backend/Capture.ts
@@ -17,7 +17,7 @@ export default class Capture {
  });
  const result = await page.screenshot({
  fullPage
- }) as Buffer;
+ }) as Uint8Array;
  await browser.close();
  return result;
  }

diff --git a/backend/entrypoint.tsx b/backend/entrypoint.tsx
@@ -5,6 +5,7 @@ import { Path } from "uix/utils/path.ts";
 import { timeout } from "unyt_core/datex_all.ts";
 
 @endpoint export class Screenshot {
+
  @timeout(40_000)
  @property static async take(url: string | URL, config?: {
  width: number,
@@ -27,7 +28,7 @@ import { timeout } from "unyt_core/datex_all.ts";
  return this.getImage(filePath);
  }
 
- static getImage(filePath: Path<`${string}:`, boolean>) {
+ private static getImage(filePath: Path<`${string}:`, boolean>) {
  return <img src={'/image/'.concat(filePath.name)}/> as HTMLImageElement;
  }
 }

diff --git a/common/components/MainPage.tsx b/common/components/MainPage.tsx
@@ -1,13 +1,14 @@
 import { UIX } from "uix";
 import { Screenshot } from 'backend/entrypoint.tsx';
+import { Path } from "uix/utils/path.ts";
 
 @UIX.template(function(this: MainPage) {
  return <div>
  <h1>UIX Screenshot <b>App</b></h1>
  <span>Get a screenshot of any given URL.</span>
 
- <input id="url" value="https://example.com" type={"url"} placeholder={"Enter URL here..."}/>
- <div id="submit" onclick={UIX.inDisplayContext(()=>this.capture())} class="submit active">Capture</div>
+ <input id="url" value="https://example.com" type="url" placeholder="Enter URL here..."/>
+ <div id="submit" onclick={()=>this.capture()} class="submit active">Capture</div>
 
  <p>Screenshot</p>
  <div id="images"/>
@@ -31,12 +32,13 @@ export class MainPage extends UIX.BaseComponent {
  try {
  const image = await Screenshot.take(url);
  this.images.prepend(image);
- } catch (error) {
+ } 
+ catch (error) {
  console.error(error);
  alert("Oups, could not create screenshot!");
- } finally {
-  this.submit.classList.toggle("active", true);
-  this.url.disabled = false;
- }
+ } 
+
+ this.submit.classList.toggle("active", true);
+ this.url.disabled = false;
  }
 }