Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/namesakefyi/namesake into o…
Browse files Browse the repository at this point in the history
…penlaws-api
  • Loading branch information
evadecker committed Sep 12, 2024
2 parents a121425 + 99aef0d commit 4f2ff9c
Show file tree
Hide file tree
Showing 53 changed files with 341 additions and 359 deletions.
5 changes: 1 addition & 4 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "namesakefyi/namesake" }
],
"changelog": "@changesets/cli/changelog",
"commit": false,
"access": "restricted",
"baseBranch": "main",
Expand Down
5 changes: 0 additions & 5 deletions .changeset/good-scissors-drum.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/modern-jobs-check.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/tidy-eagles-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"namesake": patch
---

Add link to system status from settings page
5 changes: 0 additions & 5 deletions .changeset/wicked-llamas-explain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/young-lions-hope.md

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Deploy

on:
workflow_dispatch:
push:
tags:
- '*'

jobs:
deploy:
name: Deploy
runs-on: ubuntu-latest
permissions: write-all
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
run_install: false

- name: Setup Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Deploy Convex and build app
env:
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
run: npx convex deploy --cmd 'pnpm build'

- name: Deploy to Cloudflare Pages
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: 'namesake'
directory: 'dist'
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
branch: main
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
name: Release
name: Update changelog and tags
runs-on: ubuntu-latest
permissions: write-all
steps:
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# namesake

## 0.1.0

### Minor Changes

- 6e3e40a: Allow users to toggle between system, light, and dark themes
- 6dbc67d: Add rich text editing of quest steps

### Patch Changes

- 01725ac: Display version number on the settings page
- e819e8a: Improve display of empty states
- c751fe2: Display "Page not found" message for 404 pages
- ab65749: Fix web manifest console error

## 0.0.1

### Patch Changes
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "namesake",
"version": "0.0.1",
"version": "0.1.0",
"private": true,
"type": "module",
"scripts": {
Expand Down Expand Up @@ -58,7 +58,6 @@
"@axe-core/playwright": "^4.10.0",
"@babel/preset-react": "^7.24.1",
"@biomejs/biome": "1.8.3",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.8",
"@edge-runtime/vm": "^4.0.3",
"@playwright/test": "^1.47.0",
Expand Down
43 changes: 6 additions & 37 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
export * from "./shared/AlertDialog";
export * from "./shared/AppHeader";
export * from "./shared/Badge";
export * from "./shared/Breadcrumbs";
export * from "./shared/Button";
export * from "./shared/Calendar";
export * from "./shared/Card";
export * from "./shared/Checkbox";
export * from "./shared/ComboBox";
export * from "./shared/Container";
export * from "./shared/DateField";
export * from "./shared/DatePicker";
export * from "./shared/DateRangePicker";
export * from "./shared/Dialog";
export * from "./shared/Empty";
export * from "./shared/Field";
export * from "./shared/FileTrigger";
export * from "./shared/Form";
export * from "./shared/GridList";
export * from "./shared/Link";
export * from "./shared/ListBox";
export * from "./shared/Menu";
export * from "./shared/Meter";
export * from "./shared/Modal";
export * from "./shared/Nav";
export * from "./shared/NumberField";
export * from "./shared/PageHeader";
export * from "./shared/Popover";
export * from "./shared/ProgressBar";
export * from "./shared/RadioGroup";
export * from "./shared/RangeCalendar";
export * from "./shared/RichTextEditor";
export * from "./shared/SearchField";
export * from "./shared/Select";
export * from "./shared/Separator";
export * from "./shared/Slider";
export * from "./shared/Switch";
export * from "./shared/Table";
export * from "./shared/Tabs";
export * from "./shared/TagGroup";
export * from "./shared/TextArea";
export * from "./shared/TextField";
export * from "./shared/TimeField";
export * from "./shared/ToggleButton";
export * from "./shared/Toolbar";
export * from "./shared/Tooltip";
3 changes: 1 addition & 2 deletions src/components/shared/AlertDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { AlertCircleIcon, InfoIcon } from "lucide-react";
import type { ReactNode } from "react";
import { chain } from "react-aria";
import { type DialogProps, Heading } from "react-aria-components";
import { Button } from "./Button";
import { Dialog } from "./Dialog";
import { Button, Dialog } from "..";

interface AlertDialogProps extends Omit<DialogProps, "children"> {
title: string;
Expand Down
3 changes: 1 addition & 2 deletions src/components/shared/AppHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { useAuthActions } from "@convex-dev/auth/react";
import { RiAccountCircleFill } from "@remixicon/react";
import { Authenticated, Unauthenticated } from "convex/react";
import { Button, Link, Menu, MenuItem, MenuTrigger } from ".";
import { Button, Link, Menu, MenuItem, MenuTrigger } from "..";

export const AppHeader = () => {
const { signOut } = useAuthActions();

return (
<div className="flex gap-4 items-center w-screen py-3 px-4 border-b border-gray-dim">
<Link href={{ to: "/" }}>Namesake</Link>
<Link href={{ to: "/quests" }}>Quests</Link>
<Link href={{ to: "/laws" }}>Laws</Link>
<Authenticated>
{/* TODO: Gate this by role */}
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
type LinkProps,
} from "react-aria-components";
import { twMerge } from "tailwind-merge";
import { Link } from "..";
import { composeTailwindRenderProps } from "../utils";
import { Link } from "./Link";

export function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>) {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ export interface ButtonProps extends AriaButtonProps {

const button = tv({
extend: focusRing,
base: "px-3 py-2 text-sm font-medium text-center transition rounded-lg border border-black/10 dark:border-white/10 shadow-[inset_0_1px_0_0_rgba(255,255,255,0.1)] dark:shadow-none cursor-pointer",
base: "px-3 py-2 h-10 text-sm font-medium transition rounded-lg flex gap-1 items-center justify-center border border-black/10 dark:border-white/10 cursor-pointer",
variants: {
variant: {
primary: "bg-purple-solid",
secondary: "bg-gray-ghost",
destructive: "bg-red-solid",
icon: "bg-gray-ghost border-0 p-1 flex items-center justify-center",
icon: "bg-gray-ghost border-0 p-2 flex items-center justify-center rounded-full",
},
isDisabled: {
true: "cursor-default text-gray-dim opacity-50 forced-colors:text-[GrayText]",
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
useLocale,
} from "react-aria-components";
import { tv } from "tailwind-variants";
import { Button } from "..";
import { focusRing } from "../utils";
import { Button } from "./Button";

const cellStyles = tv({
extend: focusRing,
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
composeRenderProps,
} from "react-aria-components";
import { tv } from "tailwind-variants";
import { Description, FieldError, Label } from "..";
import { composeTailwindRenderProps, focusRing } from "../utils";
import { Description, FieldError, Label } from "./Field";

export interface CheckboxGroupProps
extends Omit<AriaCheckboxGroupProps, "children"> {
Expand Down
Loading

0 comments on commit 4f2ff9c

Please sign in to comment.