diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07f9299..aec4755 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,14 +8,14 @@ jobs: uses: actions/checkout@v4 - name: Build Next.js - working-directory: ./next + working-directory: ./ui run: | npm ci npm run lint npm run build - name: Build AWS - working-directory: ./aws + working-directory: ./infra run: | npm ci npm run lint diff --git a/README.md b/README.md index 4475c17..f7902e3 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ To install the project's dependencies, build the website and deploy to AWS, run ``` # Build website -cd next +cd ui npm ci npm run build # Deploy to AWS -cd ../aws +cd ../infra npm ci npx cdk deploy -c accountId=012345678912 ``` diff --git a/aws/.eslintrc b/infra/.eslintrc similarity index 100% rename from aws/.eslintrc rename to infra/.eslintrc diff --git a/aws/.gitignore b/infra/.gitignore similarity index 100% rename from aws/.gitignore rename to infra/.gitignore diff --git a/aws/.npmignore b/infra/.npmignore similarity index 100% rename from aws/.npmignore rename to infra/.npmignore diff --git a/aws/bin/portfolio.ts b/infra/bin/portfolio.ts similarity index 100% rename from aws/bin/portfolio.ts rename to infra/bin/portfolio.ts diff --git a/aws/cdk.json b/infra/cdk.json similarity index 100% rename from aws/cdk.json rename to infra/cdk.json diff --git a/aws/jest.config.js b/infra/jest.config.js similarity index 100% rename from aws/jest.config.js rename to infra/jest.config.js diff --git a/aws/lib/portfolio-stack.ts b/infra/lib/portfolio-stack.ts similarity index 98% rename from aws/lib/portfolio-stack.ts rename to infra/lib/portfolio-stack.ts index 32dcf5d..6c86f2d 100644 --- a/aws/lib/portfolio-stack.ts +++ b/infra/lib/portfolio-stack.ts @@ -116,7 +116,7 @@ export class PortfolioStack extends Stack { new s3_deployment.BucketDeployment(this, "BucketDeployment", { destinationBucket: bucket, - sources: [s3_deployment.Source.asset("../next/out")], + sources: [s3_deployment.Source.asset("../ui/out")], distribution, distributionPaths: ["/*"], logGroup, diff --git a/aws/package-lock.json b/infra/package-lock.json similarity index 100% rename from aws/package-lock.json rename to infra/package-lock.json diff --git a/aws/package.json b/infra/package.json similarity index 100% rename from aws/package.json rename to infra/package.json diff --git a/aws/src/index.ts b/infra/src/index.ts similarity index 100% rename from aws/src/index.ts rename to infra/src/index.ts diff --git a/aws/test/__snapshots__/portfolio.test.ts.snap b/infra/test/__snapshots__/portfolio.test.ts.snap similarity index 100% rename from aws/test/__snapshots__/portfolio.test.ts.snap rename to infra/test/__snapshots__/portfolio.test.ts.snap diff --git a/aws/test/portfolio.test.ts b/infra/test/portfolio.test.ts similarity index 100% rename from aws/test/portfolio.test.ts rename to infra/test/portfolio.test.ts diff --git a/aws/tsconfig.json b/infra/tsconfig.json similarity index 100% rename from aws/tsconfig.json rename to infra/tsconfig.json diff --git a/next/.eslintrc b/ui/.eslintrc similarity index 100% rename from next/.eslintrc rename to ui/.eslintrc diff --git a/next/.gitignore b/ui/.gitignore similarity index 100% rename from next/.gitignore rename to ui/.gitignore diff --git a/next/app/blog/[slug]/page.tsx b/ui/app/blog/[slug]/page.tsx similarity index 100% rename from next/app/blog/[slug]/page.tsx rename to ui/app/blog/[slug]/page.tsx diff --git a/next/app/blog/page.tsx b/ui/app/blog/page.tsx similarity index 100% rename from next/app/blog/page.tsx rename to ui/app/blog/page.tsx diff --git a/next/app/blog/posts/openid-connect-aws-github.mdx b/ui/app/blog/posts/openid-connect-aws-github.mdx similarity index 100% rename from next/app/blog/posts/openid-connect-aws-github.mdx rename to ui/app/blog/posts/openid-connect-aws-github.mdx diff --git a/next/app/blog/utils.ts b/ui/app/blog/utils.ts similarity index 100% rename from next/app/blog/utils.ts rename to ui/app/blog/utils.ts diff --git a/next/app/components/bagde.tsx b/ui/app/components/bagde.tsx similarity index 100% rename from next/app/components/bagde.tsx rename to ui/app/components/bagde.tsx diff --git a/next/app/components/footer.tsx b/ui/app/components/footer.tsx similarity index 100% rename from next/app/components/footer.tsx rename to ui/app/components/footer.tsx diff --git a/next/app/components/header.tsx b/ui/app/components/header.tsx similarity index 100% rename from next/app/components/header.tsx rename to ui/app/components/header.tsx diff --git a/next/app/components/line.tsx b/ui/app/components/line.tsx similarity index 100% rename from next/app/components/line.tsx rename to ui/app/components/line.tsx diff --git a/next/app/components/mdx.tsx b/ui/app/components/mdx.tsx similarity index 100% rename from next/app/components/mdx.tsx rename to ui/app/components/mdx.tsx diff --git a/next/app/components/nav.tsx b/ui/app/components/nav.tsx similarity index 100% rename from next/app/components/nav.tsx rename to ui/app/components/nav.tsx diff --git a/next/app/components/paragraph.tsx b/ui/app/components/paragraph.tsx similarity index 100% rename from next/app/components/paragraph.tsx rename to ui/app/components/paragraph.tsx diff --git a/next/app/components/posts.tsx b/ui/app/components/posts.tsx similarity index 100% rename from next/app/components/posts.tsx rename to ui/app/components/posts.tsx diff --git a/next/app/global.css b/ui/app/global.css similarity index 100% rename from next/app/global.css rename to ui/app/global.css diff --git a/next/app/layout.tsx b/ui/app/layout.tsx similarity index 100% rename from next/app/layout.tsx rename to ui/app/layout.tsx diff --git a/next/app/not-found.tsx b/ui/app/not-found.tsx similarity index 100% rename from next/app/not-found.tsx rename to ui/app/not-found.tsx diff --git a/next/app/page.tsx b/ui/app/page.tsx similarity index 100% rename from next/app/page.tsx rename to ui/app/page.tsx diff --git a/next/app/preload.tsx b/ui/app/preload.tsx similarity index 100% rename from next/app/preload.tsx rename to ui/app/preload.tsx diff --git a/next/app/projects/page.tsx b/ui/app/projects/page.tsx similarity index 100% rename from next/app/projects/page.tsx rename to ui/app/projects/page.tsx diff --git a/next/app/robots.ts b/ui/app/robots.ts similarity index 100% rename from next/app/robots.ts rename to ui/app/robots.ts diff --git a/next/app/sitemap.ts b/ui/app/sitemap.ts similarity index 100% rename from next/app/sitemap.ts rename to ui/app/sitemap.ts diff --git a/next/app/work/page.tsx b/ui/app/work/page.tsx similarity index 100% rename from next/app/work/page.tsx rename to ui/app/work/page.tsx diff --git a/next/next.config.mjs b/ui/next.config.mjs similarity index 100% rename from next/next.config.mjs rename to ui/next.config.mjs diff --git a/next/package-lock.json b/ui/package-lock.json similarity index 100% rename from next/package-lock.json rename to ui/package-lock.json diff --git a/next/package.json b/ui/package.json similarity index 100% rename from next/package.json rename to ui/package.json diff --git a/next/postcss.config.js b/ui/postcss.config.js similarity index 100% rename from next/postcss.config.js rename to ui/postcss.config.js diff --git a/next/public/sprite.svg b/ui/public/sprite.svg similarity index 100% rename from next/public/sprite.svg rename to ui/public/sprite.svg diff --git a/next/tsconfig.json b/ui/tsconfig.json similarity index 100% rename from next/tsconfig.json rename to ui/tsconfig.json