From 85cde38754d9e6054c0fa98146d8b997f60579a3 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:36:37 -0400 Subject: [PATCH 01/12] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 00000000..d3b60d8d --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +smallsat2.uga.edu \ No newline at end of file From 7456924cd5c9e1489377e3a009f0cb01f9d47c39 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:40:29 -0400 Subject: [PATCH 02/12] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index d3b60d8d..324994f7 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -smallsat2.uga.edu \ No newline at end of file +www.ssrl.org \ No newline at end of file From ca5d8213d0359cca56ca5455a70eda549fdfea7f Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:41:03 -0400 Subject: [PATCH 03/12] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 324994f7..8d6ebb6d 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.ssrl.org \ No newline at end of file +www.ssrl.com \ No newline at end of file From e1b759a074f4332adf2e0331695dcfb9ce5e4a76 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:41:25 -0400 Subject: [PATCH 04/12] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 8d6ebb6d..a9546a0a 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.ssrl.com \ No newline at end of file +smallsat.uga.edu \ No newline at end of file From 1b135ee3a572e2ac06efc626d9f0b22797045901 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:41:45 -0400 Subject: [PATCH 05/12] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index a9546a0a..d3b60d8d 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -smallsat.uga.edu \ No newline at end of file +smallsat2.uga.edu \ No newline at end of file From 84afff21b5c75cc6d714cc9e6a0c125910b847ad Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:42:27 -0400 Subject: [PATCH 06/12] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index d3b60d8d..00000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -smallsat2.uga.edu \ No newline at end of file From c6ba6a7f60a6136623ab17883be632000f8b1303 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:46:25 -0400 Subject: [PATCH 07/12] Create static.yml for GitHub Pages --- .github/workflows/static.yml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 00000000..73bc4230 --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,43 @@ +# Simple workflow for deploying static content to GitHub Pages +name: Deploy static content to Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + # Upload entire repository + path: '.' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 From 41d41198c6a408e828486f3bc4b28145e2f045c1 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:51:22 -0400 Subject: [PATCH 08/12] Update static.yml with run: node app.js --- .github/workflows/static.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 73bc4230..47fead89 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -40,4 +40,5 @@ jobs: path: '.' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: node app.js + #uses: actions/deploy-pages@v2 From 4274e0bab653953df40ee1d9668b8ff90c07c1a4 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:54:19 -0400 Subject: [PATCH 09/12] Create node.js.yml --- .github/workflows/node.js.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 00000000..ff374613 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,29 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [16.x, 18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - run: node app.js From e7c7459ab3c7d3d3308c9e505f32226e104d497d Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:03:06 -0400 Subject: [PATCH 10/12] Update node.js.yml --- .github/workflows/node.js.yml | 42 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ff374613..0e1a53c5 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,29 +1,31 @@ -# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs - -name: Node.js CI +name: Build and Deploy to GitHub Pages on: push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + branches: + - master jobs: - build: - + build-and-deploy: runs-on: ubuntu-latest - strategy: - matrix: - node-version: [16.x, 18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup Node.js + uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - - run: node app.js + node-version: '14' # Use the version you prefer + + - name: Install Dependencies + run: npm install + + - name: Generate Static Files + run: npm run build # Ensure this script in your package.json exports your Express app to static files + + - name: Start + run: npm run start + + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v3 From 0ea4ad63a4a5eec68a56f5a991288709441bf4d1 Mon Sep 17 00:00:00 2001 From: SSRL-UGA <146146154+SSRL-UGA@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:04:41 -0400 Subject: [PATCH 11/12] Update node.js.yml --- .github/workflows/node.js.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 0e1a53c5..889e18dd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -20,10 +20,7 @@ jobs: - name: Install Dependencies run: npm install - - - name: Generate Static Files - run: npm run build # Ensure this script in your package.json exports your Express app to static files - + - name: Start run: npm run start From f0a1093283f7332eada29ce5d978c5e7370e2839 Mon Sep 17 00:00:00 2001 From: Aiden Hammond Date: Thu, 5 Oct 2023 17:10:59 -0400 Subject: [PATCH 12/12] changed start script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ac0bd77..36fe6b21 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "node app.js" }, "dependencies": { "body-parser": "~1.18.2",