From 6d09515907650f954bc08a73aa37f411d57314d9 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 00:53:08 -0800 Subject: [PATCH 1/9] force update docker --- .github/workflows/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ece344..3d8e6c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,22 @@ on: - 'main' jobs: + + update-docker: + runs-on: ubuntu-latest + steps: + - name: Check Docker Version + run: docker --version + - name: Install Latest Docker + run: | + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-get install docker-ce + - name: Check Docker Version + run: docker --version + + docker: runs-on: self-hosted steps: From 95d1b829e925c5f98a68f0dc26bdf3cb514e2280 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 00:55:17 -0800 Subject: [PATCH 2/9] actually update docker --- .github/workflows/main.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d8e6c0..94259b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,25 +6,22 @@ on: - 'main' jobs: - - update-docker: - runs-on: ubuntu-latest - steps: - - name: Check Docker Version - run: docker --version - - name: Install Latest Docker - run: | - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get install docker-ce - - name: Check Docker Version - run: docker --version - docker: runs-on: self-hosted steps: + + - name: Check Docker Version + run: docker --version + - name: Install Latest Docker + run: | + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-get install docker-ce + - name: Check Docker Version + run: docker --version + - name: Checkout uses: actions/checkout@v3 From 175a49bbee875123e9203a7f7566d45ec889c41a Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 00:56:54 -0800 Subject: [PATCH 3/9] Update main.yml --- .github/workflows/main.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 94259b8..8a6273d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,17 +10,6 @@ jobs: docker: runs-on: self-hosted steps: - - - name: Check Docker Version - run: docker --version - - name: Install Latest Docker - run: | - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get install docker-ce - - name: Check Docker Version - run: docker --version - name: Checkout uses: actions/checkout@v3 From 2763bec72a8f57f8c8d43765aa364a93bb79b936 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 01:28:43 -0800 Subject: [PATCH 4/9] add plausible (sorry rish) --- frontend/src/app/HomePage.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/HomePage.tsx b/frontend/src/app/HomePage.tsx index ede7959..358960f 100644 --- a/frontend/src/app/HomePage.tsx +++ b/frontend/src/app/HomePage.tsx @@ -101,6 +101,8 @@ export class HomePage extends Component let css: string = "", flexContainer: string = "flex flex-row max-[600px]:justify-center max-[600px]:mx-0 ml-[10%]"; let size: number = 5; + + ;
;
; From 05dce11666c2d10a331bee6d85c946632701d627 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 02:32:34 -0800 Subject: [PATCH 5/9] actually add plausible --- frontend/src/app/HomePage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/app/HomePage.tsx b/frontend/src/app/HomePage.tsx index 358960f..7127f67 100644 --- a/frontend/src/app/HomePage.tsx +++ b/frontend/src/app/HomePage.tsx @@ -101,14 +101,13 @@ export class HomePage extends Component let css: string = "", flexContainer: string = "flex flex-row max-[600px]:justify-center max-[600px]:mx-0 ml-[10%]"; let size: number = 5; - - ;
;
;
; return
+ ;
From c71c803a96f800d0455d8bee3dcd15482c336ea2 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 02:33:22 -0800 Subject: [PATCH 6/9] i suck --- frontend/src/app/HomePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/HomePage.tsx b/frontend/src/app/HomePage.tsx index 7127f67..be43dde 100644 --- a/frontend/src/app/HomePage.tsx +++ b/frontend/src/app/HomePage.tsx @@ -107,7 +107,7 @@ export class HomePage extends Component
; return
- ; +
From 4ebae918445907273b416f4024821e278846c118 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 02:58:03 -0800 Subject: [PATCH 7/9] use different url for analytics --- frontend/src/app/HomePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/HomePage.tsx b/frontend/src/app/HomePage.tsx index be43dde..9dac710 100644 --- a/frontend/src/app/HomePage.tsx +++ b/frontend/src/app/HomePage.tsx @@ -107,7 +107,7 @@ export class HomePage extends Component
; return
- +
From 62d853289cfafb909f1b424e0f3c6aa2bc20e9a8 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 03:15:29 -0800 Subject: [PATCH 8/9] temporarily put actually useful links in the navbar --- frontend/src/app/NavBar.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/NavBar.tsx b/frontend/src/app/NavBar.tsx index 89c7386..105afe6 100644 --- a/frontend/src/app/NavBar.tsx +++ b/frontend/src/app/NavBar.tsx @@ -72,10 +72,12 @@ export class NavBar extends Component
- + + + {/* - + */}
From 622042a67f8a33300a62ffd975a0346f56af7a0e Mon Sep 17 00:00:00 2001 From: Anderson T Date: Mon, 11 Dec 2023 03:22:46 -0800 Subject: [PATCH 9/9] rish why doesn't NavButton work ._. --- frontend/src/app/NavBar.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/NavBar.tsx b/frontend/src/app/NavBar.tsx index 105afe6..aa05ae0 100644 --- a/frontend/src/app/NavBar.tsx +++ b/frontend/src/app/NavBar.tsx @@ -72,8 +72,9 @@ export class NavBar extends Component
- - + {/* + */} + {/*