diff --git a/apps/doj-demo/astro.config.mjs b/apps/doj-demo/astro.config.mjs index 5dc1c0bf..662ad374 100644 --- a/apps/doj-demo/astro.config.mjs +++ b/apps/doj-demo/astro.config.mjs @@ -2,10 +2,14 @@ import { defineConfig } from 'astro/config'; import node from '@astrojs/node'; import react from '@astrojs/react'; +import { getGithubRepository } from './src/lib/github'; + +const githubRepository = await getGithubRepository(process.env); + // https://astro.build/config export default defineConfig({ output: 'server', - trailingSlash: 'always', + trailingSlash: 'never', base: addTrailingSlash(process.env.BASEURL || ''), adapter: node({ mode: 'standalone', @@ -18,6 +22,11 @@ export default defineConfig({ server: { port: 4322, }, + vite: { + define: { + 'import.meta.env.GITHUB': JSON.stringify(githubRepository), + }, + }, }); function addTrailingSlash(path) { diff --git a/apps/doj-demo/package.json b/apps/doj-demo/package.json index 853ade44..06e607c0 100644 --- a/apps/doj-demo/package.json +++ b/apps/doj-demo/package.json @@ -10,12 +10,12 @@ "astro": "astro" }, "dependencies": { - "@astrojs/check": "^0.5.6", - "@astrojs/node": "^8.2.3", - "@astrojs/react": "^3.0.9", + "@astrojs/check": "^0.7.0", + "@astrojs/node": "^8.3.1", + "@astrojs/react": "^3.6.0", "@atj/design": "workspace:*", "@atj/forms": "workspace:*", - "astro": "^4.4.11", + "astro": "^4.10.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-error-boundary": "^4.0.12", diff --git a/apps/doj-demo/public/favicon/android-chrome-192x192.png b/apps/doj-demo/public/favicon/android-chrome-192x192.png new file mode 100644 index 00000000..0a0b1e4e Binary files /dev/null and b/apps/doj-demo/public/favicon/android-chrome-192x192.png differ diff --git a/apps/doj-demo/public/favicon/android-chrome-384x384.png b/apps/doj-demo/public/favicon/android-chrome-384x384.png new file mode 100644 index 00000000..bf6c191a Binary files /dev/null and b/apps/doj-demo/public/favicon/android-chrome-384x384.png differ diff --git a/apps/doj-demo/public/favicon/android-chrome-512x512.png b/apps/doj-demo/public/favicon/android-chrome-512x512.png new file mode 100644 index 00000000..2df29838 Binary files /dev/null and b/apps/doj-demo/public/favicon/android-chrome-512x512.png differ diff --git a/apps/doj-demo/public/favicon/apple-touch-icon.png b/apps/doj-demo/public/favicon/apple-touch-icon.png new file mode 100644 index 00000000..e730782f Binary files /dev/null and b/apps/doj-demo/public/favicon/apple-touch-icon.png differ diff --git a/apps/doj-demo/public/favicon/favicon-16x16.png b/apps/doj-demo/public/favicon/favicon-16x16.png new file mode 100644 index 00000000..56a77e27 Binary files /dev/null and b/apps/doj-demo/public/favicon/favicon-16x16.png differ diff --git a/apps/doj-demo/public/favicon/favicon-32x32.png b/apps/doj-demo/public/favicon/favicon-32x32.png new file mode 100644 index 00000000..77bd9967 Binary files /dev/null and b/apps/doj-demo/public/favicon/favicon-32x32.png differ diff --git a/apps/doj-demo/public/favicon/favicon.ico b/apps/doj-demo/public/favicon/favicon.ico new file mode 100644 index 00000000..6905056f Binary files /dev/null and b/apps/doj-demo/public/favicon/favicon.ico differ diff --git a/apps/doj-demo/src/components/AppFormManager.tsx b/apps/doj-demo/src/components/AppFormManager.tsx index 9651dc6f..9f4b687b 100644 --- a/apps/doj-demo/src/components/AppFormManager.tsx +++ b/apps/doj-demo/src/components/AppFormManager.tsx @@ -7,6 +7,7 @@ import { } from '@atj/design'; import { getAppContext } from '../context'; +import { getFormManagerUrlById, getFormUrl } from '../routes'; export default function () { const ctx = getAppContext(); @@ -19,6 +20,8 @@ export default function () { editComponents: defaultPatternEditComponents, formService: ctx.formService, uswdsRoot: ctx.uswdsRoot, + urlForForm: getFormUrl, + urlForFormManager: getFormManagerUrlById, }} /> ); diff --git a/apps/doj-demo/src/components/Footer.astro b/apps/doj-demo/src/components/Footer.astro index 5dec3f5b..f11a3421 100644 --- a/apps/doj-demo/src/components/Footer.astro +++ b/apps/doj-demo/src/components/Footer.astro @@ -1,5 +1,11 @@ --- +import { type GithubRepository, getBranchTreeUrl } from '../lib/github'; +type Props = { + github: GithubRepository; +}; + +const { github } = Astro.props; ---