organize early-access related code

softmarshmallow · softmarshmallow · commit 311520917343 · 2023-03-02T20:07:23.000+09:00
diff --git a/packages/_firstparty-early-access/hooks/index.ts b/packages/_firstparty-early-access/hooks/index.ts
@@ -0,0 +1 @@
+export * from "./use-early-access";
diff --git a/packages/_firstparty-early-access/hooks/use-early-access.tsx b/packages/_firstparty-early-access/hooks/use-early-access.tsx
@@ -0,0 +1,15 @@
+import React, { useEffect, useState } from "react";
+import store from "../store";
+
+export function useEarlyAccess() {
+  const [accesskey, setAccessKey] = useState<string | null>(null);
+  useEffect(() => {
+    store.get().then((d) => {
+      if (d) {
+        setAccessKey(d);
+      }
+    });
+  }, []);
+
+  return accesskey;
+}
diff --git a/packages/_firstparty-early-access/index.ts b/packages/_firstparty-early-access/index.ts
@@ -1 +1,3 @@
 export { UpgradePage } from "./register";
+export * from "./hooks";
+export { default as store } from "./store";
diff --git a/packages/_firstparty-early-access/k.ts b/packages/_firstparty-early-access/k.ts
@@ -0,0 +1 @@
+export const __key = "assistant-early-access-activation";
diff --git a/packages/_firstparty-early-access/scaffolds/register-with-code-card.tsx b/packages/_firstparty-early-access/scaffolds/register-with-code-card.tsx
@@ -1,8 +1,7 @@
 import React, { useState, useEffect } from "react";
 import styled from "@emotion/styled";
 import { PluginSdk } from "@plugin-sdk/app";
-
-const __key = "assistant-early-access-activation";
+import { store } from "@assistant-fp/early-access";
 
 const __form_key_min_length = 24;
 
@@ -11,7 +10,7 @@ export function RegisterWithCodeCard() {
   const [isTokenFormatValid, setIsTokenFormatValid] = useState(false);
 
   useEffect(() => {
-    PluginSdk.getItem(__key).then((code) => {
+    store.get().then((code) => {
       verify(code).then((verified) => {
         setVerified(verified);
       });
@@ -36,7 +35,7 @@ export function RegisterWithCodeCard() {
   const activate = (code: string) => {
     verify(code).then((verified) => {
       if (verified) {
-        PluginSdk.setItem(__key, code);
+        store.set(code);
         setVerified(true);
         alert("Congrats🎉 Early access program activated.");
       } else {
diff --git a/packages/_firstparty-early-access/store.ts b/packages/_firstparty-early-access/store.ts
@@ -0,0 +1,13 @@
+import { __key } from "./k";
+import { PluginSdk } from "@plugin-sdk/app";
+
+const store = {
+  set: (value: any) => {
+    return PluginSdk.setItem(__key, value);
+  },
+  get: async () => {
+    return await PluginSdk.getItem(__key);
+  },
+};
+
+export default store;
diff --git a/packages/app-photo-loader/photo-loader.tsx b/packages/app-photo-loader/photo-loader.tsx
@@ -13,8 +13,7 @@ import InfiniteScroll from "react-infinite-scroller";
 import { useHistory } from "react-router-dom";
 import { radmon_query_placeholder } from "./k";
 import { ImagePromptBox } from "./image-prompt-box";
-
-const __key = "assistant-early-access-activation";
+import { useEarlyAccess } from "@assistant-fp/early-access";
 
 ///
 ///  TODO:
@@ -77,6 +76,7 @@ export function PhotoLoader() {
     useState(false);
 
   const [hasMore, setHasMore] = useState(false);
+  const accesskey = useEarlyAccess();
 
   // load random images on mount, once.
   useEffect(() => {
@@ -101,7 +101,6 @@ export function PhotoLoader() {
     }
   ) => {
     setLocked(true);
-    const accesskey = await PluginSdk.getItem(__key);
     try {
       const { images: gens, n } = await api
         .fromGenerative(
diff --git a/yarn.lock b/yarn.lock
@@ -1753,12 +1753,7 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
   integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
 
-"@figma/plugin-typings@1.37.0":
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/@figma/plugin-typings/-/plugin-typings-1.37.0.tgz#0eecf4972db9f321127b519a917ea4b3a40714dd"
-  integrity sha512-PfZWzRazevtDp6nfaypxS7jfkbLATTM6dLi0tIJiDvd27vYhX3wBiW1AeTqxtxjBdYY2QV1T34IJYjrOybr5wg==
-
-"@figma/plugin-typings@^1.58.0":
+"@figma/plugin-typings@1.37.0", "@figma/plugin-typings@^1.58.0":
   version "1.58.0"
   resolved "https://registry.yarnpkg.com/@figma/plugin-typings/-/plugin-typings-1.58.0.tgz#88ae0e57e2ac74203d401f2a70e95e93c470e093"
   integrity sha512-to6hFysqZYACz4VNgaBXflOVS+1pbXGNVcezDmQEMcADDkIZeAZ71Zfqf/B2YDRmU3sM1xX5Q5NkRGhjCuLOLg==
@@ -4280,7 +4275,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^18.0.28":
+"@types/react@*", "@types/react@^17.0.14", "@types/react@^18.0.28":
   version "18.0.28"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065"
   integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==
@@ -4289,15 +4284,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@^17.0.14":
-  version "17.0.53"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
-  integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
@@ -12425,7 +12411,7 @@ react-use-size@^2.0.4:
   resolved "https://registry.yarnpkg.com/react-use-size/-/react-use-size-2.0.4.tgz#14f513e310d8962a30919e64fdd746b8211a3f0d"
   integrity sha512-vMfResvkZwkXngdbytZbDNkDySJqXrEdPa882kTqIQZylxHA6PSf2NC67wJJIMpmZjGyTwV7wyG5YY1SwId1xw==
 
-react@^18.2.0:
+react@18.2.0, react@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
   integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`export { UpgradePage } from "./register";`
	`2`	`+export * from "./hooks";`
	`3`	`+export { default as store } from "./store";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const __key = "assistant-early-access-activation";`