Skip to content

Commit

Permalink
Add ui/progress-bar stories (twentyhq#936)
Browse files Browse the repository at this point in the history
* Add ui/progress-bar stories

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Add requested changes

Co-authored-by: RubensRafael <[email protected]>
Co-authored-by: v1b3m <[email protected]>

---------

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

Add pull request previews (twentyhq#954)

Add ergomake

Co-authored-by: Lucas Vieira <[email protected]>

[Do not merge] Try ergomake (twentyhq#958)

* Try ergomake

* Try redeploy

Update double cell input width to be fixed (twentyhq#946)

Fix double cell input width to be fixed

Feat/improve editable cell (twentyhq#959)

* Removed isSomeInputInEditMode

* Removed console.log

* Added a first version of generic cell text

* Removed metadata from entity table  V1

* Fix

* Fix

* Fix

TWNTY-892 - Add ui/title stories (twentyhq#955)

* Add ui/title stories

Co-authored-by: RubensRafael <[email protected]>

* Add requested changes

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Fix linter issues

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

---------

Co-authored-by: RubensRafael <[email protected]>
Co-authored-by: v1b3m <[email protected]>

Add Timeline End Icon (twentyhq#945)

* -added timeline end icon

* - fixed styledDiv in component

* - fixed icon size

Short variant for filter texts (twentyhq#943)

* - added a short variant for filter labels in the filter bar

* - fixed tests
- moved colon to shortoperand

* - fixed formatting

TWNTY-895 - Add ui/checkmark stories (twentyhq#960)

Add ui/checkmark stories

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: Thiago Nascimbeni <[email protected]>

feat: upload profile picture from google (twentyhq#964)

* feat: upload profile picture from google

* fix: only add profile picture if user don't have any

feat: increase upload size limit (twentyhq#962)

eat: create ViewField model (twentyhq#961)

* feat: create ViewField model

- Created ViewField prisma model
- Added ViewField server resolvers for findMany/updateOne
- Added getViewFields/updateViewField graphql queries

Closes twentyhq#849

* chore: update node version in .nvmrc files

feat: implement e2e test for CompanyResolver (twentyhq#944)

* feat: wip e2e server test

* feat: use github action postgres & use infra for local

* feat: company e2e test

* feat: add company e2e test for permissions

* Simplify server e2e test run

* Fix lint

---------

Co-authored-by: Charles Bochet <[email protected]>

Fix server e2e tests on CI twentyhq#1

Fix server e2e tests on CI twentyhq#2

Fix server e2e tests on CI twentyhq#3

Fix server e2e tests on CI twentyhq#4

Fix server e2e tests on CI twentyhq#5

Added generic relation cell (twentyhq#969)

* Added generic relation cell

* Deactivated debug

* Added default warning

* Put back display component

* Removed unused types

fix: 906 edit avatar style (twentyhq#923)

* fix: 906 edit avatar style

* fix: 906 add avatar size enum and mapping for font and height

* fix: 906 remove unused vars

chore: optimize size of front docker image (twentyhq#965)

Enable to drag under New button on pipeline (twentyhq#970)

feat: Add workspace delete feature (twentyhq#896)

* Add workspace delete feature

Co-authored-by: v1b3m <[email protected]>

* Add fixes and refactors

Co-authored-by: v1b3m <[email protected]>

* Add more fixes

Co-authored-by: v1b3m <[email protected]>

* Add requested changes

Co-authored-by: v1b3m <[email protected]>

* Add workspace delete mutation

Co-authored-by: v1b3m <[email protected]>

* Complete v1 of deletion

Co-authored-by: Benjamin Mayanja <[email protected]>

* Revert unwanted changes

Co-authored-by: Benjamin Mayanja <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Update debouce import

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Fix server e2e tests on CI twentyhq#3

* Fix server e2e tests on CI twentyhq#4

* Fix server e2e tests on CI twentyhq#5

* Added generic relation cell (twentyhq#969)

* Added generic relation cell

* Deactivated debug

* Added default warning

* Put back display component

* Removed unused types

* fix: 906 edit avatar style (twentyhq#923)

* fix: 906 edit avatar style

* fix: 906 add avatar size enum and mapping for font and height

* fix: 906 remove unused vars

* chore: optimize size of front docker image (twentyhq#965)

* Enable to drag under New button on pipeline (twentyhq#970)

* Add minor fix

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

---------

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>
Co-authored-by: Charles Bochet <[email protected]>
Co-authored-by: Lucas Bordeau <[email protected]>
Co-authored-by: 310387 <[email protected]>
Co-authored-by: Lucas Vieira <[email protected]>
Co-authored-by: Charles Bochet <[email protected]>

feat: rename comment thread into activity (twentyhq#939)

* feat: rename commentThread into activity server

* feat: rename commentThread into activity front

* feat: migration only create tables

feat: migration only create tables

* Update activities

* fix: rebase partial fix

* fix: all rebase problems and drop activity target alter

* fix: lint

* Update migration

* Update migration

* Fix conflicts

* Fix conflicts

---------

Co-authored-by: Charles Bochet <[email protected]>

Fix storybook tests

fix: front not running properly (twentyhq#971)

docs: add DatePicker and ImageInput stories (twentyhq#980)

Closes twentyhq#979

feat: search activities (twentyhq#972)

feat: I can delete my account easily (twentyhq#977)

* Add support for account deletion

Co-authored-by: v1b3m <[email protected]>

* Add more fixes

Co-authored-by: Benjamin Mayanja <[email protected]>

* Add more fixes

Co-authored-by: v1b3m <[email protected]>

---------

Co-authored-by: v1b3m <[email protected]>

Feat/generic editable cell chip (twentyhq#982)

* Added generic relation cell

* Deactivated debug

* Added default warning

* Put back display component

* Removed unused types

* wip

* Renamed to view field

* Use new view field structure to have chip working

* Finished

* Added a temp feature flag

chore: Add ui/modal stories (twentyhq#967)

* Add ui/modal stories

Co-authored-by: Matheus <[email protected]>

* Add requested changes

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: Matheus <[email protected]>

* Fix the formatting

Co-authored-by: Benjamin Mayanja <[email protected]>
Co-authored-by: Matheus <[email protected]>

---------

Co-authored-by: Matheus <[email protected]>
Co-authored-by: v1b3m <[email protected]>

chore: Add ui/tooltip stories (twentyhq#966)

* Add ui/tooltip stories

Co-authored-by: Thiago Nascimbeni <[email protected]>

* Add requested changes

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: Thiago Nascimbeni <[email protected]>

* Fix linting

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: Thiago Nascimbeni <[email protected]>

---------

Co-authored-by: Thiago Nascimbeni <[email protected]>
Co-authored-by: v1b3m <[email protected]>

Various fixes on table, board, tasks (twentyhq#983)

* Misc fixes

* Misc fixes

* Misc fixes

* Fix login

Add profile pictures to people and fix account/workspace deletion (twentyhq#984)

* Fix LinkedIn URL not redirecting to the right url

* add avatars for people and seeds

* Fix delete account/workspace

* Add people picture on other pages

* Change style of delete button

* Revert modal to previous size

* Fix tests

Remove empty values from relation picker (twentyhq#986)

fix: empty name values in SingleEntitySelectBase

Feat/generic editable cell all types (twentyhq#987)

* Added generic relation cell

* Deactivated debug

* Added default warning

* Put back display component

* Removed unused types

* wip

* Renamed to view field

* Use new view field structure to have chip working

* Finished

* Added a temp feature flag

* Added double text chip cell

* Ok

* Finished tables

* Fixed icon size

* Fixed bug on date field

* Use icon index

* Fix

* Fixed naming

* Fix

* removed file from merge

* Fixed tests

* Coverage

Add dueDate and assignee on notes (twentyhq#988)

* Add dueDate and assignee on notes

* Fix tests

* Fix tests

Add fake characters to prevent password managers from filling fields (twentyhq#989)

Add ability to properly cast a string, number, null to an integer (twentyhq#990)

Inbox task 2 (twentyhq#991)

* Add ability to properly cast a string, number, null to an integer

* Adding Tab UI component

* Only trigger chromatic when asked

docs: fix instructions to start projects in the docker setup flow (twentyhq#995)

Fix margin on DeleteModal overlay (twentyhq#998)

* Fix margin on DeleteModal overlay

* Update chromatic ci triggers

* Update chromatic ci triggers

Changes to commands in search window (twentyhq#996)

- changes to commands in search window

style: update deactivated state styles in onboarding button (twentyhq#997)

[952] style: update deactivated state styles in onboarding button

Clean and re-organize post table refactoring (twentyhq#1000)

* Clean and re-organize post table refactoring

* Fix tests

feat: add column resizing (twentyhq#975)

* feat: add column resizing

Closes twentyhq#817

* Use mouse up and down instead of dragging

---------

Co-authored-by: Charles Bochet <[email protected]>

Fix table mock mode (twentyhq#1007)

Add deploy buttons and clean environment variables (twentyhq#974)

* add render.yaml

* Clean environment variables

---------

Co-authored-by: Charles Bochet <[email protected]>

feat: implement user impersonation feature (twentyhq#976)

* feat: wip impersonate user

* feat: add ability to impersonate an user

* fix: remove console.log

* fix: unused import

Scroll to currently softfocus cell (twentyhq#1008)

* - scroll to currently softfocus cell

* - moved useEffect to CellSoftFocus component

Add tasks page (twentyhq#1015)

* Refactor top bar component

* Add task page with tabs

* Add tasks

* Add logic for task status

* Fix isoweek definition

* Enable click on task

* Deduplicate component

* Lint

---------

Co-authored-by: Charles Bochet <[email protected]>

A few polish on tasks (twentyhq#1023)

A few polishing on tasks

Update chromatic CI trigger

Update chromatic CI trigger

Rename SIGN_IN_PREFILLED env variable

Fix env variables for dev setup (twentyhq#1031)

[server] set local setup as default in .env.example (twentyhq#1045)

In storybook, I see a ButtonIconGroup component (twentyhq#1039)

Add ButtonIconGroup storybook components

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

Move trash icon to the top bar of right drawer (twentyhq#1014)

* Move trash icon to the top bar of right drawer

Co-authored-by: Matheus <[email protected]>

* Fix background

Co-authored-by: Matheus <[email protected]>

* Refactor the code

Co-authored-by: Matheus <[email protected]>

---------

Co-authored-by: Matheus <[email protected]>

Fix hotkeys for tasks page (twentyhq#1034)

- fix hotkeys for tasks

Fix twentyhq#1038: Logout button should be change to gray (twentyhq#1052)

feat: persist resized column widths (twentyhq#1017)

* feat: persist resized column widths

Closes twentyhq#981

* test: mock company and person view fields

Closes twentyhq#710: Add the number of opportunities on each stage (twentyhq#1011)

* Add the number of oppurtunities on each stage

* Remove excess css properties in Boardcolumn.tsx and use theme

* Remove padding from oppurnities counters

Sanitize url before fetching favicon and display letter avatar if it can't be retrieved (twentyhq#1035)

* Sanitize url before fetching favicon and display letter avatar if it can't be retrieved

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Priorotise www for apple.com domain

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Add requested changes

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Fix the tests

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

* Change avatar generation strategy

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

---------

Co-authored-by: v1b3m <[email protected]>
Co-authored-by: RubensRafael <[email protected]>

Fix: positioning of label to rename columns (twentyhq#1051)

Fix positioning of label to rename columns

Co-authored-by: Mael FOSSO <[email protected]>

Fix Avatars no centered (twentyhq#1050)

- fix workspace icon now centered
- fix profile avatar now centered

Feat/filter activity inbox (twentyhq#1032)

* Move files

* Add filtering for tasks inbox

* Add filter dropdown for single entity

* Minor

* Fill empty button

* Refine logic for filter dropdown

* remove log

* Fix unwanted change

* Set current user as default filter

* Add avatar on filter

* Improve initialization of assignee filter

* Add story for Tasks page

* Add more stories

* Add sotry with no tasks

* Improve dates

* Enh tests

---------

Co-authored-by: Charles Bochet <[email protected]>

Refactor: Morph strategy on `PipelineProgress` (twentyhq#1065)

* Deprecate pipelineprogress backref on person to improve naming

* Remove deprecated point of contact fields

* Add company and person entities on pipelineprogress

* Migrate data from old progressable to new entity fields

* Codegen frontend

* Use company Id, deprecate progressableId

* Get rid of deprecated progressableId field

* Remove deprecated progressableType field from pipeline progress

* Remove useless migrations

Improve mouse tracking (twentyhq#1061)

* Improve mouse tracking

* Fix lint

* Fix regression on Filters

* Fix according to review

[PeoplePicker] fix missing avatar in user search dropdown (twentyhq#1069)

Fix pipeline performance issue (twentyhq#1070)

Remove constraint activity morph relations foreign keys

Adding the favorite button

favorites schema

favorite ability handler

favorite module export

front end UI

front end graphql additions

server ability handlers

server resolvers and services

commits squashed and merged
  • Loading branch information
gitstart-twenty authored and AdityaPimpalkar committed Aug 4, 2023
1 parent 9176935 commit 66c1432
Show file tree
Hide file tree
Showing 619 changed files with 12,076 additions and 5,148 deletions.
36 changes: 36 additions & 0 deletions .ergomake/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: "3.9"
services:
front:
build:
context: ..
dockerfile: ./infra/prod/front/Dockerfile
args:
REACT_APP_SERVER_BASE_URL: "http://localhost:3000"
ports:
- "3001:3000"
labels:
dev.ergomake.env.replace-arg.REACT_APP_SERVER_BASE_URL: "https://{{ services.server.url }}"
server:
build:
context: ..
dockerfile: ./infra/prod/server/Dockerfile
command: sh -c "yarn prisma migrate reset --force && node dist/src/main"
ports:
- "3000:3000"
environment:
DEBUG_MODE: false
SIGN_IN_PREFILLED: true
ACCESS_TOKEN_SECRET: "secret_jwt"
LOGIN_TOKEN_SECRET: "secret_login_token"
REFRESH_TOKEN_SECRET: "secret_refresh_token"
PG_DATABASE_URL: "postgres://postgres:postgrespassword@postgres:5432/default?connection_limit=1"
FRONT_BASE_URL: "http://localhost:3000"
labels:
dev.ergomake.env.replace-env.FRONT_BASE_URL: "https://{{ services.server.url }}"
postgres:
build: ../infra/dev/postgres
environment:
POSTGRES_PASSWORD: postgrespassword
ports:
- "5432"

10 changes: 4 additions & 6 deletions .github/workflows/ci-chromatic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
branches:
- main
pull_request_target:
types: [labeled]
jobs:
chromatic-deployment:
if: ${{ contains(github.event.*.labels.*.name, 'run-chromatic') }} || github.event_name == 'push' }}
runs-on: ubuntu-latest
env:
REACT_APP_API_URL: http://127.0.0.1:3000/graphql
REACT_APP_AUTH_URL: http://127.0.0.1:3000/auth
REACT_APP_FILES_URL: http://127.0.0.1:3000/files
REACT_APP_SERVER_BASE_URL: http://127.0.0.1:3000
steps:
- uses: actions/checkout@v3
if: github.event_name == 'push'
Expand All @@ -31,9 +31,7 @@ jobs:
run: |
cd front
touch .env
echo "REACT_APP_API_URL: $REACT_APP_API_URL" >> .env
echo "REACT_APP_AUTH_URL: $REACT_APP_AUTH_URL" >> .env
echo "REACT_APP_FILES_URL: $REACT_APP_FILES_URL" >> .env
echo "REACT_APP_SERVER_BASE_URL: $REACT_APP_SERVER_BASE_URL" >> .env
- name: Front / Install Dependencies
run: cd front && yarn
- name: Publish to Chromatic
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci-front.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ jobs:
front-test:
runs-on: ubuntu-latest
env:
REACT_APP_API_URL: http://localhost:3000/graphql
REACT_APP_AUTH_URL: http://localhost:3000/auth
REACT_APP_FILES_URL: http://localhost:3000/files
REACT_APP_SERVER_BASE_URL: http://localhost:3000
steps:
- uses: actions/checkout@v3
if: github.event_name == 'push'
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/ci-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ on:
jobs:
server-test:
runs-on: ubuntu-latest
services:
postgres:
image: postgres
env:
POSTGRES_HOST: postgres
POSTGRES_PASSWORD: postgrespassword
POSTGRES_DB: test
POSTGRES_PORT: 5432
ports:
- 5432:5432
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
if: github.event_name == 'push'
Expand All @@ -27,3 +42,6 @@ jobs:
- name: Server / Run jest tests
run: |
cd server && yarn test
- name: Server / Run e2e tests
run: |
cd server && yarn test:e2e
10 changes: 4 additions & 6 deletions docs/docs/developer/local-setup.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
sidebar_position: 0
sidebar_custom_props:
icon: TbArrowBigRight
icon: TbDeviceDesktop
---

# Local Setup
Expand Down Expand Up @@ -157,16 +157,14 @@ make server-prisma-reset

### 6. Start Twenty

Run the project with the following commands:
Run the project with the following commands from `root folder`:

In `/front`:
```bash
make front-start
make server-start
```

In `/server`:
```bash
make server-start
make front-start
```

You should now have:
Expand Down
17 changes: 12 additions & 5 deletions docs/docs/hosting/self-hosting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ You will find these in the [infra/prod/front/Dockerfile](https://github.com/twen

```bash
docker build \
--build-arg REACT_APP_API_URL=REPLACE_ME \
--build-arg REACT_APP_AUTH_URL=REPLACE_ME \
--build-arg REACT_APP_FILES_URL=REPLACE_ME \
--build-arg REACT_APP_SERVER_BASE_URL=REPLACE_ME \
-t twenty-front:latest \
-f ./infra/prod/front/Dockerfile .
```
Expand All @@ -36,10 +34,19 @@ docker build \
-f ./infra/prod/server/Dockerfile .
```

## Render

[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/twentyhq/twenty)


## AWS Elastic Beanstalk (soon)

We are working on providing a joint Docker image - containing both the Twenty frontend and server - that you can deploy using [AWS Elastic Beanstalk](https://aws.amazon.com/elasticbeanstalk/).

## Railway (soon)

[Railway](https://railway.app) is an infrastructure platform that lets you deploy to the cloud in one click. We are currently working on making it available.
<!--

## Railway
[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/YWGqza?referralCode=3CLObs)

-->
2 changes: 1 addition & 1 deletion docs/docs/others/CLI.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ sidebar_custom_props:
icon: TbTerminal2
---

# CLI (soon)
# CLI

Available soon!
5 changes: 3 additions & 2 deletions docs/src/theme/DocSidebarItem/Link/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Link from '@docusaurus/Link';
import isInternalUrl from '@docusaurus/isInternalUrl';
import IconExternalLink from '@theme/Icon/ExternalLink';
import styles from './styles.module.css';
import { TbFaceIdError, TbTerminal2, TbCloud, TbServer, TbBolt, TbApps, TbTopologyStar, TbChartDots, TbBug, TbVocabulary, TbArrowBigRight } from "react-icons/tb";
import { TbFaceIdError, TbTerminal2, TbCloud, TbServer, TbBolt, TbApps, TbTopologyStar, TbChartDots, TbBug, TbVocabulary, TbArrowBigRight, TbDeviceDesktop } from "react-icons/tb";


export default function DocSidebarItemLink({
Expand All @@ -30,7 +30,8 @@ export default function DocSidebarItemLink({
'TbTopologyStar': TbTopologyStar,
'TbChartDots': TbChartDots,
'TbBug': TbBug,
'TbVocabulary': TbVocabulary
'TbVocabulary': TbVocabulary,
'TbDeviceDesktop': TbDeviceDesktop,
};

let IconComponent = customProps && customProps.icon ? icons[customProps.icon] : TbFaceIdError;
Expand Down
9 changes: 5 additions & 4 deletions front/.env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
REACT_APP_API_URL=http://localhost:3000/graphql
REACT_APP_AUTH_URL=http://localhost:3000/auth
REACT_APP_FILES_URL=http://localhost:3000/files
REACT_APP_SERVER_BASE_URL=http://localhost:3000

CHROMATIC_PROJECT_TOKEN=REPLACE_ME
# ———————— Optional ————————
# REACT_APP_SERVER_AUTH_URL=http://localhost:3000/auth
# REACT_APP_SERVER_FILES_URL=http://localhost:3000/files
# CHROMATIC_PROJECT_TOKEN=
2 changes: 1 addition & 1 deletion front/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.6.0
18.16.0
2 changes: 1 addition & 1 deletion front/.storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { initialize, mswDecorator } from 'msw-storybook-addon';
import { Preview } from '@storybook/react';
import { ThemeProvider } from '@emotion/react';
import { withThemeFromJSXProvider } from '@storybook/addon-styling';
import { lightTheme, darkTheme } from '../src/modules/ui/themes/themes';
import { lightTheme, darkTheme } from '../src/modules/ui/theme/constants/theme';
import { RootDecorator } from '../src/testing/decorators/RootDecorator';
import 'react-loading-skeleton/dist/skeleton.css';
import { mockedUserJWT } from '../src/testing/mock-data/jwt';
Expand Down
2 changes: 1 addition & 1 deletion front/codegen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
schema: process.env.REACT_APP_API_URL,
schema: process.env.REACT_APP_SERVER_BASE_URL + "/graphql",
documents: ['./src/**/*.tsx', './src/**/*.ts'],
overwrite: true,
generates: {
Expand Down
4 changes: 2 additions & 2 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
"workerDirectory": "public"
},
"nyc": {
"statements": 70,
"lines": 70,
"statements": 65,
"lines": 65,
"functions": 60,
"exclude": [
"src/generated/**/*"
Expand Down
8 changes: 7 additions & 1 deletion front/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,23 @@ import { SettingsPath } from '@/types/SettingsPath';
import { DefaultLayout } from '@/ui/layout/components/DefaultLayout';
import { CreateProfile } from '~/pages/auth/CreateProfile';
import { CreateWorkspace } from '~/pages/auth/CreateWorkspace';
import { SignInUp } from '~/pages/auth/SignInUp';
import { Verify } from '~/pages/auth/Verify';
import { Companies } from '~/pages/companies/Companies';
import { CompanyShow } from '~/pages/companies/CompanyShow';
import { Impersonate } from '~/pages/impersonate/Impersonate';
import { Opportunities } from '~/pages/opportunities/Opportunities';
import { People } from '~/pages/people/People';
import { PersonShow } from '~/pages/people/PersonShow';
import { SettingsExperience } from '~/pages/settings/SettingsExperience';
import { SettingsProfile } from '~/pages/settings/SettingsProfile';
import { SettingsWorksapce } from '~/pages/settings/SettingsWorkspace';
import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';
import { Tasks } from '~/pages/tasks/Tasks';
import { AppInternalHooks } from '~/sync-hooks/AppInternalHooks';

import { SignInUp } from './pages/auth/SignInUp';
// TEMP FEATURE FLAG FOR VIEW FIELDS
export const ACTIVATE_VIEW_FIELDS = true;

export function App() {
return (
Expand All @@ -36,6 +40,8 @@ export function App() {
<Route path={AppPath.PersonShowPage} element={<PersonShow />} />
<Route path={AppPath.CompaniesPage} element={<Companies />} />
<Route path={AppPath.CompanyShowPage} element={<CompanyShow />} />
<Route path={AppPath.TasksPage} element={<Tasks />} />
<Route path={AppPath.Impersonate} element={<Impersonate />} />

<Route path={AppPath.OpportunitiesPage} element={<Opportunities />} />
<Route
Expand Down
9 changes: 9 additions & 0 deletions front/src/AppNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
import { SettingsNavbar } from '@/settings/components/SettingsNavbar';
import {
IconBuildingSkyscraper,
IconCheckbox,
IconInbox,
IconSearch,
IconSettings,
Expand Down Expand Up @@ -49,6 +50,14 @@ export function AppNavbar() {
/>
<NavTitle label="Favourites" />
<Favorites />
<NavItem
label="Tasks"
to="/tasks"
active={currentPath === '/tasks'}
icon={<IconCheckbox size={theme.icon.size.md} />}
/>
<NavTitle label="Favourites" />
<Favorites />
<NavTitle label="Workspace" />
<NavItem
label="Companies"
Expand Down
Loading

0 comments on commit 66c1432

Please sign in to comment.