Skip to content

Commit

Permalink
[ESLint plugin] Add a rule to enforce folder architecture on frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
gitstart-twenty committed Oct 15, 2024
1 parent 6a42d58 commit bf55d6e
Show file tree
Hide file tree
Showing 718 changed files with 33,336 additions and 29,828 deletions.
1 change: 1 addition & 0 deletions .eslintrc.react.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
'@nx/workspace-use-getLoadable-and-getValue-to-get-atoms': 'error',
'@nx/workspace-useRecoilCallback-has-dependency-array': 'error',
'@nx/workspace-no-navigate-prefer-link': 'error',
'@nx/workspace-folder-structure': 'warn',
'react/no-unescaped-entities': 'off',
'react/prop-types': 'off',
'react/jsx-key': 'off',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ Your turn 👇

» 02-October-2024 by [yourhandle](https://oss.gg/yourhandle) poster Link: [poster](https://twenty.com/)

---
» 11-October-2024 by [thefool76](https://oss.gg/thefool76) poster Link: [poster](https://drive.google.com/file/d/1cIC1eitvY6zKVTXKq2LnVrS_2Ho9H8-P/view?usp=sharing)

» 12-October-2024 by [Ionfinisher](https://oss.gg/Ionfinisher) poster Link: [poster](https://x.com/ion_finisher/status/1845168965963628802)

---
13 changes: 10 additions & 3 deletions oss-gg/twenty-design-challenges/2-design-new-logo-twenty.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Side Quest**: Design/Create new Twenty logo, tweet your design, and mention @twentycrm.
**Points**: 300 Points
**Proof**: Create a logo uploade it on any of the platform and add your oss handle and logo link to the list below.
**Proof**: Create a logo upload it on any of the platform and add your oss handle and logo link to the list below.

Please follow the following schema:

Expand All @@ -16,6 +16,13 @@ Your turn 👇

////////////////////////////

» 02-October-2024 by [yourhandle](https://oss.gg/yourhandle) Logo Link: [logo](https://twenty.com/) tweet Link: [tweet](https://x.com)
» 08-October-2024 by [adityadeshlahre](https://oss.gg/adityadeshlahre) Logo Link: [logo](https://drive.google.com/drive/folders/13k22xMnX2fhnWK94vas_hO1t-ImqXcHZ?usp=drive_link) » tweet Link: [tweet](https://x.com/adityadeshlahre/status/1843354963176718374)

---
» 11-October-2024 by [thefool76](https://oss.gg/thefool76) Logo Link: [logo](https://drive.google.com/file/d/1DxSwNY_i90kGgWzPQj5SxScBz_6r02l4/view?usp=sharing) » tweet Link: [tweet](https://x.com/thefool1135/status/1844693487067034008)

» 13-October-2024 by [Atharva_404](https://oss.gg/Atharva-3000) Logo Link: [logo](https://drive.google.com/drive/folders/1XB7ELR7kPA4x7Fx5RQr8wo5etdZAZgcs?usp=drive_link) » tweet Link: [tweet](https://x.com/0x_atharva/status/1845421218914095453)

» 13-October-2024 by [Ionfinisher](https://oss.gg/Ionfinisher) Logo Link: [logo](https://drive.google.com/file/d/1l9vE8CIjW9KfdioI5WKzxrdmvO8LR4j7/view?usp=drive_link) » tweet Link: [tweet](https://x.com/ion_finisher/status/1845466470429442163)


---
34 changes: 28 additions & 6 deletions oss-gg/twenty-side-quest/1-quote-tweet-20-oss-gg-launch.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Side Quest**: Meme Magic - Craft a meme where a brick plays a role. Tweet it, and tag us @papermarkio to submit.
**Points**: 150 Points
**Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.
**Side Quest**: Like & Re-Tweet oss.gg Launch Tweet. Quote-tweet it tagging @twentycrm to say you’ll be contributing.
**Points**: 50 Points
**Proof**: Add a screenshot of the retweet to the PR description. Add a link to your retweet in the list below.

Please follow the following schema:

Expand All @@ -17,7 +17,29 @@ Your turn 👇

////////////////////////////

» 01-October-2024 by YOUR NAME
» Link to Tweet: https://x.com/...
» 13-October-2024 by Vanshika Dargan
» Link to Tweet: https://x.com/VanshikaDargan/status/1845467453108949123

---
» 13-October-2024 by Utsav Bhattarai
» Link to Tweet: https://x.com/utsavdotdev/status/1845417863462649900

» 10-October-2024 by Devansh Baghel
» Link to Tweet: https://x.com/DevanshBaghel5/status/1844359648037748954

» 11-October-2024 by Bhavesh Mishra
» Link to Tweet: https://x.com/thefool1135/status/1844453425188405326

» 11-October-2024 by Chirag Arora
» Link to Tweet: https://x.com/Chirag8023/status/1844689900668682699

» 11-October-2024 by Aritra Sadhukhan
» Link to Tweet: https://x.com/AritraDevelops/status/1844670236512878646

» 13-October-2024 by Nabhag Motivaras
» Link to Tweet: https://x.com/NabhagMotivaras/status/1845449144695218357

» 13-October-2024 by Ali Yar Khan
» Link to Tweet: https://x.com/Mr_Programmer14/status/1845527862549577860

» 13-October-2024 by Yash Parmar
» Link to Tweet: https://x.com/yashp3020/status/1845720834716959009
15 changes: 10 additions & 5 deletions oss-gg/twenty-side-quest/2-tweet-about-fav-twenty-feature.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Side Quest**: Meme Magic - Craft a meme where a brick plays a role. Tweet it, and tag us @papermarkio to submit.
**Points**: 150 Points
**Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.
**Side Quest**: Share a tweet about your favorite feature in Twenty. Tweet about your favorite feature in Twenty and mention @twentycrm.
**Points**: 50 Points
**Proof**: Add a screenshot of the tweet to the PR description. Add a link to your tweet in the list below.

Please follow the following schema:

Expand All @@ -17,7 +17,12 @@ Your turn 👇

////////////////////////////

» 01-October-2024 by YOUR NAME
» Link to Tweet: https://x.com/...
» 10-October-2024 by Devansh Baghel
» Link to Tweet: https://x.com/DevanshBaghel5/status/1844384722119704972

» 11-October-2024 by Bhavesh Mishra
» Link to Tweet: https://x.com/thefool1135/status/1844456500380696969

» 13-October-2024 by Ali Yar Khan
» Link to Tweet: https://x.com/Mr_Programmer14/status/1845530448245711197
---
23 changes: 23 additions & 0 deletions oss-gg/twenty-side-quest/3-bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Side Quest**: Create a bug report. Use the Twenty bug issue template to report a bug in detail, including steps to reproduce it.
**Points**: 50-150 Points
**Proof**: Add a link to your bug report in the list below.

Please follow the following schema:

---

» 05-April-2024 by YOUR NAME
» Link to bug report: https://github.com/twentyhq/twenty/issues/...

---

////////////////////////////

Your turn 👇

////////////////////////////

» 10-October-2024 by Devansh Baghel
» Link to bug report: https://github.com/twentyhq/twenty/issues/7560

---
23 changes: 0 additions & 23 deletions oss-gg/twenty-side-quest/3-meme-magic.md

This file was deleted.

23 changes: 0 additions & 23 deletions oss-gg/twenty-side-quest/4-gif-magic.md

This file was deleted.

34 changes: 34 additions & 0 deletions oss-gg/twenty-side-quest/4-meme-magic.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
**Side Quest**: Meme Magic: Craft a meme where the number twenty plays a role. Tweet it, and tag @twentycrm.
**Points**: 150 Points
**Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.

Please follow the following schema:

---

» 05-April-2024 by YOUR NAME
» Link to Tweet: https://x.com/...

---

////////////////////////////

Your turn 👇

////////////////////////////

» 10-October-2024 by Teddy ASSIH
» Link to Tweet: https://x.com/ion_finisher/status/1844389252253299173

» 11-October-2024 by Bhavesh Mishra
» Link to Tweet: https://x.com/thefool1135/status/1844458836402503931

» 12-October-2024 by Chirag Arora
» Link to Tweet: https://x.com/Chirag8023/status/1845108226527994222

» 13-October-2024 by Ali Yar Khan
» Link to Tweet: https://x.com/Mr_Programmer14/status/1845537662587072697

» 14-October-2024 by Yash Parmar
» Link to Tweet: [https://x.com/yashp3020/status/1845108226527994222](https://x.com/yashp3020/status/1845720142702842093)
---
33 changes: 33 additions & 0 deletions oss-gg/twenty-side-quest/5-gif-magic.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
**Side Quest**: Gif Magic: Create a gif related to Twenty. Tweet it, and tag @twentycrm.
**Points**: 150 Points
**Proof**: Add a screenshot of GIF on Giphy to the PR description. Add a link to your GIPHY in the list below.

Please follow the following schema:

---

» 05-April-2024 by YOUR NAME
» Link to gif: https://giphy.com/...

---

////////////////////////////

Your turn 👇

////////////////////////////

» 10-October-2024 by Teddy ASSIH
» Link to gif: https://giphy.com/gifs/oss-crm-twenty-VWDHAIlGTbc6Nqdza9

» 11-October-2024 by Bhavesh Mishra
» Link to gif: https://shorturl.at/yln9H

» 12-October-2024 by Chirag Arora
» Link to gif: https://giphy.com/gifs/yCJIS2MGbBdifbnuj0

» 13-October-2024 by Nabhag Motivaras
» Link to gif: https://giphy.com/gifs/twenty-twentycrm-opensourcecrm-wCcsmnJuzzzGrfuf9B


---
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**Side Quest**: Complete all papermarkio side quests
**Side Quest**: Complete all Twenty side quests
**Points**: 300 Points
**Proof**: Add screenshots for each side quest to the PR description. Add your name to the list below.

Expand Down
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
"@nestjs/serve-static": "^4.0.1",
"@nestjs/terminus": "^9.2.2",
"@nestjs/typeorm": "^10.0.0",
"@nivo/calendar": "^0.84.0",
"@nivo/core": "^0.84.0",
"@nx/eslint-plugin": "^17.2.8",
"@octokit/graphql": "^7.0.2",
"@ptc-org/nestjs-query-core": "^4.2.0",
Expand Down Expand Up @@ -296,7 +294,6 @@
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-project-structure": "^3.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
Expand Down Expand Up @@ -341,7 +338,7 @@
},
"license": "AGPL-3.0",
"name": "twenty",
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.0",
"resolutions": {
"graphql": "16.8.0",
"type-fest": "4.10.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import styled from '@emotion/styled';
import React, { useId } from 'react';

interface TextInputProps {
label?: string;
Expand All @@ -18,7 +18,7 @@ const StyledContainer = styled.div<{ fullWidth?: boolean }>`
margin-bottom: ${({ theme }) => theme.spacing(4)};
`;

const StyledLabel = styled.span`
const StyledLabel = styled.label`
color: ${({ theme }) => theme.font.color.light};
font-size: ${({ theme }) => theme.font.size.xs};
font-weight: ${({ theme }) => theme.font.weight.semiBold};
Expand Down Expand Up @@ -65,12 +65,15 @@ const TextInput: React.FC<TextInputProps> = ({
placeholder,
icon,
}) => {
const inputId = useId();

return (
<StyledContainer fullWidth={fullWidth}>
{label && <StyledLabel>{label}</StyledLabel>}
{label && <StyledLabel htmlFor={inputId}>{label}</StyledLabel>}
<StyledInputContainer>
{icon && <StyledIcon>{icon}</StyledIcon>}
<StyledInput
id={inputId}
type="text"
value={value}
onChange={(e) => onChange(e.target.value)}
Expand Down
25 changes: 0 additions & 25 deletions packages/twenty-docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
dev-build:
@docker compose -f dev/docker-compose.yml down -v
@docker compose -f dev/docker-compose.yml build

dev-up:
@docker compose -f dev/docker-compose.yml up -d

dev-start:
@docker compose -f dev/docker-compose.yml start

dev-stop:
@docker compose -f dev/docker-compose.yml stop

dev-down:
@docker compose -f dev/docker-compose.yml down -v

dev-sh:
@docker compose -f dev/docker-compose.yml exec twenty-dev sh

dev-postgres-build:
@docker stop twenty_postgres || true
@docker rm twenty_postgres || true
@docker volume rm twenty_db_data || true
@docker compose -f dev/docker-compose.yml up --build postgres -d

prod-build:
@cd ../.. && docker build -f ./packages/twenty-docker/twenty/Dockerfile --tag twenty . && cd -

Expand Down
29 changes: 0 additions & 29 deletions packages/twenty-docker/twenty-website/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion packages/twenty-emails/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twenty-emails",
"version": "0.31.0-canary",
"version": "0.32.0-canary",
"description": "",
"author": "",
"private": true,
Expand Down
Loading

0 comments on commit bf55d6e

Please sign in to comment.