@akinon/projectzero 1.36.0-rc.0 → 1.36.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/projectzero
 
+## 1.36.0-rc.2
+
+## 1.36.0-rc.1
+
+### Minor Changes
+
+- 00ffde2: ZERO-2637: enhance create command with improved messaging
+
 ## 1.36.0-rc.0
 
 ### Minor Changes

package/app-template/CHANGELOG.md

@@ -1,5 +1,34 @@
 # projectzeronext
 
+## 1.36.0-rc.2
+
+### Minor Changes
+
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+
+### Patch Changes
+
+- Updated dependencies [dff0d59]
+  - @akinon/next@1.36.0-rc.2
+  - @akinon/pz-b2b@1.36.0-rc.2
+  - @akinon/pz-gpay@1.36.0-rc.2
+  - @akinon/pz-masterpass@1.36.0-rc.2
+  - @akinon/pz-one-click-checkout@1.36.0-rc.2
+  - @akinon/pz-otp@1.36.0-rc.2
+  - @akinon/pz-pay-on-delivery@1.36.0-rc.2
+
+## 1.36.0-rc.1
+
+### Patch Changes
+
+- @akinon/next@1.36.0-rc.1
+- @akinon/pz-b2b@1.36.0-rc.1
+- @akinon/pz-gpay@1.36.0-rc.1
+- @akinon/pz-masterpass@1.36.0-rc.1
+- @akinon/pz-one-click-checkout@1.36.0-rc.1
+- @akinon/pz-otp@1.36.0-rc.1
+- @akinon/pz-pay-on-delivery@1.36.0-rc.1
+
 ## 1.36.0-rc.0
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.36.0-rc.0",
+  "version": "1.36.0-rc.2",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,13 +22,13 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.36.0-rc.0",
-    "@akinon/pz-b2b": "1.36.0-rc.0",
-    "@akinon/pz-gpay": "1.36.0-rc.0",
-    "@akinon/pz-masterpass": "1.36.0-rc.0",
-    "@akinon/pz-one-click-checkout": "1.36.0-rc.0",
-    "@akinon/pz-otp": "1.36.0-rc.0",
-    "@akinon/pz-pay-on-delivery": "1.36.0-rc.0",
+    "@akinon/next": "1.36.0-rc.2",
+    "@akinon/pz-b2b": "1.36.0-rc.2",
+    "@akinon/pz-gpay": "1.36.0-rc.2",
+    "@akinon/pz-masterpass": "1.36.0-rc.2",
+    "@akinon/pz-one-click-checkout": "1.36.0-rc.2",
+    "@akinon/pz-otp": "1.36.0-rc.2",
+    "@akinon/pz-pay-on-delivery": "1.36.0-rc.2",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -53,7 +53,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.36.0-rc.0",
+    "@akinon/eslint-plugin-projectzero": "1.36.0-rc.2",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/views/account/contact-form.tsx

@@ -3,9 +3,9 @@ import {
   Button,
   FileInput,
   Input,
+  Link,
   LoaderSpinner,
-  Select,
-  Link
+  Select
 } from '@theme/components';
 import { useSession } from 'next-auth/react';
 import { useEffect, useState } from 'react';
@@ -45,7 +45,8 @@ const contactFormSchema = (t) =>
       .when('subject', {
         is: (value) => value === '2',
         then: yup.string().required(t('account.contact.form.error.required'))
-      })
+      }),
+    file: yup.mixed()
   });
 
 const ContactForm = () => {
@@ -110,8 +111,18 @@ const ContactForm = () => {
     resolver: yupResolver(contactFormSchema(t))
   });
 
-  const onSubmit: SubmitHandler<ContactFormType> = (data) => {
-    sendContact(data);
+  const onSubmit: SubmitHandler<ContactFormType> = (data, event) => {
+    const formData = new FormData()
+
+    Object.keys(data ?? {}).forEach((key) => {
+      if (key === "file" && data[key]){
+        formData.append(key, data[key][0]);
+      } else if (data[key]) {
+        formData.append(key, data[key]);
+      }
+    });
+
+    sendContact(formData);
   };
 
   const handleChange = (e) => {
@@ -242,7 +253,12 @@ const ContactForm = () => {
             <label className="text-xs text-gray-800 mb-2 block">
               {t('account.contact.form.file.title')}
             </label>
-            <FileInput className="w-full mb-5" title="test" />
+            <FileInput
+              name="file"
+              title="file"
+              className="w-full mb-5"
+              {...register('file')}
+            />
             <Button type="submit" className="w-full font-medium">
               {t('account.contact.form.submit_button')}
             </Button>

package/commands/create.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import * as readline from 'readline';
 import { slugify } from '../utils';
 
+const { execSync } = require('child_process');
 const loadingSpinner = require('loading-spinner');
 
 interface Question {
@@ -139,7 +140,8 @@ export default async (): Promise<void> => {
   const answers = await getAnswers();
   const brandName =
     answers.brandName === '.' ? path.basename(workingDir) : answers.brandName;
-  const projectDir = path.resolve(workingDir, slugify(brandName));
+  const projectDir = answers.brandName === '.' ? workingDir : path.resolve(workingDir, slugify(brandName));
+  const relativeProjectDir = answers.brandName === '.' ? '.' : slugify(brandName);
 
   if (!fs.existsSync(projectDir)) {
     fs.mkdirSync(projectDir, { recursive: true });
@@ -172,12 +174,34 @@ export default async (): Promise<void> => {
     name: slugify(brandName)
   });
 
+
+  console.log('\x1b[34m%s\x1b[0m', '\n🚀 Installing packages...\n');
+
+  execSync(`cd ${relativeProjectDir} && yarn install`, { stdio: 'ignore' });
+
   loadingSpinner.stop();
 
-  console.log(
-    '\x1b[32m%s\x1b[0m',
-    `\n ✓ ${answers.brandName} project is ready.\n`
-  );
+  const successMessage = `
+✨ ${brandName} project is ready at \x1b[4m${projectDir}\x1b[0m
+
+Within the directory, the following commands are available:
+
+  \x1b[35m$ yarn dev\x1b[0m
+    \x1b[32mLaunches the development server.\x1b[0m
+
+  \x1b[35m$ yarn build\x1b[0m
+    \x1b[32mCompiles the app into static files for production.\x1b[0m
+
+  \x1b[35m$ yarn start\x1b[0m
+    \x1b[32mRuns the production server.\x1b[0m
+`;
+
+  const getStartedMessage = answers.brandName === '.'
+    ? 'To get started, you can type:\n\n  \x1b[35m$ yarn dev\x1b[0m\n'
+    : `To get started, you can type:\n\n  \x1b[35m$ cd ${relativeProjectDir}\x1b[0m\n  \x1b[35m$ yarn dev\x1b[0m\n`;
 
+  console.log('\x1b[32m%s\x1b[0m', successMessage);
+  console.log('\x1b[36m%s\x1b[0m', getStartedMessage);
+  console.log('\x1b[33m%s\x1b[0m', 'Project setup is complete\n');
   console.log('\x1b[33m%s\x1b[0m', 'Project Zero - Akinon\n');
 };

package/dist/commands/create.js

@@ -39,6 +39,7 @@ const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const utils_1 = require("../utils");
+const { execSync } = require('child_process');
 const loadingSpinner = require('loading-spinner');
 const workingDir = path_1.default.resolve(process.cwd());
 const rl = readline.createInterface({
@@ -128,7 +129,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const answers = yield getAnswers();
     const brandName = answers.brandName === '.' ? path_1.default.basename(workingDir) : answers.brandName;
-    const projectDir = path_1.default.resolve(workingDir, (0, utils_1.slugify)(brandName));
+    const projectDir = answers.brandName === '.' ? workingDir : path_1.default.resolve(workingDir, (0, utils_1.slugify)(brandName));
+    const relativeProjectDir = answers.brandName === '.' ? '.' : (0, utils_1.slugify)(brandName);
     if (!fs.existsSync(projectDir)) {
         fs.mkdirSync(projectDir, { recursive: true });
     }
@@ -150,7 +152,28 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     updateFileContents(path_1.default.join(projectDir, 'package.json'), {
         name: (0, utils_1.slugify)(brandName)
     });
+    console.log('\x1b[34m%s\x1b[0m', '\n🚀 Installing packages...\n');
+    execSync(`cd ${relativeProjectDir} && yarn install`, { stdio: 'ignore' });
     loadingSpinner.stop();
-    console.log('\x1b[32m%s\x1b[0m', `\n ✓ ${answers.brandName} project is ready.\n`);
+    const successMessage = `
+✨ ${brandName} project is ready at \x1b[4m${projectDir}\x1b[0m
+
+Within the directory, the following commands are available:
+
+  \x1b[35m$ yarn dev\x1b[0m
+    \x1b[32mLaunches the development server.\x1b[0m
+
+  \x1b[35m$ yarn build\x1b[0m
+    \x1b[32mCompiles the app into static files for production.\x1b[0m
+
+  \x1b[35m$ yarn start\x1b[0m
+    \x1b[32mRuns the production server.\x1b[0m
+`;
+    const getStartedMessage = answers.brandName === '.'
+        ? 'To get started, you can type:\n\n  \x1b[35m$ yarn dev\x1b[0m\n'
+        : `To get started, you can type:\n\n  \x1b[35m$ cd ${relativeProjectDir}\x1b[0m\n  \x1b[35m$ yarn dev\x1b[0m\n`;
+    console.log('\x1b[32m%s\x1b[0m', successMessage);
+    console.log('\x1b[36m%s\x1b[0m', getStartedMessage);
+    console.log('\x1b[33m%s\x1b[0m', 'Project setup is complete\n');
     console.log('\x1b[33m%s\x1b[0m', 'Project Zero - Akinon\n');
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.36.0-rc.0",
+  "version": "1.36.0-rc.2",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {