Skip to content

T
tripsent
Commit e014e7fc authored by Джумалиев Алмат's avatar Джумалиев Алмат
Browse files
Options

Merge branch 'main' into '6' 

# Conflicts:
#   src/pages/Home/Home.tsx
parents d54d4472 91ffcede
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 7 deletions
public/file.svg deleted 100644 → 0
View file @ d54d4472
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
\ No newline at end of file
public/globe.svg deleted 100644 → 0
View file @ d54d4472
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
public/next.svg deleted 100644 → 0
View file @ d54d4472
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
public/vercel.svg deleted 100644 → 0
View file @ d54d4472
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
\ No newline at end of file
public/window.svg deleted 100644 → 0
View file @ d54d4472
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
\ No newline at end of file
src/components/BackdropWindow/BackdropWindow.module.css 0 → 100644
View file @ e014e7fc
.modalWindow_bg {
position: absolute;
z-index: 99;
background-color: rgb(0, 0, 0, 0.67);
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.modalWindow_body {
background-color: white;
width: 100%;
position: fixed;
bottom: 0;
padding-bottom: 150px;
padding: 8px 20px 25px 20px;
display: flex;
gap: 17px;
flex-direction: column;
border-radius: 10px 10px 0 0;
z-index: 100;
}
.modalWindow_hr {
border: 2px solid rgba(205, 207, 208, 1);
height: 3px;
border-radius: 5px;
min-width: 35px;
position: relative;
width: 2vw;
left: 50%;
transform: translate(-50%);
}
\ No newline at end of file
src/components/BackdropWindow/BackdropWindow.tsx 0 → 100644
View file @ e014e7fc
import style from "./BackdropWindow.module.css";
type Props = {
children: React.ReactNode
close: () => void
show: boolean
}
const BackdropWindow = ({children, close, show}: Props) => {
if(!show) return
return (
<div>
<div className={style.modalWindow_bg} onClick={close}></div>
<div className={style.modalWindow_body}>
<div className={style.modalWindow_hr}></div>
{children}
</div>
</div>
);
};
export default BackdropWindow;
src/components/UI/Buttons/GoogleAppleBtn.module.css 0 → 100644
View file @ e014e7fc
.buttons {
top: 821px;
left: 20px;
display: flex;
gap: 15;
}
.Btn {
width: 160px;
height: 56px;
border-radius: 16px;
border-width: 1px;
border: 1px solid rgba(207, 213, 219, 1);
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.Btn img {
margin-right: 8px;
}
.Btn:hover {
background-color: #e7e7e7;
}
.titleBtn {
font-family: Inter;
font-weight: 600;
font-size: 14px;
line-height: 140%;
letter-spacing: 0%;
vertical-align: bottom
}
\ No newline at end of file
src/components/UI/Buttons/GoogleAppleBtn.tsx 0 → 100644
View file @ e014e7fc
import styles from './GoogleAppleBtn.module.css'
const Buttons = () => {
return (
<div className={styles.buttons}>
<button className={styles.Btn}>
<img src="Apple.png" alt="Apple logo" />
<p className={styles.titleBtn}>Apple</p>
</button>
<button className={styles.Btn}>
<img src="Google logo.png" alt="Google logo" />
<p className={styles.titleBtn}>Google</p>
</button>
</div>
)
}
export default Buttons
\ No newline at end of file
src/pages/Home/Home.tsx
View file @ e014e7fc
import Registration from "@/components/Registration/Registration"
'use client'
import BackdropWindow from "@/components/BackdropWindow/BackdropWindow"
import styles from './Home.module.css'
import { useState } from "react"
const Home = () => {
const [filters, showFilters] = useState(false)
const [priceOffer, setPriceOffer] = useState(false)
return (
<Registration/>
<>
<BackdropWindow show={filters} close={() => showFilters(false)}>
<p>From</p>
<input placeholder="Choose country" />
<input placeholder="Choose city" />
<p>To</p>
<input placeholder="Choose country" />
<input placeholder="Choose city" />
<p>Type of Delivery</p>
<input placeholder="Choose type" />
</BackdropWindow>
<BackdropWindow show={priceOffer} close={() => setPriceOffer(false)}>
<h3>Current Price</h3>
<h1>99,000 KZT</h1>
<p>Input your offer price</p>
<input placeholder="Price in KZT" />
<p>Input your offer price</p>
<input placeholder="Price in KZT" />
</BackdropWindow>
<div className={styles.container}>
<button onClick={() => showFilters(true)}>Filters</button>
<button onClick={() => setPriceOffer(true)}>Price offer</button>
</div>
</>
)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment