Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: ci

on:
push:
Expand All @@ -7,16 +7,13 @@ on:

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true

jobs:
# ---- Install + Unit CI ----
unit:
build_and_test:
runs-on: ubuntu-latest
env:
HUSKY: 0
Expand Down Expand Up @@ -55,10 +52,9 @@ jobs:
with:
path: ./dist

# ---- Playwright E2E ----
e2e:
runs-on: ubuntu-latest
needs: unit
needs: build_and_test
timeout-minutes: 60
env:
HUSKY: 0
Expand Down
27 changes: 10 additions & 17 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Deploy static content to Pages
name: deploy

on:
push:
branches: [main]

workflow_run:
workflows: ["ci"]
types:
- completed
workflow_dispatch:

permissions:
Expand All @@ -17,25 +18,17 @@ concurrency:

jobs:
deploy:
if: ${{ github.event_name == 'workflow_dispatch' || (github.event.workflow_run.conclusion == 'success') }}
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 10.7.0

- uses: actions/setup-node@v4
- name: Download artifact from CI
uses: actions/download-artifact@v4
with:
node-version: 20
cache: pnpm

- run: pnpm install

- run: pnpm build
name: github-pages
path: ./dist

- uses: actions/configure-pages@v5
- uses: actions/upload-pages-artifact@v3
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/playwright.yml

This file was deleted.

6 changes: 3 additions & 3 deletions src/features/venues/components/VenuesSearchBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,8 @@ function MobileSearchSheet({
Search venues
</Button>
</SheetTrigger>
<SheetContent side="bottom" className="p-2 max-h-[70dvh]">
<SheetHeader className="p-4 flex items-center justify-between">
<SheetContent side="bottom" className="p-0 max-h-[85dvh] flex flex-col">
<SheetHeader className="p-4 flex items-center justify-between border-b shrink-0">
<SheetTitle>Search venues</SheetTitle>
<SheetClose asChild>
<Button variant="outline" aria-label="Close search panel">
Expand All @@ -501,7 +501,7 @@ function MobileSearchSheet({
</Button>
</SheetClose>
</SheetHeader>
<div className="p-4">
<div className="p-4 overflow-y-auto">
<form onSubmit={onSubmit} className="space-y-6">
<SearchControl {...searchProps} />
<GuestControl {...guestProps} />
Expand Down
21 changes: 21 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,27 @@
}
}

@keyframes dots {
0% {
width: 0ch;
}
33% {
width: 1ch;
}
66% {
width: 2ch;
}
100% {
width: 3ch;
}
}
.pending-dots {
display: inline-block;
overflow: hidden;
vertical-align: bottom;
animation: dots 2s steps(4) infinite;
}

@layer utilities {
.animate-fade-in-up {
animation: fade-in-up 260ms var(--ease-out-soft) both;
Expand Down
5 changes: 1 addition & 4 deletions src/pages/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,9 @@ export default function About() {
Final grade
</p>
<p className="text-2xl font-semibold text-foreground">
Pending...
Pending<span className="pending-dots">...</span>
</p>
</div>
<div className="pending-grade-indicator rounded-full px-4 py-2 text-sm font-semibold text-white">
Awaiting evaluation
</div>
</div>
<div className="grid gap-2 sm:grid-cols-3">
{gradeScale.map((grade) => (
Expand Down
Loading