conflicts resolve

kivi-cars/src/components/Filters.js

@@ -1,30 +0,0 @@
-import React from "react";
-import "./Filters.css";
-import Cars from "./cars";
-
-const Filters = () => {
-
-    const unsortedCars = Cars
-    const cars = unsortedCars.sort(unsortedCars.brand)
-
-
-
-    return(
-            <div className="container">
-                
-                <div className="container-standard">
-                    <div className="cars-brands-models">
-                        <label>Marka: </label>
-                        <select name="brands" id="brands">
-                            {cars.map(car => <option className="option-field" value={car.brand}>{car.brand}</option>)}
-                        </select>
-                    </div>
-                </div>
-                <div className="container-advanced">
-                    
-                </div>
-        </div>
-    )
-}
-
-export default Filters

kivi-cars/src/components/Filters/Filter/Filter.js

@@ -0,0 +1,15 @@
+import React from "react";
+
+const Filter = (props) => {
+    return(
+        <div >
+            <select>
+                <option>
+                    
+                </option>
+            </select>
+        </div>
+    )
+}
+
+export default Filter;

kivi-cars/src/components/Filters/Standard-Filters.js

@@ -0,0 +1,14 @@
+import React from "react";
+import "./Filters.css";
+import Cars from "../../data/cars";
+
+const Filters = () => {
+
+    return(
+        <div className="filters-container">
+            
+        </div>
+    )
+}
+
+export default Filters

kivi-cars/src/components/Filters/Standard-filters.js

@@ -0,0 +1 @@
+import React from "react";

kivi-cars/src/components/Searchfilters/FiltersNav.css

@@ -5,7 +5,7 @@
 
 /* color:#02adba */
 
-.filters-container ul li {
+.links-container ul li {
     display: inline-block;
 }
 
@@ -13,7 +13,7 @@
     border-bottom: 3px solid #02adba;
 }
 
-.filters-container{
+.links-container{
     background-color: #fff;
 }
 
@@ -25,7 +25,7 @@
     text-align: center;
 }
 
-.filters{
+.filters-link{
     padding: 0.5em 2.5em;
     white-space: none;
     flex-grow: 1;
@@ -33,14 +33,14 @@
 }
 
 @media only screen and (max-width: 920px) and (min-width: 541px){
-    .filters {
+    .filters-link {
         line-height: 54px;
         font-size: 22px;
     }
 }
 
 @media only screen and (min-width: 921px){
-    .filters {
+    .filters-link {
         line-height: 54px;
         font-size: 24px;
 

kivi-cars/src/components/Searchfilters/FiltersNav.js

@@ -4,12 +4,12 @@ const FiltersNav = () => {
 
 
     return(
-        <div className="filters-container">
+        <div className="links-container">
             <ul className="filters-links">
-                <li className="filters active">
+                <li className="filters-link active">
                     <a id="standard-filters">Filteri</a>
                 </li> 
-                <li className="filters">
+                <li className="filters-link">
                     <a id="advanced-filters">Napredni filteri</a>
                 </li>
             </ul>

kivi-cars/src/containers/App.js

@@ -1,10 +1,23 @@
 import './css/App.css';
 import React from 'react';
+import FiltersNav from '../components/Searchfilters/FiltersNav';
+import Header from '../components/Header/Header';
+import ButtonsToolbar from '../components/ButtonsToolbar/ButtonsToolbar';
+import StandardBtn from '../components/Button/StandardBtn';
+import Filters from '../components/Filters/Filters';
+
+
+function App() {
+
+  const info = 'Dobrodosli na stranicu kivi!'
 
 function App() {
 
   return (
     <div className="App">
+      <Header header={info}/>
+      <ButtonsToolbar/>
+
     </div>
   );
 }

kivi-cars/src/data/air-condition.js

@@ -0,0 +1,12 @@
+const AirCondition = {
+    "ime" : "Klima",
+    "tipovi" : [
+        "Jednozonska",
+        "Dvozonska",
+        "Trozonska",
+        "Četverozonska",
+        "Ostalo"
+    ]
+}
+
+export default AirCondition;

kivi-cars/src/data/checkbox.js

@@ -0,0 +1,37 @@
+const Checkbox = [
+    "ABS",
+    "ESP",
+    "Tempomat",
+    "Alarm",
+    "Airbag",
+    "Šiber",
+    "Servo volan",
+    "Koža",
+    "Klima",
+    "Centralna brava",
+    "Daljinsko zaključavanje",
+    "ISOFIX",
+    "Registrovan",
+    "Električni podizači stakala",
+    "Električni retrovizor",
+    "Turbo",
+    "Naslon za ruke",
+    "Start/Stop",
+    "Pakring assistent",
+    "Senzor mrtvog ugla",
+    "Servisna knjiga",
+    "Komande na volanu",
+    "Navigacija",
+    "Grijanje sjedišta",
+    "Masažna sjedišta",
+    "Memorija sjedišta",
+    "Panorama",
+    "Xenon",
+    "LED",
+    "Laser",
+    "Ocarinjen",
+    "Udaren",
+    "Stranac"
+]
+
+export default Checkbox;

kivi-cars/src/data/color.js

@@ -0,0 +1,21 @@
+const Color = {
+    "ime": "Boja",
+    "tipovi": [
+        "Bež",
+        "Bijela",
+        "Bordo",
+        "Crna",
+        "Crvena",
+        "Ljubičasta",
+        "Narandžasta",
+        "Plava",
+        "Siva",
+        "Smeđa",
+        "Srebrena",
+        "Zelena",
+        "Zlatna",
+        "Žuta"
+    ]
+}
+
+export default Color;

kivi-cars/src/data/condition.js

@@ -0,0 +1,10 @@
+const Condition = {
+    "ime": "Stanje",
+    "tipovi": [
+        "Novo",
+        "Polovno",
+        "Udareno"
+    ]
+}
+
+export default Condition;

kivi-cars/src/data/doors.js

@@ -0,0 +1,9 @@
+const Doors = {
+    "ime": "Broj vrata",
+    "tipovi" : [
+        "2/3",
+        "4/5"
+    ]
+}
+
+export default Doors;

kivi-cars/src/data/drive.js

@@ -0,0 +1,10 @@
+const Drive = {
+    "ime" : "Pogon",
+    "tipovi": [
+        "Prednji",
+        "Zadnji",
+        "Sva četiri"
+    ]
+}
+
+export default Drive;

kivi-cars/src/data/fuel.js

@@ -0,0 +1,13 @@
+const Fuel = {
+    "ime": "Gorivo",
+    "tipovi": [
+        "Dizel",
+        "Benzin",
+        "Plin",
+        "Cng",
+        "Hybrid",
+        "Elektro"
+    ]
+}
+
+export default Fuel;

kivi-cars/src/data/gearbox.js

@@ -0,0 +1,15 @@
+const Gearbox = {
+    "ime": "Broj brzina",
+    "tipovi": [
+        "3+R",
+        "4+R",
+        "5+R",
+        "6+R",
+        "7+R",
+        "8+R",
+        "9+R",
+        "CVT"
+    ]
+}
+
+export default Gearbox;

kivi-cars/src/data/lights.js

@@ -0,0 +1,12 @@
+const Lights = {
+    "ime": "Svjetla",
+    "tipovi": [
+        "Halogena",
+        "Xenon",
+        "Led",
+        "Laser",
+        "Ostalo"
+    ]
+}
+
+export default Lights;

kivi-cars/src/data/seats.js

@@ -0,0 +1,16 @@
+const Seats = {
+    "ime": "Sjedišta",
+    "tipovi": [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5",
+        "6",
+        "7",
+        "8",
+        "Više"
+    ]
+}
+
+export default Seats;

kivi-cars/src/data/sensors.js

@@ -0,0 +1,11 @@
+const Sensors = {
+    "ime": "Senzori",
+    "tipovi": [
+        "naprijed",
+        "nazad",
+        "naprijed i nazad",
+        "nema"
+    ]
+}
+
+export default Sensors;

kivi-cars/src/data/transmission.js

@@ -0,0 +1,10 @@
+const Transmission = {
+    "ime": "Transmisija",
+    "tipovi": [
+        "automatski mjenjač",
+        "manuelni mjenjač",
+        "polu-automatski mjenjač"
+    ]
+}
+
+export default Transmission

kivi-cars/src/data/type.js

@@ -0,0 +1,20 @@
+const Type = {
+    "ime": "Vrsta vozila",
+    "tipovi": [
+        "Karavan",
+        "Limuzina",
+        "Monovolumen",
+        "Malo auto",
+        "Sportback",
+        "Kombi",
+        "Kabriolet",
+        "Coupe",
+        "Terenac",
+        "Off-Road",
+        "Pickup",
+        "Oldtimer",
+        "Caddy"
+    ]
+}
+
+export default Type;