Skip to content
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.

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

chore(prettier): updates prettier config and file formatting #56

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"trailingComma": "es5",
"trailingComma": "none",
"tabWidth": 2,
"semi": true,
"semi": false,
"singleQuote": true,
"printWidth": 160,
"printWidth": 100,
"jsxSingleQuote": true,
"useTabs": false,
"useEditorConfig": true,
"htmlWhitespaceSensitivity": "css",
"bracketSameLine": true,
"bracketSpacing": true,
"prettier.arrowParens": "always"
"arrowParens": "always",
"quoteProps": "as-needed"
}
93 changes: 44 additions & 49 deletions __tests__/supertest.js
Original file line number Diff line number Diff line change
@@ -1,53 +1,48 @@
const request = require('supertest');



const server = 'http:https://localhost:8080';

describe('Route integration', function(){
describe('/', () => {
describe('GET', () => {
it('responds with 200 status and text/html content type', function(done){
request(server)
.get('/convert-demo-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done);
});
});


describe('POST', () => {
it('responds with 200 status and text/html content type', function(done){
request(server)
.get('/convert-sql-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done);
});
});
const request = require('supertest')

const server = 'http:https://localhost:8080'

describe('Route integration', function () {
describe('/', () => {
describe('GET', () => {
it('responds with 200 status and text/html content type', function (done) {
request(server)
.get('/convert-demo-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done)
})
})

describe('POST', () => {
it('responds with 200 status and text/html content type', function(done){
request(server)
.get('/convert-mongo-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done);
});
});
describe('POST', () => {
it('responds with 200 status and text/html content type', function (done) {
request(server)
.get('/convert-sql-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done)
})
})

describe('POST', () => {
it('responds with 200 status and text/html content type', function (done) {
request(server)
.get('/convert-mongo-db')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, done)
})
})
describe('/', () => {
describe('GET', () => {
it('responds with 404 not found', function(done){
request(server)
.get('/fake')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(404, done);
});
});
})
describe('/', () => {
describe('GET', () => {
it('responds with 404 not found', function (done) {
request(server)
.get('/fake')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(404, done)
})
})
});

})
})
54 changes: 27 additions & 27 deletions components/CodeBoxContainer.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
import React from 'react';
import { saveAs } from 'file-saver';
import { useSelector } from 'react-redux';
import SyntaxHighlighter from 'react-syntax-highlighter';
import { Button } from '@nextui-org/react';
import React from 'react'
import { saveAs } from 'file-saver'
import { useSelector } from 'react-redux'
import SyntaxHighlighter from 'react-syntax-highlighter'
import { Button } from '@nextui-org/react'

import qtCreator from '../node_modules/react-syntax-highlighter/dist/esm/styles/hljs/qtcreator_dark';
import styles from '../styles/CodeBoxContainer.module.css';
import { SampleGQLServerCode, SampleGQLClientQueriesCode, SampleGQLClientMutationsCode } from '../server/sampleDB';
import qtCreator from '../node_modules/react-syntax-highlighter/dist/esm/styles/hljs/qtcreator_dark'
import styles from '../styles/CodeBoxContainer.module.css'
import { SampleGQLServerCode, SampleGQLClientQueriesCode, SampleGQLClientMutationsCode } from '../server/sampleDB'

function CodeBoxContainer() {
const showDemo = useSelector((state) => state.demo.showDemo);
const data = useSelector((state) => state.demo.queries);
const showDemo = useSelector((state) => state.demo.showDemo)
const data = useSelector((state) => state.demo.queries)

const uriDataGQLServerCode = data ? data.GQLServerCode : '';
const uriDataGQLClientMutationsCode = data ? data.GQLClientMutationsCode : '';
const uriDataGQLClientQueriesCode = data ? data.GQLClientQueriesCode : '';
const uriDataGQLServerCode = data ? data.GQLServerCode : ''
const uriDataGQLClientMutationsCode = data ? data.GQLClientMutationsCode : ''
const uriDataGQLClientQueriesCode = data ? data.GQLClientQueriesCode : ''

/* EXPORT GQL SERVER CODE */
const exportGQLServerCode = () => {
if (showDemo) {
saveAs(new File([`${SampleGQLServerCode}`], 'GQLServerCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${SampleGQLServerCode}`], 'GQLServerCode.js', { type: 'text/plain;charset=utf-8' }))
}
if (!showDemo && uriDataGQLServerCode !== '') {
saveAs(new File([`${uriDataGQLServerCode}`], 'GQLServerCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${uriDataGQLServerCode}`], 'GQLServerCode.js', { type: 'text/plain;charset=utf-8' }))
}
};
}

/* EXPORT GQL CLIENT MUTATIONS CODE */
const exportGQLClientMutationsCode = () => {
if (showDemo) {
saveAs(new File([`${SampleGQLClientMutationsCode}`], 'GQLClientMutationsCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${SampleGQLClientMutationsCode}`], 'GQLClientMutationsCode.js', { type: 'text/plain;charset=utf-8' }))
}
if (!showDemo && uriDataGQLClientMutationsCode !== '') {
saveAs(new File([`${uriDataGQLClientMutationsCode}`], 'GQLClientMutationsCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${uriDataGQLClientMutationsCode}`], 'GQLClientMutationsCode.js', { type: 'text/plain;charset=utf-8' }))
}
};
}

/* EXPORT GQL CLIENT QUERIES CODE */
const exportGQLClientQueriesCode = () => {
if (showDemo) {
saveAs(new File([`${SampleGQLClientQueriesCode}`], 'GQLClientQueriesCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${SampleGQLClientQueriesCode}`], 'GQLClientQueriesCode.js', { type: 'text/plain;charset=utf-8' }))
}
if (!showDemo && uriDataGQLClientQueriesCode !== '') {
saveAs(new File([`${uriDataGQLClientQueriesCode}`], 'GQLClientQueriesCode.js', { type: 'text/plain;charset=utf-8' }));
saveAs(new File([`${uriDataGQLClientQueriesCode}`], 'GQLClientQueriesCode.js', { type: 'text/plain;charset=utf-8' }))
}
};
}

return (
<div className={styles.codebox}>
Expand All @@ -60,7 +60,7 @@ function CodeBoxContainer() {
size='sm'
css={{ px: '$4', height: '$10' }}
onClick={() => {
exportGQLClientMutationsCode();
exportGQLClientMutationsCode()
}}
>
Export Code
Expand All @@ -81,7 +81,7 @@ function CodeBoxContainer() {
size='sm'
css={{ px: '$4', height: '$10' }}
onClick={() => {
exportGQLClientQueriesCode();
exportGQLClientQueriesCode()
}}
>
Export Code
Expand All @@ -103,7 +103,7 @@ function CodeBoxContainer() {
size='sm'
css={{ px: '$4', height: '$10' }}
onClick={() => {
exportGQLServerCode();
exportGQLServerCode()
}}
>
Export Code
Expand All @@ -114,7 +114,7 @@ function CodeBoxContainer() {
</SyntaxHighlighter>
</div>
</div>
);
)
}

export default CodeBoxContainer;
export default CodeBoxContainer
39 changes: 22 additions & 17 deletions components/DbInfo.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import React, { useState } from 'react';
import { Button, Spacer } from '@nextui-org/react';
import { useDispatch, useSelector } from 'react-redux';
import React, { useState } from 'react'
import { Button, Spacer } from '@nextui-org/react'
import { useDispatch, useSelector } from 'react-redux'

import { setQueries, showDemo, setIsError, setShowDBInfo, setShowFlowModal } from '../features/demoSlice';
import styles from '../styles/DbInfo.module.css';
import {
setQueries,
showDemo,
setIsError,
setShowDBInfo,
setShowFlowModal
} from '../features/demoSlice'
import styles from '../styles/DbInfo.module.css'

function DbInfo({ dbData, hidePanel, setDbData }) {
const [dbName, setDBName] = useState(!dbData ? 'Sample Database' : dbData.name);
const [dbType, setDBType] = useState(!dbData ? 'PostgreSQL' : dbData.type);
const [dbName, setDBName] = useState(!dbData ? 'Sample Database' : dbData.name)
const [dbType, setDBType] = useState(!dbData ? 'PostgreSQL' : dbData.type)

const dispatch = useDispatch();
const dispatch = useDispatch()

return (
<div className={styles.container}>
Expand All @@ -21,17 +27,16 @@ function DbInfo({ dbData, hidePanel, setDbData }) {
<Spacer y={1.5} />
<Button
onClick={() => {
dispatch(setQueries(''));
dispatch(showDemo(false));
dispatch(setIsError(false));
dispatch(setShowDBInfo(false));
setDbData(null);
}}
>
dispatch(setQueries(''))
dispatch(showDemo(false))
dispatch(setIsError(false))
dispatch(setShowDBInfo(false))
setDbData(null)
}}>
Reset
</Button>
</div>
);
)
}

export default DbInfo;
export default DbInfo
Loading