Skip to content

Commit

Permalink
Merge branch 'main' into feature-user-management
Browse files Browse the repository at this point in the history
  • Loading branch information
KilianBoute authored Jun 21, 2024
2 parents 1ef82ac + 4db1e47 commit a3f8af1
Show file tree
Hide file tree
Showing 5 changed files with 1,140 additions and 1,271 deletions.
1 change: 1 addition & 0 deletions ui/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ module.exports = {
"^.+\\.module\\.(css|sass|scss)$",
],
};

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^3.1.0",
"tailwindcss": "^3.4.3",
"ts-jest": "^29.1.4",
"ts-node": "^10.9.2",
"zod": "^3.23.8"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.3.3",
"@playwright/test": "^1.43.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.4",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.2",
Expand Down
17 changes: 0 additions & 17 deletions ui/styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -942,10 +942,6 @@ video {
place-content: center;
}

.content-center {
align-content: center;
}

.items-start {
align-items: flex-start;
}
Expand Down Expand Up @@ -974,10 +970,6 @@ video {
gap: 1rem;
}

.gap-1 {
gap: 0.25rem;
}

.space-x-10 > :not([hidden]) ~ :not([hidden]) {
--tw-space-x-reverse: 0;
margin-right: calc(2.5rem * var(--tw-space-x-reverse));
Expand Down Expand Up @@ -1246,11 +1238,6 @@ video {
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}

.bg-gray-200 {
--tw-bg-opacity: 1;
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
}

.bg-gradient-to-br {
background-image: linear-gradient(to bottom right, var(--tw-gradient-stops));
}
Expand Down Expand Up @@ -1319,10 +1306,6 @@ video {
padding: 2rem;
}

.p-4 {
padding: 1rem;
}

.px-20 {
padding-left: 5rem;
padding-right: 5rem;
Expand Down
12 changes: 9 additions & 3 deletions ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@
"name": "next"
}
],
"types": ["node", "jest"],
"paths": {
"@/*": ["./src/*"],
"@uug-ai/ui": ["./components/ui"]
},
"typeRoots": ["./src/types"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
"exclude": [
"node_modules",
"**/*.test.ts",
"**/*.spec.ts",
"**/*.test.tsx",
"**/*.spec.tsx"
]
}
Loading

0 comments on commit a3f8af1

Please sign in to comment.