senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
egradanin
2019-01-19 14:24:54 +01:00
parent 152dae91d7
commit 3cebd722fd
17 changed files with 247 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
frontend-react/src/components/filters/NekretnineFilter/AllFiltersDefined.js Normal file
View File

@@ -0,0 +1,73 @@
export const vrstaElements = [
{
value: "",
name: "Sve",
type: "radio",
optionName: "vrsta"
},
{
value: "samoprodaja",
name: "Prodaja",
type: "radio",
optionName: "vrsta"
},
{
value: "samoizdavanje",
name: "Iznajmljivanje",
type: "radio",
optionName: "vrsta"
},
{
value: "samopotraznja",
name: "Potražnja",
type: "radio",
optionName: "vrsta"
}
];
export const lokacijaOptions = {
choices: [
{ value: "9", label: "Sarajevo" },
{ value: "2", label: "Posavski" }
],
value: "kanton",
optionName: "kanton"
};
export const cijenaRangeOptions = {
min: 0,
max: 100000,
defaultValues: [0, 100000],
step: 100,
optionNames: ["od", "do"]
};
export const velicinaRangeOptions = {
min: 0,
max: 1000,
defaultValues: [0, new Date().getFullYear()],
step: 1,
optionNames: ["kvadrata_min", "kvadrata_max"]
};
export const gradoviOptions = {
parentOptionName: "kanton",
checkboxOptions: {
"9": {
elements: [
{
type: "checkbox",
name: "Ilidza",
optionName: "grad-ilidza",
value: "3879"
},
{
type: "checkbox",
name: "Sarajevo-Centar",
optionName: "grad-centar",
value: "3812"
}
]
}
}
};

7
frontend-react/src/components/filters/NekretnineFilter/Cijena.js
View File

@@ -1,7 +0,0 @@
export const rangeOptions = {
min: 0,
max: 100000,
defaultValues: [0, 100000],
step: 100,
optionNames: ["od", "do"]
};

8
frontend-react/src/components/filters/NekretnineFilter/Lokacija.js
View File

@@ -1,8 +0,0 @@
export const lokacijaOptions = {
choices: [
{ value: "9", label: "Sarajevo" },
{ value: "2", label: "Posavski" }
],
value: "kanton",
optionName: "kanton"
};

7
frontend-react/src/components/filters/NekretnineFilter/Velicina.js
View File

@@ -1,7 +0,0 @@
export const rangeOptions = {
min: 0,
max: 1000,
defaultValues: [0, new Date().getFullYear()],
step: 1,
optionNames: ["kvadrata_min", "kvadrata_max"]
};

26
frontend-react/src/components/filters/NekretnineFilter/Vrsta.js
View File

@@ -1,26 +0,0 @@
export const elements = [
{
value: "",
name: "Sve",
type: "radio",
optionName: "vrsta"
},
{
value: "samoprodaja",
name: "Prodaja",
type: "radio",
optionName: "vrsta"
},
{
value: "samoizdavanje",
name: "Iznajmljivanje",
type: "radio",
optionName: "vrsta"
},
{
value: "samopotraznja",
name: "Potražnja",
type: "radio",
optionName: "vrsta"
}
];

15
frontend-react/src/components/filters/NekretnineFilter/index.js
View File

@@ -1,9 +1,7 @@
import React from "react";
import * as Vrsta from "./Vrsta";
import * as Lokacija from "./Lokacija";
import * as Cijena from "./Cijena";
import * as Velicina from "./Velicina";
import * as Filters from "./AllFiltersDefined";
import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
import SelectDisplayCheckboxWrapper from "components/widgets/SelectDisplayCheckboxWrapper";
import RangeWrapper from "components/widgets/RangeWrapper";
import SelectWrapper from "components/widgets/SelectWrapper";
@@ -13,11 +11,12 @@ class NekretnineFilter extends React.Component {
<div>
<CheckboxAndRadioWrapper
componentName="vrsta"
elements={Vrsta.elements}
elements={Filters.vrstaElements}
/>
<SelectWrapper {...Lokacija.lokacijaOptions} />
<RangeWrapper {...Cijena.rangeOptions} optionName="cijena" />
<RangeWrapper {...Velicina.rangeOptions} optionName="velicina" />
<SelectWrapper {...Filters.lokacijaOptions} />
<SelectDisplayCheckboxWrapper {...Filters.gradoviOptions} />
<RangeWrapper {...Filters.cijenaRangeOptions} optionName="cijena" />
<RangeWrapper {...Filters.velicinaRangeOptions} optionName="velicina" />
</div>
);
}

104
frontend-react/src/components/filters/VozilaFilter/AllFiltersDefined.js Normal file
View File

@@ -0,0 +1,104 @@
export const cijenaRangeOptions = {
min: 0,
max: 100000,
defaultValues: [0, 100000],
step: 100,
optionNames: ["od", "do"]
};
export const godisteRangeOptions = {
min: 1960,
max: new Date().getFullYear(),
defaultValues: [1960, new Date().getFullYear()],
step: 1,
optionNames: ["godiste_min", "godiste_max"]
};
export const gorivoElements = [
{
name: "Dizel",
optionName: "gorivo_select_dizel",
type: "checkbox",
value: "Dizel"
},
{
name: "Benzin",
optionName: "gorivo_select_benzin",
type: "checkbox",
value: "Benzin"
},
{
name: "Plin",
optionName: "gorivo_select_plin",
type: "checkbox",
value: "Plin"
},
{
name: "Hibrid",
optionName: "gorivo_select_hibrid",
type: "checkbox",
value: "Hibrid"
},
{
name: "Elektro",
optionName: "gorivo_select_elektro",
type: "checkbox",
value: "Elektro"
}
];
export const kilometrazaOptions = {
kilometraMin: {
choices: [{ value: 5000, label: "5000" }, { value: 10000, label: "10000" }],
value: "kilometra-a_min",
optionName: "kilometra-a_min"
},
kilometraMax: {
choices: [
{ value: 15000, label: "15000" },
{ value: 200000, label: "200000" }
],
value: "kilometra-a_max",
optionName: "kilometra-a_max"
}
};
export const lokacijaOptions = {
choices: [
{ value: "9", label: "Sarajevo" },
{ value: "2", label: "Posavski" }
],
value: "kanton",
optionName: "kanton"
};
export const proizvodacOptions = {
choices: [{ value: "1900", label: "Audi" }, { value: "9000", label: "Ford" }],
value: "v_b",
optionName: "v_b"
};
export const stanjeElements = [
{
type: "radio",
value: "",
name: "Nova i polovna vozila",
optionName: "stanje"
},
{
type: "radio",
value: 1,
name: "Nova",
optionName: "stanje"
},
{
type: "radio",
value: 2,
name: "Polovna vozila",
optionName: "stanje"
},
{
type: "checkbox",
name: "Udarena vozila",
optionName: "udaren_checkbox",
value: "on"
}
];

7
frontend-react/src/components/filters/VozilaFilter/Cijena.js
View File

@@ -1,7 +0,0 @@
export const rangeOptions = {
min: 0,
max: 100000,
defaultValues: [0, 100000],
step: 100,
optionNames: ["od", "do"]
};

7
frontend-react/src/components/filters/VozilaFilter/Godiste.js
View File

@@ -1,7 +0,0 @@
export const rangeOptions = {
min: 1960,
max: new Date().getFullYear(),
defaultValues: [1960, new Date().getFullYear()],
step: 1,
optionNames: ["godiste_min", "godiste_max"]
};

32
frontend-react/src/components/filters/VozilaFilter/Gorivo.js
View File

@@ -1,32 +0,0 @@
export const elements = [
{
name: "Dizel",
optionName: "gorivo_select_dizel",
type: "checkbox",
value: "Dizel"
},
{
name: "Benzin",
optionName: "gorivo_select_benzin",
type: "checkbox",
value: "Benzin"
},
{
name: "Plin",
optionName: "gorivo_select_plin",
type: "checkbox",
value: "Plin"
},
{
name: "Hibrid",
optionName: "gorivo_select_hibrid",
type: "checkbox",
value: "Hibrid"
},
{
name: "Elektro",
optionName: "gorivo_select_elektro",
type: "checkbox",
value: "Elektro"
}
];

15
frontend-react/src/components/filters/VozilaFilter/Kilometraza.js
View File

@@ -1,15 +0,0 @@
export const kilometrazaOptions = {
kilometraMin: {
choices: [{ value: 5000, label: "5000" }, { value: 10000, label: "10000" }],
value: "kilometra-a_min",
optionName: "kilometra-a_min"
},
kilometraMax: {
choices: [
{ value: 15000, label: "15000" },
{ value: 200000, label: "200000" }
],
value: "kilometra-a_max",
optionName: "kilometra-a_max"
}
};

8
frontend-react/src/components/filters/VozilaFilter/Lokacija.js
View File

@@ -1,8 +0,0 @@
export const lokacijaOptions = {
choices: [
{ value: "9", label: "Sarajevo" },
{ value: "2", label: "Posavski" }
],
value: "kanton",
optionName: "kanton"
};

5
frontend-react/src/components/filters/VozilaFilter/Proizvodac.js
View File

@@ -1,5 +0,0 @@
export const proizvodacOptions = {
choices: [{ value: "1900", label: "Audi" }, { value: "9000", label: "Ford" }],
value: "v_b",
optionName: "v_b"
};

26
frontend-react/src/components/filters/VozilaFilter/Stanje.js
View File

@@ -1,26 +0,0 @@
export const elements = [
{
type: "radio",
value: "",
name: "Nova i polovna vozila",
optionName: "stanje"
},
{
type: "radio",
value: 1,
name: "Nova",
optionName: "stanje"
},
{
type: "radio",
value: 2,
name: "Polovna vozila",
optionName: "stanje"
},
{
type: "checkbox",
name: "Udarena vozila",
optionName: "udaren_checkbox",
value: "on"
}
];

24
frontend-react/src/components/filters/VozilaFilter/index.js
View File

@@ -1,11 +1,5 @@
import React from "react";
import * as Stanje from "./Stanje";
import * as Proizvodac from "./Proizvodac";
import * as Cijena from "./Cijena";
import * as Lokacija from "./Lokacija";
import * as Godiste from "./Godiste";
import * as Kilometraza from "./Kilometraza";
import * as Gorivo from "./Gorivo";
import * as Filters from "./AllFiltersDefined";
import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
import RangeWrapper from "components/widgets/RangeWrapper";
import SelectWrapper from "components/widgets/SelectWrapper";
@@ -16,17 +10,17 @@ class VozilaFilter extends React.Component {
<div>
<CheckboxAndRadioWrapper
componentName="stanje"
elements={Stanje.elements}
elements={Filters.stanjeElements}
/>
<SelectWrapper {...Proizvodac.proizvodacOptions} />
<RangeWrapper {...Cijena.rangeOptions} />
<SelectWrapper {...Lokacija.lokacijaOptions} />
<RangeWrapper {...Godiste.rangeOptions} />
<SelectWrapper {...Kilometraza.kilometrazaOptions.kilometraMin} />
<SelectWrapper {...Kilometraza.kilometrazaOptions.kilometraMax} />
<SelectWrapper {...Filters.proizvodacOptions} />
<RangeWrapper {...Filters.cijenaRangeOptions} />
<SelectWrapper {...Filters.lokacijaOptions} />
<RangeWrapper {...Filters.godisteRangeOptions} />
<SelectWrapper {...Filters.kilometrazaOptions.kilometraMin} />
<SelectWrapper {...Filters.kilometrazaOptions.kilometraMax} />
<CheckboxAndRadioWrapper
componentName="gorivo"
elements={Gorivo.elements}
elements={Filters.gorivoElements}
/>
</div>
);

21
frontend-react/src/components/widgets/SelectDisplayCheckboxWrapper.js Normal file
View File

@@ -0,0 +1,21 @@
import React from "react";
import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
import { optionchangewrapper } from "utils/optionchangewrapper";
class SelectDisplayCheckboxWrapper extends React.Component {
render() {
const { options, checkboxOptions, parentOptionName } = this.props;
let elements =
options[parentOptionName] &&
checkboxOptions[options[parentOptionName].value].elements;
return elements ? (
<div>
<CheckboxAndRadioWrapper
componentName={`${parentOptionName}-child`}
elements={elements}
/>
</div>
) : null;
}
}
export default optionchangewrapper(SelectDisplayCheckboxWrapper);