3 Commits

Author SHA1 Message Date
ismailsosic
c04f094b0d add filters data 2022-03-15 11:54:33 +01:00
ismailsosic
09a176cd98 resolve conflicts 2022-03-14 12:14:58 +01:00
ismailsosic
a064e89ceb add filter_navigation 2022-03-14 12:03:26 +01:00
26 changed files with 312 additions and 106 deletions

View File

@@ -6,7 +6,6 @@
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^13.5.0",
"nouislider": "^15.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "5.0.0",

View File

@@ -1,59 +0,0 @@
@media only screen and (min-width: 601px) {
.container {
width: 80%;
display: flex;
flex-direction: column;
justify-content: center;
margin: auto;
}
.filters-tab {
width: 100%;
height: 48;
}
.filters-links{
margin-top: 2rem;
width: 100%;
display: flex;
flex-grow: 1;
flex-wrap: nowrap;
justify-content: space-evenly;
list-style-type: none;
}
.filters-links li {
text-align: center;
width: 7rem;
flex-grow: 1;
flex-wrap: nowrap;
}
.filters {
display: inline-block;
border-bottom: 2px solid #02adba;
width: 5rem;
padding: 1rem 10rem;
white-space: nowrap;
margin-left: auto;
font-size: 22px;
}
.filters a{
text-decoration: none;
color: #02adba;
}
.filters a:visited {
color: #02adba;
}
.cars-brands-models {
border: 2px solid blue;
width: 100%;
}
}

View File

@@ -1,41 +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="filters-tabs">
<ul className="filters-links">
<li className="filters">
<a id="standard-filters" href="#">Filteri</a>
</li>
<li className="filters">
<a id="advanced-filters" href="#">Napredni filteri</a>
</li>
</ul>
</div>
<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

View File

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

View File

@@ -0,0 +1,3 @@

View File

@@ -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

View File

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

View File

@@ -0,0 +1,53 @@
*{
margin: 0;
padding: 0;
}
/* color:#02adba */
.links-container ul li {
display: inline-block;
}
.active {
border-bottom: 3px solid #02adba;
}
.links-container{
background-color: #fff;
}
.filters-links{
display: flex;
justify-content: space-around;
padding: 1em;
box-sizing: border-box;
text-align: center;
}
.filters-link{
padding: 0.5em 2.5em;
white-space: none;
flex-grow: 1;
cursor: pointer;
}
@media only screen and (max-width: 920px) and (min-width: 541px){
.filters-link {
line-height: 54px;
font-size: 22px;
}
}
@media only screen and (min-width: 921px){
.filters-link {
line-height: 54px;
font-size: 24px;
}
.filters-links {
width: 90%;
margin: auto;
}
}

View File

@@ -0,0 +1,20 @@
import './FiltersNav.css';
const FiltersNav = () => {
return(
<div className="links-container">
<ul className="filters-links">
<li className="filters-link active">
<a id="standard-filters">Filteri</a>
</li>
<li className="filters-link">
<a id="advanced-filters">Napredni filteri</a>
</li>
</ul>
</div>
)
}
export default FiltersNav;

View File

@@ -7,4 +7,8 @@
.App{
display: flex;
flex-direction: column;
}
p, h1, h2, h3 ,h4 {
font-family: Arial, Helvetica, sans-serif;
}

View File

@@ -1,9 +1,12 @@
import './App.css';
import React from 'react';
import Filters from '../components/Filters';
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 StandardBtn from '../components/Button/StandardBtn';
import Filters from '../components/Filters/Filters';
function App() {
const info = 'Dobrodosli na stranicu kivi!'
@@ -13,10 +16,8 @@ function App() {
<div className="App">
<Header header={info}/>
<ButtonsToolbar/>
<StandardBtn/>
</div>
);
}

View File

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

View File

@@ -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;

View File

@@ -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;

View File

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

View File

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

View File

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

View File

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

View File

@@ -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;

View File

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

View File

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

View File

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

View File

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

View File

@@ -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;