Fix warnings/errors#63

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
angeljruiz merged 19 commits into from
Dec 28, 2020
Merged

Fix warnings/errors #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
59da64e
fixes dashboard console errors
angeljruiz Dec 5, 2020
ff00e34
fixes some event page errors
angeljruiz Dec 6, 2020
0e07043
fixes sidebar errors
angeljruiz Dec 6, 2020
f5d9c93
fixes login errors
angeljruiz Dec 6, 2020
39715e1
editor page fixes
angeljruiz Dec 6, 2020
3f86b43
.
angeljruiz Dec 7, 2020
2b3b0dc
Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…
angeljruiz Dec 7, 2020
e157f78
Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…
angeljruiz Dec 7, 2020
a6be854
fixes dashboard errors
angeljruiz Dec 7, 2020
6928807
fixes event page errors
angeljruiz Dec 7, 2020
7a980ad
Fixes bridge editor errors
angeljruiz Dec 7, 2020
c457856
Fixes landing page error
angeljruiz Dec 7, 2020
2755f42
.
angeljruiz Dec 9, 2020
97dc881
Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…
angeljruiz Dec 11, 2020
f7a59bb
spec fix
angeljruiz Dec 12, 2020
17f1e2a
Fix single digit time on events
AndiLavera Dec 20, 2020
28137a7
Fix eslint
AndiLavera Dec 20, 2020
f459b68
Fix single digit hours
AndiLavera Dec 20, 2020
330b2bf
.
angeljruiz Dec 21, 2020
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: 5 additions & 5 deletions components/Dashboard/Card.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
const classes = useStyles();

const completedAt = (bridge.completedAt
&& new Date(bridge.completedAt).toDateString())
const latestRequest = (bridge.latestRequest
&& new Date(bridge.latestRequest).toDateString())
|| 'No requests';

const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

<Grid item xs container direction="column" className={classes.values}>
<Typography variant="subtitle1" id={`card-completedAt-${index}`}>
{completedAt}
{latestRequest}
</Typography>

<Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
title: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired,
eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
active: PropTypes.bool.isRequired,
eventId: PropTypes.number.isRequired,
eventId: PropTypes.number,
}).isRequired,
index: PropTypes.number.isRequired,
};
1 change: 0 additions & 1 deletion components/Editor/BridgeTestCard/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
values: PropTypes.shape({
outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
retries: PropTypes.string.isRequired,
delay: PropTypes.string.isRequired,
headers: PropTypes.arrayOf(
Expand Down
4 changes: 1 addition & 3 deletions components/Editor/EnvironmentVariablesCard/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
<AccordionSummary
icon={<ExpandMoreIcon />}
title="Environment variables"
subtitle="Keep Your Secrets Safe"
tooltip
tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
subtitle="Encrypted To Keep Your Secrets Safe"
/>
<AccordionDetails>
<Grid container spacing={2}>
Expand Down
3 changes: 1 addition & 2 deletions components/Editor/PayloadCard/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
className={classes.payloadContainer}
>

<CodeMirror readOnly isEditView={isEditView} />
<CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
</Container>
</AccordionDetails>
</Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
isEditView: PropTypes.bool.isRequired,
values: PropTypes.shape({
outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
retries: PropTypes.string.isRequired,
delay: PropTypes.string.isRequired,
headers: PropTypes.arrayOf(
Expand Down
37 changes: 20 additions & 17 deletions components/Editor/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
Send your events here:
</Typography>
<Typography variant="h6">
{slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
{slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
</Typography>
</Grid>
</Grid>
<Grid item sm={4} md={4} lg={4} container justify="flex-end">
<Grid>
<ActionsDialog
active={active}
open={actionsDialogOpen}
onClose={() => setActionsDialogOpen(false)}
bridgeSlug={slug}
/>
<Button
onClick={() => setActionsDialogOpen(true)}
variant="outlined"
color="secondary"
className={classes.action}
id="actions-button"
>
Actions
</Button>
{slug && (
<>
<ActionsDialog
active={active}
open={actionsDialogOpen}
onClose={() => setActionsDialogOpen(false)}
bridgeSlug={slug}
/>
<Button
onClick={() => setActionsDialogOpen(true)}
variant="outlined"
color="secondary"
className={classes.action}
id="actions-button"
>
Actions
</Button>
</>
)}
<Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
</Grid>
</Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
events: PropTypes.arrayOf(
PropTypes.shape({
id: PropTypes.number.isRequired,
bridge_id: PropTypes.number.isRequired,
completed: PropTypes.bool,
completed_at: PropTypes.string,
data: PropTypes.string,
Expand Down
2 changes: 1 addition & 1 deletion components/Event/InboundAccordion.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
Payload:
</Typography>

<CodeMirror readOnly isEditView data={request.payload} />
<CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
</Grid>
</AccordionDetails>
</Accordion>
Expand Down
36 changes: 17 additions & 19 deletions components/Event/OutboundAccordion.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
Accordion,
AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
root: {
width: '100%',
},
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
},
bold: {
fontWeight: '700',
margin: theme.spacing(0, 1, 0, 2),
},
});
}));

function OutboundAccordion({ request }) {
const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

<Typography>
Headers:
{' '}
<ul>
{request.headers.map((header) => (
<li key={`${header.key}`}>
<Typography display="inline" className={classes.bold}>
{header.key}
:
</Typography>
{' '}
<Typography display="inline">
{header.value}
</Typography>
</li>
))}
</ul>

</Typography>

{request.headers.map((header) => (
<div style={{ display: 'flex' }} key={`${header.key}`}>
<Typography variant="body1" className={classes.bold}>
{header.key}
:
</Typography>
<Typography variant="body1">
{header.value}
</Typography>
</div>
))}

<Typography
variant="subtitle1"
className={classes.payloadHeader}
>
Payload:
</Typography>

<CodeMirror readOnly isEditView data={request.payload} />
<CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
</Grid>
</AccordionDetails>
</Accordion>
Expand Down
2 changes: 1 addition & 1 deletion components/Event/ResponseAccordion.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
Payload:
</Typography>

<CodeMirror readOnly isEditView data={request.payload} />
<CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
</Grid>
</AccordionDetails>
</Accordion>
Expand Down
9 changes: 7 additions & 2 deletions components/Sidebar/ListItem.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
statusCode: PropTypes.number.isRequired,
completedAt: PropTypes.string.isRequired,
statusCode: PropTypes.number,
completedAt: PropTypes.string,
completed: PropTypes.bool.isRequired,
eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
statusCode: null,
completedAt: null,
};
1 change: 1 addition & 0 deletions components/Sidebar/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
statusCode={event.statusCode}
completed={event.completed}
eventId={event.id}
key={event.id}
/>
))
)}
Expand Down
2 changes: 1 addition & 1 deletion components/shared/Footer/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
</Container>

<Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
<Grid item spacing={3} maxWidth>
<Grid item>
<Typography style={{ fontWeight: 'bold' }}>
About Us
</Typography>
Expand Down
2 changes: 1 addition & 1 deletion pages/bridge/[id].js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
active: PropTypes.bool.isRequired,
slug: PropTypes.string.isRequired,
outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
retries: PropTypes.number.isRequired,
delay: PropTypes.number.isRequired,
headers: PropTypes.arrayOf(
Expand Down
13 changes: 9 additions & 4 deletions pages/dashboard.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
<Grid container spacing={2} id="dashboard-card-container">

{bridges && bridges.length > 0
? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
? (bridges.map((bridge, idx) => (
<Card
bridge={bridge}
key={bridge.updatedAt}
index={idx}
/>
)))
: (
<Grid item xs={12}>
<Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
PropTypes.shape({
title: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired,
lastRequest: PropTypes.string.isRequired,
requests: PropTypes.string.isRequired,
eventId: PropTypes.string.isRequired,
lastRequest: PropTypes.string,
eventId: PropTypes.number,
}),
).isRequired,
};
6 changes: 2 additions & 4 deletions pages/events/[slug].js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
completed: PropTypes.bool.isRequired,
aborted: PropTypes.bool.isRequired,
id: PropTypes.number.isRequired,
bridgeId: PropTypes.number.isRequired,
completedAt: PropTypes.string.isRequired,
completedAt: PropTypes.string,
data: PropTypes.shape({
inbound: PropTypes.shape({
dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
completed: PropTypes.bool.isRequired,
aborted: PropTypes.bool.isRequired,
id: PropTypes.number.isRequired,
bridgeId: PropTypes.number.isRequired,
completedAt: PropTypes.string.isRequired,
completedAt: PropTypes.string,
data: PropTypes.shape({
inbound: PropTypes.shape({
dateTime: PropTypes.string.isRequired,
Expand Down
1 change: 1 addition & 0 deletions specs/fixtures/bridges.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
},
"created_at": "2020-11-24T13:49:08.508Z",
"updated_at": "2020-11-25T15:33:12.740Z",
"latest_request": "2020-11-25T15:33:12.740Z",
"user_id": 3,
"active": true,
"eventCount": 1,
Expand Down
9 changes: 8 additions & 1 deletion utils/formatDate.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
let hour = date.getHours();
let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
hour -= 12;
} else if (hour === 12) {
amPm = 'PM';
} else if (hour < 10) {
hour = `0${hour}`;
amPm = 'AM';
} else {
amPm = 'AM';
}

if (minutes.length === 1) {
minutes = `0${minutes}`;
}

return `${hour}:${minutes}${amPm}`;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix warnings/errors#63

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

angeljruiz
merged 19 commits into

from

Dec 28, 2020
 Merged


Fix warnings/errors
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
59da64e

fixes dashboard console errors


angeljruiz Dec 5, 2020
ff00e34

fixes some event page errors


angeljruiz Dec 6, 2020
0e07043

fixes sidebar errors


angeljruiz Dec 6, 2020
f5d9c93

fixes login errors


angeljruiz Dec 6, 2020
39715e1

editor page fixes


angeljruiz Dec 6, 2020
3f86b43

.


angeljruiz Dec 7, 2020
2b3b0dc

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
e157f78

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 7, 2020
a6be854

fixes dashboard errors


angeljruiz Dec 7, 2020
6928807

fixes event page errors


angeljruiz Dec 7, 2020
7a980ad

Fixes bridge editor errors


angeljruiz Dec 7, 2020
c457856

Fixes landing page error


angeljruiz Dec 7, 2020
2755f42

.


angeljruiz Dec 9, 2020
97dc881

Merge branch 'master' of https://github.com/williampj/bridgeapi.js in…


angeljruiz Dec 11, 2020
f7a59bb

spec fix


angeljruiz Dec 12, 2020
17f1e2a

Fix single digit time on events


AndiLavera Dec 20, 2020
28137a7

Fix eslint


AndiLavera Dec 20, 2020
f459b68

Fix single digit hours


AndiLavera Dec 20, 2020
330b2bf

.


angeljruiz Dec 21, 2020

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: 5 additions & 5 deletions
components/Dashboard/Card.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ const useStyles = makeStyles((theme) => ({
function Card({ bridge, index }) {
 const classes = useStyles();

 const completedAt = (bridge.completedAt
 && new Date(bridge.completedAt).toDateString())
 const latestRequest = (bridge.latestRequest
 && new Date(bridge.latestRequest).toDateString())
 || 'No requests';

 const updatedAt = new Date(bridge.updatedAt).toDateString();
Expand DownExpand Up@@ -72,7 +72,7 @@ function Card({ bridge, index }) {

 <Grid item xs container direction="column" className={classes.values}>
 <Typography variant="subtitle1" id={`card-completedAt-${index}`}>
 {completedAt}
 {latestRequest}
 </Typography>

 <Typography variant="subtitle1" id={`card-updateAt-${index}`}>
Expand DownExpand Up@@ -126,9 +126,9 @@ Card.propTypes = {
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 eventCount: PropTypes.number.isRequired,
completedAt: PropTypes.string,
latestRequest: PropTypes.string,
 active: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
 eventId: PropTypes.number,
 }).isRequired,
 index: PropTypes.number.isRequired,
};

1 change: 0 additions & 1 deletion
components/Editor/BridgeTestCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,6 @@ export default BridgeTestCard;
BridgeTestCard.propTypes = {
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

4 changes: 1 addition & 3 deletions
components/Editor/EnvironmentVariablesCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,9 +56,7 @@ function EnvironmentVariablesCard({ environmentVariables }) {
 <AccordionSummary
 icon={<ExpandMoreIcon />}
 title="Environment variables"
 subtitle="Keep Your Secrets Safe"
 tooltip
 tooltipMessage="Environment variables are encrypted for data protection. You will not be able to view the value after saving."
 subtitle="Encrypted To Keep Your Secrets Safe"
 />
 <AccordionDetails>
 <Grid container spacing={2}>
Expand Down

3 changes: 1 addition & 2 deletions
components/Editor/PayloadCard/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ function PayloadCard({ isEditView, values }) {
 className={classes.payloadContainer}
 >

 <CodeMirror readOnly isEditView={isEditView} />
 <CodeMirror readOnly isEditView={isEditView} id="latestPayload" />
 </Container>
 </AccordionDetails>
 </Accordion>
Expand All@@ -85,7 +85,6 @@ PayloadCard.propTypes = {
 isEditView: PropTypes.bool.isRequired,
 values: PropTypes.shape({
 outboundUrl: PropTypes.string.isRequired,
 method: PropTypes.string.isRequired,
 retries: PropTypes.string.isRequired,
 delay: PropTypes.string.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

37 changes: 20 additions & 17 deletions
components/Editor/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,27 +203,31 @@ function Editor({ bridge, isEditView }) {
 Send your events here:
 </Typography>
 <Typography variant="h6">
 {slug ? (`https://api.bridgeapi.dev/${slug}`) : ('Autogenerated on save')}
 {slug ? `https://api.bridgeapi.dev/${slug}` : 'Autogenerated on save.'}
 </Typography>
 </Grid>
 </Grid>
 <Grid item sm={4} md={4} lg={4} container justify="flex-end">
 <Grid>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 {slug && (
 <>
 <ActionsDialog
 active={active}
 open={actionsDialogOpen}
 onClose={() => setActionsDialogOpen(false)}
 bridgeSlug={slug}
 />
 <Button
 onClick={() => setActionsDialogOpen(true)}
 variant="outlined"
 color="secondary"
 className={classes.action}
 id="actions-button"
 >
 Actions
 </Button>
 </>
 )}
 <Button id="save-btn" onClick={submitForm} variant="contained" color="secondary">Save</Button>
 </Grid>
 </Grid>
Expand DownExpand Up@@ -313,7 +317,6 @@ Editor.propTypes = {
 events: PropTypes.arrayOf(
 PropTypes.shape({
 id: PropTypes.number.isRequired,
 bridge_id: PropTypes.number.isRequired,
 completed: PropTypes.bool,
 completed_at: PropTypes.string,
 data: PropTypes.string,
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/InboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ function TimelineAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-inbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

36 changes: 17 additions & 19 deletions
components/Event/OutboundAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
 Accordion,
 AccordionDetails,
Expand All@@ -21,7 +22,7 @@ import CodeMirror from '../Codemirror';

import { hourMinutes } from '../../utils/formatDate';

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
 root: {
 width: '100%',
 },
Expand DownExpand Up@@ -52,8 +53,9 @@ const useStyles = makeStyles({
 },
 bold: {
 fontWeight: '700',
 margin: theme.spacing(0, 1, 0, 2),
 },
});
}));

function OutboundAccordion({ request }) {
 const classes = useStyles();
Expand DownExpand Up@@ -97,32 +99,28 @@ function OutboundAccordion({ request }) {

 <Typography>
 Headers:
 {' '}
 <ul>
 {request.headers.map((header) => (
 <li key={`${header.key}`}>
 <Typography display="inline" className={classes.bold}>
 {header.key}
 :
 </Typography>
 {' '}
 <Typography display="inline">
 {header.value}
 </Typography>
 </li>
 ))}
 </ul>

 </Typography>

 {request.headers.map((header) => (
 <div style={{ display: 'flex' }} key={`${header.key}`}>
 <Typography variant="body1" className={classes.bold}>
 {header.key}
 :
 </Typography>
 <Typography variant="body1">
 {header.value}
 </Typography>
 </div>
 ))}

 <Typography
 variant="subtitle1"
 className={classes.payloadHeader}
 >
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-outbound" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

2 changes: 1 addition & 1 deletion
components/Event/ResponseAccordion.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ function ResponseAccordion({ request }) {
 Payload:
 </Typography>

 <CodeMirror readOnly isEditView data={request.payload} />
 <CodeMirror readOnly id="codemirror-response" isEditView data={request.payload} />
 </Grid>
 </AccordionDetails>
 </Accordion>
Expand Down

9 changes: 7 additions & 2 deletions
components/Sidebar/ListItem.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,13 @@ function ListItem({
export default ListItem;

ListItem.propTypes = {
 statusCode: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 statusCode: PropTypes.number,
 completedAt: PropTypes.string,
 completed: PropTypes.bool.isRequired,
 eventId: PropTypes.number.isRequired,
};

ListItem.defaultProps = {
 statusCode: null,
 completedAt: null,
};

1 change: 1 addition & 0 deletions
components/Sidebar/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ function Sidebar({ events, bridgeSlug, title }) {
 statusCode={event.statusCode}
 completed={event.completed}
 eventId={event.id}
 key={event.id}
 />
 ))
 )}
Expand Down

2 changes: 1 addition & 1 deletion
components/shared/Footer/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ function Footer({ handleOpen }) {
 </Container>

 <Container maxWidth="md" style={{ marginTop: '0.5rem' }}>
 <Grid item spacing={3} maxWidth>
 <Grid item>
 <Typography style={{ fontWeight: 'bold' }}>
 About Us
 </Typography>
Expand Down

2 changes: 1 addition & 1 deletion
pages/bridge/[id].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ Show.propTypes = {
 active: PropTypes.bool.isRequired,
 slug: PropTypes.string.isRequired,
 outboundUrl: PropTypes.string.isRequired,
method: PropTypes.string.isRequired,
httpMethod: PropTypes.string.isRequired,
 retries: PropTypes.number.isRequired,
 delay: PropTypes.number.isRequired,
 headers: PropTypes.arrayOf(
Expand Down

13 changes: 9 additions & 4 deletions
pages/dashboard.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,13 @@ function Dashboard({ bridges }) {
 <Grid container spacing={2} id="dashboard-card-container">

 {bridges && bridges.length > 0
 ? (bridges.map((bridge, idx) => <Card bridge={bridge} key={bridge} index={idx} />))
 ? (bridges.map((bridge, idx) => (
 <Card
 bridge={bridge}
 key={bridge.updatedAt}
 index={idx}
 />
 )))
 : (
 <Grid item xs={12}>
 <Typography
Expand DownExpand Up@@ -72,9 +78,8 @@ Dashboard.propTypes = {
 PropTypes.shape({
 title: PropTypes.string.isRequired,
 updatedAt: PropTypes.string.isRequired,
 lastRequest: PropTypes.string.isRequired,
 requests: PropTypes.string.isRequired,
 eventId: PropTypes.string.isRequired,
 lastRequest: PropTypes.string,
 eventId: PropTypes.number,
 }),
 ).isRequired,
};

6 changes: 2 additions & 4 deletions
pages/events/[slug].js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,8 +129,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand DownExpand Up@@ -171,8 +170,7 @@ Events.propTypes = {
 completed: PropTypes.bool.isRequired,
 aborted: PropTypes.bool.isRequired,
 id: PropTypes.number.isRequired,
 bridgeId: PropTypes.number.isRequired,
 completedAt: PropTypes.string.isRequired,
 completedAt: PropTypes.string,
 data: PropTypes.shape({
 inbound: PropTypes.shape({
 dateTime: PropTypes.string.isRequired,
Expand Down

1 change: 1 addition & 0 deletions
specs/fixtures/bridges.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
 },
 "created_at": "2020-11-24T13:49:08.508Z",
 "updated_at": "2020-11-25T15:33:12.740Z",
 "latest_request": "2020-11-25T15:33:12.740Z",
 "user_id": 3,
 "active": true,
 "eventCount": 1,
Expand Down

9 changes: 8 additions & 1 deletion
utils/formatDate.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ export default formatDate;

export const hourMinutes = (timestamp) => {
 const date = new Date(timestamp);
const minutes = date.getMinutes();
let minutes = String(date.getMinutes());
 let hour = date.getHours();
 let amPm;

Expand All@@ -21,9 +21,16 @@ export const hourMinutes = (timestamp) => {
 hour -= 12;
 } else if (hour === 12) {
 amPm = 'PM';
 } else if (hour < 10) {
 hour = `0${hour}`;
 amPm = 'AM';
 } else {
 amPm = 'AM';
 }

 if (minutes.length === 1) {
 minutes = `0${minutes}`;
 }

 return `${hour}:${minutes}${amPm}`;
};