Skip to content

Commit 19a7f39

Browse files
helloanoophelloanoop
committed
feat(usebruno#197): prettier formatting on all files in packages/bruno-app
1 parent a103f41 commit 19a7f39

File tree

117 files changed

+1249
-854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1249
-854
lines changed

‎.prettierrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"tabWidth": 2,
44
"semi": true,
55
"singleQuote": true,
6-
"printWidth": 180
6+
"printWidth": 120
77
}

‎packages/bruno-app/.prettierrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"tabWidth": 2,
44
"semi": true,
55
"singleQuote": true,
6-
"printWidth": 180
6+
"printWidth": 120
77
}

‎packages/bruno-app/src/components/Bruno/index.js

+26-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ const Bruno = ({ width }) => {
1414
stroke="none"
1515
points="36,47.2521 32.9167,49.6688 30.4167,49.6688 30.3333,53.5021 31.0833,57.0021 32.1667,58.9188 35,60.4188 39.5833,59.8355 41.1667,58.0855 42.1667,53.8355 41.9167,49.8355 39.9167,50.0855"
1616
/>
17-
<polygon fill="#3F3F3F" stroke="none" points="32.5,36.9188 30.9167,40.6688 33.0833,41.9188 34.3333,42.4188 38.6667,42.5855 41.5833,40.3355 39.8333,37.0855" />
17+
<polygon
18+
fill="#3F3F3F"
19+
stroke="none"
20+
points="32.5,36.9188 30.9167,40.6688 33.0833,41.9188 34.3333,42.4188 38.6667,42.5855 41.5833,40.3355 39.8333,37.0855"
21+
/>
1822
</g>
1923
<g id="hair" />
2024
<g id="skin" />
@@ -84,8 +88,27 @@ const Bruno = ({ width }) => {
8488
strokeWidth="2"
8589
d="M52.6309,46.4628c0,0-3.0781,6.7216-7.8049,8.2712"
8690
/>
87-
<path fill="none" stroke="#000000" strokeLinecap="round" strokeLinejoin="round" strokeMiterlimit="10" strokeWidth="2" d="M19.437,46.969c0,0,3.0781,6.0823,7.8049,7.632" />
88-
<line x1="36.2078" x2="36.2078" y1="47.3393" y2="44.3093" fill="none" stroke="#000000" strokeLinecap="round" strokeLinejoin="round" strokeMiterlimit="10" strokeWidth="2" />
91+
<path
92+
fill="none"
93+
stroke="#000000"
94+
strokeLinecap="round"
95+
strokeLinejoin="round"
96+
strokeMiterlimit="10"
97+
strokeWidth="2"
98+
d="M19.437,46.969c0,0,3.0781,6.0823,7.8049,7.632"
99+
/>
100+
<line
101+
x1="36.2078"
102+
x2="36.2078"
103+
y1="47.3393"
104+
y2="44.3093"
105+
fill="none"
106+
stroke="#000000"
107+
strokeLinecap="round"
108+
strokeLinejoin="round"
109+
strokeMiterlimit="10"
110+
strokeWidth="2"
111+
/>
89112
</g>
90113
</svg>
91114
);

‎packages/bruno-app/src/components/CodeEditor/StyledWrapper.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ const StyledWrapper = styled.div`
66
border: solid 1px ${(props) => props.theme.codemirror.border};
77
}
88
9-
.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
9+
.CodeMirror-overlayscroll-horizontal div,
10+
.CodeMirror-overlayscroll-vertical div {
1011
background: #d2d7db;
1112
}
1213
@@ -17,29 +18,35 @@ const StyledWrapper = styled.div`
1718
// Todo: dark mode temporary fix
1819
// Clean this
1920
.CodeMirror.cm-s-monokai {
20-
.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
21+
.CodeMirror-overlayscroll-horizontal div,
22+
.CodeMirror-overlayscroll-vertical div {
2123
background: #444444;
2224
}
2325
}
2426
25-
.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {
27+
.cm-s-monokai span.cm-property,
28+
.cm-s-monokai span.cm-attribute {
2629
color: #9cdcfe !important;
2730
}
2831
2932
.cm-s-monokai span.cm-string {
3033
color: #ce9178 !important;
3134
}
3235
33-
.cm-s-monokai span.cm-number{
36+
.cm-s-monokai span.cm-number {
3437
color: #b5cea8 !important;
3538
}
3639
37-
.cm-s-monokai span.cm-atom{
40+
.cm-s-monokai span.cm-atom {
3841
color: #569cd6 !important;
3942
}
4043
41-
.cm-variable-valid{color: green}
42-
.cm-variable-invalid{color: red}
44+
.cm-variable-valid {
45+
color: green;
46+
}
47+
.cm-variable-invalid {
48+
color: red;
49+
}
4350
`;
4451

4552
export default StyledWrapper;

‎packages/bruno-app/src/components/CodeEditor/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default class CodeEditor extends React.Component {
4343
foldGutter: true,
4444
gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
4545
readOnly: this.props.readOnly,
46-
scrollbarStyle: "overlay",
46+
scrollbarStyle: 'overlay',
4747
theme: this.props.theme === 'dark' ? 'monokai' : 'default',
4848
extraKeys: {
4949
'Cmd-Enter': () => {
@@ -96,7 +96,7 @@ export default class CodeEditor extends React.Component {
9696
this.editor.setValue(this.props.value);
9797
}
9898

99-
if(this.editor) {
99+
if (this.editor) {
100100
let variables = getEnvironmentVariables(this.props.collection);
101101
if (!isEqual(variables, this.variables)) {
102102
this.addOverlay();
@@ -135,7 +135,7 @@ export default class CodeEditor extends React.Component {
135135

136136
defineCodeMirrorBrunoVariablesMode(variables, mode);
137137
this.editor.setOption('mode', 'brunovariables');
138-
}
138+
};
139139

140140
_onEdit = () => {
141141
if (!this.ignoreChangeEvent && this.editor) {

‎packages/bruno-app/src/components/Dropdown/index.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ import StyledWrapper from './StyledWrapper';
55
const Dropdown = ({ icon, children, onCreate, placement }) => {
66
return (
77
<StyledWrapper className="dropdown">
8-
<Tippy content={children} placement={placement || 'bottom-end'} animation={false} arrow={false} onCreate={onCreate} interactive={true} trigger="click" appendTo="parent">
8+
<Tippy
9+
content={children}
10+
placement={placement || 'bottom-end'}
11+
animation={false}
12+
arrow={false}
13+
onCreate={onCreate}
14+
interactive={true}
15+
trigger="click"
16+
appendTo="parent"
17+
>
918
{icon}
1019
</Tippy>
1120
</StyledWrapper>

‎packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import styled from 'styled-components';
22

33
const Wrapper = styled.div`
44
.current-enviroment {
5-
background-color: ${(props) => props.theme.sidebar.badge.bg};
5+
background-color: ${(props) => props.theme.sidebar.badge.bg};
66
border-radius: 15px;
77
88
.caret {

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ const CreateEnvironment = ({ collection, onClose }) => {
1616
name: ''
1717
},
1818
validationSchema: Yup.object({
19-
name: Yup.string().min(1, 'must be atleast 1 characters').max(50, 'must be 50 characters or less').required('name is required')
19+
name: Yup.string()
20+
.min(1, 'must be atleast 1 characters')
21+
.max(50, 'must be 50 characters or less')
22+
.required('name is required')
2023
}),
2124
onSubmit: (values) => {
2225
dispatch(addEnvironment(values.name, collection.uid))
@@ -40,7 +43,13 @@ const CreateEnvironment = ({ collection, onClose }) => {
4043

4144
return (
4245
<Portal>
43-
<Modal size="sm" title={'Create Environment'} confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
46+
<Modal
47+
size="sm"
48+
title={'Create Environment'}
49+
confirmText="Create"
50+
handleConfirm={onSubmit}
51+
handleCancel={onClose}
52+
>
4453
<form className="bruno-form" onSubmit={formik.handleSubmit}>
4554
<div>
4655
<label htmlFor="name" className="block font-semibold">
@@ -59,7 +68,9 @@ const CreateEnvironment = ({ collection, onClose }) => {
5968
onChange={formik.handleChange}
6069
value={formik.values.name || ''}
6170
/>
62-
{formik.touched.name && formik.errors.name ? <div className="text-red-500">{formik.errors.name}</div> : null}
71+
{formik.touched.name && formik.errors.name ? (
72+
<div className="text-red-500">{formik.errors.name}</div>
73+
) : null}
6374
</div>
6475
</form>
6576
</Modal>

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ const DeleteEnvironment = ({ onClose, environment, collection }) => {
2020
return (
2121
<Portal>
2222
<StyledWrapper>
23-
<Modal size="sm" title={'Delete Environment'} confirmText="Delete" handleConfirm={onConfirm} handleCancel={onClose}>
23+
<Modal
24+
size="sm"
25+
title={'Delete Environment'}
26+
confirmText="Delete"
27+
handleConfirm={onConfirm}
28+
handleCancel={onClose}
29+
>
2430
Are you sure you want to delete <span className="font-semibold">{environment.name}</span> ?
2531
</Modal>
2632
</StyledWrapper>

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Wrapper = styled.div`
1212
}
1313
1414
thead {
15-
color: ${(props) => props.theme.table.thead.color};;
15+
color: ${(props) => props.theme.table.thead.color};
1616
font-size: 0.8125rem;
1717
user-select: none;
1818
}

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@ const EnvironmentVariables = ({ environment, collection }) => {
9999
</td>
100100
<td>
101101
<div className="flex items-center">
102-
<input type="checkbox" checked={variable.enabled} className="mr-3 mousetrap" onChange={(e) => handleVarChange(e, variable, 'enabled')} />
102+
<input
103+
type="checkbox"
104+
checked={variable.enabled}
105+
className="mr-3 mousetrap"
106+
onChange={(e) => handleVarChange(e, variable, 'enabled')}
107+
/>
103108
<button onClick={() => handleRemoveVars(variable)}>
104109
<IconTrash strokeWidth={1.5} size={20} />
105110
</button>
@@ -119,7 +124,12 @@ const EnvironmentVariables = ({ environment, collection }) => {
119124
</div>
120125

121126
<div>
122-
<button type="submit" className="submit btn btn-md btn-secondary mt-2" disabled={!hasChanges} onClick={saveChanges}>
127+
<button
128+
type="submit"
129+
className="submit btn btn-md btn-secondary mt-2"
130+
disabled={!hasChanges}
131+
onClick={saveChanges}
132+
>
123133
Save
124134
</button>
125135
</div>

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,16 @@ const EnvironmentDetails = ({ environment, collection }) => {
1010

1111
return (
1212
<div className="px-6 flex-grow flex flex-col pt-6" style={{ maxWidth: '700px' }}>
13-
{openEditModal && <RenameEnvironment onClose={() => setOpenEditModal(false)} environment={environment} collection={collection} />}
14-
{openDeleteModal && <DeleteEnvironment onClose={() => setOpenDeleteModal(false)} environment={environment} collection={collection} />}
13+
{openEditModal && (
14+
<RenameEnvironment onClose={() => setOpenEditModal(false)} environment={environment} collection={collection} />
15+
)}
16+
{openDeleteModal && (
17+
<DeleteEnvironment
18+
onClose={() => setOpenDeleteModal(false)}
19+
environment={environment}
20+
collection={collection}
21+
/>
22+
)}
1523
<div className="flex">
1624
<div className="flex flex-grow items-center">
1725
<IconDatabase className="cursor-pointer" size={20} strokeWidth={1.5} />

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const EnvironmentList = ({ collection }) => {
1414
const prevEnvUids = usePrevious(envUids);
1515

1616
useEffect(() => {
17-
if(selectedEnvironment) {
17+
if (selectedEnvironment) {
1818
return;
1919
}
20-
20+
2121
const environment = findEnvironmentInCollection(collection, collection.activeEnvironmentUid);
22-
if(environment) {
22+
if (environment) {
2323
setSelectedEnvironment(environment);
2424
} else {
2525
setSelectedEnvironment(environments && environments.length ? environments[0] : null);
@@ -28,17 +28,17 @@ const EnvironmentList = ({ collection }) => {
2828

2929
useEffect(() => {
3030
// check env add
31-
if (prevEnvUids && prevEnvUids.length && envUids.length > prevEnvUids.length) {
31+
if (prevEnvUids && prevEnvUids.length && envUids.length > prevEnvUids.length) {
3232
const newEnv = environments.find((env) => !prevEnvUids.includes(env.uid));
33-
if(newEnv){
33+
if (newEnv) {
3434
setSelectedEnvironment(newEnv);
3535
}
3636
}
3737

3838
// check env delete
3939
if (prevEnvUids && prevEnvUids.length && envUids.length < prevEnvUids.length) {
4040
setSelectedEnvironment(environments && environments.length ? environments[0] : null);
41-
}
41+
}
4242
}, [envUids, environments, prevEnvUids]);
4343

4444
if (!selectedEnvironment) {

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
1616
name: environment.name
1717
},
1818
validationSchema: Yup.object({
19-
name: Yup.string().min(1, 'must be atleast 1 characters').max(50, 'must be 50 characters or less').required('name is required')
19+
name: Yup.string()
20+
.min(1, 'must be atleast 1 characters')
21+
.max(50, 'must be 50 characters or less')
22+
.required('name is required')
2023
}),
2124
onSubmit: (values) => {
2225
dispatch(renameEnvironment(values.name, environment.uid, collection.uid))
@@ -40,7 +43,13 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
4043

4144
return (
4245
<Portal>
43-
<Modal size="sm" title={'Rename Environment'} confirmText="Rename" handleConfirm={onSubmit} handleCancel={onClose}>
46+
<Modal
47+
size="sm"
48+
title={'Rename Environment'}
49+
confirmText="Rename"
50+
handleConfirm={onSubmit}
51+
handleCancel={onClose}
52+
>
4453
<form className="bruno-form" onSubmit={formik.handleSubmit}>
4554
<div>
4655
<label htmlFor="name" className="block font-semibold">
@@ -59,7 +68,9 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
5968
onChange={formik.handleChange}
6069
value={formik.values.name || ''}
6170
/>
62-
{formik.touched.name && formik.errors.name ? <div className="text-red-500">{formik.errors.name}</div> : null}
71+
{formik.touched.name && formik.errors.name ? (
72+
<div className="text-red-500">{formik.errors.name}</div>
73+
) : null}
6374
</div>
6475
</form>
6576
</Modal>

‎packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,21 @@ const EnvironmentSettings = ({ collection, onClose }) => {
1111
if (!environments || !environments.length) {
1212
return (
1313
<StyledWrapper>
14-
<Modal size="md" title="Environments" confirmText={'Close'} handleConfirm={onClose} handleCancel={onClose} hideCancel={true}>
14+
<Modal
15+
size="md"
16+
title="Environments"
17+
confirmText={'Close'}
18+
handleConfirm={onClose}
19+
handleCancel={onClose}
20+
hideCancel={true}
21+
>
1522
{openCreateModal && <CreateEnvironment collection={collection} onClose={() => setOpenCreateModal(false)} />}
1623
<div className="text-center">
1724
<p>No environments found!</p>
18-
<button className="btn-create-environment text-link pr-2 py-3 mt-2 select-none" onClick={() => setOpenCreateModal(true)}>
25+
<button
26+
className="btn-create-environment text-link pr-2 py-3 mt-2 select-none"
27+
onClick={() => setOpenCreateModal(true)}
28+
>
1929
+ <span>Create Environment</span>
2030
</button>
2131
</div>

‎packages/bruno-app/src/components/Icons/Send/index.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
import React from 'react';
22

3-
const SendIcon = ({color, width}) => {
3+
const SendIcon = ({ color, width }) => {
44
return (
5-
<svg
6-
xmlns="http://www.w3.org/2000/svg"
7-
width={width}
8-
height={width}
9-
viewBox="0 0 48 48"
10-
>
11-
<path fill={color} d="M4.02 42l41.98-18-41.98-18-.02 14 30 4-30 4z"/>
12-
<path d="M0 0h48v48h-48z" fill="none"/>
5+
<svg xmlns="http://www.w3.org/2000/svg" width={width} height={width} viewBox="0 0 48 48">
6+
<path fill={color} d="M4.02 42l41.98-18-41.98-18-.02 14 30 4-30 4z" />
7+
<path d="M0 0h48v48h-48z" fill="none" />
138
</svg>
149
);
15-
}
10+
};
1611

1712
export default SendIcon;

0 commit comments

Comments
 (0)