Skip to content

Commit

Permalink
fix: polish page identifier text
Browse files Browse the repository at this point in the history
  • Loading branch information
devrsi0n committed Jul 8, 2023
1 parent 8d83bd6 commit e32b68c
Show file tree
Hide file tree
Showing 15 changed files with 1,678 additions and 1,509 deletions.
4 changes: 2 additions & 2 deletions apps/bootstrapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"dotenv-cli": "7.2.1",
"dotenv-expand": "10.0.0",
"eslint": "8.44.0",
"jest": "29.5.0",
"jest": "29.6.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.1.6",
"vite": "4.3.9",
"vite": "4.4.1",
"vite-plugin-dts": "2.3.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion apps/emails/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@maizzle/framework": "4.4.6",
"autoprefixer": "10.4.14",
"glob": "8.0.3",
"postcss": "8.4.24",
"postcss": "8.4.25",
"tailwindcss": "3.3.2",
"tailwindcss-box-shadow": "2.0.1",
"tailwindcss-email-variants": "2.0.2",
Expand Down
12 changes: 6 additions & 6 deletions apps/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"gray-matter": "4.0.3",
"html-loader": "4.2.0",
"lodash": "4.17.21",
"next": "13.4.7",
"next": "13.4.9",
"next-axiom": "0.17.0",
"next-connect": "0.12.2",
"next-mdx-remote": "3.0.8",
"next-superjson-plugin": "0.5.8",
"next-superjson-plugin": "0.5.9",
"next-themes": "0.2.1",
"nodemailer": "6.9.3",
"react": "18.2.0",
Expand All @@ -56,7 +56,7 @@
"@chirpy-dev/eslint-config": "workspace:*",
"@chirpy-dev/service-worker": "workspace:*",
"@chirpy-dev/tsconfigs": "workspace:*",
"@next/bundle-analyzer": "13.4.7",
"@next/bundle-analyzer": "13.4.9",
"@relative-ci/agent": "4.1.5",
"@types/cors": "2.8.13",
"@types/jest": "29.5.2",
Expand All @@ -70,11 +70,11 @@
"dotenv-cli": "7.2.1",
"dotenv-expand": "10.0.0",
"eslint": "8.44.0",
"jest": "29.5.0",
"postcss": "8.4.24",
"jest": "29.6.1",
"postcss": "8.4.25",
"tailwindcss": "3.3.2",
"typescript": "5.1.6",
"webpack": "5.88.0"
"webpack": "5.88.1"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion apps/service-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dotenv-expand": "10.0.0",
"eslint": "8.44.0",
"typescript": "5.1.6",
"vite": "4.3.9"
"vite": "4.4.1"
},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "chirpy",
"license": "AGPL-3.0-or-later",
"scripts": {
"bootstrap": "cd apps/bootstrapper && pnpm build && cd ../service-worker && pnpm build",
"dev": "cd apps/main && pnpm run dev",
"build": "turbo run build --filter=@chirpy-dev/main-app...",
"changeset": "changeset",
Expand All @@ -14,13 +15,13 @@
},
"devDependencies": {
"@changesets/changelog-github": "0.4.8",
"@changesets/cli": "2.26.1",
"@changesets/cli": "2.26.2",
"@chirpy-dev/eslint-config": "workspace:*",
"@chirpy-dev/prettier-config": "workspace:*",
"eslint": "8.44.0",
"husky": "8.0.3",
"lint-staged": "13.2.3",
"next": "13.4.7",
"next": "13.4.9",
"prettier": "2.8.8",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@chirpy-dev/types": "workspace:*",
"@chirpy-dev/utils": "workspace:*",
"@headlessui/react": "1.7.15",
"@tremor/react": "3.3.0",
"@tremor/react": "3.4.1",
"clsx": "1.2.1",
"next": "13.4.7",
"next": "13.4.9",
"prop-types": "15.8.1",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand All @@ -32,7 +32,7 @@
"@types/react-dom": "18.2.6",
"autoprefixer": "10.4.14",
"eslint": "8.44.0",
"postcss": "8.4.24",
"postcss": "8.4.25",
"tailwindcss": "3.3.2",
"typescript": "5.1.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/configs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@radix-ui/colors": "1.0.0",
"@tailwindcss/typography": "0.5.9",
"color-convert": "2.0.1",
"postcss": "8.4.24",
"postcss": "8.4.25",
"postcss-flexbugs-fixes": "5.0.2",
"postcss-preset-env": "8.5.1",
"tailwindcss": "3.3.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"main": "./index.js",
"dependencies": {
"@chirpy-dev/prettier-config": "workspace:*",
"@typescript-eslint/eslint-plugin": "5.60.1",
"@typescript-eslint/parser": "5.60.1",
"eslint-config-next": "13.4.7",
"@typescript-eslint/eslint-plugin": "5.61.0",
"@typescript-eslint/parser": "5.61.0",
"eslint-config-next": "13.4.9",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-jest": "27.2.2",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-storybook": "0.6.7",
"eslint-plugin-unicorn": "47.0.0",
"next": "13.4.7",
"next": "13.4.9",
"prettier": "2.8.8",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/trpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"@next-auth/prisma-adapter": "1.0.7",
"@prisma/client": "4.16.2",
"@tanstack/react-query": "4.29.19",
"@trpc/client": "10.33.0",
"@trpc/next": "10.33.0",
"@trpc/react-query": "10.33.0",
"@trpc/server": "10.33.0",
"@trpc/client": "10.34.0",
"@trpc/next": "10.34.0",
"@trpc/react-query": "10.34.0",
"@trpc/server": "10.34.0",
"@types/web-push": "3.3.2",
"dayjs": "1.11.9",
"next": "13.4.7",
"next": "13.4.9",
"next-auth": "4.22.1",
"next-axiom": "0.17.0",
"react": "18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"csstype": "3.1.2",
"next": "13.4.7",
"next": "13.4.9",
"next-auth": "4.22.1",
"next-mdx-remote": "3.0.8",
"react": "18.2.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"dayjs": "1.11.9",
"debounce-promise": "3.1.2",
"framer-motion": "10.12.18",
"lucide-react": "0.257.0",
"next": "13.4.7",
"lucide-react": "0.258.0",
"next": "13.4.9",
"next-auth": "4.22.1",
"next-axiom": "0.17.0",
"next-mdx-remote": "3.0.8",
Expand All @@ -56,7 +56,7 @@
"tailwindcss-animate": "1.0.6"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.22.8",
"@chirpy-dev/configs": "workspace:*",
"@chirpy-dev/eslint-config": "workspace:*",
"@chirpy-dev/tsconfigs": "workspace:*",
Expand All @@ -78,7 +78,7 @@
"@types/node": "18.16.18",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@types/testing-library__jest-dom": "5.14.6",
"@types/testing-library__jest-dom": "5.14.7",
"autoprefixer": "10.4.14",
"babel-loader": "8.2.5",
"chromatic": "6.11.4",
Expand All @@ -89,11 +89,11 @@
"fake-indexeddb": "4.0.1",
"html-loader": "4.2.0",
"intersection-observer": "0.12.2",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"jest": "29.6.1",
"jest-environment-jsdom": "29.6.1",
"msw": "1.2.2",
"msw-storybook-addon": "1.6.3",
"postcss": "8.4.24",
"postcss": "8.4.25",
"postcss-loader": "7.3.3",
"require-from-string": "2.0.2",
"resolve-url-loader": "5.0.0",
Expand All @@ -104,7 +104,7 @@
"tailwindcss": "3.3.2",
"type-fest": "3.12.0",
"typescript": "5.1.6",
"webpack": "5.88.0",
"webpack": "5.88.1",
"whatwg-fetch": "3.6.2"
},
"modules": "./src/index.ts",
Expand Down
4 changes: 3 additions & 1 deletion packages/ui/src/pages/dashboard/settings/card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ export type CardProps = {
};

export function Card(props: CardProps): JSX.Element {
return <section className="mt-10 rounded border">{props.children}</section>;
return (
<section className="mt-10 rounded-md border">{props.children}</section>
);
}

Card.Body = CardBody;
Expand Down
24 changes: 4 additions & 20 deletions packages/ui/src/pages/dashboard/settings/page-identifier.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,14 @@ export function PageIdentifier(props: PageUrlProps): JSX.Element {
<Card.Body>
<Card.Title>Page identifier</Card.Title>
<Text variant="secondary">
{`To distinguish between various pages on your site, we rely on the URL (excluding the `}
<Link
variant="primary"
href="https://en.wikipedia.org/wiki/URI_fragment"
>
{`fragment/hash`}
</Link>
{` and `}
{`Chirpy uses the URL domain + path of your page as the comment widget identifier by default, if you want to add `}
<Link
variant="primary"
href="https://en.wikipedia.org/wiki/Query_string"
>
{`query parameters`}
</Link>
{`) as the identifier.`}
</Text>
<Text variant="secondary">
{`For instance, if the URL of your page is `}
<em>https://example.com/blog?id=my-life#heading</em>
{` (assume it uses the id parameter to load different posts), then the page identifier would be `}
<em>https://example.com/blog</em>
{` by default, which loads the same widget on different pages, which might not be what you want.`}
</Text>
<Text variant="secondary">
{`If your page use query parameters as the identifier, please specify them below.`}
{` as the identifier, please specify them below.`}
</Text>
<div className="pt-6">
<TextField
Expand All @@ -91,7 +74,8 @@ export function PageIdentifier(props: PageUrlProps): JSX.Element {
className="w-full"
name="pageQueryParameters"
label="Query parameters"
hintText="Multiply parameters must be separated by commas"
hintText="Multiple parameters must be separated by commas"
placeholder="id,name"
errorMessage={error}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/pages/dashboard/settings/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function ProjectSettings({
}: ProjectSettingsProps): JSX.Element {
return (
<SiteLayout title="Project settings">
<PageTitle>Project settings, {name}</PageTitle>
<PageTitle>Project settings</PageTitle>
<PageIdentifier id={id} />
<DeleteProject domain={domain} name={name} />
</SiteLayout>
Expand Down
Loading

0 comments on commit e32b68c

Please sign in to comment.