Skip to content
Closed
150 changes: 75 additions & 75 deletions console/src/components/Main/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,39 +312,39 @@ class Main extends React.Component {
</div>
{!this.state.loveConsentState.isDismissed
? [
<div
key="main_love_1"
className={styles.shareSection + ' dropdown-toggle'}
aria-expanded="false"
onClick={this.handleDropdownToggle.bind(this)}
>
<img
className={'img-responsive'}
src={pixHeart}
alt={'pix Heart'}
/>
{/* <i className={styles.heart + ' fa fa-heart'} /> */}
</div>,
<ul
key="main_love_2"
className={'dropdown-menu ' + styles.dropdown_menu}
>
<div className={styles.dropdown_menu_container}>
<div className={styles.closeDropDown}>
<i
className="fa fa-close"
onClick={this.closeLoveIcon.bind(this)}
/>
{/*
<div
key="main_love_1"
className={styles.shareSection + ' dropdown-toggle'}
aria-expanded="false"
onClick={this.handleDropdownToggle.bind(this)}
>
<img
className={'img-responsive'}
src={pixHeart}
alt={'pix Heart'}
/>
{/* <i className={styles.heart + ' fa fa-heart'} /> */}
</div>,
<ul
key="main_love_2"
className={'dropdown-menu ' + styles.dropdown_menu}
>
<div className={styles.dropdown_menu_container}>
<div className={styles.closeDropDown}>
<i
className="fa fa-close"
onClick={this.closeLoveIcon.bind(this)}
/>
{/*
<img
className={'img-responsive'}
src={closeIcon}
alt={'closeIcon'}
onClick={this.closeLoveIcon.bind(this)}
/>
*/}
</div>
{/*
</div>
{/*
<div className={styles.arrow_up_dropdown} />
<div className={styles.graphqlHeartText}>
Love GraphQL Engine? Shout it from the rooftops!
Expand All @@ -355,37 +355,37 @@ class Main extends React.Component {
</span>
</div>
*/}
<div className={styles.displayFlex}>
<li className={styles.pixelText1}>
<div className={styles.displayFlex}>
<li className={styles.pixelText1}>
Roses are red, <br />
Violets are blue;
<br />
<br />
Star us on Github,
<br />
<br />
To make our <i className={'fa fa-heart'} /> go
wooooo!
</li>
<li className={'dropdown-item'}>
<a
href="https://github.com/hasura/graphql-engine"
target="_blank"
rel="noopener noreferrer"
>
<div className={styles.socialIcon}>
<img
className="img img-responsive"
src={
'https://storage.googleapis.com/hasura-graphql-engine/console/assets/githubicon.png'
}
alt={'Github'}
/>
</div>
<div className={styles.pixelText}>
<i className="fa fa-star" />
</li>
<li className={'dropdown-item'}>
<a
href="https://github.com/hasura/graphql-engine"
target="_blank"
rel="noopener noreferrer"
>
<div className={styles.socialIcon}>
<img
className="img img-responsive"
src={
'https://storage.googleapis.com/hasura-graphql-engine/console/assets/githubicon.png'
}
alt={'Github'}
/>
</div>
<div className={styles.pixelText}>
<i className="fa fa-star" />
&nbsp; Star
</div>
</a>
{/*
</div>
</a>
{/*
<div className={styles.gitHubBtn}>
<iframe
title="github"
Expand All @@ -397,32 +397,32 @@ class Main extends React.Component {
/>
</div>
*/}
</li>
<li className={'dropdown-item '}>
<a
href="https://twitter.com/intent/tweet?hashtags=graphql,postgres&text=Just%20deployed%20a%20GraphQL%20backend%20with%20@HasuraHQ!%20%E2%9D%A4%EF%B8%8F%20%F0%9F%9A%80%0Ahttps://github.com//hasura/graphql-engine%0A"
target="_blank"
rel="noopener noreferrer"
>
<div className={styles.socialIcon}>
<img
className="img img-responsive"
src={
'https://storage.googleapis.com/hasura-graphql-engine/console/assets/twittericon.png'
}
alt={'Twitter'}
/>
</div>
<div className={styles.pixelText}>
<i className="fa fa-twitter" />
</li>
<li className={'dropdown-item '}>
<a
href="https://twitter.com/intent/tweet?hashtags=graphql,postgres&text=Just%20deployed%20a%20GraphQL%20backend%20with%20@HasuraHQ!%20%E2%9D%A4%EF%B8%8F%20%F0%9F%9A%80%0Ahttps://github.com//hasura/graphql-engine%0A"
target="_blank"
rel="noopener noreferrer"
>
<div className={styles.socialIcon}>
<img
className="img img-responsive"
src={
'https://storage.googleapis.com/hasura-graphql-engine/console/assets/twittericon.png'
}
alt={'Twitter'}
/>
</div>
<div className={styles.pixelText}>
<i className="fa fa-twitter" />
&nbsp; Tweet
</div>
</a>
</li>
</div>
</a>
</li>
</div>
</div>
</div>
</ul>,
]
</ul>,
]
: null}
</div>
</div>
Expand Down
40 changes: 20 additions & 20 deletions console/src/components/Services/Data/Metadata/Metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,32 +88,32 @@ class Metadata extends Component {

{this.state.showMetadata
? [
<div key="meta_data_1" className={metaDataStyles.intro_note}>
<h4>Reload metadata</h4>
<div className={metaDataStyles.content_width}>
<div key="meta_data_1" className={metaDataStyles.intro_note}>
<h4>Reload metadata</h4>
<div className={metaDataStyles.content_width}>
Refresh Hasura metadata, typically required if you have
changed the underlying postgres.
</div>
</div>,
<div key="meta_data_2">
<ReloadMetadata {...this.props} />
</div>,
<div
key="access_key_reset_1"
className={metaDataStyles.intro_note}
>
<h4>Clear access key (logout)</h4>
<div className={metaDataStyles.content_width}>
</div>
</div>,
<div key="meta_data_2">
<ReloadMetadata {...this.props} />
</div>,
<div
key="access_key_reset_1"
className={metaDataStyles.intro_note}
>
<h4>Clear access key (logout)</h4>
<div className={metaDataStyles.content_width}>
The console caches the access key (HASURA_GRAPHQL_ACCESS_KEY)
in the browser. You can clear this cache to force a prompt for
the access key when the console is accessed next using this
browser.
</div>
</div>,
<div key="access_key_reset_2">
<ClearAccessKey {...this.props} />
</div>,
]
</div>
</div>,
<div key="access_key_reset_2">
<ClearAccessKey {...this.props} />
</div>,
]
: null}
</div>
);
Expand Down
72 changes: 36 additions & 36 deletions console/src/components/Services/Data/Notification.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,42 +74,42 @@ const showErrorNotification = (title, message, reqBody, error) => {
message: modMessage,
action: finalJson
? {
label: 'Details',
callback: () => {
dispatch(
showNotification({
level: 'error',
title,
message: modMessage,
dismissible: 'button',
children: [
<div className={styles.aceBlock}>
<i
onClick={e => {
e.preventDefault();
expandClicked(finalJson);
}}
className={styles.aceBlockExpand + ' fa fa-expand'}
/>
<AceEditor
readOnly
showPrintMargin={false}
mode="json"
showGutter={false}
theme="github"
name="notification-response"
value={JSON.stringify(finalJson, null, 4)}
minLines={1}
maxLines={15}
width="100%"
/>
{refreshBtn}
</div>,
],
})
);
},
}
label: 'Details',
callback: () => {
dispatch(
showNotification({
level: 'error',
title,
message: modMessage,
dismissible: 'button',
children: [
<div className={styles.aceBlock}>
<i
onClick={e => {
e.preventDefault();
expandClicked(finalJson);
}}
className={styles.aceBlockExpand + ' fa fa-expand'}
/>
<AceEditor
readOnly
showPrintMargin={false}
mode="json"
showGutter={false}
theme="github"
name="notification-response"
value={JSON.stringify(finalJson, null, 4)}
minLines={1}
maxLines={15}
width="100%"
/>
{refreshBtn}
</div>,
],
})
);
},
}
: null,
})
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ const deleteRelMigrate = (tableName, relName, lcol, rtable, rcol, isObjRel) => (
using: isObjRel
? { foreign_key_constraint_on: lcol }
: {
foreign_key_constraint_on: {
table: { name: rtable, schema: currentSchema },
column: rcol,
foreign_key_constraint_on: {
table: { name: rtable, schema: currentSchema },
column: rcol,
},
},
},
},
},
];
Expand Down Expand Up @@ -109,11 +109,11 @@ const addRelNewFromStateMigrate = () => (dispatch, getState) => {
using: isObjRel
? { foreign_key_constraint_on: state.lcol }
: {
foreign_key_constraint_on: {
table: { name: state.rTable, schema: currentSchema },
column: state.rcol,
foreign_key_constraint_on: {
table: { name: state.rTable, schema: currentSchema },
column: state.rcol,
},
},
},
},
},
];
Expand Down Expand Up @@ -398,11 +398,11 @@ const autoAddRelName = obj => (dispatch, getState) => {
using: isObjRel
? { foreign_key_constraint_on: obj.lcol }
: {
foreign_key_constraint_on: {
table: { name: obj.rTable, schema: currentSchema },
column: obj.rcol,
foreign_key_constraint_on: {
table: { name: obj.rTable, schema: currentSchema },
column: obj.rcol,
},
},
},
},
},
];
Expand Down
Loading