From 9beb3135fbdf1cae6ed49709358480d0e28f34e5 Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Sat, 17 Feb 2024 04:40:09 +0000 Subject: [PATCH 1/3] Restructure Project Files into Distinct Folders --- .github/workflows/frontend-tests.yml | 26 ++++++++++++++++++ .../.eslintrc.json | 0 .gitignore => frontend-next/.gitignore | 1 + README.md => frontend-next/README.md | 0 jsconfig.json => frontend-next/jsconfig.json | 0 .../next.config.mjs | 0 .../package-lock.json | 0 package.json => frontend-next/package.json | 0 .../postcss.config.js | 0 {public => frontend-next/public}/next.svg | 0 {public => frontend-next/public}/vercel.svg | 0 {src => frontend-next/src}/app/favicon.ico | Bin {src => frontend-next/src}/app/globals.css | 0 {src => frontend-next/src}/app/layout.js | 0 {src => frontend-next/src}/app/page.js | 0 .../tailwind.config.js | 0 16 files changed, 27 insertions(+) create mode 100644 .github/workflows/frontend-tests.yml rename .eslintrc.json => frontend-next/.eslintrc.json (100%) rename .gitignore => frontend-next/.gitignore (93%) rename README.md => frontend-next/README.md (100%) rename jsconfig.json => frontend-next/jsconfig.json (100%) rename next.config.mjs => frontend-next/next.config.mjs (100%) rename package-lock.json => frontend-next/package-lock.json (100%) rename package.json => frontend-next/package.json (100%) rename postcss.config.js => frontend-next/postcss.config.js (100%) rename {public => frontend-next/public}/next.svg (100%) rename {public => frontend-next/public}/vercel.svg (100%) rename {src => frontend-next/src}/app/favicon.ico (100%) rename {src => frontend-next/src}/app/globals.css (100%) rename {src => frontend-next/src}/app/layout.js (100%) rename {src => frontend-next/src}/app/page.js (100%) rename tailwind.config.js => frontend-next/tailwind.config.js (100%) diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml new file mode 100644 index 0000000..dfbcecc --- /dev/null +++ b/.github/workflows/frontend-tests.yml @@ -0,0 +1,26 @@ +name: Next.Js Build Validation + +on: + pull_request: + push: + branches: + - "main" + +jobs: + nextjs: + runs-on: ubuntu-latest + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + + - name: Setup Node + uses: actions/setup-node@v2 + with: + node-version: 21.6.2 + + - name: Install dependencies + run: npm install frontend-next/ + + - name: Buide + run: npm --prefix frontend-next/ run build diff --git a/.eslintrc.json b/frontend-next/.eslintrc.json similarity index 100% rename from .eslintrc.json rename to frontend-next/.eslintrc.json diff --git a/.gitignore b/frontend-next/.gitignore similarity index 93% rename from .gitignore rename to frontend-next/.gitignore index fd3dbb5..ea3d442 100644 --- a/.gitignore +++ b/frontend-next/.gitignore @@ -34,3 +34,4 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts +frontend-next/node_modules \ No newline at end of file diff --git a/README.md b/frontend-next/README.md similarity index 100% rename from README.md rename to frontend-next/README.md diff --git a/jsconfig.json b/frontend-next/jsconfig.json similarity index 100% rename from jsconfig.json rename to frontend-next/jsconfig.json diff --git a/next.config.mjs b/frontend-next/next.config.mjs similarity index 100% rename from next.config.mjs rename to frontend-next/next.config.mjs diff --git a/package-lock.json b/frontend-next/package-lock.json similarity index 100% rename from package-lock.json rename to frontend-next/package-lock.json diff --git a/package.json b/frontend-next/package.json similarity index 100% rename from package.json rename to frontend-next/package.json diff --git a/postcss.config.js b/frontend-next/postcss.config.js similarity index 100% rename from postcss.config.js rename to frontend-next/postcss.config.js diff --git a/public/next.svg b/frontend-next/public/next.svg similarity index 100% rename from public/next.svg rename to frontend-next/public/next.svg diff --git a/public/vercel.svg b/frontend-next/public/vercel.svg similarity index 100% rename from public/vercel.svg rename to frontend-next/public/vercel.svg diff --git a/src/app/favicon.ico b/frontend-next/src/app/favicon.ico similarity index 100% rename from src/app/favicon.ico rename to frontend-next/src/app/favicon.ico diff --git a/src/app/globals.css b/frontend-next/src/app/globals.css similarity index 100% rename from src/app/globals.css rename to frontend-next/src/app/globals.css diff --git a/src/app/layout.js b/frontend-next/src/app/layout.js similarity index 100% rename from src/app/layout.js rename to frontend-next/src/app/layout.js diff --git a/src/app/page.js b/frontend-next/src/app/page.js similarity index 100% rename from src/app/page.js rename to frontend-next/src/app/page.js diff --git a/tailwind.config.js b/frontend-next/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to frontend-next/tailwind.config.js -- 2.52.0 From cbaf8cae3aa63993e707065b68c4b096cc978106 Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Sat, 17 Feb 2024 04:50:44 +0000 Subject: [PATCH 2/3] Typo in final step of frontend-tests.yml --- .github/workflows/frontend-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index dfbcecc..e54297d 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -22,5 +22,5 @@ jobs: - name: Install dependencies run: npm install frontend-next/ - - name: Buide + - name: Build run: npm --prefix frontend-next/ run build -- 2.52.0 From c3befbcebde2b2d43f29b54b17c00771b3ad42f6 Mon Sep 17 00:00:00 2001 From: Nicholas Pease <34464552+LAX18@users.noreply.github.com> Date: Sat, 17 Feb 2024 00:05:54 -0500 Subject: [PATCH 3/3] Restore original README --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9dc6949 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ChatMaps +Main repo for ChatMaps, our COS420 Project. -- 2.52.0