diff --git a/client/src/AppRoutes.js b/client/src/AppRoutes.js index 997a4dd..d1f2c9c 100644 --- a/client/src/AppRoutes.js +++ b/client/src/AppRoutes.js @@ -1,5 +1,6 @@ -import Truck from './components/Truck'; +import React from 'react'; import { Route, Routes } from 'react-router-dom'; +import Truck from './components/Truck'; import App from './App'; import NotFound from './components/NotFound' import QuizGame from './components/QuizGame'; @@ -8,9 +9,6 @@ import AppProvider from './components/AppContext'; const AppRoutes = () => { - - - return ( } /> diff --git a/client/src/components/BottomFPage.jsx b/client/src/components/BottomFPage.jsx index 6648033..18158b7 100644 --- a/client/src/components/BottomFPage.jsx +++ b/client/src/components/BottomFPage.jsx @@ -7,25 +7,10 @@ import {Link} from 'react-router-dom'; import {useState, useEffect} from 'react'; import FooterQuiz from './FooterQuiz'; + + const BottomFPage = () => { - const [data, setData] = useState(null); - const [loading, setLoading] = useState(true); - const [error, setError] = useState(null); - const url = '/osp-units?prefix=Gdańsk'; - useEffect(() => { - fetch(url) - .then((response) => { - if(!response.ok){ - throw new Error( - `PROBLEM ${response.status}` - ) - } - return response; - }) - .then(data => console.log(data)) - .catch(err => console.log(err.message)) - }, []); const {unitOsp} = useContext(AppContext); @@ -46,7 +31,7 @@ const BottomFPage = () => {
Nie widzisz swojej jednostki?
  • Napisz do nas!
  • -
    @Wszelkie prawa zastrzeżone 2023 Skrytka.app

    Skrytka 2023

    +
    ©Wszelkie prawa zastrzeżone 2023 Skrytka.app

    Skrytka 2023

    diff --git a/client/src/components/QuizGame.jsx b/client/src/components/QuizGame.jsx index 19e74bd..d15326c 100644 --- a/client/src/components/QuizGame.jsx +++ b/client/src/components/QuizGame.jsx @@ -6,8 +6,6 @@ import { EndCorrectAnswer } from './GetImageAndQuestion'; import Timer from './Timer'; import FooterQuiz from './FooterQuiz'; export let link = ""; -console.log(link) - export let endScore = 1; const NavigationQuiz = ({score}) => { diff --git a/client/src/components/Result.jsx b/client/src/components/Result.jsx index 03d5b9a..f609709 100644 --- a/client/src/components/Result.jsx +++ b/client/src/components/Result.jsx @@ -5,8 +5,7 @@ import { SecondMinutes } from './Timer'; import { useNavigate } from 'react-router-dom'; import Conffetti from './Conffetti'; -import Player from './Sound'; -import url from '../style/congratulation.mp3'; + import { link } from './QuizGame'; import { InformationTrackFromDB } from './Truck'; const UpdateTrackScore = () => { @@ -25,17 +24,22 @@ const Result = () => { UpdateTrackScore(); return ( <> -
    +
    -

    BRAWO !!!

    - -

    Twój wynik to: {endScore} / 10

    -

    Czas: {SecondMinutes} minut {SecondSeconds} sekund

    - - - - -
    +

    Koniec

    +

    W quizie uzyskałeś/aś:

    + +

    {{endScore}/10 < 9 ? "Jesteś szybki.. ale pożar jest szybszy" : "Brawo udało ci się ugasić pożar"}

    + + + +

    Twój czas wyniósł: {SecondMinutes}:{SecondSeconds}

    +

    Łącznie udało ci się zdobyć: {endScore}/10

    +

    Roznieć zapał, rozwiązuj quizy, i podziel się wynikiem ze znajomymi

    + + + +
    diff --git a/client/src/components/SelectBox.jsx b/client/src/components/SelectBox.jsx index 3e2027c..054de56 100644 --- a/client/src/components/SelectBox.jsx +++ b/client/src/components/SelectBox.jsx @@ -1,4 +1,4 @@ -import React, {useContext, useState ,useRef} from 'react'; +import React, {useContext, useState ,useRef, useEffect} from 'react'; import { AppContext } from './AppContext'; const SearchBox = () => { @@ -7,10 +7,27 @@ const SearchBox = () => { const [value, setValue] = useState(""); const inputSearchRef = useRef(true); + + const handleChangeInput = (e) => { - setIsContainerActive(true); - const tasks = localization.filter(localization => localization.toLowerCase().includes(e.target.value.toLowerCase())); - setValue(tasks); + if(e.target.value === "") return + fetch(`/osp-units?locality=${e.target.value}`) + .then(data => data.json()) + .then(data1=> { + console.log(data1) + data1.map(locality => { + console.log(locality.locality); + let localityArray = []; + localityArray.push(locality.locality); + let tasks = localityArray.filter(localization => localization.toLowerCase().includes(e.target.value.toLowerCase())); + console.log(tasks); + setIsContainerActive(true); + setValue(tasks); + }) + }) + + + } const OptionJSXTag = () => { diff --git a/client/src/components/Truck.jsx b/client/src/components/Truck.jsx index b4c2411..af45f2f 100644 --- a/client/src/components/Truck.jsx +++ b/client/src/components/Truck.jsx @@ -1,10 +1,11 @@ -import React, {useRef} from 'react'; +import React, {useRef,useEffect} from 'react'; import { useState } from 'react'; import { useParams } from 'react-router-dom'; import {Link} from 'react-router-dom'; + export let InformationTrackFromDB = [ { img: '../img/fire-truck/track1.jpg', diff --git a/client/src/style/_Result.scss b/client/src/style/_Result.scss index 59fa0f1..b7c383f 100644 --- a/client/src/style/_Result.scss +++ b/client/src/style/_Result.scss @@ -1,10 +1,4 @@ -.trophy { - min-width: 450px; - min-height: 450px; - max-width: 450px; - max-height: 450px; - -} + .congratulationh2 { font-size: 40px; letter-spacing: 3px; @@ -13,6 +7,12 @@ #resultButton { margin-top: 5%; + background-color: #d42436; +} +#resultButton1 { + margin-top: 5%; + background-color: #c6c4c4; + color: black; } .endScoreh2 {