Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-76489 || add project settings layout #3063

Merged
merged 2 commits into from
Apr 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app/src/layouts/appLayout/appLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,26 @@ import { AppHeader } from './appHeader';
import { AppSidebar } from './appSidebar';
import { DemoBanner } from './demoBanner';

const AppLayoutComponent = ({ children, isDemoInstance }) => (
<Layout Header={AppHeader} Sidebar={AppSidebar} Banner={isDemoInstance ? DemoBanner : null}>
const AppLayoutComponent = ({ children, isDemoInstance, rawContent }) => (
<Layout
Header={AppHeader}
Sidebar={AppSidebar}
Banner={isDemoInstance ? DemoBanner : null}
rawContent={rawContent}
>
{children}
</Layout>
);

AppLayoutComponent.propTypes = {
children: PropTypes.node,
isDemoInstance: PropTypes.bool,
rawContent: PropTypes.bool,
};
AppLayoutComponent.defaultProps = {
children: null,
isDemoInstance: false,
rawContent: false,
};

export const AppLayout = connect((state) => ({
Expand Down
17 changes: 17 additions & 0 deletions app/src/layouts/appLayout/rawContentAppLayout/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright 2022 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export { RawContentAppLayout } from './rawContentAppLayout';
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2022 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import React from 'react';
import { AppLayout } from '../appLayout';

export const RawContentAppLayout = (props) => <AppLayout {...props} rawContent />;
49 changes: 31 additions & 18 deletions app/src/layouts/common/layout/layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ export class Layout extends Component {
Banner: PropTypes.elementType,
Header: PropTypes.elementType,
Sidebar: PropTypes.elementType,
rawContent: PropTypes.bool,
};
static defaultProps = {
children: null,
Banner: null,
Header: null,
Sidebar: null,
rawContent: false,
};

state = {
Expand Down Expand Up @@ -79,7 +81,18 @@ export class Layout extends Component {
};

render() {
const { Header, Sidebar, Banner } = this.props;
const { Header, Sidebar, Banner, rawContent, children } = this.props;
const header = (
<div className={cx('header-container')}>
{Header && (
<Header
isSideMenuOpened={this.state.sideMenuOpened}
toggleSideMenu={this.toggleSideMenu}
/>
)}
</div>
);

return (
<div className={cx('layout')}>
<div className={cx('slide-container', { 'side-menu-opened': this.state.sideMenuOpened })}>
Expand All @@ -95,24 +108,24 @@ export class Layout extends Component {
</div>
<div className={cx('content')}>
{Banner && <Banner />}
<ScrollWrapper
withBackToTop
withFooter
resetRequired={this.state.resetScroll}
onReset={this.unmarkScrollToReset}
>
<div className={cx('scrolling-content')}>
<div className={cx('header-container')}>
{Header && (
<Header
isSideMenuOpened={this.state.sideMenuOpened}
toggleSideMenu={this.toggleSideMenu}
/>
)}
{rawContent ? (
<>
{header}
{children}
</>
) : (
<ScrollWrapper
withBackToTop
withFooter
resetRequired={this.state.resetScroll}
onReset={this.unmarkScrollToReset}
>
<div className={cx('scrolling-content')}>
{header}
<div className={cx('page-container')}>{children}</div>
</div>
<div className={cx('page-container')}>{this.props.children}</div>
</div>
</ScrollWrapper>
</ScrollWrapper>
)}
<div
className={cx('sidebar-close-area', { visible: this.state.sideMenuOpened })}
onClick={this.toggleSideMenu}
Expand Down
17 changes: 17 additions & 0 deletions app/src/layouts/settingsLayout/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright 2022 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export { SettingsLayout } from './settingsLayout';
40 changes: 40 additions & 0 deletions app/src/layouts/settingsLayout/settingsLayout.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright 2022 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames/bind';
import styles from './settingsLayout.scss';

const cx = classNames.bind(styles);

export const SettingsLayout = ({ navigation, children }) => (
<div className={cx('container')}>
<div className={cx('navigation')}>{navigation}</div>
<div className={cx('section')}>{children}</div>
</div>
);

SettingsLayout.propTypes = {
navigation: PropTypes.node,
header: PropTypes.node,
children: PropTypes.node,
};
SettingsLayout.defaultProps = {
navigation: null,
header: null,
children: null,
};
33 changes: 33 additions & 0 deletions app/src/layouts/settingsLayout/settingsLayout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*!
* Copyright 2022 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

.container {
display: flex;
height: 100%;
background: $COLOR--bg-000;
}

.navigation {
flex-shrink: 0;
width: 353px;
border-right: 1px solid $COLOR--e-100;
box-sizing: border-box;
}

.section {
width: 100%;
background: $COLOR--bg-100;
}