Merge branch 'main' into fix/fake-data

abhiShandy · Mar 22, 2023 · 3d3c3d2 · 3d3c3d2
2 parents 3be0282 + 1a2a2f6
commit 3d3c3d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/aws-cdk.yml b/.github/workflows/aws-cdk.yml
@@ -1,6 +1,9 @@
 name: AWS CDK Deploy
 
-on: push
+on:
+  push:
+    branches:
+      - main
 
 permissions:
   id-token: write # This is required for requesting the JWT

diff --git a/.github/workflows/client-pr.yml b/.github/workflows/client-pr.yml
@@ -1,7 +1,7 @@
 name: Client PR Review
 
 on:
-  pull-request:
+  pull_request:
     paths:
       - "client/**"
 

diff --git a/client/src/lib/molecules/AddProductForm.tsx b/client/src/lib/molecules/AddProductForm.tsx
@@ -7,10 +7,10 @@ export type AddProduct = {
   image: FileList;
   asset: FileList;
   /**
-   * Nostr private key
-   * - should start with nsec
+   * Nostr public key
+   * - should start with npub
    */
-  nsec: string;
+  npub: string;
 };
 
 export default function AddProductForm({
@@ -175,27 +175,27 @@ export default function AddProductForm({
 
             <div className="sm:col-span-6">
               <label
-                htmlFor="nsec"
+                htmlFor="npub"
                 className="block text-sm font-medium leading-6 text-gray-900"
               >
-                NOSTR private key
+                NOSTR public key
               </label>
               <div className="mt-2 flex rounded-md shadow-sm">
                 <input
                   type="text"
-                  {...register("nsec", {
+                  {...register("npub", {
                     required: true,
                     disabled: isLoading,
                   })}
-                  id="nsec"
-                  autoComplete="nsec"
+                  id="npub"
+                  autoComplete="npub"
                   className="block w-full rounded-md border-0 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-gray-600 sm:py-1.5 sm:text-sm sm:leading-6"
-                  placeholder="nsec..."
+                  placeholder="npub..."
                 />
               </div>
-              <p className="mt-2 text-sm text-gray-500">
+              {/* <p className="mt-2 text-sm text-gray-500">
                 Prove that you are the seller of this product.
-              </p>
+              </p> */}
             </div>
           </div>
         </div>

diff --git a/client/src/routes/CreateProduct.tsx b/client/src/routes/CreateProduct.tsx
@@ -25,7 +25,6 @@ export const CreateProduct = () => {
   const onSubmit: SubmitHandler<AddProduct> = async (event) => {
     try {
       setIsLoading(true);
-      const npub = nsecToNpub(event.nsec);
 
       const { url, key } = await getAssetUploadURL();
 
@@ -42,7 +41,7 @@ export const CreateProduct = () => {
             title: event.title,
             description: event.description,
             assetKey: key,
-            npub,
+            npub: event.npub,
           },
           images: [
             {