The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Update create twenty app scaffolded front component (#20733)
martmullf1b7c21b6c46
diff --git a/packages/create-twenty-app/package.json b/packages/create-twenty-app/package.jsonindex 89249234405..d6bd8028a0c 100644--- a/packages/create-twenty-app/package.json+++ b/packages/create-twenty-app/package.json@@ -1,6 +1,6 @@{"name": "create-twenty-app",- "version": "2.5.1",+ "version": "2.6.0","description": "Command-line interface to create Twenty application","main": "dist/cli.cjs","bin": "dist/cli.cjs",diff --git a/packages/create-twenty-app/src/cli.ts b/packages/create-twenty-app/src/cli.tsindex e41aa9924ae..05026ea2e4e 100644--- a/packages/create-twenty-app/src/cli.ts+++ b/packages/create-twenty-app/src/cli.ts@@ -74,12 +74,17 @@ const program = new Command(packageJson.name));}+ const workspaceUrl = (options?.workspaceUrl ?? options?.apiUrl)?.replace(+ /\/+$/,+ '',+ );+await new CreateAppCommand().execute({directory,name: options?.name,displayName: options?.displayName,description: options?.description,- workspaceUrl: options?.workspaceUrl ?? options?.apiUrl,+ workspaceUrl,authenticationMethod: options?.authenticationMethod,});},diff --git a/packages/create-twenty-app/src/constants/template/src/front-components/main-page.tsx b/packages/create-twenty-app/src/constants/template/src/front-components/main-page.tsxindex 2f1162c0cf2..98de4442709 100644--- a/packages/create-twenty-app/src/constants/template/src/front-components/main-page.tsx+++ b/packages/create-twenty-app/src/constants/template/src/front-components/main-page.tsx@@ -1,4 +1,11 @@import { defineFrontComponent } from 'twenty-sdk/define';+import {+ Avatar,+ IconBox,+ IconHierarchy,+ IconLayout,+ IconSettingsAutomation,+} from 'twenty-sdk/ui';import { useState } from 'react';import {@@ -30,7 +37,7 @@ const CATEGORIES = [href: `${DOCS_BASE_URL}/logic/logic-functions`,},{- label: 'SERVERLESS FUNCT.',+ label: 'LOGIC FUNCTION',href: `${DOCS_BASE_URL}/logic/logic-functions`,},{@@ -59,15 +66,6 @@ const CATEGORIES = [},] as const;-const ItemIcon = ({ color }: { color: string }) => (- <svg width="16" height="16" viewBox="0 0 16 16" fill="none">- <rect x="2" y="2" width="5" height="5" rx="1" fill={color} />- <rect x="9" y="2" width="5" height="5" rx="1" fill={color} opacity="0.6" />- <rect x="2" y="9" width="5" height="5" rx="1" fill={color} opacity="0.6" />- <rect x="9" y="9" width="5" height="5" rx="1" fill={color} opacity="0.3" />- </svg>-);-const ArrowUpRight = ({ color = '#999' }: { color?: string }) => (<svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path@@ -93,6 +91,18 @@ const CategoryCard = ({}) => {const [hoveredItem, setHoveredItem] = useState<string | null>(null);+ const CategoryIcon = () => {+ if (title === 'Data model') {+ return <IconHierarchy color={color} size={'20px'} />;+ }+ if (title === 'Logic') {+ return <IconSettingsAutomation color={color} size={'20px'} />;+ }+ if (title === 'Layout') {+ return <IconLayout color={color} size={'20px'} />;+ }+ };+return (<divstyle={{@@ -111,8 +121,12 @@ const CategoryCard = ({style={{padding: '16px 20px',background: `${color}22`,+ display: 'flex',+ alignItems: 'center',+ gap: '12px',}}>+ <CategoryIcon /><spanstyle={{fontSize: '16px',@@ -154,7 +168,7 @@ const CategoryCard = ({transition: 'background 0.15s',}}>- <ItemIcon color={color} />+ <IconBox color={color} size={'20px'} /><spanstyle={{fontSize: '13px',@@ -190,13 +204,11 @@ const MainPage = () => {padding: '40px',}}>- {/*<Avatar- avatarUrl={getPublicAssetUrl('logo.svg')}+ <Avatarplaceholder={APP_DISPLAY_NAME}placeholderColorSeed={APP_DISPLAY_NAME}- type="squared"size="xl"- />*/}+ /><spanstyle={{fontSize: '24px',@@ -220,7 +232,7 @@ const MainPage = () => {You can now add content to your app.</span><a- href="/settings/applications"+ href="/settings/applications#installed"style={{display: 'inline-flex',alignItems: 'center',diff --git a/packages/create-twenty-app/src/create-app.command.ts b/packages/create-twenty-app/src/create-app.command.tsindex 383bddacd02..9e2f9c7e656 100644--- a/packages/create-twenty-app/src/create-app.command.ts+++ b/packages/create-twenty-app/src/create-app.command.ts@@ -17,7 +17,7 @@ import {DEV_API_URL,serverStart,} from 'twenty-sdk/cli';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, normalizeUrl } from 'twenty-shared/utils';import {getDockerInstallInstructions,isDockerInstalled,@@ -389,7 +389,7 @@ export class CreateAppCommand {const frontUrl = urls.customUrl ?? urls.subdomainUrl;- return frontUrl?.replace(/\/+$/, '') ?? null;+ return frontUrl ? normalizeUrl(frontUrl) : null;}private async readMainPageLayoutUniversalIdentifier(diff --git a/packages/twenty-client-sdk/package.json b/packages/twenty-client-sdk/package.jsonindex 303d6f87ba5..1e3e9c173cc 100644--- a/packages/twenty-client-sdk/package.json+++ b/packages/twenty-client-sdk/package.json@@ -1,6 +1,6 @@{"name": "twenty-client-sdk",- "version": "2.5.1",+ "version": "2.6.0","sideEffects": false,"license": "AGPL-3.0","scripts": {diff --git a/packages/twenty-sdk/package.json b/packages/twenty-sdk/package.jsonindex bf6d32e1549..07e84112dce 100644--- a/packages/twenty-sdk/package.json+++ b/packages/twenty-sdk/package.json@@ -1,6 +1,6 @@{"name": "twenty-sdk",- "version": "2.5.1",+ "version": "2.6.0","sideEffects": false,"bin": {"twenty": "dist/cli.cjs"diff --git a/packages/twenty-sdk/src/cli/commands/remote.ts b/packages/twenty-sdk/src/cli/commands/remote.tsindex 4ff009cc813..1c5e177b09c 100644--- a/packages/twenty-sdk/src/cli/commands/remote.ts+++ b/packages/twenty-sdk/src/cli/commands/remote.ts@@ -7,6 +7,7 @@ import { detectLocalServer } from '@/cli/utilities/server/detect-local-server';import chalk from 'chalk';import type { Command } from 'commander';import inquirer from 'inquirer';+import { normalizeUrl } from 'twenty-shared/utils';const deriveRemoteName = (url: string): string => {try {@@ -117,7 +118,7 @@ export const registerRemoteCommands = (program: Command): void => {return;}- let apiUrl = options.apiUrl;+ let apiUrl = options.apiUrl ? normalizeUrl(options.apiUrl) : undefined;if (!apiUrl) {const detectedUrl = await detectLocalServer();@@ -136,24 +137,26 @@ export const registerRemoteCommands = (program: Command): void => {console.log(chalk.gray(`Found local server at ${detectedUrl}`));apiUrl = detectedUrl;} else {- apiUrl = (- await inquirer.prompt<{ apiUrl: string }>([- {- type: 'input',- name: 'apiUrl',- message: 'Twenty server URL:',- validate: (input: string) => {- try {- new URL(input);-- return true;- } catch {- return 'Please enter a valid URL';- }+ apiUrl = normalizeUrl(+ (+ await inquirer.prompt<{ apiUrl: string }>([+ {+ type: 'input',+ name: 'apiUrl',+ message: 'Twenty server URL:',+ validate: (input: string) => {+ try {+ new URL(input);++ return true;+ } catch {+ return 'Please enter a valid URL';+ }+ },},- },- ])- ).apiUrl;+ ])+ ).apiUrl,+ );}}