Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' into boards
Mike Caoc3e0290e6569
diff --cc .gitignoreindex 377e4be6b,8b543f6b9..fcb577bad--- a/.gitignore+++ b/.gitignore@@@ -1,49 -1,48 +1,49 @@@- # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.-- # dependencies- node_modules- .pnp- .pnp.js- .pnpm-store- package-lock.json-- # testing- /coverage-- # next.js- /.next- /out-- # production- /build- /public/script.js- /geo- /dist- /generated- /src/generated- pm2.yml-- # misc- .DS_Store- .idea- .yarn- *.iml- *.log- .vscode- .tool-versions- .claude- tmpclaude*- nul-- # debug- npm-debug.log*- yarn-debug.log*- yarn-error.log*-- # local env files- .env- .env.*- *.env.*-- *.dev.yml-+ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.++ # dependencies+ node_modules+ .pnp+ .pnp.js+ .pnpm-store+ package-lock.json++ # testing+ /coverage++ # next.js+ /.next+ /out++ # production+ /build+ /public/script.js+ /geo+ /dist+ /generated+ /src/generated+ pm2.yml++ # misc+ .DS_Store+ .idea+ .yarn+ *.iml+ *.log+ .vscode+ .tool-versions+ .claude++tmpclaude*+ nul++ # debug+ npm-debug.log*+ yarn-debug.log*+ yarn-error.log*++ # local env files+ .env+ .env.*+ *.env.*++ *.dev.yml+diff --cc src/components/hooks/index.tsindex d40fbc3e9,89cb904b8..b6e0a3a98--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@@ -1,9 -1,9 +1,10 @@@'use client';// Context hooks+export * from './context/useBoard';export * from './context/useLink';export * from './context/usePixel';+ export * from './context/useShare';export * from './context/useTeam';export * from './context/useUser';export * from './context/useWebsite';diff --cc src/lang/fi-FI.jsonindex daaa62f0d,686294701..0656bc2dd--- a/src/lang/fi-FI.json+++ b/src/lang/fi-FI.json@@@ -306,34 -306,34 +306,34 @@@"message.go-to-settings": "Mene asetuksiin","message.incorrect-username-password": "Väärä käyttäjänimi/salasana.","message.invalid-domain": "Virheellinen verkkotunnus",- "message.min-password-length": "Minimum length of {n} characters",- "message.new-version-available": "A new version of Umami {version} is available!",+ "message.min-password-length": "Vähimmäispituus {n} merkkiä",+ "message.new-version-available": "Umamista on saatavilla uusi versio {version}!","message.no-data-available": "Tietoja ei ole käytettävissä.",- "message.no-event-data": "No event data is available.",+ "message.no-event-data": "Tapahtumatietoja ei ole saatavilla.","message.no-match-password": "Salasanat eivät täsmää",- "message.no-results-found": "No results were found.",- "message.no-team-websites": "This team does not have any websites.",- "message.no-teams": "You have not created any teams.",- "message.no-users": "There are no users.",+ "message.no-results-found": "Tuloksia ei löytynyt.",+ "message.no-team-websites": "Tällä tiimillä ei ole verkkosivustoja.",+ "message.no-teams": "Et ole luonut yhtään tiimiä.",+ "message.no-users": "Käyttäjiä ei ole.","message.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",- "message.not-found": "Not found",- "message.nothing-selected": "Nothing selected.",+ "message.not-found": "Ei löytynyt",+ "message.nothing-selected": "Mitään ei ole valittu.","message.page-not-found": "Sivua ei löydetty.",- "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",+ "message.reset-website": "Nollaa verkkosivusto kirjoittamalla {confirmation} alla olevaan kenttään vahvistaaksesi.","message.reset-website-warning": "Kaikki sivuston tilastot poistetaan, mutta seurantakoodi pysyy muuttumattomana.","message.saved": "Tallennettu onnistuneesti.",- "message.sever-error": "Server error",+ "message.sever-error": "Palvelinvirhe","message.share-url": "Tämä on julkisesti jaettu URL sivustolle {target}.",- "message.team-already-member": "You are already a member of the team.",- "message.team-not-found": "Team not found.",- "message.team-websites-info": "Websites can be viewed by anyone on the team.",+ "message.team-already-member": "Olet jo tiimissä.",+ "message.team-not-found": "Tiimiä ei löydetty.",+ "message.team-websites-info": "Verkkosivuja voi tarkastella kuka tahansa tiimin jäsen.","message.tracking-code": "Seurantakoodi",- "message.transfer-team-website-to-user": "Transfer this website to your account?",- "message.transfer-user-website-to-team": "Select the team to transfer this website to.",- "message.transfer-website": "Transfer website ownership to your account or another team.",- "message.triggered-event": "Triggered event",- "message.unauthorized": "Unauthorized",- "message.user-deleted": "User deleted.",- "message.viewed-page": "Viewed page",+ "message.transfer-team-website-to-user": "Siirretäänkö tämä verkkosivu tilillesi?",+ "message.transfer-user-website-to-team": "Valitse tiimi, johon verkkosivusto siirretään.",+ "message.transfer-website": "Siirrä verkkosivusto tiliisi tai toiselle tiimille.",+ "message.triggered-event": "Laukaistu tapahtuma",+ "message.unauthorized": "Ei oikeuksia",+ "message.user-deleted": "Käyttäjä poistettu.",+ "message.viewed-page": "Katsottu sivu","message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}"-}+}diff --cc src/lib/types.tsindex 5973da3c2,9a6775a01..9adc6002d--- a/src/lib/types.ts+++ b/src/lib/types.ts@@@ -144,28 -143,8 +145,34 @@@ export interface ApiError extends Erromessage: string;}+export interface BoardComponent {+ id: string;+ type: string;+ value: string;+}++export interface BoardColumn {+ id: string;+ component?: ReactElement;+ size?: number;+}++export interface BoardRow {+ id: string;+ columns: BoardColumn[];+ size?: number;+}++export interface BoardParameters {+ rows?: BoardRow[];+}++export interface Board extends Omit<PrismaBoard, 'parameters'> {+ parameters: BoardParameters;+}+++ export interface WhiteLabel {+ name: string;+ url: string;+ image: string;+ }