[incubator-superset] 04/33: step 1: broken stuff!

[yj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yjc pushed a commit to branch home-screen-mvp
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git

commit 64d806cea34487b31e281b95840eb6614eadb806
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Thu Sep 10 13:57:48 2020 -0700

    step 1: broken stuff!
---
 superset-frontend/src/components/Menu/SubMenu.tsx    |  5 +++++
 superset-frontend/src/views/CRUD/welcome/Welcome.tsx | 15 ++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/src/components/Menu/SubMenu.tsx b/superset-frontend/src/components/Menu/SubMenu.tsx
index df7e501..381ac2e 100644
--- a/superset-frontend/src/components/Menu/SubMenu.tsx
+++ b/superset-frontend/src/components/Menu/SubMenu.tsx
@@ -66,8 +66,13 @@ type MenuClickHandler = React.MouseEventHandler<MenuItem>;
 type MenuChild = {
   label: string;
   name: string;
+<<<<<<< HEAD
   url: string;
   usesRouter?: boolean;
+=======
+  url?: string;
+  onClick?: any;
+>>>>>>> step 1: broken stuff!
 };
 
 export interface ButtonProps {
diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
index 337b4e1..a610d43 100644
--- a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
@@ -16,21 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useCallback, useState } from 'react';
-import {
-  Panel,
-  Row,
-  Col,
-  Tabs,
-  Tab,
-  FormControl,
-  FormControlProps,
-} from 'react-bootstrap';
+import React, { useState } from 'react';
+import { FormControl } from 'react-bootstrap';
+import SubMenu from 'src/components/Menu/SubMenu';
+import { Collapse } from 'src/common/components';
 import { t } from '@superset-ui/core';
 import { useQueryParam, StringParam, QueryParamConfig } from 'use-query-params';
 import { User } from 'src/types/bootstrapTypes';
 import RecentActivity from 'src/profile/components/RecentActivity';
-import Favorites from 'src/profile/components/Favorites';
 import ChartTable from './ChartTable';
 import SavedQueries from './SavedQueries';
 import DashboardTable from './DashboardTable';