Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Added tracking code form.

Mike Cao58a1be7a30b3
diff --git a/assets/code.svg b/assets/code.svg
new file mode 100644
index 000000000..cd29765e0
--- /dev/null
+++ b/assets/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M234.8 511.7L196 500.4c-4.2-1.2-6.7-5.7-5.5-9.9L331.3 5.8c1.2-4.2 5.7-6.7 9.9-5.5L380 11.6c4.2 1.2 6.7 5.7 5.5 9.9L244.7 506.2c-1.2 4.3-5.6 6.7-9.9 5.5zm-83.2-121.1l27.2-29c3.1-3.3 2.8-8.5-.5-11.5L72.2 256l106.1-94.1c3.4-3 3.6-8.2.5-11.5l-27.2-29c-3-3.2-8.1-3.4-11.3-.4L2.5 250.2c-3.4 3.2-3.4 8.5 0 11.7L140.3 391c3.2 3 8.2 2.8 11.3-.4zm284.1.4l137.7-129.1c3.4-3.2 3.4-8.5 0-11.7L435.7 121c-3.2-3-8.3-2.9-11.3.4l-27.2 29c-3.1 3.3-2.8 8.5.5 11.5L503.8 256l-106.1 94.1c-3.4 3-3.6 8.2-.5 11.5l27.2 29c3.1 3.2 8.1 3.4 11.3.4z"/></svg>
\ No newline at end of file
diff --git a/components/Settings.js b/components/Settings.js
index e5432f4d0..e9c56610f 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -1,22 +1,25 @@
import React, { useState, useEffect } from 'react';
import Page from './layout/Page';
import Table from './common/Table';
-import Button from './interface/Button';
+import Button from './common/Button';
import PageHeader from './layout/PageHeader';
import Pen from 'assets/pen.svg';
import Trash from 'assets/trash.svg';
import Plus from 'assets/plus.svg';
+import Code from 'assets/code.svg';
import { get } from 'lib/web';
import Modal from './common/Modal';
import WebsiteEditForm from './forms/WebsiteEditForm';
import styles from './Settings.module.css';
import WebsiteDeleteForm from './forms/WebsiteDeleteForm';
+import WebsiteCodeForm from './forms/WebsiteCodeForm';
export default function Settings() {
const [data, setData] = useState();
const [edit, setEdit] = useState();
const [del, setDelete] = useState();
const [add, setAdd] = useState();
+ const [code, setCode] = useState();
const [saved, setSaved] = useState(0);
const columns = [
@@ -29,6 +32,9 @@ export default function Settings() {
},
render: row => (
<>
+ <Button icon={<Code />} size="S" onClick={() => setCode(row)}>
+ <div>Get Code</div>
+ </Button>
<Button icon={<Pen />} size="S" onClick={() => setEdit(row)}>
<div>Edit</div>
</Button>
@@ -49,6 +55,7 @@ export default function Settings() {
setAdd(null);
setEdit(null);
setDelete(null);
+ setCode(null);
}
async function loadData() {
@@ -74,13 +81,13 @@ export default function Settings() {
<Table columns={columns} rows={data} />
{edit && (
<Modal title="Edit website">
- <WebsiteEditForm initialValues={edit} onSave={handleSave} onClose={handleClose} />
+ <WebsiteEditForm values={edit} onSave={handleSave} onClose={handleClose} />
</Modal>
)}
{add && (
<Modal title="Add website">
<WebsiteEditForm
- initialValues={{ name: '', domain: '' }}
+ values={{ name: '', domain: '' }}
onSave={handleSave}
onClose={handleClose}
/>
@@ -88,7 +95,12 @@ export default function Settings() {
)}
{del && (
<Modal title="Delete website">
- <WebsiteDeleteForm initialValues={del} onSave={handleSave} onClose={handleClose} />
+ <WebsiteDeleteForm values={del} onSave={handleSave} onClose={handleClose} />
+ </Modal>
+ )}
+ {code && (
+ <Modal title="Tracking code">
+ <WebsiteCodeForm values={code} onClose={handleClose} />
</Modal>
)}
</Page>
diff --git a/components/WebsiteList.js b/components/WebsiteList.js
index 0e1dfd89f..1ac294f52 100644
--- a/components/WebsiteList.js
+++ b/components/WebsiteList.js
@@ -1,11 +1,11 @@
import React, { useState, useEffect } from 'react';
import { useRouter } from 'next/router';
import { get } from 'lib/web';
-import Link from './interface/Link';
+import Link from './common/Link';
import WebsiteChart from './charts/WebsiteChart';
import Page from './layout/Page';
-import Icon from './interface/Icon';
-import Button from './interface/Button';
+import Icon from './common/Icon';
+import Button from './common/Button';
import PageHeader from './layout/PageHeader';
import Arrow from 'assets/arrow-right.svg';
import styles from './WebsiteList.module.css';
diff --git a/components/charts/QuickButtons.js b/components/charts/QuickButtons.js
index 831a2c057..515fd6686 100644
--- a/components/charts/QuickButtons.js
+++ b/components/charts/QuickButtons.js
@@ -1,6 +1,6 @@
import React from 'react';
import classNames from 'classnames';
-import Button from '../interface/Button';
+import Button from '../common/Button';
import { getDateRange } from 'lib/date';
import styles from './QuickButtons.module.css';
diff --git a/components/interface/Button.js b/components/common/Button.js
similarity index 93%
rename from components/interface/Button.js
rename to components/common/Button.js
index 73513d91e..7963a36aa 100644
--- a/components/interface/Button.js
+++ b/components/common/Button.js
@@ -10,7 +10,7 @@ export default function Button({
variant,
children,
className,
- onClick = () => {},
+ ...props
}) {
return (
<button
@@ -21,7 +21,7 @@ export default function Button({
[styles.action]: variant === 'action',
[styles.danger]: variant === 'danger',
})}
- onClick={onClick}
+ {...props}
>
{icon && <Icon icon={icon} size={size} />}
{children}
diff --git a/components/interface/Button.module.css b/components/common/Button.module.css
similarity index 100%
rename from components/interface/Button.module.css
rename to components/common/Button.module.css
diff --git a/components/common/CopyButton.js b/components/common/CopyButton.js
new file mode 100644
index 000000000..8d6b5db68
--- /dev/null
+++ b/components/common/CopyButton.js
@@ -0,0 +1,23 @@
+import React, { useState } from 'react';
+import Button from './Button';
+
+const defaultText = 'Copy to clipboard';
+
+export default function CopyButton({ element, ...props }) {
+ const [text, setText] = useState(defaultText);
+
+ function handleClick() {
+ if (element?.current) {
+ element.current.select();
+ document.execCommand('copy');
+ setText('Copied!');
+ window.getSelection().removeAllRanges();
+ }
+ }
+
+ return (
+ <Button {...props} onClick={handleClick}>
+ {text}
+ </Button>
+ );
+}
diff --git a/components/common/DropDown.js b/components/common/DropDown.js
index f74fabff7..1f8bfda02 100644
--- a/components/common/DropDown.js
+++ b/components/common/DropDown.js
@@ -1,10 +1,10 @@
import React, { useState, useRef } from 'react';
import classNames from 'classnames';
-import Menu from '../interface/Menu';
+import Menu from './Menu';
import useDocumentClick from 'hooks/useDocumentClick';
import Chevron from 'assets/chevron-down.svg';
import styles from './Dropdown.module.css';
-import Icon from '../interface/Icon';
+import Icon from './Icon';
export default function DropDown({
value,
diff --git a/components/interface/Icon.js b/components/common/Icon.js
similarity index 100%
rename from components/interface/Icon.js
rename to components/common/Icon.js
diff --git a/components/interface/Icon.module.css b/components/common/Icon.module.css
similarity index 100%
rename from components/interface/Icon.module.css
rename to components/common/Icon.module.css
diff --git a/components/interface/Link.js b/components/common/Link.js
similarity index 100%
rename from components/interface/Link.js
rename to components/common/Link.js
diff --git a/components/interface/Link.module.css b/components/common/Link.module.css
similarity index 100%
rename from components/interface/Link.module.css
rename to components/common/Link.module.css
diff --git a/components/interface/Menu.js b/components/common/Menu.js
similarity index 100%
rename from components/interface/Menu.js
rename to components/common/Menu.js
diff --git a/components/interface/Menu.module.css b/components/common/Menu.module.css
similarity index 100%
rename from components/interface/Menu.module.css
rename to components/common/Menu.module.css
diff --git a/components/common/Table.module.css b/components/common/Table.module.css
index 3e0f4cbb1..609297a7a 100644
--- a/components/common/Table.module.css
+++ b/components/common/Table.module.css
@@ -12,6 +12,7 @@
font-weight: 600;
line-height: 40px;
flex: 1;
+ border-bottom: 1px solid var(--gray300);
}
.body {
diff --git a/components/interface/UserButton.js b/components/common/UserButton.js
similarity index 100%
rename from components/interface/UserButton.js
rename to components/common/UserButton.js
diff --git a/components/interface/UserButton.module.css b/components/common/UserButton.module.css
similarity index 100%
rename from components/interface/UserButton.module.css
rename to components/common/UserButton.module.css
diff --git a/components/forms/LoginForm.js b/components/forms/LoginForm.js
index 0991c5eb5..366abbf75 100644
--- a/components/forms/LoginForm.js
+++ b/components/forms/LoginForm.js
@@ -2,9 +2,8 @@ import React, { useState } from 'react';
import { Formik, Form, Field } from 'formik';
import Router from 'next/router';
import { post } from 'lib/web';
-import Button from '../interface/Button';
+import Button from '../common/Button';
import FormLayout, { FormButtons, FormError, FormMessage, FormRow } from '../layout/FormLayout';
-import styles from './LoginForm.module.css';
const validate = ({ username, password }) => {
const errors = {};
@@ -44,7 +43,7 @@ export default function LoginForm() {
>
{() => (
<Form>
- <h1 className={styles.title}>umami</h1>
+ <h1 className="center">umami</h1>
<FormRow>
<label htmlFor="username">Username</label>
<Field name="username" type="text" />
diff --git a/components/forms/LoginForm.module.css b/components/forms/LoginForm.module.css
deleted file mode 100644
index 572dcb152..000000000
--- a/components/forms/LoginForm.module.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.title {
- font-size: var(--font-size-xlarge);
- text-align: center;
-}
-
-.button {
- color: var(--gray50);
- background: var(--gray900);
-}
-
-.button:hover {
- background: var(--gray800);
-}
diff --git a/components/forms/WebsiteCodeForm.js b/components/forms/WebsiteCodeForm.js
new file mode 100644
index 000000000..a05ae9222
--- /dev/null
+++ b/components/forms/WebsiteCodeForm.js
@@ -0,0 +1,30 @@
+import React, { useRef } from 'react';
+import Button from 'components/common/Button';
+import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
+import CopyButton from '../common/CopyButton';
+
+export default function WebsiteCodeForm({ values, onClose }) {
+ const ref = useRef();
+
+ return (
+ <FormLayout>
+ <p>
+ To track stats for <b>{values.name}</b>, place the following code in the &lt;head&gt;
+ section of your website.
+ </p>
+ <FormRow>
+ <textarea
+ ref={ref}
+ rows={3}
+ cols={60}
+ defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}/umami.js" />`}
+ readOnly
+ />
+ </FormRow>
+ <FormButtons>
+ <CopyButton type="submit" variant="action" element={ref} />
+ <Button onClick={onClose}>Cancel</Button>
+ </FormButtons>
+ </FormLayout>
+ );
+}
diff --git a/components/forms/WebsiteDeleteForm.js b/components/forms/WebsiteDeleteForm.js
index 37d4de797..b9010c334 100644
--- a/components/forms/WebsiteDeleteForm.js
+++ b/components/forms/WebsiteDeleteForm.js
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Formik, Form, Field } from 'formik';
import { del } from 'lib/web';
-import Button from 'components/interface/Button';
+import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
@@ -19,7 +19,7 @@ const validate = ({ confirmation }) => {
return errors;
};
-export default function WebsiteDeleteForm({ initialValues, onSave, onClose }) {
+export default function WebsiteDeleteForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async ({ website_id }) => {
@@ -35,21 +35,20 @@ export default function WebsiteDeleteForm({ initialValues, onSave, onClose }) {
return (
<FormLayout>
<Formik
- initialValues={{ confirmation: '', ...initialValues }}
+ initialValues={{ confirmation: '', ...values }}
validate={validate}
onSubmit={handleSubmit}
>
{() => (
<Form>
<div>
- Are your sure you want to delete <b>{initialValues.name}</b>?
+ Are your sure you want to delete <b>{values.name}</b>?
</div>
<div>All associated data will be deleted as well.</div>
<p>
Type <b>DELETE</b> in the box below to confirm.
</p>
<FormRow>
- <label htmlFor="confirmation">Confirm</label>
<Field name="confirmation" />
<FormError name="confirmation" />
</FormRow>
diff --git a/components/forms/WebsiteEditForm.js b/components/forms/WebsiteEditForm.js
index a287947ad..10f98ff51 100644
--- a/components/forms/WebsiteEditForm.js
+++ b/components/forms/WebsiteEditForm.js
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Formik, Form, Field } from 'formik';
import { post } from 'lib/web';
-import Button from 'components/interface/Button';
+import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
@@ -22,7 +22,7 @@ const validate = ({ name, domain }) => {
return errors;
};
-export default function WebsiteEditForm({ initialValues, onSave, onClose }) {
+export default function WebsiteEditForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async values => {
@@ -37,7 +37,7 @@ export default function WebsiteEditForm({ initialValues, onSave, onClose }) {
return (
<FormLayout>
- <Formik initialValues={initialValues} validate={validate} onSubmit={handleSubmit}>
+ <Formik initialValues={values} validate={validate} onSubmit={handleSubmit}>
{() => (
<Form>
<FormRow>
diff --git a/components/layout/Header.js b/components/layout/Header.js
index 193c33125..d382bcaf2 100644
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@@ -1,9 +1,9 @@
import React from 'react';
import { useSelector } from 'react-redux';
import classNames from 'classnames';
-import Link from 'components/interface/Link';
-import UserButton from '../interface/UserButton';
-import Icon from '../interface/Icon';
+import Link from 'components/common/Link';
+import UserButton from '../common/UserButton';
+import Icon from '../common/Icon';
import Logo from 'assets/logo.svg';
import styles from './Header.module.css';
diff --git a/lib/crypto.js b/lib/crypto.js
index dbd578bd6..32ce80f83 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -16,7 +16,7 @@ export function secret() {
export function uuid(...args) {
if (!args.length) return v4();
- return v5(args.join(''), v5(process.env.HASH_SALT, v5.DNS));
+ return v5(args.join(''), v5.DNS);
}
export function isValidId(s) {
diff --git a/lib/request.js b/lib/request.js
index e0d022321..904611f06 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -31,7 +31,7 @@ export function getDevice(screen, browser, os) {
}
return 'desktop';
} else if (MOBILE_OS.includes(os)) {
- if (os === 'Amazon OS' || width < MOBILE_SCREEN_WIDTH) {
+ if (os === 'Amazon OS' || width > MOBILE_SCREEN_WIDTH) {
return 'tablet';
}
return 'mobile';
diff --git a/pages/login.js b/pages/login.js
index 1d3f29963..fbbab1d17 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -1,7 +1,7 @@
import React from 'react';
import Layout from 'components/layout/Layout';
import LoginForm from 'components/forms/LoginForm';
-import Icon from 'components/interface/Icon';
+import Icon from 'components/common/Icon';
import Logo from 'assets/logo.svg';
export default function LoginPage() {
diff --git a/styles/index.css b/styles/index.css
index ef4a88598..d84248f0a 100644
--- a/styles/index.css
+++ b/styles/index.css
@@ -54,7 +54,9 @@ textarea {
line-height: 1.8;
border: 1px solid var(--gray500);
border-radius: 4px;
+ width: 100%;
outline: none;
+ resize: none;
}
select {
@@ -80,3 +82,7 @@ main {
padding-right: 0;
padding-left: 0;
}
+
+.center {
+ text-align: center;
+}