diff --git a/.gitignore b/.gitignore index 3d23d7fa4..00c501bfb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions +.vercel diff --git a/packages/twenty-docs/docs/developer/rest_api.mdx b/packages/twenty-docs/docs/developer/rest_api.mdx index 0a2d064aa..90674e790 100644 --- a/packages/twenty-docs/docs/developer/rest_api.mdx +++ b/packages/twenty-docs/docs/developer/rest_api.mdx @@ -6,8 +6,7 @@ sidebar_custom_props: --- To use the REST API, you will need an API key. -Connect to your Twenty account and follow the following -[documentation](user-guide/integrations/generating-api-keys.mdx) to generate one +Connect to your Twenty account ang do to Setting > Developers to generate one. ## Using Postman? diff --git a/packages/twenty-docs/docs/user-guide/basics/_category_.json b/packages/twenty-docs/docs/user-guide/basics/_category_.json deleted file mode 100644 index daec3e16a..000000000 --- a/packages/twenty-docs/docs/user-guide/basics/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "label": "Basics", - "position": 1 -} diff --git a/packages/twenty-docs/docs/user-guide/integrations/_category_.json b/packages/twenty-docs/docs/user-guide/integrations/_category_.json deleted file mode 100644 index f8777284b..000000000 --- a/packages/twenty-docs/docs/user-guide/integrations/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "label": "Integrations", - "position": 2 -} diff --git a/packages/twenty-docs/docs/user-guide/others/_category_.json b/packages/twenty-docs/docs/user-guide/others/_category_.json deleted file mode 100644 index 9aa323d85..000000000 --- a/packages/twenty-docs/docs/user-guide/others/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "label": "Others", - "position": 3 -} diff --git a/packages/twenty-docs/docusaurus.config.js b/packages/twenty-docs/docusaurus.config.js index d05b9a3af..6c0188f67 100644 --- a/packages/twenty-docs/docusaurus.config.js +++ b/packages/twenty-docs/docusaurus.config.js @@ -75,11 +75,6 @@ const config = { type: "search", position: "left", }, - { - to: "/user-guide", - label: "User Guide", - position: "right", - }, { to: "https://github.com/twentyhq/twenty/releases", label: "Releases", diff --git a/packages/twenty-website/README.md b/packages/twenty-website/README.md index 1601a6b33..08e731e56 100644 --- a/packages/twenty-website/README.md +++ b/packages/twenty-website/README.md @@ -1,16 +1,21 @@ -This is a [Next.js](https://nextjs.org/) project. + +# Twenty-Website +This used for the marketing website (twenty.com). +This is not related in anyway to the main app, which you can find in twenty-front and twenty-server. ## Getting Started -First, run the development server: +We're using Nest.JS +From the root directory: ```bash -yarn dev +nx run twenty-website:dev ``` +Then open [http://localhost:3000](http://localhost:3000) with your browser to see the result. -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. - - +Or to build in prod: +```bash +nx run twenty-website:build +nx run twenty-website:start +``` \ No newline at end of file diff --git a/packages/twenty-docs/static/img/user-guide/all-opportunities-dark.png b/packages/twenty-website/public/images/user-guide/all-opportunities-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/all-opportunities-dark.png rename to packages/twenty-website/public/images/user-guide/all-opportunities-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/all-opportunities-light.png b/packages/twenty-website/public/images/user-guide/all-opportunities-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/all-opportunities-light.png rename to packages/twenty-website/public/images/user-guide/all-opportunities-light.png diff --git a/packages/twenty-docs/static/img/user-guide/attach-files-to-records-dark.png b/packages/twenty-website/public/images/user-guide/attach-files-to-records-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/attach-files-to-records-dark.png rename to packages/twenty-website/public/images/user-guide/attach-files-to-records-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/attach-files-to-records-light.png b/packages/twenty-website/public/images/user-guide/attach-files-to-records-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/attach-files-to-records-light.png rename to packages/twenty-website/public/images/user-guide/attach-files-to-records-light.png diff --git a/packages/twenty-docs/static/img/user-guide/compact-opportunities-view-dark.png b/packages/twenty-website/public/images/user-guide/compact-opportunities-view-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/compact-opportunities-view-dark.png rename to packages/twenty-website/public/images/user-guide/compact-opportunities-view-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/compact-opportunities-view-light.png b/packages/twenty-website/public/images/user-guide/compact-opportunities-view-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/compact-opportunities-view-light.png rename to packages/twenty-website/public/images/user-guide/compact-opportunities-view-light.png diff --git a/packages/twenty-docs/static/img/user-guide/connect-zapier.png b/packages/twenty-website/public/images/user-guide/connect-zapier.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/connect-zapier.png rename to packages/twenty-website/public/images/user-guide/connect-zapier.png diff --git a/packages/twenty-docs/static/img/user-guide/create-custom-object.gif b/packages/twenty-website/public/images/user-guide/create-custom-object.gif similarity index 100% rename from packages/twenty-docs/static/img/user-guide/create-custom-object.gif rename to packages/twenty-website/public/images/user-guide/create-custom-object.gif diff --git a/packages/twenty-docs/static/img/user-guide/create-new-note-dark.png b/packages/twenty-website/public/images/user-guide/create-new-note-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/create-new-note-dark.png rename to packages/twenty-website/public/images/user-guide/create-new-note-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/create-new-note-light.png b/packages/twenty-website/public/images/user-guide/create-new-note-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/create-new-note-light.png rename to packages/twenty-website/public/images/user-guide/create-new-note-light.png diff --git a/packages/twenty-docs/static/img/user-guide/create-new-task-dark.png b/packages/twenty-website/public/images/user-guide/create-new-task-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/create-new-task-dark.png rename to packages/twenty-website/public/images/user-guide/create-new-task-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/create-new-task-light.png b/packages/twenty-website/public/images/user-guide/create-new-task-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/create-new-task-light.png rename to packages/twenty-website/public/images/user-guide/create-new-task-light.png diff --git a/packages/twenty-docs/static/img/user-guide/display-fields-dark.png b/packages/twenty-website/public/images/user-guide/display-fields-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/display-fields-dark.png rename to packages/twenty-website/public/images/user-guide/display-fields-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/display-fields-light.png b/packages/twenty-website/public/images/user-guide/display-fields-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/display-fields-light.png rename to packages/twenty-website/public/images/user-guide/display-fields-light.png diff --git a/packages/twenty-docs/static/img/user-guide/filter-opportunities-dark.png b/packages/twenty-website/public/images/user-guide/filter-opportunities-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/filter-opportunities-dark.png rename to packages/twenty-website/public/images/user-guide/filter-opportunities-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/filter-opportunities-light.png b/packages/twenty-website/public/images/user-guide/filter-opportunities-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/filter-opportunities-light.png rename to packages/twenty-website/public/images/user-guide/filter-opportunities-light.png diff --git a/packages/twenty-docs/static/img/user-guide/manage-custom-object.png b/packages/twenty-website/public/images/user-guide/manage-custom-object.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/manage-custom-object.png rename to packages/twenty-website/public/images/user-guide/manage-custom-object.png diff --git a/packages/twenty-docs/static/img/user-guide/view-all-objects-dark.png b/packages/twenty-website/public/images/user-guide/view-all-objects-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/view-all-objects-dark.png rename to packages/twenty-website/public/images/user-guide/view-all-objects-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/view-all-objects-light.png b/packages/twenty-website/public/images/user-guide/view-all-objects-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/view-all-objects-light.png rename to packages/twenty-website/public/images/user-guide/view-all-objects-light.png diff --git a/packages/twenty-docs/static/img/user-guide/view-favorite-records-dark.png b/packages/twenty-website/public/images/user-guide/view-favorite-records-dark.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/view-favorite-records-dark.png rename to packages/twenty-website/public/images/user-guide/view-favorite-records-dark.png diff --git a/packages/twenty-docs/static/img/user-guide/view-favorite-records-light.png b/packages/twenty-website/public/images/user-guide/view-favorite-records-light.png similarity index 100% rename from packages/twenty-docs/static/img/user-guide/view-favorite-records-light.png rename to packages/twenty-website/public/images/user-guide/view-favorite-records-light.png diff --git a/packages/twenty-website/src/app/api/github/route.ts b/packages/twenty-website/src/app/api/github/route.ts deleted file mode 100644 index 21778e739..000000000 --- a/packages/twenty-website/src/app/api/github/route.ts +++ /dev/null @@ -1,8 +0,0 @@ -import {NextRequest, NextResponse} from "next/server"; - -export async function GET (request: NextRequest){ - const response = await fetch('https://api.github.com/repos/twentyhq/twenty/releases'); - const data = await response.json(); - - return NextResponse.json(data); -} \ No newline at end of file diff --git a/packages/twenty-website/src/app/blog/[slug]/page.tsx b/packages/twenty-website/src/app/blog/[slug]/page.tsx deleted file mode 100644 index 994520518..000000000 --- a/packages/twenty-website/src/app/blog/[slug]/page.tsx +++ /dev/null @@ -1,4 +0,0 @@ -export default async function BlogPost({ params }: { params: { slug: string } }) { - const posts = {}; - return <>Blog Post: {params.slug}>; -} diff --git a/packages/twenty-website/src/app/blog/list-posts.tsx b/packages/twenty-website/src/app/blog/list-posts.tsx deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/twenty-website/src/app/blog/page.tsx b/packages/twenty-website/src/app/blog/page.tsx deleted file mode 100644 index 9b360fed5..000000000 --- a/packages/twenty-website/src/app/blog/page.tsx +++ /dev/null @@ -1,6 +0,0 @@ - - -export default async function BlogHome() { - const posts = {}; - return <>Blog Home>; -} \ No newline at end of file diff --git a/packages/twenty-website/src/app/components/ContentContainer.tsx b/packages/twenty-website/src/app/components/ContentContainer.tsx index db033a27a..0e6ba61a2 100644 --- a/packages/twenty-website/src/app/components/ContentContainer.tsx +++ b/packages/twenty-website/src/app/components/ContentContainer.tsx @@ -1,11 +1,18 @@ 'use client' +import styled from '@emotion/styled' + +const Container = styled.div` + display: flex; + flex-direction: column; + width: 600px; + @media(max-width: 809px) { + width: 100%; + }`; + + export const ContentContainer = ({children}: {children?: React.ReactNode}) => { return ( -
## Add Records To Favorites
You can add records to your favorites for quick access. To do so, expand the record you want to add, and click on the heart icon on the top right. You'll now be able to see your favorite records in your sidebar right above your workspace.
-
## Import data
diff --git a/packages/twenty-docs/docs/user-guide/basics/custom objects.mdx b/packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx
similarity index 81%
rename from packages/twenty-docs/docs/user-guide/basics/custom objects.mdx
rename to packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx
index a8554f89b..5ace07038 100644
--- a/packages/twenty-docs/docs/user-guide/basics/custom objects.mdx
+++ b/packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx
@@ -1,11 +1,10 @@
---
-title: Creating Custom Objects
+title: Custom Objects
sidebar_position: 1
sidebar_custom_props:
icon: TbAugmentedReality
---
-import ThemedImage from '@theme/ThemedImage';
Objects are structures that allow you to store data (records, attributes, and values) specific to an organization. Twenty provides both standard and custom objects.
@@ -22,7 +21,7 @@ To create a new custom object:
+
+
## Format Notes
diff --git a/packages/twenty-docs/docs/user-guide/basics/opportunities.mdx b/packages/twenty-website/src/content/user-guide/basics/opportunities.mdx
similarity index 79%
rename from packages/twenty-docs/docs/user-guide/basics/opportunities.mdx
rename to packages/twenty-website/src/content/user-guide/basics/opportunities.mdx
index 8949b33bb..5e05a0567 100644
--- a/packages/twenty-docs/docs/user-guide/basics/opportunities.mdx
+++ b/packages/twenty-website/src/content/user-guide/basics/opportunities.mdx
@@ -5,11 +5,11 @@ sidebar_custom_props:
icon: TbTargetArrow
---
-import ThemedImage from '@theme/ThemedImage';
+import PostImage from '@theme/PostImage';
All opportunities are presented in a Kanban board, where each column represents the stage of your workflow and each card represents a record. For each card, you can list the amount, close date, probability, and the point of contact. You can also move each card between stages as it goes through your workflow.
-
## Add and delete stages
@@ -26,7 +26,7 @@ It's easy to add filters and update your view to focus on only the most importan
- You can also add another filter by following the same steps or clicking on the `+ Add filter` button on top of the columns.
- To remove a filter condition, simply click on the X next to the attribute you used to filter the records.
-
\ No newline at end of file
diff --git a/packages/twenty-docs/docs/user-guide/basics/tasks.mdx b/packages/twenty-website/src/content/user-guide/basics/tasks.mdx
similarity index 78%
rename from packages/twenty-docs/docs/user-guide/basics/tasks.mdx
rename to packages/twenty-website/src/content/user-guide/basics/tasks.mdx
index 786da1e75..b2211a84e 100644
--- a/packages/twenty-docs/docs/user-guide/basics/tasks.mdx
+++ b/packages/twenty-website/src/content/user-guide/basics/tasks.mdx
@@ -5,11 +5,11 @@ sidebar_custom_props:
icon: TbChecklist
---
-import ThemedImage from '@theme/ThemedImage';
+import PostImage from '../../../components/PostImage'
You can find all the tasks from across your workspace in the Tasks window in your sidebar. You can also find a dedicated tab for Tasks on each record so you can add and edit tasks directly from each record. Alternatively, you can click on the `+` button on the top right of each record page and then click on Task to create a new task.
-
## Tasks page
diff --git a/packages/twenty-website/src/content/user-guide/integrations/_category_.json b/packages/twenty-website/src/content/user-guide/integrations/_category_.json
new file mode 100644
index 000000000..4309ef82a
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/integrations/_category_.json
@@ -0,0 +1,4 @@
+{
+ "title": "Integrations",
+ "position": 2
+}
diff --git a/packages/twenty-docs/docs/user-guide/integrations/connect-zapier.mdx b/packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx
similarity index 93%
rename from packages/twenty-docs/docs/user-guide/integrations/connect-zapier.mdx
rename to packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx
index bf7e8c132..801fff10d 100644
--- a/packages/twenty-docs/docs/user-guide/integrations/connect-zapier.mdx
+++ b/packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx
@@ -21,7 +21,7 @@ Sync Twenty with 3000+ apps using [Zapier](https://zapier.com/), and automate yo
6. Enter your API key and click on 'Yes, Continue to Twenty.'
+