From 8550846deb8a0e24cc866fec14b515d0bd954d58 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:16:27 -0500 Subject: [PATCH 01/10] test commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a8352ffc..22d3d70f 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ docs - Documentation for the project refs - Reference material used for the project, including papers src - Source code test - Test cases -etc. \ No newline at end of file +etc. From 23d4d6ff13a3dc6ae1522073d75b4d2a1d316305 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:21:16 -0500 Subject: [PATCH 02/10] added actions to branch --- .github/node.js.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/node.js.yml diff --git a/.github/node.js.yml b/.github/node.js.yml new file mode 100644 index 00000000..b243f44d --- /dev/null +++ b/.github/node.js.yml @@ -0,0 +1,33 @@ +# 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: ["main"] + pull_request: + branches: ["main"] + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [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" + - name: Build Client App + run: npm ci && npm run build --if-present + working-directory: ./src/leo-client-app + - name: Build Server App + run: npm ci && npm run build --if-present + working-directory: ./src/leo-server-app From ef06be1328b6353c578ae935d97eb549220a6ad5 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:23:09 -0500 Subject: [PATCH 03/10] created proper repo for actions --- .github/{ => workflows}/node.js.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/node.js.yml (100%) diff --git a/.github/node.js.yml b/.github/workflows/node.js.yml similarity index 100% rename from .github/node.js.yml rename to .github/workflows/node.js.yml From 8b61cb8e5d7027949a35c7d1cfb1f60dc35f1db2 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:24:01 -0500 Subject: [PATCH 04/10] edited actions to work on all branches --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index b243f44d..4be6c932 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -5,9 +5,9 @@ name: Node.js CI on: push: - branches: ["main"] + branches: ["*"] pull_request: - branches: ["main"] + branches: ["*"] jobs: build: From 213634ea2f9702e190dd4c87d062fb34fe2839e5 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:37:49 -0500 Subject: [PATCH 05/10] separated workflow for client and server --- .../{node.js.yml => node-client.js.yml} | 20 +++++-------- .github/workflows/node-server.js.yml | 29 +++++++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) rename .github/workflows/{node.js.yml => node-client.js.yml} (56%) create mode 100644 .github/workflows/node-server.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node-client.js.yml similarity index 56% rename from .github/workflows/node.js.yml rename to .github/workflows/node-client.js.yml index 4be6c932..e802fbb7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node-client.js.yml @@ -1,7 +1,7 @@ # 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: Node Client CI on: push: @@ -13,21 +13,17 @@ jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - node-version: [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 }} + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node-version }} + node-version: 18.x cache: "npm" + + - name: Clean Install Client App + run: npm ci + working-directory: ./src/leo-client-app - name: Build Client App - run: npm ci && npm run build --if-present + run: npm run build --if-present working-directory: ./src/leo-client-app - - name: Build Server App - run: npm ci && npm run build --if-present - working-directory: ./src/leo-server-app diff --git a/.github/workflows/node-server.js.yml b/.github/workflows/node-server.js.yml new file mode 100644 index 00000000..ba0713b9 --- /dev/null +++ b/.github/workflows/node-server.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 Server CI + +on: + push: + branches: ["*"] + pull_request: + branches: ["*"] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js 18.x + uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: "npm" + + - name: Clean Install Server App + run: npm ci + working-directory: ./src/leo-server-app + - name: Build Server App + run: npm run build --if-present + working-directory: ./src/leo-server-app From 1e656d3e16a6616d038b5b3871b405aebb1a22fd Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:39:04 -0500 Subject: [PATCH 06/10] added working dir for server actions --- .github/workflows/node-server.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node-server.js.yml b/.github/workflows/node-server.js.yml index ba0713b9..685e7b26 100644 --- a/.github/workflows/node-server.js.yml +++ b/.github/workflows/node-server.js.yml @@ -20,6 +20,7 @@ jobs: with: node-version: 18.x cache: "npm" + working-directory: ./src/leo-server-app - name: Clean Install Server App run: npm ci From db02c19247f2e413980a9bf83d225ec4c6f347f2 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:42:19 -0500 Subject: [PATCH 07/10] another server edit for subdirectory --- .github/workflows/node-server.js.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node-server.js.yml b/.github/workflows/node-server.js.yml index 685e7b26..a74f51c4 100644 --- a/.github/workflows/node-server.js.yml +++ b/.github/workflows/node-server.js.yml @@ -15,12 +15,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 + - uses: actions/setup-node@v3 with: node-version: 18.x - cache: "npm" - working-directory: ./src/leo-server-app + cache: npm + working-directory: ./src/leo-server-app/package-lock.json - name: Clean Install Server App run: npm ci From 985d913b628790da8eca0516ccd006f06ec16398 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:43:40 -0500 Subject: [PATCH 08/10] spelling mistake --- .github/workflows/node-server.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-server.js.yml b/.github/workflows/node-server.js.yml index a74f51c4..a3bb9d0c 100644 --- a/.github/workflows/node-server.js.yml +++ b/.github/workflows/node-server.js.yml @@ -19,7 +19,7 @@ jobs: with: node-version: 18.x cache: npm - working-directory: ./src/leo-server-app/package-lock.json + cache-dependency-path: ./src/leo-server-app/package-lock.json - name: Clean Install Server App run: npm ci From 6c57a5b39a61132a0f32b06cc75ea4c7857dc835 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:45:32 -0500 Subject: [PATCH 09/10] edited client path for actions --- .github/workflows/node-client.js.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node-client.js.yml b/.github/workflows/node-client.js.yml index e802fbb7..5125c910 100644 --- a/.github/workflows/node-client.js.yml +++ b/.github/workflows/node-client.js.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 + - uses: actions/setup-node@v3 with: node-version: 18.x - cache: "npm" + cache: npm + cache-dependency-path: ./src/leo-client-app/package-lock.json - name: Clean Install Client App run: npm ci From f04422267558b7da966c5ec9c53418c15a2a07f4 Mon Sep 17 00:00:00 2001 From: quinn ha Date: Mon, 25 Dec 2023 16:50:31 -0500 Subject: [PATCH 10/10] minor edits to fix test cases --- src/leo-client-app/src/components/FuturePasses.tsx | 11 +++++++---- src/leo-client-app/src/pages/index.tsx | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/leo-client-app/src/components/FuturePasses.tsx b/src/leo-client-app/src/components/FuturePasses.tsx index f08ad03c..2de4c109 100644 --- a/src/leo-client-app/src/components/FuturePasses.tsx +++ b/src/leo-client-app/src/components/FuturePasses.tsx @@ -52,10 +52,11 @@ const FuturePasses: React.FC = () => { return ( -

Next Week's Passes

+

Next Week's Passes

+ sx={{ maxWidth: 650, background: "#40403fb0" }} + > @@ -71,12 +72,14 @@ const FuturePasses: React.FC = () => { {passes.map((passPair, index) => ( + sx={{ "&:last-child td, &:last-child th": { border: 0 } }} + > + scope="row" + > {passPair[0].type === "Enter" && <>{passPair[0].time}} diff --git a/src/leo-client-app/src/pages/index.tsx b/src/leo-client-app/src/pages/index.tsx index ca7d687e..cf3ce02b 100644 --- a/src/leo-client-app/src/pages/index.tsx +++ b/src/leo-client-app/src/pages/index.tsx @@ -6,6 +6,6 @@ export default function Index() { useEffect(() => { replace("/satellite-passes"); - }, [pathname]); + }, [pathname, replace]); return null; }