Skip to content

Commit 9b814aa

Browse files
franciscao633franciscao633
committed
revert prisma schema to latest, add global css for scroll-bar, fix css
1 parent c479a20 commit 9b814aa

File tree

13 files changed

+76
-24
lines changed

13 files changed

+76
-24
lines changed

‎prisma/schema.prisma‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ datasource db {
1010
}
1111

1212
model User {
13-
id String @id @unique @map("user_id") @db.Uuid
13+
id String @id() @map("user_id") @db.Uuid
1414
username String @unique @db.VarChar(255)
1515
password String @db.VarChar(60)
1616
role String @map("role") @db.VarChar(50)
@@ -32,7 +32,7 @@ model User {
3232
}
3333

3434
model Session {
35-
id String @id @unique @map("session_id") @db.Uuid
35+
id String @id() @map("session_id") @db.Uuid
3636
websiteId String @map("website_id") @db.Uuid
3737
browser String? @db.VarChar(20)
3838
os String? @db.VarChar(20)
@@ -64,7 +64,7 @@ model Session {
6464
}
6565

6666
model Website {
67-
id String @id @unique @map("website_id") @db.Uuid
67+
id String @id() @map("website_id") @db.Uuid
6868
name String @db.VarChar(100)
6969
domain String? @db.VarChar(500)
7070
resetAt DateTime? @map("reset_at") @db.Timestamptz(6)
@@ -185,7 +185,7 @@ model SessionData {
185185
}
186186

187187
model Team {
188-
id String @id() @unique() @map("team_id") @db.Uuid
188+
id String @id() @map("team_id") @db.Uuid
189189
name String @db.VarChar(50)
190190
accessCode String? @unique @map("access_code") @db.VarChar(50)
191191
logoUrl String? @map("logo_url") @db.VarChar(2183)
@@ -197,14 +197,14 @@ model Team {
197197
members TeamUser[]
198198
links Link[]
199199
pixels Pixel[]
200-
boards Board[]
200+
boards Board[]
201201
202202
@@index([accessCode])
203203
@@map("team")
204204
}
205205

206206
model TeamUser {
207-
id String @id() @unique() @map("team_user_id") @db.Uuid
207+
id String @id() @map("team_user_id") @db.Uuid
208208
teamId String @map("team_id") @db.Uuid
209209
userId String @map("user_id") @db.Uuid
210210
role String @db.VarChar(50)
@@ -220,7 +220,7 @@ model TeamUser {
220220
}
221221

222222
model Report {
223-
id String @id() @unique() @map("report_id") @db.Uuid
223+
id String @id() @map("report_id") @db.Uuid
224224
userId String @map("user_id") @db.Uuid
225225
websiteId String @map("website_id") @db.Uuid
226226
type String @db.VarChar(50)
@@ -241,7 +241,7 @@ model Report {
241241
}
242242

243243
model Segment {
244-
id String @id() @unique() @map("segment_id") @db.Uuid
244+
id String @id() @map("segment_id") @db.Uuid
245245
websiteId String @map("website_id") @db.Uuid
246246
type String @db.VarChar(50)
247247
name String @db.VarChar(200)
@@ -256,7 +256,7 @@ model Segment {
256256
}
257257

258258
model Revenue {
259-
id String @id() @unique() @map("revenue_id") @db.Uuid
259+
id String @id() @map("revenue_id") @db.Uuid
260260
websiteId String @map("website_id") @db.Uuid
261261
sessionId String @map("session_id") @db.Uuid
262262
eventId String @map("event_id") @db.Uuid
@@ -276,7 +276,7 @@ model Revenue {
276276
}
277277

278278
model Link {
279-
id String @id() @unique() @map("link_id") @db.Uuid
279+
id String @id() @map("link_id") @db.Uuid
280280
name String @db.VarChar(100)
281281
url String @db.VarChar(500)
282282
slug String @unique() @db.VarChar(100)
@@ -297,7 +297,7 @@ model Link {
297297
}
298298

299299
model Pixel {
300-
id String @id() @unique() @map("pixel_id") @db.Uuid
300+
id String @id() @map("pixel_id") @db.Uuid
301301
name String @db.VarChar(100)
302302
slug String @unique() @db.VarChar(100)
303303
userId String? @map("user_id") @db.Uuid
@@ -317,7 +317,7 @@ model Pixel {
317317
}
318318

319319
model Board {
320-
id String @id() @unique() @map("board_id") @db.Uuid
320+
id String @id() @map("board_id") @db.Uuid
321321
type String @db.VarChar(50)
322322
name String @db.VarChar(200)
323323
description String @db.VarChar(500)
@@ -339,8 +339,9 @@ model Board {
339339
}
340340

341341
model Share {
342-
id String @id() @unique() @map("share_id") @db.Uuid
342+
id String @id() @map("share_id") @db.Uuid
343343
entityId String @map("entity_id") @db.Uuid
344+
name String @db.VarChar(200)
344345
shareType Int @map("share_type") @db.Integer
345346
slug String @unique() @db.VarChar(100)
346347
parameters Json
@@ -349,4 +350,4 @@ model Share {
349350
350351
@@index([entityId])
351352
@@map("share")
352-
}
353+
}

‎src/app/(main)/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ export function App({ children }) {
4949
<Column display={{ base: 'none', lg: 'flex' }}>
5050
<SideNav />
5151
</Column>
52-
<Column alignItems="center" overflowY="auto" overflowX="hidden" position="relative">
53-
{children}
52+
<Column overflowX="hidden" position="relative">
53+
<Column alignItems="center">{children}</Column>
5454
</Column>
5555
<UpdateNotice user={user} config={config} />
5656
{process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (

‎src/app/(main)/settings/SettingsLayout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
1212
width="240px"
1313
height="100%"
1414
border="right"
15-
backgroundColor
15+
backgroundColor={'surface-raised'}
1616
marginRight="2"
1717
padding="3"
1818
>

‎src/app/(main)/settings/preferences/DateRangeSetting.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ export function DateRangeSetting() {
2121

2222
return (
2323
<Row gap="3">
24-
<DateFilter value={date} onChange={handleChange} placement="bottom start" />
24+
<DateFilter
25+
value={date}
26+
onChange={handleChange}
27+
placement="bottom start"
28+
style={{ minWidth: '250px' }}
29+
/>
2530
<Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>
2631
</Row>
2732
);

‎src/app/(main)/settings/preferences/LanguageSetting.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export function LanguageSetting() {
3434
onSearch={setSearch}
3535
onOpenChange={handleOpen}
3636
listProps={{ style: { maxHeight: 300 } }}
37+
style={{ minWidth: '250px' }}
3738
>
3839
{items.map(item => (
3940
<ListItem key={item} id={item}>

‎src/app/(main)/settings/preferences/PreferenceSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function PreferenceSettings() {
1515
}
1616

1717
return (
18-
<Column width="400px" gap="6">
18+
<Column gap="6">
1919
<Column>
2020
<Label>{formatMessage(labels.defaultDateRange)}</Label>
2121
<DateRangeSetting />

‎src/app/(main)/settings/preferences/TimezoneSetting.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export function TimezoneSetting() {
3030
onSearch={setSearch}
3131
onOpenChange={handleOpen}
3232
listProps={{ style: { maxHeight: 300 } }}
33+
style={{ minWidth: '250px' }}
3334
>
3435
{items.map((item: any) => (
3536
<ListItem key={item} id={item}>

‎src/app/(main)/settings/profile/ProfileSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function ProfileSettings() {
2929
};
3030

3131
return (
32-
<Column width="400px" gap="6">
32+
<Column gap="6">
3333
<Column>
3434
<Label>{formatMessage(labels.username)}</Label>
3535
{username}

‎src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function SessionActivity({
6161

6262
return (
6363
<Column key={eventId} gap>
64-
{showHeader && <Heading size="sm">{formatTimezoneDate(createdAt, 'PPPP')}</Heading>}
64+
{showHeader && <Heading size="lg">{formatTimezoneDate(createdAt, 'PPPP')}</Heading>}
6565
<Row alignItems="center" gap="6" height="40px">
6666
<StatusLight color={`#${visitId?.substring(0, 6)}`}>
6767
<Text wrap="nowrap">{formatTimezoneDate(createdAt, 'pp')}</Text>

‎src/app/global.css‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,41 @@ a:hover {
2424
color: var(--text-primary);
2525
text-decoration: none;
2626
}
27+
28+
::-webkit-scrollbar {
29+
width: 15px;
30+
background: transparent;
31+
}
32+
33+
::-webkit-scrollbar-track {
34+
border: 7px solid rgba(0, 0, 0, 0);
35+
background-color: var(--border-default);
36+
background-clip: padding-box;
37+
}
38+
39+
::-webkit-scrollbar-thumb {
40+
border: 7px solid rgba(0, 0, 0, 0);
41+
background-color: var(--text-disabled);
42+
border-radius: var(--border-radius-full);
43+
background-clip: padding-box;
44+
}
45+
46+
::-webkit-scrollbar-thumb:hover {
47+
border: 4px solid rgba(0, 0, 0, 0);
48+
background-clip: padding-box;
49+
}
50+
51+
/* Fix autofill background color to match dark theme */
52+
input:-webkit-autofill,
53+
input:-webkit-autofill:hover,
54+
input:-webkit-autofill:focus,
55+
input:-webkit-autofill:active,
56+
textarea:-webkit-autofill,
57+
textarea:-webkit-autofill:hover,
58+
textarea:-webkit-autofill:focus,
59+
select:-webkit-autofill,
60+
select:-webkit-autofill:hover,
61+
select:-webkit-autofill:focus {
62+
-webkit-box-shadow: 0 0 0 1000px var(--background-color) inset !important;
63+
transition: color 5000s ease-in-out 0s;
64+
}

0 commit comments

Comments
 (0)