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
Website edit functionality.
Mike Cao00e232fee8b1
diff --git a/components/Account.js b/components/Account.jsindex 7b9e0dda0..08ebe815f 100644--- a/components/Account.js+++ b/components/Account.js@@ -1,6 +1,6 @@import React from 'react';import { useSelector } from 'react-redux';-import Page from './Page';+import Page from './layout/Page';import styles from './Account.module.css';export default function Account() {diff --git a/components/Footer.js b/components/Footer.jsdeleted file mode 100644index 47f9d4d91..000000000--- a/components/Footer.js+++ /dev/null@@ -1,5 +0,0 @@-import React from 'react';--export default function Footer() {- return <footer className="container mt-5 mb-5">umami - deliciously simple web stats</footer>;-}diff --git a/components/Settings.js b/components/Settings.jsindex 23e218b5a..267f3d602 100644--- a/components/Settings.js+++ b/components/Settings.js@@ -1,30 +1,36 @@import React, { useState, useEffect } from 'react';-import Page from './Page';-import Table from './Table';-import Button from './Button';-import Icon from './Icon';-import PageHeader from './PageHeader';+import Page from './layout/Page';+import Table from './common/Table';+import Button from './interface/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 { get } from 'lib/web';+import Modal from './common/Modal';+import WebsiteForm from './forms/WebsiteForm';+import styles from './Settings.module.css';export default function Settings() {const [data, setData] = useState();+ const [edit, setEdit] = useState();+ const [del, setDelete] = useState();+ const [saved, setSaved] = useState(0);const columns = [{ key: 'name', label: 'Name' },{ key: 'domain', label: 'Domain' },{key: 'action',- label: '',- style: { flex: 0 },- render: ({ website_id }) => (+ cell: {+ className: styles.buttons,+ },+ render: row => (<>- <Button icon={<Pen />} size="S">+ <Button icon={<Pen />} size="S" onClick={() => setEdit(row)}><div>Edit</div></Button>- <Button icon={<Trash />} size="S">+ <Button icon={<Trash />} size="S" onClick={() => setDelete(row)}><div>Delete</div></Button></>@@ -32,13 +38,23 @@ export default function Settings() {},];+ function handleSave() {+ setSaved(state => state + 1);+ handleClose();+ }++ function handleClose() {+ setEdit(null);+ setDelete(null);+ }+async function loadData() {setData(await get(`/api/website`));}useEffect(() => {loadData();- }, []);+ }, [saved]);if (!data) {return null;@@ -47,13 +63,17 @@ export default function Settings() {return (<Page><PageHeader>- <div>Settings</div>- <Button size="S">- <Icon icon={<Plus />} size="S" />+ <div>Websites</div>+ <Button icon={<Plus />} size="S"><div>Add website</div></Button></PageHeader>- <Table columns={columns} rows={data.websites} />+ <Table columns={columns} rows={data} />+ {edit && (+ <Modal title="Edit website">+ <WebsiteForm initialValues={edit} onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}</Page>);}diff --git a/components/Settings.module.css b/components/Settings.module.cssnew file mode 100644index 000000000..91af32469--- /dev/null+++ b/components/Settings.module.css@@ -0,0 +1,4 @@+.buttons {+ display: flex;+ justify-content: flex-end;+}diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.jsindex 96ed4c740..a5c27f353 100644--- a/components/WebsiteDetails.js+++ b/components/WebsiteDetails.js@@ -1,14 +1,14 @@import React, { useEffect, useState } from 'react';import classNames from 'classnames';-import WebsiteChart from './WebsiteChart';-import RankingsChart from './RankingsChart';-import WorldMap from './WorldMap';-import Page from './Page';+import WebsiteChart from './charts/WebsiteChart';+import RankingsChart from './charts/RankingsChart';+import WorldMap from './common/WorldMap';+import Page from './layout/Page';import { getDateRange } from 'lib/date';import { get } from 'lib/web';import { browserFilter, urlFilter, refFilter, deviceFilter, countryFilter } from 'lib/filters';import styles from './WebsiteDetails.module.css';-import PageHeader from './PageHeader';+import PageHeader from './layout/PageHeader';const pageviewClasses = 'col-md-12 col-lg-6';const sessionClasses = 'col-12 col-lg-4';diff --git a/components/WebsiteList.js b/components/WebsiteList.jsindex 8f449ee7a..0e1dfd89f 100644--- a/components/WebsiteList.js+++ b/components/WebsiteList.js@@ -1,12 +1,12 @@import React, { useState, useEffect } from 'react';import { useRouter } from 'next/router';import { get } from 'lib/web';-import Link from './Link';-import WebsiteChart from './WebsiteChart';-import Page from './Page';-import Icon from './Icon';-import Button from './Button';-import PageHeader from './PageHeader';+import Link from './interface/Link';+import WebsiteChart from './charts/WebsiteChart';+import Page from './layout/Page';+import Icon from './interface/Icon';+import Button from './interface/Button';+import PageHeader from './layout/PageHeader';import Arrow from 'assets/arrow-right.svg';import styles from './WebsiteList.module.css';@@ -24,32 +24,31 @@ export default function WebsiteList() {return (<Page>- {data &&- data.websites.map(({ website_id, name }) => (- <div key={website_id} className={styles.website}>- <PageHeader>- <Link- href="/website/[...id]"- as={`/website/${website_id}/${name}`}- className={styles.title}- >- {name}- </Link>- <Button- icon={<Arrow />}- onClick={() =>- router.push('/website/[...id]', `/website/${website_id}/${name}`, {- shallow: true,- })- }- size="S"- >- <div>View details</div>- </Button>- </PageHeader>- <WebsiteChart key={website_id} title={name} websiteId={website_id} />- </div>- ))}+ {data?.map(({ website_id, name }) => (+ <div key={website_id} className={styles.website}>+ <PageHeader>+ <Link+ href="/website/[...id]"+ as={`/website/${website_id}/${name}`}+ className={styles.title}+ >+ {name}+ </Link>+ <Button+ icon={<Arrow />}+ onClick={() =>+ router.push('/website/[...id]', `/website/${website_id}/${name}`, {+ shallow: true,+ })+ }+ size="S"+ >+ <div>View details</div>+ </Button>+ </PageHeader>+ <WebsiteChart key={website_id} title={name} websiteId={website_id} />+ </div>+ ))}</Page>);}diff --git a/components/MetricCard.js b/components/charts/MetricCard.jssimilarity index 100%rename from components/MetricCard.jsrename to components/charts/MetricCard.jsdiff --git a/components/MetricCard.module.css b/components/charts/MetricCard.module.csssimilarity index 100%rename from components/MetricCard.module.cssrename to components/charts/MetricCard.module.cssdiff --git a/components/MetricsBar.js b/components/charts/MetricsBar.jssimilarity index 100%rename from components/MetricsBar.jsrename to components/charts/MetricsBar.jsdiff --git a/components/MetricsBar.module.css b/components/charts/MetricsBar.module.csssimilarity index 100%rename from components/MetricsBar.module.cssrename to components/charts/MetricsBar.module.cssdiff --git a/components/PageviewsChart.js b/components/charts/PageviewsChart.jssimilarity index 100%rename from components/PageviewsChart.jsrename to components/charts/PageviewsChart.jsdiff --git a/components/PageviewsChart.module.css b/components/charts/PageviewsChart.module.csssimilarity index 100%rename from components/PageviewsChart.module.cssrename to components/charts/PageviewsChart.module.cssdiff --git a/components/QuickButtons.js b/components/charts/QuickButtons.jssimilarity index 94%rename from components/QuickButtons.jsrename to components/charts/QuickButtons.jsindex de5722e6d..831a2c057 100644--- a/components/QuickButtons.js+++ b/components/charts/QuickButtons.js@@ -1,6 +1,6 @@import React from 'react';import classNames from 'classnames';-import Button from './Button';+import Button from '../interface/Button';import { getDateRange } from 'lib/date';import styles from './QuickButtons.module.css';diff --git a/components/QuickButtons.module.css b/components/charts/QuickButtons.module.csssimilarity index 100%rename from components/QuickButtons.module.cssrename to components/charts/QuickButtons.module.cssdiff --git a/components/RankingsChart.js b/components/charts/RankingsChart.jssimilarity index 97%rename from components/RankingsChart.jsrename to components/charts/RankingsChart.jsindex 6a86dbbcd..85acefeb3 100644--- a/components/RankingsChart.js+++ b/components/charts/RankingsChart.js@@ -1,7 +1,7 @@import React, { useState, useEffect, useMemo } from 'react';import { useSpring, animated, config } from 'react-spring';import classNames from 'classnames';-import CheckVisible from './CheckVisible';+import CheckVisible from '../helpers/CheckVisible';import { get } from 'lib/web';import { percentFilter } from 'lib/filters';import styles from './RankingsChart.module.css';diff --git a/components/RankingsChart.module.css b/components/charts/RankingsChart.module.csssimilarity index 100%rename from components/RankingsChart.module.cssrename to components/charts/RankingsChart.module.cssdiff --git a/components/WebsiteChart.js b/components/charts/WebsiteChart.jssimilarity index 93%rename from components/WebsiteChart.jsrename to components/charts/WebsiteChart.jsindex 5779258a7..837b75486 100644--- a/components/WebsiteChart.js+++ b/components/charts/WebsiteChart.js@@ -1,11 +1,11 @@import React, { useState, useEffect, useMemo, useRef } from 'react';import classNames from 'classnames';import PageviewsChart from './PageviewsChart';-import CheckVisible from './CheckVisible';+import CheckVisible from '../helpers/CheckVisible';import MetricsBar from './MetricsBar';import QuickButtons from './QuickButtons';-import DateFilter from './DateFilter';-import StickyHeader from './StickyHeader';+import DateFilter from '../common/DateFilter';+import StickyHeader from '../helpers/StickyHeader';import { get } from 'lib/web';import { getDateArray, getDateRange, getTimezone } from 'lib/date';import styles from './WebsiteChart.module.css';diff --git a/components/WebsiteChart.module.css b/components/charts/WebsiteChart.module.csssimilarity index 100%rename from components/WebsiteChart.module.cssrename to components/charts/WebsiteChart.module.cssdiff --git a/components/DateFilter.js b/components/common/DateFilter.jssimilarity index 100%rename from components/DateFilter.jsrename to components/common/DateFilter.jsdiff --git a/components/DropDown.js b/components/common/DropDown.jssimilarity index 93%rename from components/DropDown.jsrename to components/common/DropDown.jsindex 9538d6f5e..c3d6f8528 100644--- a/components/DropDown.js+++ b/components/common/DropDown.js@@ -1,10 +1,10 @@import React, { useState, useRef } from 'react';import classNames from 'classnames';-import Menu from './Menu';+import Menu from '../interface/Menu';import useDocumentClick from 'hooks/useDocumentClick';import Chevron from 'assets/chevron-down.svg';import styles from './Dropdown.module.css';-import Icon from './Icon';+import Icon from '../interface/Icon';export default function DropDown({value,diff --git a/components/Dropdown.module.css b/components/common/Dropdown.module.csssimilarity index 100%rename from components/Dropdown.module.cssrename to components/common/Dropdown.module.cssdiff --git a/components/common/Modal.js b/components/common/Modal.jsnew file mode 100644index 000000000..c2bca43f6--- /dev/null+++ b/components/common/Modal.js@@ -0,0 +1,16 @@+import React from 'react';+import { useSpring, animated } from 'react-spring';+import styles from './Modal.module.css';++export default function Modal({ title, children }) {+ const props = useSpring({ opacity: 1, from: { opacity: 0 } });++ return (+ <animated.div className={styles.modal} style={props}>+ <div className={styles.content}>+ {title && <div className={styles.header}>{title}</div>}+ <div className={styles.body}>{children}</div>+ </div>+ </animated.div>+ );+}diff --git a/components/common/Modal.module.css b/components/common/Modal.module.cssnew file mode 100644index 000000000..450b58202--- /dev/null+++ b/components/common/Modal.module.css@@ -0,0 +1,45 @@+.modal {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ margin: auto;+}++.modal:before {+ content: '';+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ margin: auto;+ background: var(--gray900);+ opacity: 0.1;+}++.content {+ position: absolute;+ top: 50%;+ left: 50%;+ transform: translate(-50%, -50%);+ background: var(--gray50);+ min-width: 200px;+ min-height: 100px;+ z-index: 1;+ border: 1px solid var(--gray300);+ padding: 30px;+ border-radius: 4px;+ overflow: hidden;+}++.header {+ font-weight: 600;+ margin-bottom: 20px;+}++.body {+ display: flex;+ flex-direction: column;+}diff --git a/components/Table.js b/components/common/Table.jssimilarity index 64%rename from components/Table.jsrename to components/common/Table.jsindex a910f5d1e..169bfd22e 100644--- a/components/Table.js+++ b/components/common/Table.js@@ -6,8 +6,12 @@ export default function Table({ columns, rows }) {return (<div className={styles.table}><div className={styles.header}>- {columns.map(({ key, label }) => (- <div key={key} className={styles.head}>+ {columns.map(({ key, label, header }) => (+ <div+ key={key}+ className={classNames(styles.head, header?.className)}+ style={header?.style}+ >{label}</div>))}@@ -15,11 +19,11 @@ export default function Table({ columns, rows }) {<div className={styles.body}>{rows.map((row, rowIndex) => (<div className={styles.row} key={rowIndex}>- {columns.map(({ key, render, className, style }) => (+ {columns.map(({ key, render, cell }) => (<divkey={`${rowIndex}${key}`}- className={classNames(styles.cell, className)}- style={style}+ className={classNames(styles.cell, cell?.className)}+ style={cell?.style}>{render ? render(row) : row[key]}</div>diff --git a/components/Table.module.css b/components/common/Table.module.csssimilarity index 86%rename from components/Table.module.cssrename to components/common/Table.module.cssindex 75b44feb4..3e0f4cbb1 100644--- a/components/Table.module.css+++ b/components/common/Table.module.css@@ -14,6 +14,11 @@flex: 1;}+.body {+ display: flex;+ flex-direction: column;+}+.row {display: flex;border-bottom: 1px solid var(--gray300);diff --git a/components/WorldMap.js b/components/common/WorldMap.jssimilarity index 100%rename from components/WorldMap.jsrename to components/common/WorldMap.jsdiff --git a/components/WorldMap.module.css b/components/common/WorldMap.module.csssimilarity index 100%rename from components/WorldMap.module.cssrename to components/common/WorldMap.module.cssdiff --git a/components/Login.js b/components/forms/LoginForm.jssimilarity index 91%rename from components/Login.jsrename to components/forms/LoginForm.jsindex d2da76d8c..395319bb5 100644--- a/components/Login.js+++ b/components/forms/LoginForm.js@@ -2,9 +2,9 @@ import React, { useState } from 'react';import { Formik, Form, Field } from 'formik';import Router from 'next/router';import { post } from 'lib/web';-import Button from './Button';-import FormLayout, { FormButtons, FormError, FormMessage, FormRow } from './FormLayout';-import styles from './Login.module.css';+import Button from '../interface/Button';+import FormLayout, { FormButtons, FormError, FormMessage, FormRow } from '../layout/FormLayout';+import styles from './LoginForm.module.css';const validate = ({ username, password }) => {const errors = {};@@ -19,7 +19,7 @@ const validate = ({ username, password }) => {return errors;};-export default function Login() {+export default function LoginForm() {const [message, setMessage] = useState();const handleSubmit = async ({ username, password }) => {diff --git a/components/Login.module.css b/components/forms/LoginForm.module.csssimilarity index 100%rename from components/Login.module.cssrename to components/forms/LoginForm.module.cssdiff --git a/components/forms/WebsiteForm.js b/components/forms/WebsiteForm.jsnew file mode 100644index 000000000..b131b93cb--- /dev/null+++ b/components/forms/WebsiteForm.js@@ -0,0 +1,64 @@+import React, { useState } from 'react';+import { Formik, Form, Field } from 'formik';+import Router from 'next/router';+import { post } from 'lib/web';+import Button from 'components/interface/Button';+import FormLayout, {+ FormButtons,+ FormError,+ FormMessage,+ FormRow,+} from 'components/layout/FormLayout';++const validate = ({ name, domain }) => {+ const errors = {};++ if (!name) {+ errors.name = 'Required';+ }+ if (!domain) {+ errors.domain = 'Required';+ }++ return errors;+};++export default function WebsiteForm({ initialValues, onSave, onClose }) {+ const [message, setMessage] = useState();++ const handleSubmit = async values => {+ const response = await post(`/api/website`, values);++ if (response) {+ onSave();+ } else {+ setMessage('Something went wrong.');+ }+ };++ return (+ <FormLayout>+ <Formik initialValues={initialValues} validate={validate} onSubmit={handleSubmit}>+ {() => (+ <Form>+ <FormRow>+ <label htmlFor="name">Name</label>+ <Field name="name" type="text" />+ <FormError name="name" />+ </FormRow>+ <FormRow>+ <label htmlFor="domain">Domain</label>+ <Field name="domain" type="text" />+ <FormError name="domain" />+ </FormRow>+ <FormButtons>+ <Button type="submit">Save</Button>+ <Button onClick={onClose}>Cancel</Button>+ </FormButtons>+ <FormMessage>{message}</FormMessage>+ </Form>+ )}+ </Formik>+ </FormLayout>+ );+}diff --git a/components/CheckVisible.js b/components/helpers/CheckVisible.jssimilarity index 100%rename from components/CheckVisible.jsrename to components/helpers/CheckVisible.jsdiff --git a/components/StickyHeader.js b/components/helpers/StickyHeader.jssimilarity index 100%rename from components/StickyHeader.jsrename to components/helpers/StickyHeader.jsdiff --git a/components/Button.js b/components/interface/Button.jssimilarity index 100%rename from components/Button.jsrename to components/interface/Button.jsdiff --git a/components/Button.module.css b/components/interface/Button.module.csssimilarity index 100%rename from components/Button.module.cssrename to components/interface/Button.module.cssdiff --git a/components/Icon.js b/components/interface/Icon.jssimilarity index 100%rename from components/Icon.jsrename to components/interface/Icon.jsdiff --git a/components/Icon.module.css b/components/interface/Icon.module.csssimilarity index 100%rename from components/Icon.module.cssrename to components/interface/Icon.module.cssdiff --git a/components/Link.js b/components/interface/Link.jssimilarity index 100%rename from components/Link.jsrename to components/interface/Link.jsdiff --git a/components/Link.module.css b/components/interface/Link.module.csssimilarity index 100%rename from components/Link.module.cssrename to components/interface/Link.module.cssdiff --git a/components/Menu.js b/components/interface/Menu.jssimilarity index 100%rename from components/Menu.jsrename to components/interface/Menu.jsdiff --git a/components/Menu.module.css b/components/interface/Menu.module.csssimilarity index 100%rename from components/Menu.module.cssrename to components/interface/Menu.module.cssdiff --git a/components/UserButton.js b/components/interface/UserButton.jssimilarity index 100%rename from components/UserButton.jsrename to components/interface/UserButton.jsdiff --git a/components/UserButton.module.css b/components/interface/UserButton.module.csssimilarity index 100%rename from components/UserButton.module.cssrename to components/interface/UserButton.module.cssdiff --git a/components/layout/Footer.js b/components/layout/Footer.jsnew file mode 100644index 000000000..c534e6853--- /dev/null+++ b/components/layout/Footer.js@@ -0,0 +1,11 @@+import React from 'react';+import classNames from 'classnames';+import styles from './Footer.module.css';++export default function Footer() {+ return (+ <footer className={classNames(styles.footer, 'container mt-5 mb-5')}>+ umami - deliciously simple web stats+ </footer>+ );+}diff --git a/components/layout/Footer.module.css b/components/layout/Footer.module.cssnew file mode 100644index 000000000..92bc10c18--- /dev/null+++ b/components/layout/Footer.module.css@@ -0,0 +1,3 @@+.footer {+ font-size: var(--font-size-small);+}diff --git a/components/FormLayout.js b/components/layout/FormLayout.jssimilarity index 100%rename from components/FormLayout.jsrename to components/layout/FormLayout.jsdiff --git a/components/FormLayout.module.css b/components/layout/FormLayout.module.csssimilarity index 74%rename from components/FormLayout.module.cssrename to components/layout/FormLayout.module.cssindex 85c61ac8f..9bf5a3de1 100644--- a/components/FormLayout.module.css+++ b/components/layout/FormLayout.module.css@@ -33,11 +33,24 @@top: 0;left: 100%;bottom: 0;- margin-left: 10px;- padding: 4px 8px;+ margin-left: 16px;+ padding: 4px 10px;border-radius: 4px;}+.error:after {+ content: '';+ position: absolute;+ top: 0;+ left: -5px;+ bottom: 0;+ margin: auto;+ width: 10px;+ height: 10px;+ background: var(--color-error);+ transform: rotate(45deg);+}+.message {text-align: center;margin: 20px 0;diff --git a/components/Header.js b/components/layout/Header.jssimilarity index 87%rename from components/Header.jsrename to components/layout/Header.jsindex 1fc62eed9..193c33125 100644--- a/components/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/Link';-import UserButton from './UserButton';-import Icon from './Icon';+import Link from 'components/interface/Link';+import UserButton from '../interface/UserButton';+import Icon from '../interface/Icon';import Logo from 'assets/logo.svg';import styles from './Header.module.css';diff --git a/components/Header.module.css b/components/layout/Header.module.csssimilarity index 100%rename from components/Header.module.cssrename to components/layout/Header.module.cssdiff --git a/components/Layout.js b/components/layout/Layout.jssimilarity index 89%rename from components/Layout.jsrename to components/layout/Layout.jsindex a2d45cc10..91591ccca 100644--- a/components/Layout.js+++ b/components/layout/Layout.js@@ -1,8 +1,8 @@import React from 'react';import classNames from 'classnames';import Head from 'next/head';-import Header from 'components/Header';-import Footer from 'components/Footer';+import Header from 'components/layout/Header';+import Footer from 'components/layout/Footer';import styles from './Layout.module.css';export default function Layout({diff --git a/components/Layout.module.css b/components/layout/Layout.module.csssimilarity index 100%rename from components/Layout.module.cssrename to components/layout/Layout.module.cssdiff --git a/components/Page.js b/components/layout/Page.jssimilarity index 100%rename from components/Page.jsrename to components/layout/Page.jsdiff --git a/components/Page.module.css b/components/layout/Page.module.csssimilarity index 100%rename from components/Page.module.cssrename to components/layout/Page.module.cssdiff --git a/components/PageHeader.js b/components/layout/PageHeader.jssimilarity index 100%rename from components/PageHeader.jsrename to components/layout/PageHeader.jsdiff --git a/components/PageHeader.module.css b/components/layout/PageHeader.module.csssimilarity index 100%rename from components/PageHeader.module.cssrename to components/layout/PageHeader.module.cssdiff --git a/lib/db.js b/lib/db.jsindex 8f20b0b53..b047b8665 100644--- a/lib/db.js+++ b/lib/db.js@@ -56,6 +56,20 @@ export async function getWebsites(user_id) {where: {user_id,},+ orderBy: {+ name: 'asc',+ },+ }),+ );+}++export async function updateWebsite(website_id, data) {+ return runQuery(+ prisma.website.update({+ where: {+ website_id,+ },+ data,}),);}diff --git a/pages/404.js b/pages/404.jsindex 5e7a2938f..3c0c232ed 100644--- a/pages/404.js+++ b/pages/404.js@@ -1,5 +1,5 @@import React from 'react';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';export default function Custom404() {return (diff --git a/pages/account.js b/pages/account.jsindex 0b56dfdcf..d97b63252 100644--- a/pages/account.js+++ b/pages/account.js@@ -1,5 +1,5 @@import React from 'react';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';import Account from 'components/Account';import useRequireLogin from 'hooks/useRequireLogin';diff --git a/pages/api/website.js b/pages/api/website.jsindex cb8f840af..e308c65ec 100644--- a/pages/api/website.js+++ b/pages/api/website.js@@ -1,12 +1,26 @@-import { getWebsites } from 'lib/db';+import { getWebsites, updateWebsite } from 'lib/db';import { useAuth } from 'lib/middleware';export default async (req, res) => {await useAuth(req, res);const { user_id } = req.auth;+ const { website_id } = req.body;- const websites = await getWebsites(user_id);+ if (req.method === 'GET') {+ const websites = await getWebsites(user_id);- return res.status(200).json({ websites });+ return res.status(200).json(websites);+ }++ if (req.method === 'POST') {+ if (website_id) {+ const { name, domain } = req.body;+ const website = await updateWebsite(website_id, { name, domain });++ return res.status(200).json(website);+ }+ }++ return res.status(405).end();};diff --git a/pages/dashboard.js b/pages/dashboard.jsindex 63c5be499..aeb9d772f 100644--- a/pages/dashboard.js+++ b/pages/dashboard.js@@ -1,5 +1,5 @@import React from 'react';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';import WebsiteList from 'components/WebsiteList';import useRequireLogin from 'hooks/useRequireLogin';diff --git a/pages/login.js b/pages/login.jsindex 7a91fcbad..1d3f29963 100644--- a/pages/login.js+++ b/pages/login.js@@ -1,14 +1,14 @@import React from 'react';-import Layout from 'components/Layout';-import Login from 'components/Login';-import Icon from 'components/Icon';+import Layout from 'components/layout/Layout';+import LoginForm from 'components/forms/LoginForm';+import Icon from 'components/interface/Icon';import Logo from 'assets/logo.svg';export default function LoginPage() {return (<Layout title="login" header={false} footer={false} center middle><Icon icon={<Logo />} size="XL" />- <Login />+ <LoginForm /></Layout>);}diff --git a/pages/settings.js b/pages/settings.jsindex 6cf411f1a..f244529b5 100644--- a/pages/settings.js+++ b/pages/settings.js@@ -1,5 +1,5 @@import React from 'react';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';import Settings from 'components/Settings';import useRequireLogin from 'hooks/useRequireLogin';diff --git a/pages/test.js b/pages/test.jsindex 16bd8b612..3dcc834c9 100644--- a/pages/test.js+++ b/pages/test.js@@ -1,6 +1,6 @@import Head from 'next/head';import Link from 'next/link';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';export default function Test({ websiteId }) {return (diff --git a/pages/website/[...id].js b/pages/website/[...id].jsindex 499f93f01..991d393a2 100644--- a/pages/website/[...id].js+++ b/pages/website/[...id].js@@ -1,6 +1,6 @@import React from 'react';import { useRouter } from 'next/router';-import Layout from 'components/Layout';+import Layout from 'components/layout/Layout';import WebsiteDetails from 'components/WebsiteDetails';import useRequireLogin from 'hooks/useRequireLogin';