Merge branch 'main' into landing-improvements

2022-05-05 12:09:46 -04:00 · 2022-05-05 12:09:46 -04:00 · d6419ef4ba
commit d6419ef4ba
--- a/.github/workflows/lint.backend.yml
+++ b/.github/workflows/lint.backend.yml
@ -6,6 +6,7 @@ on:
      - "main"
    paths:
      - "backend/**"
+      - "!backend/deploy/**"

 jobs:
  build:
--- a/.github/workflows/lint.crawlers.yml
+++ b/.github/workflows/lint.crawlers.yml
@ -6,6 +6,7 @@ on:
      - "main"
    paths:
      - "crawlers/**"
+      - "!crawlers/deploy/**"

 jobs:
  build:
--- a/.github/workflows/lint.db.yml
+++ b/.github/workflows/lint.db.yml
@ -6,6 +6,7 @@ on:
      - "main"
    paths:
      - "db/**"
+      - "!db/deploy/**"

 jobs:
  build:
--- 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
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain ethereum -n
+SyslogIdentifier=ethereum-missing
--- 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
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler trending
+SyslogIdentifier=ethereum-trending
--- 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

--- 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
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain polygon -n
+SyslogIdentifier=polygon-missing
--- 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
--- 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

--- a/frontend/src/components/Sidebar.js
+++ b/frontend/src/components/Sidebar.js
@ -108,7 +108,12 @@ const Sidebar = () => {
                      <React.Fragment key={`Fragment-${idx}`}>
                        {item.children.map((child, idx) => {
                          return (
-                            <MenuItem key={`MenuItem-SITEMAP-${idx}`}>
+                            <MenuItem
+                              key={`MenuItem-SITEMAP-${idx}`}
+                              onClick={() => {
+                                ui.setSidebarToggled(false);
+                              }}
+                            >
                              <RouterLink href={child.path}>
                                {child.title}
                              </RouterLink>
@ -142,6 +147,9 @@ const Sidebar = () => {
                          <MenuItem
                            icon={<MdDashboard />}
                            key={`dashboard-link-${idx}`}
+                            onClick={() => {
+                              ui.setSidebarToggled(false);
+                            }}
                          >
                            <RouterLink href={`/dashboard/${dashboard?.id}`}>
                              {dashboard.resource_data.name}
@ -156,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}
                  >
@ -183,13 +192,28 @@ const Sidebar = () => {
        <Divider color="gray.300" w="100%" />
        {ui.isLoggedIn && (
          <Menu iconShape="square">
-            <MenuItem icon={<MdSettings />}>
+            <MenuItem
+              icon={<MdSettings />}
+              onClick={() => {
+                ui.setSidebarToggled(false);
+              }}
+            >
              <RouterLink href="/subscriptions">Subscriptions </RouterLink>
            </MenuItem>
-            <MenuItem icon={<MdTimeline />}>
+            <MenuItem
+              icon={<MdTimeline />}
+              onClick={() => {
+                ui.setSidebarToggled(false);
+              }}
+            >
              <RouterLink href="/stream">Stream</RouterLink>
            </MenuItem>
-            <MenuItem icon={<LockIcon />}>
+            <MenuItem
+              icon={<LockIcon />}
+              onClick={() => {
+                ui.setSidebarToggled(false);
+              }}
+            >
              <RouterLink href="/account/tokens">API Tokens</RouterLink>
            </MenuItem>
            <Divider />
--- 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
+WantedBy=multi-user.target