Skip to content

Commit

Permalink
Merge pull request #36 from nathanvale/kent
Browse files Browse the repository at this point in the history
Kent
  • Loading branch information
nathanvale committed Jul 10, 2023
2 parents bf47bc1 + 736f18d commit d3061f0
Show file tree
Hide file tree
Showing 66 changed files with 1,390 additions and 2,336 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
- name: 📥 Download deps
uses: bahmutov/npm-install@v1

- name: 🖼 Build icons
run: npm run build:icons

- name: 🔬 Lint
run: npm run lint

Expand Down Expand Up @@ -57,6 +60,9 @@ jobs:
- name: 📥 Download deps
uses: bahmutov/npm-install@v1

- name: 🖼 Build icons
run: npm run build:icons

- name: 🔎 Type check
run: npm run typecheck --if-present

Expand All @@ -78,6 +84,9 @@ jobs:
- name: 🏄 Copy test env vars
run: cp .env.example .env

- name: 🖼 Build icons
run: npm run build:icons

- name: ⚡ Run vitest
run: npm run test -- --coverage

Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.DS_store

/build
/public/build
Expand All @@ -20,7 +21,10 @@ node_modules
# Easy way to create temporary files/folders that won't accidentally be added to git
*.local.*


preferences.arc
sam.json
sam.yaml
sam.yaml

# generated files
/app/components/ui/icon.svg
/app/components/ui/icon.tsx
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ instructions:

1. Fork and clone the repo
2. Copy `.env.example` into `.env`
3. Run `npm run setup -s` to install dependencies and run validation
3. Run `npm install && npm run setup -s` to install dependencies and run
validation
4. Create a branch for your PR with `git checkout -b pr/your-branch-name`

> Tip: Keep your `main` branch pointing at the original repository and make pull
Expand Down
2 changes: 2 additions & 0 deletions app/components/confetti.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { ClientOnly } from 'remix-utils'
* confetti is a unique random identifier which re-renders the component
*/
export function Confetti({ confetti }: { confetti?: string }) {
if (!confetti) return null

return (
<ClientOnly>
{() => (
Expand Down
2 changes: 1 addition & 1 deletion app/components/error-boundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function GeneralErrorBoundary({
}

return (
<div className="container mx-auto flex items-center justify-center p-20 text-h2">
<div className="container flex items-center justify-center p-20 text-h2">
{isRouteErrorResponse(error)
? (statusHandlers?.[error.status] ?? defaultStatusHandler)({
error,
Expand Down
2 changes: 2 additions & 0 deletions app/components/floating-toolbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const floatingToolbarClassName =
'absolute bottom-3 left-3 right-3 flex items-center gap-2 rounded-lg bg-muted/80 p-4 pl-5 shadow-xl shadow-accent backdrop-blur-sm md:gap-4 md:pl-7 justify-end'
10 changes: 5 additions & 5 deletions app/components/forms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ export function ErrorList({
<AlertCircle className="h-4 w-4" />
<AlertTitle>{title}</AlertTitle>
<AlertDescription>
<ul id={id} className="space-y-2">
<ul id={id} className="flex flex-col gap-1">
{errorsToRender.map(e => (
<li key={e} className="text-sm font-medium text-destructive">
<li key={e} className="text-foreground-danger text-[10px]">
{e}
</li>
))}
Expand All @@ -43,8 +43,8 @@ export function Field({
errors,
className,
}: {
labelProps: Omit<React.LabelHTMLAttributes<HTMLLabelElement>, 'className'>
inputProps: Omit<React.InputHTMLAttributes<HTMLInputElement>, 'className'>
labelProps: React.LabelHTMLAttributes<HTMLLabelElement>
inputProps: React.InputHTMLAttributes<HTMLInputElement>
errors?: ListOfErrors
className?: string
}) {
Expand Down Expand Up @@ -90,7 +90,7 @@ export function TextareaField({
aria-describedby={errorId}
{...textareaProps}
/>
<div className="px-4 pb-3 pt-1">
<div className="min-h-[32px] px-4 pb-3 pt-1">
{errorId ? <ErrorList id={errorId} errors={errors} /> : null}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
'fixed left-[50%] top-[50%] z-50 grid max-h-[90%] w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
className,
)}
{...props}
Expand Down
129 changes: 0 additions & 129 deletions app/components/ui/icon.svg

This file was deleted.

0 comments on commit d3061f0

Please sign in to comment.