muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 11:06:40 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

routes: tabs

Browse source
This commit is contained in:
muerwre 2018-12-13 15:48:00 +07:00
parent ddb77e1245
commit a27db14c65
3 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/dialogs/MapListMoreDialog.jsx
View file

@ -71,6 +71,11 @@ class Component extends React.Component<Props> {
return ( return (
<div className="dialog-content"> <div className="dialog-content">
<div className="dialog-head-tabs">
<div className="dialog-head-tab active">Мои</div>
<div className="dialog-head-tab">Общие</div>
<div className="dialog-head-tab">Выбранные</div>
</div>
<div className="dialog-head"> <div className="dialog-head">
<div> <div>
<input <input

44
src/redux/user/reducer.js
View file

@ -128,7 +128,9 @@ const searchSetTab = (state, { tab = 'mine' }) => ({
} }
}); });
const newDistCalc = ({ distance, min, max, filter }) => { const newDistCalc = ({
distance, min, max, filter
}) => {
if (filter.min === filter.max) { if (filter.min === filter.max) {
// slider was disabled // slider was disabled
return [min, max]; return [min, max];
@ -137,33 +139,21 @@ const newDistCalc = ({ distance, min, max, filter }) => {
// state.routes.filter.distance // state.routes.filter.distance
}; };
const searchPutRoutes = (state, { list = [], min, max }) => { const searchPutRoutes = (state, { list = [], min, max }) => ({
console.log('a', state.routes.filter.distance[0], state.routes.filter.min); ...state,
return ({ routes: {
...state, ...state.routes,
routes: { list,
...state.routes, filter: {
list, ...state.routes.filter,
filter: { distance: (state.routes.filter.min === state.routes.filter.max)
...state.routes.filter, ? [min, max]
distance: (state.routes.filter.min === state.routes.filter.max) : state.routes.filter.distance,
? [min, max] min,
: state.routes.filter.distance, max,
// distance:
// [
// (state.routes.filter.min > min && state.routes.filter.distance[0] <= state.routes.filter.min)
// ? min
// : state.routes.filter.distance[0],
// (state.routes.filter.max < max && state.routes.filter.distance[1] >= state.routes.filter.max)
// ? max
// : state.routes.filter.distance[1],
// ],
min,
max,
}
} }
}); }
} });
const searchSetLoading = (state, { loading = false }) => ({ const searchSetLoading = (state, { loading = false }) => ({
...state, ...state,

21
src/styles/dialogs.less
View file

@ -168,6 +168,27 @@
color: white; color: white;
} }
.dialog-head-tabs {
background: rgba(255, 255, 255, 0);
border-radius: @panel_radius @panel_radius 0 0;
height: 32px;
.dialog-head-tab {
height: 32px;
display: inline-flex;
align-items: center;
justify-content: center;
color: white;
padding: 0 10px;
cursor: pointer;
border-radius: @panel_radius @panel_radius 0 0;
&.active {
background: rgba(255, 255, 255, 0.1);
}
}
}
.dialog-head-title { .dialog-head-title {
font-size: 20px; font-size: 20px;
text-transform: uppercase; text-transform: uppercase;