diff --git a/kivi-cars/src/components/CategoryBtns/categorybtns.js b/kivi-cars/src/components/CategoryBtns/categorybtns.js
index 2ab1f07..59ea647 100644
--- a/kivi-cars/src/components/CategoryBtns/categorybtns.js
+++ b/kivi-cars/src/components/CategoryBtns/categorybtns.js
@@ -8,8 +8,8 @@ const CategoryBtns = (props) => {
let auto = 'Auto';
let motor = 'Motor';
- let kamion = 'Kamion';
- let filter = 'Vozilo'
+ let kamion = 'Teretno vozilo';
+ let filter = 'Vozilo';
const {data, setData} = props.data;
diff --git a/kivi-cars/src/components/Filters/Standard-filters.js b/kivi-cars/src/components/Filters/Standard-filters.js
index 140508d..fd4d4f2 100644
--- a/kivi-cars/src/components/Filters/Standard-filters.js
+++ b/kivi-cars/src/components/Filters/Standard-filters.js
@@ -5,6 +5,8 @@ import Filter from "./Filter/Filter";
import DoubleFilter from "./Filter/DoubleFilter";
import TitleBtn from "../Button/TitleBtn";
import Cars from "../../data/cars-brands";
+import Trucks from "../../data/trucks-brands";
+import Motors from "../../data/motors-brands"
import Cubes from "../../data/cubes";
import Type from "../../data/type";
import Fuel from "../../data/fuel";
@@ -20,20 +22,38 @@ import Kilometers from "../../data/kilometers";
const StandardFilters = (props) => {
- const {filters, setFilters} = props.data;
+ const {data, filters, setFilters} = props.data;
const [brandIndex, setBrandIndex] = useState(0);
+ const [model, showModel] = useState(true);
let index = 0;
+ let brands;
+
+ // if(data.Category.Vozilo === "Auto"){
+ // showModel(true)
+ // return
+ // })
+
+ // }else if(data.Category.Vozilo === "Motor"){
+ // showModel(false)
+ // return brands = Motors.map(brand => {
+ // return brand.brand
+ // })
+ // }else if(data.Category.Vozilo === "Teretno vozilo"){
+ // return brands = Trucks.map(brand => {
+ // return brand.brand
+ // })
+ // }
+
+ brands = Cars.map(brand => {
+ return brand.brand})
- const brands = Cars.map(brand => {
- return brand.brand
- })
useEffect(() => {
if(filters.Marka)setBrandIndex(brands.indexOf(filters.Marka))
- console.log("filters", filters)
}, [filters])
const models = Cars[brandIndex].models
+
const Brands = {
"ime": "Marka",
@@ -52,7 +72,7 @@ const StandardFilters = (props) => {
return(
-
+ {model ? (
): null}
{data3.map(item => {
index += 1;
diff --git a/kivi-cars/src/containers/FiltersPage.js b/kivi-cars/src/containers/FiltersPage.js
index b8a56fa..5ee3a8e 100644
--- a/kivi-cars/src/containers/FiltersPage.js
+++ b/kivi-cars/src/containers/FiltersPage.js
@@ -23,9 +23,9 @@ const FiltersPage = (props) => {
const showFilters = (toggle) => {
if(toggle){
- return
+ return
}
- return
;
+ return
;
}
return(
diff --git a/kivi-cars/src/data/motors-brands.js b/kivi-cars/src/data/motors-brands.js
new file mode 100644
index 0000000..3713864
--- /dev/null
+++ b/kivi-cars/src/data/motors-brands.js
@@ -0,0 +1,45 @@
+const Motors = [
+ {"brand":"Izaberite"},
+ {"brand":"Aprilia"},
+ {"brand":"Benelli"},
+ {"brand":"BMW"},
+ {"brand":"Cagiva"},
+ {"brand":"Classe"},
+ {"brand":"CPI"},
+ {"brand":"Derbi"},
+ {"brand":"Ducati"},
+ {"brand":"Gilera"},
+ {"brand":"Harley Davidson"},
+ {"brand":"Honda"},
+ {"brand":"huatian"},
+ {"brand":"Husqvarna"},
+ {"brand":"Hyosung"},
+ {"brand":"Italjet"},
+ {"brand":"Jawa"},
+ {"brand":"kanuni"},
+ {"brand":"Kawasaki"},
+ {"brand":"Keeway"},
+ {"brand":"KTM"},
+ {"brand":"Kymco"},
+ {"brand":"LBC"},
+ {"brand":"Lifan"},
+ {"brand":"Malaguti"},
+ {"brand":"Moto Guzzi"},
+ {"brand":"Nitro"},
+ {"brand":"Panasonic"},
+ {"brand":"Peugeot"},
+ {"brand":"Piaggio"},
+ {"brand":"Puch"},
+ {"brand":"Qingqi"},
+ {"brand":"Sprint"},
+ {"brand":"Spyder"},
+ {"brand":"Suzuki"},
+ {"brand":"Tibra"},
+ {"brand":"Tomos"},
+ {"brand":"Triumph"},
+ {"brand":"Vespa"},
+ {"brand":"Yamaha"},
+ {"brand":"yamasaki"}
+]
+
+export default Motors;
\ No newline at end of file
diff --git a/kivi-cars/src/data/trucks-brands.js b/kivi-cars/src/data/trucks-brands.js
new file mode 100644
index 0000000..d605c53
--- /dev/null
+++ b/kivi-cars/src/data/trucks-brands.js
@@ -0,0 +1,85 @@
+const Trucks = [
+ {"brand":"Izaberite"},
+ {"brand":"Mercedes"},
+ {"brand":"MAN"},
+ {"brand":"Volkswagen"},
+ {"brand":"Iveco"},
+ {"brand":"TAM"},
+ {"brand":"Fiat"},
+ {"brand":"Mecedes"},
+ {"brand":"Volvo"},
+ {"brand":"Renault"},
+ {"brand":"Ford"},
+ {"brand":"Peugeot"},
+ {"brand":"Scania"},
+ {"brand":"Daf"},
+ {"brand":"Zastava"},
+ {"brand":"FAP"},
+ {"brand":"IMT"},
+ {"brand":"Citroen"},
+ {"brand":"MAGIRUS"},
+ {"brand":"steyr"},
+ {"brand":"Zetor"},
+ {"brand":"Opel"},
+ {"brand":"Nissan"},
+ {"brand":"mercedes benz"},
+ {"brand":"Schmitz"},
+ {"brand":"JCB"},
+ {"brand":"KOGEL"},
+ {"brand":"cat"},
+ {"brand":"Hyundai"},
+ {"brand":"MEILLER"},
+ {"brand":"TORPEDO"},
+ {"brand":"miller"},
+ {"brand":"Atlas"},
+ {"brand":"Schwarzmuller"},
+ {"brand":"Kia"},
+ {"brand":"traktor"},
+ {"brand":"Isuzu"},
+ {"brand":"LKT"},
+ {"brand":"Mitsubishi"},
+ {"brand":"Toyota"},
+ {"brand":"Saurer"},
+ {"brand":"John Deere"},
+ {"brand":"vw"},
+ {"brand":"Mazda"},
+ {"brand":"Škoda"},
+ {"brand":"Timberjack"},
+ {"brand":"Hafei"},
+ {"brand":"Hanomag"},
+ {"brand":"Massey Ferguson"},
+ {"brand":"Same"},
+ {"brand":"KRONE"},
+ {"brand":"Liebherr"},
+ {"brand":"Seat"},
+ {"brand":"hiab"},
+ {"brand":"O&K"},
+ {"brand":"URSUS"},
+ {"brand":"GAZ"},
+ {"brand":"Gorica"},
+ {"brand":"vw kombi"},
+ {"brand":"Tomo Vinkovic"},
+ {"brand":"Actros"},
+ {"brand":"Setra"},
+ {"brand":"Sprinter"},
+ {"brand":"Langendorf"},
+ {"brand":"ZettelMeyer"},
+ {"brand":"DEUTZ"},
+ {"brand":"Komatsu"},
+ {"brand":"TAM 110"},
+ {"brand":"Tatra"},
+ {"brand":"MF"},
+ {"brand":"BOSCH"},
+ {"brand":"Mercedea-Benz"},
+ {"brand":"Caddy"},
+ {"brand":"teretno"},
+ {"brand":"Mercedez Benz"},
+ {"brand":"motokultivator"},
+ {"brand":"kombi"},
+ {"brand":"CASE"},
+ {"brand":"TAM 75"},
+ {"brand":"CLARK"},
+ {"brand":"hurlimann"}
+]
+
+export default Trucks;
\ No newline at end of file