Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Merge branch 'master' into umami-import

Edward Cuied3a81d693c3
diff --cc client/src/components/SiteSettings/SiteSettings.tsx
index a996055f0,59f6a062d..09f3123cd
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@@ -67,18 -52,15 +53,16 @@@ function SiteSettingsInner({ siteMetada
</Button>
)}
</DialogTrigger>
- <DialogContent className="sm:max-w-[500px]">
+ <DialogContent className="sm:max-w-[600px]">
<DialogHeader>
<DialogTitle>Site Settings</DialogTitle>
- <DialogDescription>
- Manage settings for {siteMetadata.domain}
- </DialogDescription>
+ <DialogDescription>Manage settings for {siteMetadata.domain}</DialogDescription>
</DialogHeader>
<Tabs value={activeTab} onValueChange={setActiveTab} className="pb-4">
- <TabsList className="grid w-full grid-cols-3">
+ <TabsList className="grid w-full grid-cols-4">
<TabsTrigger value="script">Tracking Script</TabsTrigger>
<TabsTrigger value="apikey">API Key</TabsTrigger>
+ <TabsTrigger value="import">Import</TabsTrigger>
<TabsTrigger value="settings">Site Settings</TabsTrigger>
</TabsList>
@@@ -96,19 -72,8 +74,15 @@@
<ApiKeyManager siteId={siteMetadata.siteId} disabled={disabled} />
</TabsContent>
+ <TabsContent
+ value="import"
+ className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto"
+ >
+ <ImportManager siteId={siteMetadata.siteId} disabled={disabled} />
+ </TabsContent>
+
<TabsContent value="settings">
- <SiteConfiguration
- siteMetadata={siteMetadata}
- disabled={disabled}
- onClose={() => setDialogOpen(false)}
- />
+ <SiteConfiguration siteMetadata={siteMetadata} disabled={disabled} onClose={() => setDialogOpen(false)} />
</TabsContent>
</Tabs>
diff --cc server/package-lock.json
index 2f655c25a,92f9f2d2e..72abb5d33
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@@ -6,15 -6,12 +6,15 @@@
"packages": {
"": {
"name": "rybbit-backend",
- "version": "1.5.1",
+ "version": "1.6.1",
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
+ "@aws-sdk/lib-storage": "^3.850.0",
"@axiomhq/pino": "^1.3.1",
"@clickhouse/client": "1.11.1",
+ "@fast-csv/parse": "^5.0.2",
"@fastify/cors": "11.0.1",
+ "@fastify/multipart": "^9.0.3",
"@fastify/one-line-logger": "2.0.2",
"@fastify/rate-limit": "^10.3.0",
"@fastify/static": "8.1.1",