Merged in feature/weekly_active_daos (pull request #158)

#1 - Prioritize Weekly Active DAOs and Weekly Active Users
near-daos · Jan 19, 2022 · bdd0129 · bdd0129
2 parents 0fd4e35 + 1d3bf69
commit bdd0129
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/src/app/general-info/active-dao/active-dao.tsx b/src/app/general-info/active-dao/active-dao.tsx
@@ -116,7 +116,11 @@ export const ActiveDao: FC = () => {
             period={period}
             setPeriod={setPeriod}
             lines={[
-              { name: 'Active DAOs', color: '#E33F84', dataKey: 'count' },
+              {
+                name: 'Weekly Active DAOs',
+                color: '#E33F84',
+                dataKey: 'count',
+              },
             ]}
           />
         ) : null}

diff --git a/src/app/general-info/general-info.tsx b/src/app/general-info/general-info.tsx
@@ -65,35 +65,35 @@ export const GeneralInfo: FC = () => {
         <Widgets>
           <WidgetTile
             className={styles.widget}
+            onClick={() => history.push(routes.generalInfo)}
             active={Boolean(
               matchPath(location.pathname, {
                 path: ROUTES.generalInfo,
                 exact: true,
               }),
             )}
-            onClick={() => history.push(routes.generalInfo)}
           >
             <WidgetInfo
-              title="Number of DAOs"
-              number={general?.dao?.count}
-              percentages={general?.dao?.growth}
+              title="Active DAOs"
+              number={general?.activity?.count}
+              percentages={general?.activity?.growth}
             />
           </WidgetTile>
 
           <WidgetTile
             className={styles.widget}
-            onClick={() => history.push(routes.generalInfoActiveDao)}
             active={Boolean(
               matchPath(location.pathname, {
-                path: ROUTES.generalInfoActiveDao,
+                path: ROUTES.generalInfoDaoCount,
                 exact: true,
               }),
             )}
+            onClick={() => history.push(routes.generalInfoDaoCount)}
           >
             <WidgetInfo
-              title="Active DAOs"
-              number={general?.activity?.count}
-              percentages={general?.activity?.growth}
+              title="Number of DAOs"
+              number={general?.dao?.count}
+              percentages={general?.dao?.growth}
             />
           </WidgetTile>
 
@@ -134,11 +134,11 @@ export const GeneralInfo: FC = () => {
 
         <div className={styles.mainContent}>
           <Switch>
-            <Route exact path={ROUTES.generalInfo} component={NumbersDao} />
+            <Route exact path={ROUTES.generalInfo} component={ActiveDao} />
             <Route
               exact
-              path={ROUTES.generalInfoActiveDao}
-              component={ActiveDao}
+              path={ROUTES.generalInfoDaoCount}
+              component={NumbersDao}
             />
             <Route exact path={ROUTES.generalInfoGroups} component={Groups} />
             <Route

diff --git a/src/app/root/app.tsx b/src/app/root/app.tsx
@@ -54,7 +54,7 @@ export const App: FC = () => (
                     />
                     <Route
                       exact
-                      path={ROUTES.generalInfoActiveDao}
+                      path={ROUTES.generalInfoDaoCount}
                       component={GeneralInfo}
                     />
                     <Route

diff --git a/src/constants/routes.ts b/src/constants/routes.ts
@@ -4,7 +4,7 @@ export const ROUTES = {
   page404: '/404',
 
   generalInfo: '/:contract/general-info',
-  generalInfoActiveDao: '/:contract/general-info/dao-active',
+  generalInfoDaoCount: '/:contract/general-info/dao-count',
   generalInfoGroups: '/:contract/general-info/groups',
   generalInfoAverageGroups: '/:contract/general-info/average-groups',
   generalInfoDao: '/:contract/general-info/:dao',
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ export const App: FC = () => ( @@
                         />
                         <Route
                           exact
-                          path={ROUTES.generalInfoActiveDao}
+                          path={ROUTES.generalInfoDaoCount}
                           component={GeneralInfo}
                         />
                         <Route
@@ Expand Down @@