Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
113ca17
feat: use turbo for root dev commands (dev:web, dev:backend, codegen)
Kneesal Feb 18, 2026
86df7b1
feat(web): add header, footer, layout with shadcn and theming
Kneesal Feb 18, 2026
e1100dd
chore: apply prettier to globals.css and package.json
Kneesal Feb 18, 2026
19ddfa5
feat(web): header and footer with Jesus Film branding and assets
Kneesal Feb 19, 2026
151a08a
chore: merge upstream main into feat/61-header-footer-layout
Kneesal Feb 19, 2026
97e036d
fix(web): layout flex container and path alias
Kneesal Feb 19, 2026
6d6ebe4
fix(web): footer per CodeRabbit review
Kneesal Feb 19, 2026
89dd8c4
chore(web): use default dev port (drop -p 5000)
Kneesal Feb 19, 2026
5215bf4
fix(web): optional env for local dev and CI
Kneesal Feb 19, 2026
634bb14
chore(web): remove unused shadcn components and fix typedRoutes
Kneesal Feb 19, 2026
9ccfc50
fix(web): address PR 64 review feedback
Kneesal Mar 2, 2026
d7de419
fix(web): address header/footer review feedback
Kneesal Mar 2, 2026
5673621
fix(web): apply remaining header/footer review suggestions
Kneesal Mar 2, 2026
d003630
chore: merge main and regenerate pnpm lockfile
Ur-imazing Mar 3, 2026
feeacc2
fix(web): require STRAPI_API_TOKEN
Kneesal Mar 3, 2026
fe19776
fix(web): simplify STRAPI_API_TOKEN schema
Kneesal Mar 3, 2026
6c58496
Merge upstream/main into feat/61-header-footer-layout (resolve pnpm-l…
Kneesal Mar 4, 2026
8532ef8
chore: merge upstream/main, resolve pnpm-lock.yaml conflict
Kneesal Mar 4, 2026
f0b88a0
chore: resolve pnpm-lock conflict with origin/feat/61-header-footer-l…
Kneesal Mar 4, 2026
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
19 changes: 19 additions & 0 deletions apps/web/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "",
"css": "src/app/globals.css",
"baseColor": "neutral",
"cssVariables": true
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
}
}
12 changes: 10 additions & 2 deletions apps/web/next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
basePath: "/watch",
experimental: {
typedRoutes: true,
typedRoutes: true,
async redirects() {
return [
{
source: "/",
destination: "/watch",
permanent: false,
basePath: false,
},
]
},
images: {
remotePatterns: [
Expand Down
9 changes: 8 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@
"@apollo/client": "^4.1.4",
"@forge/graphql": "workspace:*",
"@t3-oss/env-nextjs": "^0.13.10",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"graphql": "^16.12.0",
"gql.tada": "^1.9.0",
"lucide-react": "^0.574.0",
"next": "^16.1.6",
"radix-ui": "^1.4.3",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"rxjs": "^7.3.0",
"tailwind-merge": "^3.4.1",
"zod": "^4.3.6"
},
"devDependencies": {
Expand All @@ -27,6 +33,7 @@
"eslint": "^9.0.0",
"eslint-config-next": "^16.1.6",
"postcss": "^8.5.6",
"tailwindcss": "^4.1.18"
"tailwindcss": "^4.1.18",
"tw-animate-css": "^1.4.0"
}
}
1 change: 1 addition & 0 deletions apps/web/public/facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/favicon-180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/favicon-32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/public/instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions apps/web/public/jesus-film-logo-full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/jesus-film-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/web/public/jesusfilm-sign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/public/x-twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/public/youtube.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading