Skip to content

Support mobile #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hatzen merged 2 commits into from
Jul 28, 2026
Merged

Support mobile #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a181d
optimize mobile
Hatzen Jul 6, 2026
af21a2f
added salary estimator
Hatzen Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@


<!-- Try caching all resources https://developer.mozilla.org/de/docs/Web/HTTP/Headers/Cache-Control#statische_assets_cachen -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta http-equiv="cache-control" content="public, max-age=31536000" />
<style>
body {
Expand Down
217 changes: 154 additions & 63 deletions src/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import ControlPane from './controlPane'
import DisclaimerModal from './disclaimerModal'
import MenuAppBar from './appBar'
import { Provider, observer } from 'mobx-react'
import { Tab, Tabs } from '@mui/material'
import { Tab, Tabs, Drawer, Autocomplete, TextField } from '@mui/material'
import { StoreProps } from '../stores/storeHelper'
import SurveyEntry from '../model/surveyEntry'
import ConsideredDataTable from './consideredDataTable'
import CurrencyConversionTable from './currencyConversionTable'
import SalaryEstimator from './salaryEstimator'
import translationStore from '../stores/translationStore'
import controlStore from '../stores/controlStore'
import { uiStore } from '../stores/uiStore'

interface AppState {
components: number[],
tabIndex: number
}

Expand All @@ -29,7 +29,6 @@ class App extends React.Component<Record<string, unknown>, AppState> {
super(props)
this.controlPane = React.createRef<AllotmentHandle>()
this.state ={
components: [0, 1],
tabIndex: 0
}
SurveyEntry.entryStore = entryStore
Expand All @@ -44,90 +43,182 @@ class App extends React.Component<Record<string, unknown>, AppState> {
}
}

componentDidMount(): void {
uiStore.initMobileDetection()
}

render(): JSX.Element {
const t = translationStore.t
const fitAll: React.CSSProperties = {position: 'absolute', top:0, left:0, bottom: 0, right:0}
const stores: StoreProps = {
entryStore,
controlStore,
uiStore: uiStore
}

const panes = this.state.components
const isMobile = uiStore.isMobileView
const appBarHeight = isMobile ? 48 : 64

return (
<div style={fitAll}>
<Provider {...stores}>
<DisclaimerModal fullScreen={false} />
<DisclaimerModal fullScreen={isMobile} />
<MenuAppBar menuClicked={this.toggleControls.bind(this)} />
<div style={{position: 'absolute', top: 64, bottom: 0, left: 0, right:0}}>
<Allotment ref={this.controlPane}>
{panes.map((pane: number) => {
if (pane === 0) {
return (
<Allotment.Pane key={pane}>
<div style={{position: 'relative', top: 0, left: 0, right: 0}} >
<Tabs
value={this.state.tabIndex}
onChange={this.changeTab}
sx={{
'& .MuiTabs-indicator': {
backgroundColor: '#F48024'
},
'& .MuiTab-root': {
color: '#F48024',
'&.Mui-selected': {
color: '#F48024',
fontWeight: 500
}
}
}}>
<Tab label={t.salaryTab} />
<Tab label={t.participationTab} />
<Tab label={t.consideredDataTab} />
<Tab label={t.currencyRatesTab} />
</Tabs>
</div>
<div style={{position: 'relative', top: 0, left: 0, right: 0, height: 'calc(100% - 48px)', width: '100%'}}>
<div style={{width: '100%', height: '100%'}}>
{this.state.tabIndex === 0 ? <BoxPlot /> :
this.state.tabIndex === 1 ? <BarPlot /> :
this.state.tabIndex === 2 ? <ConsideredDataTable /> :
<CurrencyConversionTable />}
</div>
</div>
</Allotment.Pane>
)
} else {
return (
<Allotment.Pane key={pane} snap maxSize={400}>
<ControlPane />
</Allotment.Pane>
)
}
})}
</Allotment>
<div style={{position: 'absolute', top: appBarHeight, bottom: isMobile ? 48 : 0, left: 0, right:0}}>
{isMobile ? this.renderMobileLayout() : this.renderDesktopLayout()}
</div>
{isMobile && this.renderMobileFooter()}
<Drawer
anchor="right"
open={uiStore.controlPaneOpen && isMobile}
onClose={this.closeDrawer.bind(this)}
PaperProps={{
sx: { width: '100%', maxWidth: '400px', backgroundColor: '#fff' }
}}
>
<ControlPane />
</Drawer>
</Provider>
</div>
)
}

private renderDesktopLayout(): JSX.Element {
const t = translationStore.t
return (
<Allotment ref={this.controlPane}>
<Allotment.Pane>
<div style={{position: 'relative', top: 0, left: 0, right: 0}} >
<Tabs
value={this.state.tabIndex}
onChange={this.changeTab}
variant="scrollable"
scrollButtons="auto"
sx={{
'& .MuiTabs-indicator': {
backgroundColor: '#F48024'
},
'& .MuiTab-root': {
color: '#F48024',
'&.Mui-selected': {
color: '#F48024',
fontWeight: 500
}
}
}}>
<Tab label={t.salaryTab} />
<Tab label={t.participationTab} />
<Tab label={t.consideredDataTab} />
<Tab label={t.currencyRatesTab} />
<Tab label={t.estimatorTab} />
</Tabs>
</div>
<div style={{position: 'relative', top: 0, left: 0, right: 0, height: 'calc(100% - 48px)', width: '100%'}}>
<div style={{width: '100%', height: '100%'}}>
{this.state.tabIndex === 0 ? <BoxPlot /> :
this.state.tabIndex === 1 ? <BarPlot /> :
this.state.tabIndex === 2 ? <ConsideredDataTable /> :
this.state.tabIndex === 3 ? <CurrencyConversionTable /> :
<SalaryEstimator />}
</div>
</div>
</Allotment.Pane>
<Allotment.Pane snap maxSize={400}>
<ControlPane />
</Allotment.Pane>
</Allotment>
)
}

private renderMobileLayout(): JSX.Element {
const t = translationStore.t
return (
<div style={{width: '100%', height: '100%'}}>
<div style={{position: 'relative', top: 0, left: 0, right: 0}} >
<Tabs
value={this.state.tabIndex}
onChange={this.changeTab}
variant="scrollable"
scrollButtons="auto"
sx={{
'& .MuiTabs-indicator': {
backgroundColor: '#F48024'
},
'& .MuiTab-root': {
color: '#F48024',
'&.Mui-selected': {
color: '#F48024',
fontWeight: 500
}
}
}}>
<Tab label={t.salaryTab} />
<Tab label={t.participationTab} />
<Tab label={t.consideredDataTab} />
<Tab label={t.currencyRatesTab} />
<Tab label={t.estimatorTab} />
</Tabs>
</div>
<div style={{position: 'relative', top: 0, left: 0, right: 0, height: 'calc(100% - 48px)', width: '100%'}}>
<div style={{width: '100%', height: '100%'}}>
{this.state.tabIndex === 0 ? <BoxPlot /> :
this.state.tabIndex === 1 ? <BarPlot /> :
this.state.tabIndex === 2 ? <ConsideredDataTable /> :
this.state.tabIndex === 3 ? <CurrencyConversionTable /> :
<SalaryEstimator />}
</div>
</div>
</div>
)
}

private renderMobileFooter(): JSX.Element {
const t = translationStore.t
return (
<div style={{
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
height: 48,
backgroundColor: '#F48024',
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 16px',
zIndex: 10
}}>
<Autocomplete
options={['en', 'de']}
value={controlStore.language ?? 'en'}
onChange={(_event, value) => {
if (value) {
controlStore.setLanguage(value as 'en' | 'de')
}
}}
renderInput={(params) => (
<TextField
{...params}
label={t.language}
size="small"
color="secondary"
style={{ width: 120, color: '#fff' }}
/>
)}
/>
</div>
)
}

private changeTab = (event: React.ChangeEvent<unknown>, newValue: number | string): void => {
this.setState({tabIndex: Number(newValue)})
}

private toggleControls(): void {
if (this.state.components.length === 1) {
this.setState({
components: [0 ,1]
})
this.controlPane.current!.reset()
} else {
this.setState({
components: [0]
})
}
uiStore.setControlPaneOpen(!uiStore.controlPaneOpen)
}

private closeDrawer(): void {
uiStore.setControlPaneOpen(false)
}

}
Expand Down
Loading
Loading