From 35c5e0a6a3b1143ed4159ed4727caa159416ab63 Mon Sep 17 00:00:00 2001 From: Kellan Wampler Date: Sun, 1 May 2022 23:12:48 -0400 Subject: [PATCH 1/5] Toggle sidebar after link click in mobile view. --- frontend/src/components/Sidebar.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Sidebar.js b/frontend/src/components/Sidebar.js index b6a77643..09db2d04 100644 --- a/frontend/src/components/Sidebar.js +++ b/frontend/src/components/Sidebar.js @@ -108,7 +108,12 @@ const Sidebar = () => { {item.children.map((child, idx) => { return ( - + { + ui.setSidebarToggled(false); + }} + > {child.title} From 4f307a2a2043cad1c2c9cb78125f55bbc1bbb3d9 Mon Sep 17 00:00:00 2001 From: Kellan Wampler Date: Mon, 2 May 2022 09:21:16 -0400 Subject: [PATCH 2/5] Toggle sidebar closed when a link is clicked (logged-in mode). --- frontend/src/components/Sidebar.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Sidebar.js b/frontend/src/components/Sidebar.js index 09db2d04..d94ab891 100644 --- a/frontend/src/components/Sidebar.js +++ b/frontend/src/components/Sidebar.js @@ -147,6 +147,9 @@ const Sidebar = () => { } key={`dashboard-link-${idx}`} + onClick={() => { + ui.setSidebarToggled(false); + }} > {dashboard.resource_data.name} @@ -161,11 +164,12 @@ const Sidebar = () => { variant="solid" colorScheme="orange" size="sm" - onClick={() => + onClick={() => { overlay.toggleModal({ type: MODAL_TYPES.NEW_DASHBOARD_FLOW, - }) - } + }); + ui.setSidebarToggled(false); + }} // w="100%" // borderRadius={0} > From 6c19d735418541f60ee0a0feea0dbad075930435 Mon Sep 17 00:00:00 2001 From: Kellan Wampler Date: Mon, 2 May 2022 13:57:26 -0400 Subject: [PATCH 3/5] More links that need to toggle sidebar. --- frontend/src/components/Sidebar.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Sidebar.js b/frontend/src/components/Sidebar.js index d94ab891..084393a1 100644 --- a/frontend/src/components/Sidebar.js +++ b/frontend/src/components/Sidebar.js @@ -192,13 +192,28 @@ const Sidebar = () => { {ui.isLoggedIn && ( - }> + } + onClick={() => { + ui.setSidebarToggled(false); + }} + > Subscriptions - }> + } + onClick={() => { + ui.setSidebarToggled(false); + }} + > Stream - }> + } + onClick={() => { + ui.setSidebarToggled(false); + }} + > API Tokens From a0e3165cf25014d64ba0e954e4fccb07b4ecd544 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 3 May 2022 12:39:33 +0000 Subject: [PATCH 4/5] Sys log identifiers --- crawlers/deploy/ethereum-missing.service | 3 ++- crawlers/deploy/ethereum-trending.service | 3 ++- crawlers/deploy/ethereum-txpool.service | 4 ++++ crawlers/deploy/polygon-missing.service | 3 ++- crawlers/deploy/polygon-statistics.service | 1 + crawlers/deploy/polygon-txpool.service | 4 ++++ nodes/deploy/node-balancer.service | 2 +- 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/crawlers/deploy/ethereum-missing.service b/crawlers/deploy/ethereum-missing.service index c52eb23b..07f271ad 100644 --- a/crawlers/deploy/ethereum-missing.service +++ b/crawlers/deploy/ethereum-missing.service @@ -8,4 +8,5 @@ User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env -ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain ethereum -n \ No newline at end of file +ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain ethereum -n +SyslogIdentifier=ethereum-missing diff --git a/crawlers/deploy/ethereum-trending.service b/crawlers/deploy/ethereum-trending.service index 1bb59d79..fa7b3b1f 100644 --- a/crawlers/deploy/ethereum-trending.service +++ b/crawlers/deploy/ethereum-trending.service @@ -8,4 +8,5 @@ User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env -ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler trending \ No newline at end of file +ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler trending +SyslogIdentifier=ethereum-trending diff --git a/crawlers/deploy/ethereum-txpool.service b/crawlers/deploy/ethereum-txpool.service index d4221a6f..3c584ce6 100644 --- a/crawlers/deploy/ethereum-txpool.service +++ b/crawlers/deploy/ethereum-txpool.service @@ -1,12 +1,16 @@ [Unit] Description=Ethereum txpool crawler After=network.target +StartLimitIntervalSec=300 +StartLimitBurst=3 [Service] User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/txpool EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env +Restart=on-failure +RestartSec=15s ExecStart=/home/ubuntu/moonstream/crawlers/txpool/txpool -blockchain ethereum SyslogIdentifier=ethereum-txpool diff --git a/crawlers/deploy/polygon-missing.service b/crawlers/deploy/polygon-missing.service index 2b90adcb..3bd873e7 100644 --- a/crawlers/deploy/polygon-missing.service +++ b/crawlers/deploy/polygon-missing.service @@ -8,4 +8,5 @@ User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env -ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain polygon -n \ No newline at end of file +ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain polygon -n +SyslogIdentifier=polygon-missing diff --git a/crawlers/deploy/polygon-statistics.service b/crawlers/deploy/polygon-statistics.service index 9ad0585a..d82eae9e 100644 --- a/crawlers/deploy/polygon-statistics.service +++ b/crawlers/deploy/polygon-statistics.service @@ -9,3 +9,4 @@ Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.stats_worker.dashboard generate --blockchain polygon +SyslogIdentifier=polygon-statistics diff --git a/crawlers/deploy/polygon-txpool.service b/crawlers/deploy/polygon-txpool.service index cf4dae92..a2d3a728 100644 --- a/crawlers/deploy/polygon-txpool.service +++ b/crawlers/deploy/polygon-txpool.service @@ -1,12 +1,16 @@ [Unit] Description=Polygon txpool crawler After=network.target +StartLimitIntervalSec=300 +StartLimitBurst=3 [Service] User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/txpool EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env +Restart=on-failure +RestartSec=15s ExecStart=/home/ubuntu/moonstream/crawlers/txpool/txpool -blockchain polygon SyslogIdentifier=polygon-txpool diff --git a/nodes/deploy/node-balancer.service b/nodes/deploy/node-balancer.service index 9402b8e1..908fc99f 100644 --- a/nodes/deploy/node-balancer.service +++ b/nodes/deploy/node-balancer.service @@ -15,4 +15,4 @@ ExecStart=/home/ubuntu/moonstream/nodes/node_balancer/nodebalancer -host "${AWS_ SyslogIdentifier=node-balancer [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target From e2ce86fbd2cafea8238af8eeaafc90c17c6e633f Mon Sep 17 00:00:00 2001 From: kompotkot Date: Tue, 3 May 2022 18:45:34 +0000 Subject: [PATCH 5/5] Ignore deploy path in lint actions --- .github/workflows/lint.backend.yml | 1 + .github/workflows/lint.crawlers.yml | 1 + .github/workflows/lint.db.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/lint.backend.yml b/.github/workflows/lint.backend.yml index 5e77057c..07c73419 100644 --- a/.github/workflows/lint.backend.yml +++ b/.github/workflows/lint.backend.yml @@ -6,6 +6,7 @@ on: - "main" paths: - "backend/**" + - "!backend/deploy/**" jobs: build: diff --git a/.github/workflows/lint.crawlers.yml b/.github/workflows/lint.crawlers.yml index c8d202c6..0bf9ea50 100644 --- a/.github/workflows/lint.crawlers.yml +++ b/.github/workflows/lint.crawlers.yml @@ -6,6 +6,7 @@ on: - "main" paths: - "crawlers/**" + - "!crawlers/deploy/**" jobs: build: diff --git a/.github/workflows/lint.db.yml b/.github/workflows/lint.db.yml index 99c26d72..00607ed5 100644 --- a/.github/workflows/lint.db.yml +++ b/.github/workflows/lint.db.yml @@ -6,6 +6,7 @@ on: - "main" paths: - "db/**" + - "!db/deploy/**" jobs: build: