fix: create app with logo

Author: brettstack

.env.development.local.example

@@ -1,5 +1,5 @@
 # API_ENDPOINT='https://xxxxxxxxxx.execute-api.us-west-2.amazonaws.com'
-API_ENDPOINT='http://localhost:4911'
+API_ENDPOINT='http://localhost:4912'
 ISSUER_URL='https://cognito-idp.us-west-2.amazonaws.com/us-west-2_xxxxxxxxxx/.well-known/openid-configuration'
 CLIENT_ID='xxxxxxxxxxxxxxxxxxxxxxxxxx'
 DEBUG='codegenie:*'

README.md

@@ -5,15 +5,17 @@ npx @codegenie/cli generate --description "An app that lets users upload photos,
 ```
 
 <!-- toc -->
-* [Code Genie CLI](#code-genie-cli)
-* [Usage](#usage)
-* [Commands](#commands)
-* [Release](#release)
+
+- [Code Genie CLI](#code-genie-cli)
+- [Usage](#usage)
+- [Commands](#commands)
+- [Release](#release)
 <!-- tocstop -->
 
 # Usage
 
 <!-- usage -->
+
 ```sh-session
 $ npm install -g @codegenie/cli
 $ @codegenie/cli COMMAND
@@ -25,16 +27,23 @@ USAGE
   $ @codegenie/cli COMMAND
 ...
 ```
+
 <!-- usagestop -->
 
 # Commands
 
 <!-- commands -->
-* [`@codegenie/cli autocomplete [SHELL]`](#codegeniecli-autocomplete-shell)
-* [`@codegenie/cli generate`](#codegeniecli-generate)
-* [`@codegenie/cli help [COMMANDS]`](#codegeniecli-help-commands)
-* [`@codegenie/cli login`](#codegeniecli-login)
-* [`@codegenie/cli update [CHANNEL]`](#codegeniecli-update-channel)
+
+- [Code Genie CLI](#code-genie-cli)
+- [Usage](#usage)
+- [Commands](#commands)
+  - [`@codegenie/cli autocomplete [SHELL]`](#codegeniecli-autocomplete-shell)
+  - [`@codegenie/cli generate`](#codegeniecli-generate)
+  - [`@codegenie/cli help [COMMANDS]`](#codegeniecli-help-commands)
+  - [`@codegenie/cli login`](#codegeniecli-login)
+  - [`@codegenie/cli update [CHANNEL]`](#codegeniecli-update-channel)
+- [Release](#release)
+- [Development](#development)
 
 ## `@codegenie/cli autocomplete [SHELL]`
 
@@ -185,6 +194,7 @@ EXAMPLES
 ```
 
 _See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.2.13/src/commands/update.ts)_
+
 <!-- commandsstop -->
 
 # Release
@@ -196,3 +206,7 @@ npm publish --access=public
 ```
 
 See [Oclif Release Docs](https://oclif.io/docs/releasing/) for more details.
+
+# Development
+
+DOTENV_ENV=local ~/projects/codegenie-cli/bin/dev.js generate

src/commands/generate.ts

@@ -6,9 +6,9 @@ import { cosmiconfig } from 'cosmiconfig'
 import createDebug from 'debug'
 import { execSync } from 'node:child_process'
 import { cwd } from 'node:process'
-import { dirname, join, resolve } from 'node:path'
+import { dirname, extname, join, resolve } from 'node:path'
 import { inspect } from 'node:util'
-import { copyFile, mkdir } from 'node:fs/promises'
+import { copyFile, mkdir, readFile } from 'node:fs/promises'
 import { fileURLToPath } from 'node:url'
 import { awsCredentialsFileExists } from '../aws-creds.js'
 import sleep from '../sleep.js'
@@ -18,6 +18,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 const debug = createDebug('codegenie:generate')
 const appDir = cwd()
+const dotCodeGenieDir = join(appDir, '.codegenie')
 
 const explorer = cosmiconfig('codegenie', {
   searchPlaces: [`.codegenie/app.js`, `.codegenie/app.ts`, `.codegenie/app.mjs`, `.codegenie/app.cjs`],
@@ -115,7 +116,7 @@ generating app...
           awsProfileToCopy,
         }
       }
-    } else if (!existsSync(join(appDir, '.codegenie'))) {
+    } else if (!existsSync(dotCodeGenieDir)) {
       this.error(
         "No .codegenie directory found. Make sure you're running this command inside a directory that has a child .codegenie directory.",
         {
@@ -260,8 +261,10 @@ Run \`npm run init:dev\` to get started. See https://codegenie.codes/docs/guides
     ux.action.start('🧞  Creating a new Code Genie App')
 
     try {
+      const logo = await this.getLogo()
       const createAppResponse = await axios.post('/apps', {
         appDefinition: generateAppDefinitionResponse.data.appDefinition,
+        logo,
         // app: {
         //   name: appName,
         //   description,
@@ -296,8 +299,27 @@ Run \`npm run init:dev\` to get started. See https://codegenie.codes/docs/guides
     }
   }
 
+  async getLogo() {
+    let logo = null
+    try {
+      const logoPath = join(dotCodeGenieDir, 'logo.png')
+      const logoBuffer = await readFile(logoPath)
+      const mimeType = extname(logoPath).toLowerCase() === '.png' ? 'image/png' : 'image/jpeg'
+      const base64Data = logoBuffer.toString('base64')
+      logo = `data:${mimeType};base64,${base64Data}`
+    } catch (fileError: any) {
+      if (fileError.code === 'ENOENT') {
+        console.warn('No logo found. Proceeding without a logo.')
+      } else {
+        console.error('Error reading logo file:', fileError.message)
+      }
+    }
+    console.log('logo is', logo)
+    return logo
+  }
+
   async writeGeneratedAppDefinitionFile({ appDefinition }: { appDefinition: AppDefinition }) {
-    const codeGenieDir = join(appDir, '.codegenie')
+    const codeGenieDir = dotCodeGenieDir
     if (!existsSync(codeGenieDir)) {
       await mkdir(codeGenieDir)
     }
@@ -315,7 +337,7 @@ export default codeGenieAppDefinition
   }
 
   async addAppIdToAppDefinitionFile({ appId }: { appId: string }) {
-    const codeGenieDir = join(appDir, '.codegenie')
+    const codeGenieDir = dotCodeGenieDir
     const appDefinitionFilePath = join(codeGenieDir, 'app.ts')
     const appDefinitionFileContents = readFileSync(appDefinitionFilePath, { encoding: 'utf8' })
     const appDefinitionFileContentsWithAppId = appDefinitionFileContents.replace(
@@ -346,8 +368,10 @@ export default codeGenieAppDefinition
 
     if (!appId) {
       try {
+        const logo = await this.getLogo()
         const createAppResponse = await axios.post('/apps', {
           appDefinition,
+          logo,
         })
         debug('createAppResponse %O', createAppResponse)
         appId = createAppResponse.data.data.appId as string
@@ -465,7 +489,7 @@ export default codeGenieAppDefinition
   async copyCodeGenieLogo() {
     const debug = createDebug('codegenie:generate:copyCodeGenieLogo')
     const codeGenieLogoPath = resolve(__dirname, '../../logo.png')
-    const appCodeGenieDir = join(appDir, '.codegenie')
+    const appCodeGenieDir = dotCodeGenieDir
     debug('copying logo from %s to %s', codeGenieLogoPath, appCodeGenieDir)
     await copyFile(codeGenieLogoPath, join(appCodeGenieDir, 'logo.png'))
     debug('complete')