From c682e08cf393797cf71f5241e907e3b37ecd579a Mon Sep 17 00:00:00 2001 From: Sevka <240303vilkov@gmail.com> Date: Tue, 5 Sep 2023 20:46:24 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=80=D0=BE=D1=83=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 42 +++++- package.json | 1 + src/{ => components/App}/App.css | 0 src/{ => components/App}/App.js | 42 +++--- src/components/City/City.js | 5 +- .../ReportWebVitals}/reportWebVitals.js | 0 src/components/Second/Second.js | 8 +- .../serviceWorkerRegistration.js | 0 src/{ => components/SetupTests}/setupTests.js | 0 src/components/Start/Start.js | 125 +++++++++--------- src/components/Tinder/Tinder.js | 4 +- src/index.js | 6 +- 12 files changed, 136 insertions(+), 97 deletions(-) rename src/{ => components/App}/App.css (100%) rename src/{ => components/App}/App.js (56%) rename src/{ => components/ReportWebVitals}/reportWebVitals.js (100%) rename src/{ => components/ServiceWorkerRegistration}/serviceWorkerRegistration.js (100%) rename src/{ => components/SetupTests}/setupTests.js (100%) diff --git a/package-lock.json b/package-lock.json index aa8c665..bb2d9a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "matchmedia": "^0.1.2", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", "react-swipeable": "^7.0.1", "react-tinder-card": "^1.6.2", @@ -34,8 +35,7 @@ "workbox-routing": "^6.6.0", "workbox-strategies": "^6.6.0", "workbox-streams": "^6.6.0" - }, - "devDependencies": {} + } }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", @@ -3409,6 +3409,14 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/@remix-run/router": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz", + "integrity": "sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -14924,6 +14932,36 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz", + "integrity": "sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==", + "dependencies": { + "@remix-run/router": "1.8.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz", + "integrity": "sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==", + "dependencies": { + "@remix-run/router": "1.8.0", + "react-router": "6.15.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", diff --git a/package.json b/package.json index af319c1..2d7fc46 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "matchmedia": "^0.1.2", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", "react-swipeable": "^7.0.1", "react-tinder-card": "^1.6.2", diff --git a/src/App.css b/src/components/App/App.css similarity index 100% rename from src/App.css rename to src/components/App/App.css diff --git a/src/App.js b/src/components/App/App.js similarity index 56% rename from src/App.js rename to src/components/App/App.js index 5014984..3cb0900 100644 --- a/src/App.js +++ b/src/components/App/App.js @@ -1,9 +1,10 @@ import React, { useState, useEffect } from 'react'; -import Start from './components/Start/Start'; -import Second from './components/Second/Second'; -import Tinder from './components/Tinder/Tinder'; -import Main from './components/Main/Main'; -import City from './components/City/City'; +import { BrowserRouter, Routes, Route } from 'react-router-dom'; +import Start from '../Start/Start'; +import Second from '../Second/Second'; +import Tinder from '../Tinder/Tinder'; +import Main from '../Main/Main'; +import City from '../City/City'; import axios from 'axios'; import './App.css'; @@ -48,30 +49,17 @@ function App() { console.log(userData); }, [userData]); - let content = null; - switch (buttonValue) { - case '/second': - content = - break; - case '/tinder': - content = - break; - case '/main': - content =
- break; - case '/city': - content = - break; - default: - content = - } - - const arrayLength = userData.unique ? userData.unique.length : 0; return ( -
- {arrayLength !== 0 ?
: content} -
+ + + }/> + } /> + } /> + } /> + } /> + + ); } diff --git a/src/components/City/City.js b/src/components/City/City.js index 2594065..a17685d 100644 --- a/src/components/City/City.js +++ b/src/components/City/City.js @@ -1,10 +1,13 @@ import React, { useEffect, useState } from "react"; +import { useNavigate } from "react-router-dom"; + import axios from "axios"; import './City.css' const City = (props) => { const route = props.getValue; const setUserData = props.setUserData + const second = useNavigate(); const [cityOptions, setCityOptions] = useState([]); const [filteredCityOptions, setFilteredCityOptions] = useState([]); @@ -111,7 +114,7 @@ const City = (props) => { - + + ) diff --git a/src/serviceWorkerRegistration.js b/src/components/ServiceWorkerRegistration/serviceWorkerRegistration.js similarity index 100% rename from src/serviceWorkerRegistration.js rename to src/components/ServiceWorkerRegistration/serviceWorkerRegistration.js diff --git a/src/setupTests.js b/src/components/SetupTests/setupTests.js similarity index 100% rename from src/setupTests.js rename to src/components/SetupTests/setupTests.js diff --git a/src/components/Start/Start.js b/src/components/Start/Start.js index c5c8aa6..e816ec9 100644 --- a/src/components/Start/Start.js +++ b/src/components/Start/Start.js @@ -1,69 +1,74 @@ import React, { useEffect } from "react"; +import { useNavigate } from "react-router-dom"; const Start = (props) => { + const history = useNavigate(); + const kek = './circle.html'; - const route = props.getValue; - const kek = './circle.html' + function hideAddressBar() { + if (document.documentElement.scrollHeight < window.outerHeight / window.devicePixelRatio) + document.documentElement.style.height = (window.outerHeight / window.devicePixelRatio) + 'px'; + setTimeout(window.scrollTo(1, 1), 0); + } - function hideAddressBar(){ - if(document.documentElement.scrollHeight { - const handler = (ev: MessageEvent<{ type: string }>) => { - if (typeof ev.data !== 'object') return - if (!ev.data.type) return - if (ev.data.type !== 'button-click') return - - route('/city') - } - - window.addEventListener('message', handler) - - // Don't forget to remove addEventListener - return () => window.removeEventListener('message', handler) - }, []) + const handleButtonClick = () => { + history('/city'); + }; - return ( -
-
- logo - Путешествия

Просто!

 -
- - -
- ) + useEffect(() => { + const frame = document.querySelector("#start"); + frame.addEventListener('load', () => { + frame.contentWindow.addEventListener('click', () => { + handleButtonClick(); + }); + }); + + return () => { + frame.removeEventListener('load', () => { + frame.contentWindow.removeEventListener('click', () => { + }); + }); + }; + }, []); + + return ( +
+
+ logo + Путешествия

Просто!

 +
+ +
+ ) }; -export default Start; +export default Start; \ No newline at end of file diff --git a/src/components/Tinder/Tinder.js b/src/components/Tinder/Tinder.js index 34ddbab..745b661 100644 --- a/src/components/Tinder/Tinder.js +++ b/src/components/Tinder/Tinder.js @@ -1,4 +1,5 @@ import React, { useState } from 'react'; +import { useNavigate } from "react-router-dom"; import TinderCard from 'react-tinder-card'; import './Tinder.css'; @@ -7,6 +8,7 @@ const Tinder = (props) => { const route = props.getValue; const cardInfo = props.cardInfo; const setUserData = props.setUserData; + const main = useNavigate(); const [lastDirection, setLastDirection] = useState(); const [cardId, setCardId] = useState([]); @@ -51,7 +53,7 @@ const Tinder = (props) => { var unique = [...new Set(cardId)] var uniqueIds = [...new Set(allIds)]; if(uniqueIds.length === cardInfo.length) { - route('/main'); + main('/main'); setUserData(prevUserData => ({ ...prevUserData, unique: unique })); console.log(unique); console.log(props.userData); diff --git a/src/index.js b/src/index.js index 6d5f43c..b522533 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,9 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; -import App from './App'; -import * as serviceWorkerRegistration from './serviceWorkerRegistration'; -import reportWebVitals from './reportWebVitals'; +import App from './components/App/App'; +import * as serviceWorkerRegistration from './components/ServiceWorkerRegistration/serviceWorkerRegistration'; +import reportWebVitals from './components/ReportWebVitals/reportWebVitals'; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( From 726e533bb92d82e1e692f5bb79f9a8e22a54bcd0 Mon Sep 17 00:00:00 2001 From: serega404 Date: Tue, 5 Sep 2023 21:06:24 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BB=D0=B8=D1=86=D0=B5=D0=BD=D0=B7=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e72bfdd --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 3a8cff16af003877b7fff919fb875f2cab0baaa0 Mon Sep 17 00:00:00 2001 From: Sevka <240303vilkov@gmail.com> Date: Wed, 6 Sep 2023 00:10:02 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 ++++++++ package.json | 5 ++ src/components/City/City.css | 46 --------------- src/components/City/City.js | 73 ++++-------------------- src/components/City/City.scss | 93 +++++++++++++++++++++++++++++++ src/components/Second/Second.js | 36 ++---------- src/components/Second/second.scss | 77 +++++++++++++++++++++++++ src/components/Second/style.css | 50 ----------------- src/components/Start/Start.js | 38 +++---------- src/components/Start/start.scss | 37 ++++++++++++ 10 files changed, 257 insertions(+), 220 deletions(-) delete mode 100644 src/components/City/City.css create mode 100644 src/components/City/City.scss create mode 100644 src/components/Second/second.scss delete mode 100644 src/components/Second/style.css create mode 100644 src/components/Start/start.scss diff --git a/package-lock.json b/package-lock.json index bb2d9a7..6de3ec7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "react-scripts": "5.0.1", "react-swipeable": "^7.0.1", "react-tinder-card": "^1.6.2", + "sass": "^1.66.1", "web-vitals": "^2.1.4", "workbox-background-sync": "^6.6.0", "workbox-broadcast-update": "^6.6.0", @@ -9458,6 +9459,11 @@ "url": "https://opencollective.com/immer" } }, + "node_modules/immutable": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==" + }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -15543,6 +15549,22 @@ "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz", "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==" }, + "node_modules/sass": { + "version": "1.66.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz", + "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==", + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/sass-loader": { "version": "12.6.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", diff --git a/package.json b/package.json index 2d7fc46..0b8066a 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "react-scripts": "5.0.1", "react-swipeable": "^7.0.1", "react-tinder-card": "^1.6.2", + "sass": "^1.66.1", "web-vitals": "^2.1.4", "workbox-background-sync": "^6.6.0", "workbox-broadcast-update": "^6.6.0", @@ -54,6 +55,10 @@ "last 1 safari version" ] }, + "devDependencies": { + "react-scripts": "^5.0.1", + "sass": "^1.38.0" + }, "main": "index.js", "keywords": [], "author": "", diff --git a/src/components/City/City.css b/src/components/City/City.css deleted file mode 100644 index c4215df..0000000 --- a/src/components/City/City.css +++ /dev/null @@ -1,46 +0,0 @@ -/* .button-container { - display: flex; - flex-direction: column; - gap: 10px; - opacity: 0; - transform: translateY(20px); - transition: opacity 0.5s ease, transform 0.5s ease; -} */ - -.animated-button { - width: 304px; - height: 54px; - font-size: 20px; - border-radius: 27px; - border: none; - background-color: #46A2E3; - font-family: 'Raleway'; - color: #FFFFFF; - font-weight: 97px; -} - -.animated-button:hover { - background-color: #398ac5; -} - -.ab { - width: 304px; - height: 54px; - font-size: 20px; - border-radius: 27px; - border: none; - background-color: white; - font-family: 'Raleway'; - color: #398ac5; - font-weight: 97px; -} - -.ab:hover { - background-color: #f8f8f8; -} - -/* -.button-container.visible { - opacity: 1; - transform: translateY(0); -} */ \ No newline at end of file diff --git a/src/components/City/City.js b/src/components/City/City.js index a17685d..a355c67 100644 --- a/src/components/City/City.js +++ b/src/components/City/City.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import axios from "axios"; -import './City.css' +import './City.scss' const City = (props) => { const route = props.getValue; @@ -54,48 +54,13 @@ const City = (props) => { }, [selectedCity, cityOptions]); return ( -
-
-
- # +
+
+
+ #
- - cityHandler(e)} placeholder="Выберите город..." value={selectedCity} id="city" name="city" className="city__choise"> + {filteredCityOptions.map(option => (
{buttonsVisible ? ( -
+
diff --git a/src/components/City/City.scss b/src/components/City/City.scss new file mode 100644 index 0000000..2a0adca --- /dev/null +++ b/src/components/City/City.scss @@ -0,0 +1,93 @@ +.button-container { + display: flex; + flex-direction: column; + position: fixed; + bottom: 50px; + gap: 10px; +} + +.animated-button { + width: 304px; + height: 54px; + font-size: 20px; + border-radius: 27px; + border: none; + background-color: #46A2E3; + font-family: 'Raleway'; + color: #FFFFFF; + font-weight: 97px; + &:hover { + background-color: #398ac5; + } +} +.city__ticket { + width: 304px; + height: 54px; + font-size: 20px; + border-radius: 27px; + border: none; + background-color: white; + font-family: 'Raleway'; + color: #398ac5; + font-weight: 97px; + display: flex; + justify-content: center; + align-items: center; + height: 42px; + border: none; + &_img { + font-size: 20px; + width: 30px; + height: 30px; + margin-right: 10px; + } + &:hover { + background-color: #f8f8f8; + } +} + + +/* +.button-container.visible { + opacity: 1; + transform: translateY(0); +} */ + +.container { + display: flex; + flex-direction: column; + height: 100vh; + justify-content: space-around; + align-items: center; + background: linear-gradient(180deg, #7EAFE7 0.27%, rgba(41, 134, 242, 0.38) 27.08%, rgba(41, 134, 242, 0.35) 31.77%, rgba(152, 198, 253, 0.28) 46.35%, rgba(41, 134, 242, 0.00) 100%); + +} +.city { + height: 520px; + position: fixed; + top: 100px; + display: flex; + align-items: center; + flex-direction: column; + justify-content: space-between; + gap: 80px; + &__plannet { + display: flex; + justify-content: center; + width: 304px; + &_img { + width: 282px; + height: 282px; + } + } + &__choise { + height: 40px; + width: 304px; + border-radius: 20px; + border: none; + padding: 5px; + &_option { + max-width: 200px; + } + } +} diff --git a/src/components/Second/Second.js b/src/components/Second/Second.js index fd01f4d..bced485 100644 --- a/src/components/Second/Second.js +++ b/src/components/Second/Second.js @@ -1,6 +1,6 @@ import React from "react" import { useNavigate } from "react-router-dom"; -import './style.css' +import './second.scss' import Icon from './images/Vector.svg' @@ -10,39 +10,15 @@ const Second = (props) => { const tinder = useNavigate(); const main = useNavigate(); return ( -
+
# -
-

Давайте
знакомиться!

-

Пройдите небольшой тест,
чтобы мы подобрали интересные
+

+

Давайте
знакомиться!

+

Пройдите небольшой тест,
чтобы мы подобрали интересные
для вас мероприятия

-
+
diff --git a/src/components/Second/second.scss b/src/components/Second/second.scss new file mode 100644 index 0000000..b90fa4f --- /dev/null +++ b/src/components/Second/second.scss @@ -0,0 +1,77 @@ +@font-face { + font-family: "Raleway"; + src: url("../Second/fonts/Raleway.ttf"); + } + + + + +.container { + display: flex; + flex-direction: column; + align-content: center; + flex-wrap: wrap; + justify-content: space-between; + height: 95vh; + background: linear-gradient(180deg, #7EAFE7 0.27%, rgba(41, 134, 242, 0.38) 27.08%, rgba(41, 134, 242, 0.35) 31.77%, rgba(152, 198, 253, 0.28) 46.35%, rgba(41, 134, 242, 0.00) 100%); + filter: blur(2); + padding-bottom: 10px; + overflow: hidden; + + &__description { + display: flex; + flex-direction: column; + gap: 20px; + align-items: center; + } + &__main_text{ + font-size: 45px; + text-align: center; + font-family: "Raleway"; + p { + font-size: 18px; + color: #6C6C6C; + text-align: center; + width: 332px; + font-family: "Raleway"; + } + + } +} + +.btn__container { + display: flex; + flex-direction: column; + gap: 15px; + align-items: center; +} +.btn_first{ + width: 231px; + height: 61px; + background: #46A2E3; + color: #fff; + font-size: 24px; + border: none; + text-align: center; + border-radius: 53px; + font-weight: bold; +} + +.btn_first:hover { + background-color: #398ac5; +} + +.btn_second{ + width: 169px; + height: 49px; + background: #7dc5f8; + border: #0094FF; + color: #ffffff; + font-size: 15px; + text-align: center; + border-radius: 53px; +} + +.btn_second:hover { + background-color: #398ac5; +} \ No newline at end of file diff --git a/src/components/Second/style.css b/src/components/Second/style.css deleted file mode 100644 index ef966da..0000000 --- a/src/components/Second/style.css +++ /dev/null @@ -1,50 +0,0 @@ -@font-face { - font-family: "Raleway"; - src: url("../Second/fonts/Raleway.ttf"); - } - - - -.main_text{ - font-size: 45px; - text-align: center; - font-family: "Raleway"; - -} -.text{ - font-size: 18px; - color: #6C6C6C; - text-align: center; - width: 332px; - font-family: "Raleway"; -} -.btn_first{ - width: 231px; - height: 61px; - background: #46A2E3; - color: #fff; - font-size: 24px; - border: none; - text-align: center; - border-radius: 53px; - font-weight: bold; -} - -.btn_first:hover { - background-color: #398ac5; -} - -.btn_second{ - width: 169px; - height: 49px; - background: #7dc5f8; - border: #0094FF; - color: #ffffff; - font-size: 15px; - text-align: center; - border-radius: 53px; -} - -.btn_second:hover { - background-color: #398ac5; -} \ No newline at end of file diff --git a/src/components/Start/Start.js b/src/components/Start/Start.js index e816ec9..f3ae8b2 100644 --- a/src/components/Start/Start.js +++ b/src/components/Start/Start.js @@ -1,5 +1,7 @@ import React, { useEffect } from "react"; import { useNavigate } from "react-router-dom"; +import './start.scss'; + const Start = (props) => { const history = useNavigate(); @@ -35,38 +37,12 @@ const Start = (props) => { }, []); return ( -
-
- logo - Путешествия

Просто!

 +
+
+ logo + Путешествия

Просто!
- +
) }; diff --git a/src/components/Start/start.scss b/src/components/Start/start.scss new file mode 100644 index 0000000..85b1043 --- /dev/null +++ b/src/components/Start/start.scss @@ -0,0 +1,37 @@ +.container { + display: flex; + flex-direction: column; + align-content: center; + align-items: center; + flex-wrap: wrap; + justify-content: space-evenly; + height: 95vh; + overflow: hidden; +} +.header { + display: flex; + flex-direction: column; + align-items: center; + &__logo { + width: 181px; + height: 181px; + } + &__text { + color: #F68C43; + display: flex; + flex-direction: column; + align-items: start; + font-weight: 700; + font-family: 'Raleway'; + font-size: 40px; + p { + color: #4EB0F2; + } + } +} +.content__btn { + overflow: hidden; + border: none; + width: 440px; + height: 440px; +} \ No newline at end of file From 632b11e42164cacf497ee8e83af867c430e6fe2b Mon Sep 17 00:00:00 2001 From: Sevka <240303vilkov@gmail.com> Date: Wed, 6 Sep 2023 00:24:09 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/City/City.js | 2 +- src/components/City/City.scss | 8 +++++--- src/components/Second/Second.js | 2 +- src/components/Second/second.scss | 2 +- src/components/Start/Start.js | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/City/City.js b/src/components/City/City.js index a355c67..8760b90 100644 --- a/src/components/City/City.js +++ b/src/components/City/City.js @@ -54,7 +54,7 @@ const City = (props) => { }, [selectedCity, cityOptions]); return ( -
+
# diff --git a/src/components/City/City.scss b/src/components/City/City.scss index 2a0adca..649c5c1 100644 --- a/src/components/City/City.scss +++ b/src/components/City/City.scss @@ -56,11 +56,13 @@ .container { display: flex; flex-direction: column; - height: 100vh; - justify-content: space-around; + height: 95vh; + align-items: center; background: linear-gradient(180deg, #7EAFE7 0.27%, rgba(41, 134, 242, 0.38) 27.08%, rgba(41, 134, 242, 0.35) 31.77%, rgba(152, 198, 253, 0.28) 46.35%, rgba(41, 134, 242, 0.00) 100%); - + &_space_around { + justify-content: space-around; + } } .city { height: 520px; diff --git a/src/components/Second/Second.js b/src/components/Second/Second.js index bced485..bfc8671 100644 --- a/src/components/Second/Second.js +++ b/src/components/Second/Second.js @@ -1,6 +1,6 @@ import React from "react" import { useNavigate } from "react-router-dom"; -import './second.scss' +import './second.scss'; import Icon from './images/Vector.svg' diff --git a/src/components/Second/second.scss b/src/components/Second/second.scss index b90fa4f..7c99fd2 100644 --- a/src/components/Second/second.scss +++ b/src/components/Second/second.scss @@ -12,7 +12,7 @@ align-content: center; flex-wrap: wrap; justify-content: space-between; - height: 95vh; + height: 100%; background: linear-gradient(180deg, #7EAFE7 0.27%, rgba(41, 134, 242, 0.38) 27.08%, rgba(41, 134, 242, 0.35) 31.77%, rgba(152, 198, 253, 0.28) 46.35%, rgba(41, 134, 242, 0.00) 100%); filter: blur(2); padding-bottom: 10px; diff --git a/src/components/Start/Start.js b/src/components/Start/Start.js index f3ae8b2..23f3f2d 100644 --- a/src/components/Start/Start.js +++ b/src/components/Start/Start.js @@ -37,7 +37,7 @@ const Start = (props) => { }, []); return ( -
+
logo Путешествия

Просто!