diff --git a/src/react/src/containers/MailAccounts/MailAccounts.scss b/src/react/src/containers/MailAccounts/MailAccounts.scss
index 02c021d38..7ed611d06 100644
--- a/src/react/src/containers/MailAccounts/MailAccounts.scss
+++ b/src/react/src/containers/MailAccounts/MailAccounts.scss
@@ -17,7 +17,7 @@
div.list-item {
.r-col {
.stat.email {
- width: max-content;
+ width: fit-content;
text-transform: none;
}
}
diff --git a/src/react/src/containers/Mails/Mails.jsx b/src/react/src/containers/Mails/Mails.jsx
index 51ae99f14..f7e788c60 100644
--- a/src/react/src/containers/Mails/Mails.jsx
+++ b/src/react/src/containers/Mails/Mails.jsx
@@ -426,4 +426,4 @@ const Mails = props => {
);
}
-export default Mails;
\ No newline at end of file
+export default Mails;
diff --git a/src/react/src/containers/Servers/Servers.jsx b/src/react/src/containers/Servers/Servers.jsx
index 541218437..45b1a62d7 100644
--- a/src/react/src/containers/Servers/Servers.jsx
+++ b/src/react/src/containers/Servers/Servers.jsx
@@ -319,7 +319,7 @@ const Servers = props => {
-
{i18n['show: CPU / MEM / NET / DISK']}
+
{i18n['show: CPU / MEM / NET / DISK']}
props.changeSearchTerm(term)} />
diff --git a/src/react/src/containers/ServiceInfo/index.jsx b/src/react/src/containers/ServiceInfo/index.jsx
index 6c169ea4b..f6b9fe2df 100644
--- a/src/react/src/containers/ServiceInfo/index.jsx
+++ b/src/react/src/containers/ServiceInfo/index.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { addActiveElement } from 'src/actions/MainNavigation/mainNavigationActions';
import TopPanel from 'src/components/TopPanel/TopPanel';
-import { useParams, useHistory } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import { getServiceLogs } from 'src/ControlPanelService/Server';
@@ -11,13 +11,12 @@ import { Helmet } from 'react-helmet';
import ReactHtmlParser from 'react-html-parser';
import './styles.scss';
+import QueryString from 'qs';
const ServiceInfo = () => {
const { i18n, userName } = useSelector(state => state.session);
const dispatch = useDispatch();
- const { activeElement } = useSelector(state => state.mainNavigation);
const history = useHistory();
- const { service } = useParams();
const [state, setState] = useState({
data: "",
loading: false
@@ -30,14 +29,28 @@ const ServiceInfo = () => {
}, [userName]);
useEffect(() => {
- fetchData();
- dispatch(addActiveElement(`/list/server/${service}`));
- }, [activeElement]);
+ let queryParams = QueryString.parse(history.location.search, { ignoreQueryPrefix: true });
- const fetchData = () => {
+ if (!queryParams.srv) {
+ fetchData('cpu');
+ dispatch(addActiveElement('/list/server/service/?srv=cpu'));
+ return;
+ }
+
+ if (!menuItems.find(item => item.service === queryParams.srv)) {
+ dispatch(addActiveElement('/list/server/service/?srv=cpu'));
+ history.push('/list/server/service/?srv=cpu');
+ return;
+ }
+
+ fetchData(queryParams.srv);
+ dispatch(addActiveElement(`/list/server/service/?srv=${queryParams.srv}`));
+ }, [history.location.search]);
+
+ const fetchData = serviceName => {
setState({ ...state, loading: true });
- getServiceLogs(service)
+ getServiceLogs(serviceName)
.then(result => {
setState({ ...state, data: result.data.service_log, loading: false });
})
@@ -49,35 +62,43 @@ const ServiceInfo = () => {
const menuItems = [
{
- route: '/list/server/cpu',
+ route: '/list/server/service/?srv=cpu',
+ service: 'cpu',
name: i18n['CPU']
},
{
- route: '/list/server/mem',
+ route: '/list/server/service/?srv=mem',
+ service: 'mem',
name: i18n['MEMORY']
},
{
- route: '/list/server/disk',
+ route: '/list/server/service/?srv=disk',
+ service: 'disk',
name: i18n['DISK']
},
{
- route: '/list/server/net',
+ route: '/list/server/service/?srv=net',
+ service: 'net',
name: i18n['NETWORK']
},
{
- route: '/list/server/web',
+ route: '/list/server/service/?srv=web',
+ service: 'web',
name: i18n['WEB']
},
{
- route: '/list/server/dns',
+ route: '/list/server/service/?srv=dns',
+ service: 'dns',
name: i18n['DNS']
},
{
- route: '/list/server/mail',
+ route: '/list/server/service/?srv=mail',
+ service: 'mail',
name: i18n['MAIL']
},
{
- route: '/list/server/db',
+ route: '/list/server/service/?srv=db',
+ service: 'db',
name: i18n['DB']
}
];
@@ -93,7 +114,7 @@ const ServiceInfo = () => {
state.loading
?
: (
- {state.data.length && state.data.map(line => (<>{ReactHtmlParser(line)}
))}
+ {state.data && ReactHtmlParser(state.data)}
)
}
diff --git a/src/react/src/containers/ServiceInfo/styles.scss b/src/react/src/containers/ServiceInfo/styles.scss
index 64d26c5e0..ea27fc579 100644
--- a/src/react/src/containers/ServiceInfo/styles.scss
+++ b/src/react/src/containers/ServiceInfo/styles.scss
@@ -1,7 +1,36 @@
-.service-info {
+.App .service-info {
+ @media screen and (max-width: 1066px) {
+ .top-panel {
+ display: flex;
+ }
+ }
+
+ @media screen and (min-width: 1200px) {
+ .top-panel {
+ padding: 0 13%;
+ }
+ }
+
.content {
font-size: 14px;
color: #555;
padding-top: 4rem;
+
+ @media screen and (min-width: 1067px) {
+ padding-top: 5rem !important;
+ margin-top: 0px !important;
+ }
+
+ @media screen and (max-width: 1066px) {
+ padding-top: 5rem !important;
+ margin-top: 0px !important;
+ }
+
+ table {
+ td,th {
+ padding: 5px 10px;
+ border: 1px solid black;
+ }
+ }
}
}
diff --git a/src/react/src/containers/Web/Web.jsx b/src/react/src/containers/Web/Web.jsx
index f16838b66..fb8c427a6 100644
--- a/src/react/src/containers/Web/Web.jsx
+++ b/src/react/src/containers/Web/Web.jsx
@@ -17,12 +17,16 @@ import { useDispatch, useSelector } from 'react-redux';
import { Helmet } from 'react-helmet';
import './Web.scss';
import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions';
+import { useHistory } from 'react-router-dom';
const Web = props => {
const { i18n } = useSelector(state => state.session);
const { controlPanelFocusedElement } = useSelector(state => state.controlPanelContent);
const { focusedElement } = useSelector(state => state.mainNavigation);
+ const { panel } = useSelector(state => state.panel);
+ const { userName } = useSelector(state => state.session);
const dispatch = useDispatch();
+ const history = useHistory();
const [loading, setLoading] = useState(false);
const [modal, setModal] = useState({
text: '',
@@ -40,6 +44,10 @@ const Web = props => {
});
useEffect(() => {
+ if (panel[userName]['WEB_DOMAINS'] === '0') {
+ return history.push('/');
+ }
+
dispatch(addActiveElement('/list/web/'));
dispatch(removeFocusedElement());
dispatch(removeControlPanelContentFocusedElement());
diff --git a/src/react/src/containers/WebLogs/WebLogs.jsx b/src/react/src/containers/WebLogs/WebLogs.jsx
index 038b5ee61..d97193159 100644
--- a/src/react/src/containers/WebLogs/WebLogs.jsx
+++ b/src/react/src/containers/WebLogs/WebLogs.jsx
@@ -94,7 +94,7 @@ export default function WebLogs() {
-
{state.prefix}
+ {state.prefix}
{
state.loading
diff --git a/src/react/src/containers/WebLogs/WebLogs.scss b/src/react/src/containers/WebLogs/WebLogs.scss
index 17e8bf0c2..f00f61bc0 100644
--- a/src/react/src/containers/WebLogs/WebLogs.scss
+++ b/src/react/src/containers/WebLogs/WebLogs.scss
@@ -1,12 +1,30 @@
-.web-logs {
+.App .web-logs {
+ .top-panel {
+ .left-menu {
+ .logo {
+ justify-content: start;
+ margin: 0;
+
+ a {
+ padding: 0 !important;
+ }
+ }
+ }
+ }
+
.content {
font-size: 14px;
color: #555;
padding-top: 4rem;
- }
- .nav-link:nth-child(3),
- .nav-link:nth-child(4) {
- width: 9rem;
+ @media screen and (min-width: 1067px) {
+ padding-top: 5rem !important;
+ margin-top: 0px !important;
+ }
+
+ @media screen and (max-width: 1066px) {
+ padding-top: 5rem !important;
+ margin-top: 0px !important;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/react/src/reducers/Notification/notificationReducer.js b/src/react/src/reducers/Notification/notificationReducer.js
index c15f96a53..0e3a269eb 100644
--- a/src/react/src/reducers/Notification/notificationReducer.js
+++ b/src/react/src/reducers/Notification/notificationReducer.js
@@ -1,7 +1,7 @@
import { ADD_NOTIFICATIONS, REMOVE_NOTIFICATIONS } from 'src/actions/Notification/notificationTypes';
const INITIAL_STATE = {
- notifications: null
+ notifications: []
};
const notificationReducer = (state = INITIAL_STATE, action) => {
diff --git a/src/react/src/reducers/Panel/panel.js b/src/react/src/reducers/Panel/panel.js
new file mode 100644
index 000000000..36ee5b39e
--- /dev/null
+++ b/src/react/src/reducers/Panel/panel.js
@@ -0,0 +1,19 @@
+import { REFRESH_PANEL } from '../../actions/Panel/panelTypes';
+
+const INITIAL_STATE = {
+ panel: {}
+};
+
+const panelReducer = (state = INITIAL_STATE, action) => {
+ switch (action.type) {
+ case REFRESH_PANEL:
+ return {
+ ...state,
+ panel: action.value.panel
+ };
+
+ default: return state;
+ }
+};
+
+export default panelReducer;
diff --git a/src/react/src/reducers/Session/sessionReducer.js b/src/react/src/reducers/Session/sessionReducer.js
index 5c82c6c24..c05888534 100644
--- a/src/react/src/reducers/Session/sessionReducer.js
+++ b/src/react/src/reducers/Session/sessionReducer.js
@@ -4,8 +4,7 @@ const INITIAL_STATE = {
token: '',
error: '',
i18n: {},
- userName: '',
- panel: {}
+ userName: ''
};
const sessionReducer = (state = INITIAL_STATE, action) => {
@@ -16,7 +15,6 @@ const sessionReducer = (state = INITIAL_STATE, action) => {
token: action.value.token,
userName: action.value.userName,
i18n: action.value.i18n || {},
- panel: action.value.panel,
error: action.value.error
};
@@ -26,7 +24,6 @@ const sessionReducer = (state = INITIAL_STATE, action) => {
token: action.value.token,
userName: action.value.userName,
i18n: action.value.i18n || {},
- panel: action.value.panel,
error: action.value.error
};
@@ -36,7 +33,6 @@ const sessionReducer = (state = INITIAL_STATE, action) => {
token: action.value.token,
userName: action.value.userName,
i18n: action.value.i18n || {},
- panel: action.value.panel,
error: action.value.error
};
@@ -45,7 +41,6 @@ const sessionReducer = (state = INITIAL_STATE, action) => {
token: action.value.token,
userName: action.value.userName,
i18n: action.value.i18n || {},
- panel: action.value.panel,
error: action.value.error
};
diff --git a/src/react/src/reducers/rootReducer.js b/src/react/src/reducers/rootReducer.js
index 6fc6ce145..c3fde2017 100644
--- a/src/react/src/reducers/rootReducer.js
+++ b/src/react/src/reducers/rootReducer.js
@@ -5,6 +5,7 @@ import notificationReducer from './Notification/notificationReducer';
import menuCounterReducer from './MenuCounters/menuCounterReducer';
import userSessionReducer from './UserSession/userSessionReducer';
import sessionReducer from './Session/sessionReducer';
+import panelReducer from './Panel/panel';
export default combineReducers({
mainNavigation: mainNavigationReducer,
@@ -13,4 +14,5 @@ export default combineReducers({
menuCounters: menuCounterReducer,
userSession: userSessionReducer,
session: sessionReducer,
+ panel: panelReducer,
});
\ No newline at end of file