这是indexloc提供的服务，不要输入任何密码
Skip to content

Console refactor #1688

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
merged 32 commits into from
Mar 6, 2019
Merged

Console refactor #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
94f618f
css syntax refactor
rikinsk Feb 28, 2019
65e75d9
Merge branch 'master' into console-css
rikinsk Feb 28, 2019
80f9b98
remove duplicates for FilterQuery.scss
rikinsk Feb 28, 2019
742447d
remove duplicate Migrations component
rikinsk Feb 28, 2019
016ffa4
remove duplicate SchemaContainer.scss
rikinsk Feb 28, 2019
9fd120d
Merge branch 'master' into console-css
rikinsk Mar 1, 2019
85fcf27
fix collapse icon css
rikinsk Mar 1, 2019
87c9e02
add break word to browse rows cell
rikinsk Mar 1, 2019
bb95477
remove duplicate PageContainer.scss
rikinsk Mar 1, 2019
dc6c775
console files restructure
rikinsk Mar 1, 2019
4fd51a8
console files restructure
rikinsk Mar 1, 2019
17ae989
remove duplicate SchemaContainer.js
rikinsk Mar 1, 2019
803f553
update PageContainer -> LeftNavBar
rikinsk Mar 1, 2019
7afa580
Merge branch 'master' into console-refactor
rikinsk Mar 1, 2019
ddcb2d7
add minRows to all reactTables
rikinsk Mar 4, 2019
1a89778
remove duplicate TableStyles.scss
rikinsk Mar 4, 2019
2a63989
update event schema/remote schema Manage tab
rikinsk Mar 4, 2019
812027f
removed duplicate Table.scss
rikinsk Mar 4, 2019
95289eb
rename Table and Event Modify.scss
rikinsk Mar 4, 2019
7923b2d
remove duplicate ReactTableFix.css
rikinsk Mar 4, 2019
f0ec086
remove duplicate ReactTableFix.css
rikinsk Mar 4, 2019
d6319ca
fix react table expander css
rikinsk Mar 4, 2019
046f7d2
Merge branch 'master' into console-refactor
rikinsk Mar 4, 2019
9a15856
update layout
rikinsk Mar 5, 2019
3debc16
remove duplicate LeftNavBar code
rikinsk Mar 5, 2019
e31211e
Merge branch 'master' into console-refactor
rikinsk Mar 5, 2019
cf7a7ee
fix custom resolver sibebar
rikinsk Mar 5, 2019
ac4d562
fix event logs table rendering
rikinsk Mar 5, 2019
f3dc32c
moved localStorageManager
rikinsk Mar 6, 2019
4cd992f
update prettifier version
rikinsk Mar 6, 2019
cdce30d
run prettier on all console files
rikinsk Mar 6, 2019
418e3ba
Merge branch 'master' into console-refactor
rikinsk Mar 6, 2019
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
8 changes: 4 additions & 4 deletions console/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from './src/components/Services/Data/DataActions';

// import Event Tab parts
import eventRouter from './src/components/Services/EventTrigger/EventRouter';
import eventRouterUtils from './src/components/Services/EventTrigger/EventRouter';
import { eventReducer } from './src/components/Services/EventTrigger';

// import Remote Schema parts
Expand All @@ -31,8 +31,8 @@ import mainState from './src/components/Main/State';
import { changeRequestHeader } from './src/components/ApiExplorer/Actions';
import { validateLogin } from './src/components/Main/Actions';

const filterQueryScss = require('./src/components/Services/Data/TableBrowseRows/FilterQuery.scss');
const tableScss = require('./src/components/Services/Data/TableCommon/Table.scss');
const filterQueryScss = require('./src/components/Common/FilterQuery/FilterQuery.scss');
const tableScss = require('./src/components/Common/TableCommon/Table.scss');

// export GraphiQL parts
export { GraphiQLWrapper };
Expand All @@ -44,7 +44,7 @@ export { UPDATE_CURRENT_SCHEMA, UPDATE_DATA_HEADERS, ACCESS_KEY_ERROR };
export { dataHeaders };

// export Event Tab parts
export { eventRouter, eventReducer };
export { eventRouterUtils, eventReducer };

// export Remote Schema parts
export { getCustomResolverRouter, customResolverReducer };
Expand Down
6 changes: 3 additions & 3 deletions console/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"match-sorter": "^2.3.0",
"multireducer": "^1.0.2",
"piping": "^0.3.0",
"prettier": "^1.13.0",
"prettier": "^1.16.4",
"pretty-error": "^1.2.0",
"prop-types": "^15.6.0",
"query-string": "^6.1.0",
Expand Down
3 changes: 2 additions & 1 deletion console/src/components/404/PageNotFound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import Helmet from 'react-helmet';
class PageNotFound extends Component {
render() {
const lostImage = require('./404-logo.png');
const styles = require('./Styles.scss');
const styles = require('./PageNotFound.scss');

return (
<div className={styles.viewcontainer}>
<Helmet title="404 - Page Not Found | Hasura" />
Expand Down
5 changes: 5 additions & 0 deletions console/src/components/404/Styles.scss → console/src/components/404/PageNotFound.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
.message {
padding: 50px 20%;
}

.message h1 {
font-size: 54px;
font-weight: bold;
}

.message p {
margin-left: 15px;
}

.message p > a {
font-weight: bold;
}
Expand All @@ -29,12 +32,14 @@

.header {
background: #eee;

h2 {
margin: 0;
padding: 26px;
float: left;
line-height: 26px;
}

.nav {
padding: 20px;
float: left;
Expand Down
Loading