Merge branch 'dev' into boards
# Conflicts: # .gitignore # package.json # pnpm-lock.yaml # prisma/migrations/16_boards/migration.sql # prisma/schema.prisma # src/app/(main)/MobileNav.tsx # src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx # src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx # src/components/common/SideMenu.tsx # src/lib/types.ts
This commit is contained in:
commit
c3e0290e65
150 files changed
+3028
-787
No files matched your search
@@ -92,6 +92,7 @@ export interface FilterParams {
|
||||
segment?: string;
|
||||
cohort?: string;
|
||||
compare?: string;
|
||||
excludeBounce?: boolean;
|
||||
}
|
||||
|
||||
export interface SortParams {
|
||||
@@ -169,3 +170,9 @@ export interface BoardParameters {
|
||||
export interface Board extends Omit<PrismaBoard, 'parameters'> {
|
||||
parameters: BoardParameters;
|
||||
}
|
||||
|
||||
export interface WhiteLabel {
|
||||
name: string;
|
||||
url: string;
|
||||
image: string;
|
||||
}
|
||||
Reference in new issue
Block a user