Skip to content

Commit c29c150

Browse files
spincycle01spincycle01
committed
Merge branch 'development' of https://github.com/team-reactype/ReacType 
2 parents 144a646 + 09aa788 commit c29c150

File tree

10 files changed

+230
-252
lines changed

10 files changed

+230
-252
lines changed

‎src/components/BottomTabs.jsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ class BottomTabs extends Component {
168168
classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
169169
label={`Component Props ${propCount ? `(${propCount})` : ''} `}
170170
/>
171-
{/* <Tab
172-
disableRipple
173-
classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
174-
label="Component State"
175-
/> */}
176171
<Tab
177172
disableRipple
178173
classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
179174
label={`HTML Element Attributes ${htmlAttribCount ? `(${htmlAttribCount})` : ''} `}
180175
/>
176+
{/* <Tab
177+
disableRipple
178+
classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
179+
label="Component State"
180+
/> */}
181181
</Tabs>
182182

183183
{value === 0 && (

‎src/components/HTMLComponentPanel.jsx‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class HTMLComponentPanel extends Component {
3333
};
3434

3535
render() {
36-
const { addChild, classes } = this.props;
36+
const { classes } = this.props;
3737
return (
38-
<div className={'htmlPanel'} align="center">
38+
<div align="center">
3939
<Tab
4040
disableRipple
4141
classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
@@ -67,7 +67,7 @@ class HTMLComponentPanel extends Component {
6767
variant="outlined"
6868
style={{
6969
color: 'white',
70-
fontSize: '50%',
70+
fontSize: '80%',
7171
margin: 0,
7272
padding: 0,
7373
}}
@@ -94,7 +94,7 @@ class HTMLComponentPanel extends Component {
9494
variant="outlined"
9595
style={{
9696
color: 'white',
97-
fontSize: '50%',
97+
fontSize: '80%',
9898
}}
9999
/>
100100
</Grid>
@@ -118,7 +118,7 @@ class HTMLComponentPanel extends Component {
118118
variant="outlined"
119119
style={{
120120
color: 'white',
121-
fontSize: '50%',
121+
fontSize: '80%',
122122
}}
123123
/>
124124
</Grid>
@@ -142,7 +142,7 @@ class HTMLComponentPanel extends Component {
142142
variant="outlined"
143143
style={{
144144
color: 'white',
145-
fontSize: '50%',
145+
fontSize: '80%',
146146
}}
147147
/>
148148
</Grid>
@@ -166,11 +166,18 @@ class HTMLComponentPanel extends Component {
166166
variant="outlined"
167167
style={{
168168
color: 'white',
169-
fontSize: '50%',
169+
fontSize: '80%',
170170
}}
171171
/>
172172
</Grid>
173-
<Grid item xs={4}>
173+
<Grid
174+
item
175+
xs={4}
176+
style={{
177+
margin: 0,
178+
padding: 0,
179+
}}
180+
>
174181
<IconButton
175182
className="htmlicons"
176183
aria-label="Paragraph"
@@ -182,15 +189,19 @@ class HTMLComponentPanel extends Component {
182189
padding: 0,
183190
}}
184191
>
185-
<ParagraphIcon style={{ color: '#e0e0e0' }} />
192+
<ParagraphIcon
193+
style={{ color: '#e0e0e0', paddingRight: '0px', marginRight: '0px' }}
194+
/>
186195
</IconButton>
187196
<Chip
188197
label="Paragraph"
189198
className={classes.chip}
190199
variant="outlined"
191200
style={{
192201
color: 'white',
193-
fontSize: '50%',
202+
fontSize: '62%',
203+
padding: '0px',
204+
margin: '0px',
194205
}}
195206
/>
196207
</Grid>

‎src/components/HtmlAttr.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class HtmlAttr extends Component {
8484
input: classes.input,
8585
},
8686
}}
87-
style={{ background: '#424242', height: '80%' }}
87+
style={{ background: '#424242', height: '70%' }}
8888
label={attr}
8989
variant="outlined"
9090
id={attr}
@@ -95,7 +95,7 @@ class HtmlAttr extends Component {
9595
<Grid item xs={1}>
9696
<Fab
9797
variant="extended"
98-
size="large"
98+
size="small"
9999
color="default"
100100
aria-label="Save"
101101
style={{
@@ -110,7 +110,7 @@ class HtmlAttr extends Component {
110110
</Fab>
111111
</Grid>
112112
<Grid item xs={4}>
113-
<Paper className={classes.root} style={{ height: '80%' }}>
113+
<Paper className={classes.root} style={{ height: '70%' }}>
114114
<p style={{ color: 'black' }}>
115115
{focusChild.HTMLInfo[attr] ? focusChild.HTMLInfo[attr] : ' no attribute assigned'}
116116
</p>

‎src/components/KonvaStage.jsx‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,19 +158,7 @@ class KonvaStage extends Component {
158158
}}
159159
tabIndex="0" // required for keydown event to be heard by this.container
160160
>
161-
{/* <Button
162-
onClick={deleteChild}
163-
style={{
164-
width: '150px',
165-
position: 'relative',
166-
float: 'right',
167-
background: '#dbdbdb',
168-
zIndex: 2,
169-
}}
170-
>
171-
delete child
172-
</Button> */}
173-
<Fab
161+
{/* <Fab
174162
variant="extended"
175163
size="small"
176164
color="inherit"
@@ -190,7 +178,7 @@ class KonvaStage extends Component {
190178
>
191179
<DeleteIcon />
192180
Delete Child
193-
</Fab>
181+
</Fab> */}
194182
<Stage
195183
className={'canvasStage'}
196184
ref={(node) => {

‎src/components/LeftColExpansionPanel.jsx‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import IconButton from '@material-ui/core/IconButton';
88
import Grid from '@material-ui/core/Grid';
99
import AddIcon from '@material-ui/icons/Add';
1010
import DeleteIcon from '@material-ui/icons/Delete';
11-
import Fab from '@material-ui/core/Fab';
11+
import Button from '@material-ui/core/Button';
1212

1313
const LeftColExpansionPanel = (props) => {
1414
const {
@@ -72,48 +72,51 @@ const LeftColExpansionPanel = (props) => {
7272
{directParents ? (
7373
<p
7474
style={{
75-
marginLeft: '10px',
76-
color: 'white',
75+
padding: '0px',
76+
marginTop: '0px',
77+
marginLeft: '15px',
78+
color: '#D3D3D3',
7779
fontSize: '12px',
78-
marginTop: '1px',
7980
}}
8081
>
8182
Used in: {directParents}
8283
</p>
8384
) : (
8485
<p
8586
style={{
86-
marginLeft: '10px',
87-
color: 'white',
87+
padding: '0px',
88+
marginTop: '0px',
89+
marginLeft: '15px',
90+
color: '#D3D3D3',
8891
fontSize: '12px',
89-
marginTop: '1px',
9092
}}
9193
>
9294
Not used
9395
</p>
9496
)}
9597
</span>
96-
<Fab
97-
variant="extended"
98+
<Button
99+
variant="text"
98100
size="small"
99-
color="inherit"
101+
color="default"
100102
aria-label="Delete"
101103
className={classes.margin}
102-
style={{
103-
marginLeft: '10px',
104-
marginTop: '5px',
105-
marginBottom: '10px',
106-
}}
107-
// style={{ maxWidth: "20px" }}
108104
onClick={() => deleteComponent({
109105
componentId: id,
110106
stateComponents: components,
111107
})
112108
}
109+
style={{
110+
color: '#D3D3D3',
111+
marginBottom: '10px',
112+
marginTop: '0px',
113+
marginLeft: '11px',
114+
padding: '0px',
115+
}}
113116
>
114-
<DeleteIcon />
117+
<DeleteIcon style={{ color: '#D3D3D3' }} />
115118
Delete
116-
</Fab>
119+
</Button>
117120
{/* <IconButton
118121
style={{ display: "inline-block" }}
119122
onClick={() =>

‎src/components/SimpleModal.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const SimpleModal = (props) => {
7878
<div>
7979
{secBtnLabel ? (
8080
<Button
81-
variant="extendedFab"
81+
variant="contained"
8282
color="secondary"
8383
className={classes.button}
8484
onClick={secBtnAction}
@@ -88,7 +88,7 @@ const SimpleModal = (props) => {
8888
) : null}
8989
{primBtnLabel ? (
9090
<Button
91-
variant="extendedFab"
91+
variant="contained"
9292
color="primary"
9393
className={classes.button}
9494
onClick={primBtnAction}

‎src/containers/LeftContainer.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,37 @@ const mapDispatchToProps = (dispatch: any) => ({
5353
stateComponents: ComponentsInt;
5454
}) => dispatch(actions.deleteComponent({ componentId, stateComponents })),
5555
deleteAllData: () => dispatch(actions.deleteAllData()),
56+
createApp: ({ path, components, genOption }) => dispatch(
57+
actions.createApplication({
58+
path,
59+
components,
60+
genOption,
61+
}),
62+
),
5663
});
5764

5865
class LeftContainer extends Component<Props> {
5966
state = {
6067
componentName: '',
6168
modal: null,
6269
genOptions: ['Export components', 'Export components with application files'],
70+
genOption: 0,
6371
};
6472

73+
constructor(props) {
74+
super(props);
75+
76+
IPC.on('app_dir_selected', (event, path) => {
77+
const { components } = this.props;
78+
const { genOption } = this.state;
79+
this.props.createApp({
80+
path,
81+
components,
82+
genOption,
83+
});
84+
});
85+
}
86+
6587
handleChange = (event) => {
6688
this.setState({
6789
[event.target.name]: event.target.value,

‎src/public/styles/style.css‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,12 @@ LEFT COLUMN
8080
.left {
8181
padding: 10px;
8282
width: 20%;
83-
min-width: 350px;
83+
min-width: 300px;
8484
display: flex;
8585
flex-direction: column;
8686
position: relative;
8787
}
8888

89-
.htmlPanel {
90-
/* position: absolute;
91-
bottom: 0;
92-
margin-right: 50px;
93-
margin-left: 50px;
94-
margin-bottom: 50px;
95-
left: 0px;
96-
right: 0px;
97-
width: 100%;
98-
padding: 1%; */
99-
}
100-
10189
.component-input {
10290
bottom: 2.8%;
10391
}

0 commit comments

Comments
 (0)