Skip to content

Commit 72bfb25

Browse files
committed
[Feat] Tabelau UI redesign
* update splash and config screens to look more like Tableau native UI Signed-off-by: Valentine <[email protected]>
1 parent a7c802b commit 72bfb25

File tree

15 files changed

+367
-235
lines changed

15 files changed

+367
-235
lines changed

src/App.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ html {
55
html, body {
66
max-width: 100%;
77
overflow-x: hidden;
8-
font-family: "Avenir";
8+
font-family: "Roboto", "Helvetica", "Arial";
9+
background-color: #F5F5F5;
10+
font-size: 12px;
911
}
1012
::-webkit-scrollbar {
1113
width: 0px; /* remove scrollbar space */

src/App.js

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import {
7272
import dbLogo from './assets/dblogo.png';
7373
import ssLogo from './assets/sslogo.jpg';
7474
import kepLogo from './assets/kepler.gl-logo_2x.png';
75+
import { Typography } from '@material-ui/core';
7576

7677
const MAPBOX_ACCESS_TOKEN =
7778
'pk.eyJ1IjoidWJlcmRhdGEiLCJhIjoiY2p2OGVvejQwMDJxZzRma2dvdWQ2OTQwcSJ9.VbuIamTa_JayuD2yr5tjaA';
@@ -714,13 +715,17 @@ class App extends Component {
714715
// Placeholder sheet names. TODO: Bind to worksheet data
715716
return (
716717
<React.Fragment>
717-
<Stepper stepIndex={this.state.stepIndex} steps={stepNames} />
718-
<PickSheets
719-
sheetNames={this.state.sheetNames}
720-
configCallBack={this.configCallBack}
721-
field={'ConfigSheet'}
722-
ConfigSheet={tableauSettingsState.ConfigSheet || ''}
723-
/>
718+
<div style={{padding: '24px'}}>
719+
<Typography variant={'display1'} style={{color: '#333'}}>
720+
Kepler.gl within Tableau Configuration
721+
</Typography>
722+
<PickSheets
723+
sheetNames={this.state.sheetNames}
724+
configCallBack={this.configCallBack}
725+
field={'ConfigSheet'}
726+
ConfigSheet={tableauSettingsState.ConfigSheet || ''}
727+
/>
728+
</div>
724729
<StepButtons
725730
onNextClick={this.onNextStep}
726731
onPrevClick={this.onPrevStep}
@@ -738,14 +743,18 @@ class App extends Component {
738743
if (this.state.stepIndex === 2) {
739744
return (
740745
<React.Fragment>
741-
<Stepper stepIndex={this.state.stepIndex} steps={stepNames} />
742-
<CustomizeViolin
743-
handleChange={this.handleChange}
744-
customCallBack={this.customCallBack}
745-
field={'configuration'}
746-
tableauSettings={tableauSettingsState}
747-
configSheetColumns={this.state.ConfigSheetStringColumns || []}
748-
/>
746+
<div style={{padding: '24px'}}>
747+
<Typography variant={'display1'} style={{color: '#333'}}>
748+
Kepler.gl within Tableau Configuration
749+
</Typography>
750+
<CustomizeViolin
751+
handleChange={this.handleChange}
752+
customCallBack={this.customCallBack}
753+
field={'configuration'}
754+
tableauSettings={tableauSettingsState}
755+
configSheetColumns={this.state.ConfigSheetStringColumns || []}
756+
/>
757+
</div>
749758
<StepButtons
750759
onNextClick={this.onNextStep}
751760
onPrevClick={this.onPrevStep}
@@ -770,6 +779,7 @@ class App extends Component {
770779
<SplashScreen
771780
configure={this.configure}
772781
title="Kepler.gl within Tableau"
782+
version={KEPLER_GL_VERSION}
773783
desc="Leverage the brilliance of Kepler.gl functionality, directly within Tableau!"
774784
ctaText="Configure"
775785
poweredBy={
@@ -786,30 +796,35 @@ class App extends Component {
786796
<br /> Tableau Requirements: Tableau Desktop (Mac Only) 2018.3
787797
or >= 2019.1.2 or Tableau Server >= 2018.3
788798
</p>
789-
<p className="info">Brought to you by: </p>
790-
<a
791-
href="http://www.datablick.com/"
792-
target="_blank"
793-
rel="noopener noreferrer"
794-
>
795-
<img src={dbLogo} />
796-
</a>{' '}
797-
<a
798-
href="https://starschema.com/"
799-
target="_blank"
800-
rel="noopener noreferrer"
801-
>
802-
<img src={ssLogo} />
803-
</a>
804-
<p className="info">Powered by: </p>
805-
<a
806-
href="https://github.com/uber/kepler.gl"
807-
target="_blank"
808-
rel="noopener noreferrer"
809-
>
810-
<img src={kepLogo} />
811-
</a>
812-
<p className="info">Version: {KEPLER_GL_VERSION}</p>
799+
<div className="inline">
800+
<div>
801+
<p className="info">Brought to you by: </p>
802+
<a
803+
href="http://www.datablick.com/"
804+
target="_blank"
805+
rel="noopener noreferrer"
806+
>
807+
<img src={dbLogo} />
808+
</a>{' '}
809+
<a
810+
href="https://starschema.com/"
811+
target="_blank"
812+
rel="noopener noreferrer"
813+
>
814+
<img src={ssLogo} />
815+
</a>
816+
</div>
817+
<div>
818+
<p className="info">Powered by: </p>
819+
<a
820+
href="https://github.com/uber/kepler.gl"
821+
target="_blank"
822+
rel="noopener noreferrer"
823+
>
824+
<img src={kepLogo} />
825+
</a>
826+
</div>
827+
</div>
813828
</React.Fragment>
814829
}
815830
/>

src/assets/tableau/css/style.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3160,7 +3160,7 @@ Style guide: buttons-links.cta
31603160
cursor: pointer;
31613161
letter-spacing: 1px;
31623162
line-height: 1;
3163-
font-size: 11px;
3163+
font-size: 12px;
31643164
font-family: "Benton Sans Medium", Helvetica, sans-serif;
31653165
color: #fff;
31663166
text-transform: uppercase;
@@ -3510,7 +3510,7 @@ Style guide: buttons-links.toggle-links
35103510
cursor: pointer;
35113511
letter-spacing: 1px;
35123512
line-height: 1;
3513-
font-size: 11px;
3513+
font-size: 12px;
35143514
text-transform: uppercase;
35153515
font-family: "Benton Sans Book", Helvetica, sans-serif;
35163516
color: #e8762c;
@@ -14119,3 +14119,4 @@ Style guide: typography.text-stat
1411914119
@media (max-width: 960px) {
1412014120
.text-stat {
1412114121
font-size: 4em; } }
14122+

src/components/Configuration/ConfigScreen.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,16 @@ const styles = {
3838

3939
function ConfigScreen(props) {
4040
const {
41-
classes,
4241
selectSheet,
4342
sheetNames,
4443
configTitle,
4544
listTitle,
4645
field,
4746
selectedValue } = props;
4847

49-
console.log('configScreen', props);
5048
return (
5149
<React.Fragment>
52-
<div className="sheetScreen" style={{padding : 10, paddingBottom: 100 }}>
50+
<div className="sheetScreen">
5351
<Grid
5452
container
5553
alignItems="center"

0 commit comments

Comments
 (0)