fixed conflict and merged branch addcategorybuttons

2022-03-14 13:06:46 +01:00
parent 09a176cd98 a738f08905
commit 44163ea615
6 changed files with 54 additions and 11 deletions
--- a/kivi-cars/src/containers/App.js
+++ b/kivi-cars/src/containers/App.js
@@ -3,18 +3,19 @@ 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 CategoryBtns from '../components/CategoryBtns/categorybtns'
 function App() {

-  const info = 'Dobrodosli na stranicu kivi!'
+  const naslov = 'Dobrodosli na stranicu kivi!'


  return (
    <div className="App">
-      <Header header={info}/>
+      <Header header={naslov}/>
      <ButtonsToolbar/>
      <FiltersNav />
      <StandardBtn/>
+      <CategoryBtns/>

    </div>
  );