From bf5f73cb960bdd8c9e133740a38433acdce5af38 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Tue, 18 Jan 2022 15:38:18 +0300 Subject: [PATCH 1/5] feat(issue-164): add prototype page for specialists of pfr-app web version --- src/WebApps/pfr-app/pfr-app/src/App.css | 4 + .../pfr-app/pfr-app/src/Components/Header.jsx | 28 +++- .../pfr-app/src/Components/SpecialistItem.jsx | 120 ++++++++++++++++-- .../pfr-app/src/Components/SpecialistList.jsx | 5 +- .../pfr-app/pfr-app/src/Data/specialists.js | 68 ++++++++++ .../pfr-app/pfr-app/src/pages/Home.jsx | 2 +- .../pfr-app/pfr-app/src/pages/Specialists.jsx | 24 +++- 7 files changed, 227 insertions(+), 24 deletions(-) diff --git a/src/WebApps/pfr-app/pfr-app/src/App.css b/src/WebApps/pfr-app/pfr-app/src/App.css index 4b4bfd1b..149e8cc8 100644 --- a/src/WebApps/pfr-app/pfr-app/src/App.css +++ b/src/WebApps/pfr-app/pfr-app/src/App.css @@ -1,3 +1,7 @@ +* { +margin:0; +padding:0 +} .logo{ width:180px; height:180px; diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx index e19e2dca..0dbc1a29 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx @@ -1,10 +1,17 @@ import {FaBars, FaSearch, FaShoppingCart, FaUserPlus} from 'react-icons/fa' import {Link} from "react-router-dom"; import logo from "../pfr-logo.svg"; +import React from "react"; const Header = () => { return ( -
+
+
+
+ PF_R Community +

#PF_R Community

+ +
{/*
*/} {/*
*/} {/* */} @@ -35,17 +42,26 @@ const Header = () => { {/*
  • Support
    • */} {/* */} {/*
    */} -
    -
      -
    • +
      +
        +
      • Home
        • -
      • +
      • Specialists
        • -
      • +
      • About
        • +
      • + Community +
        • +
      • + Login +
        • +
      • + Sign up +
      {/*
      */} diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx index 698e5b5b..66dcc13f 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx @@ -2,25 +2,117 @@ import React from 'react'; const SpecialistItem = (props) => { return ( -
      -
      +
      +
      + +
      + + -
      - + -
      -
      {props.specialist.fio}
      -
      {props.specialist.specialnost}
      +
      +
      +
        +
      • + * * * * *
        • +
      + Rating +

      {props.specialist.ratings.sessions} sessions

      +
      + +
      +
      +
      + {props.specialist.fio} + { + props.specialist.status == 'online' ? +

      + * {props.specialist.status} * + +

      + : +

      + * {props.specialist.status} * + +

      + } +

      {props.specialist.intro}

      +
      +
      + + Languages + +
        +
      • Germany: |||
        • +
      • English: ||||||
        • +
      • Russian: |||||||||||
        • +
      +
      +
      + Tags + + +
      +
      + Rates +
        +
      • Trial (30 min): 20 USD
        • +
      • Hourly Rate from: 30 USD
        • +
      +
      - {/*
      */} - {/* */} - {/*
      */} +
      + + +
      +
      +
      +
        +
      • + Video +
        • +
      • Intro
        • +
      • Calendar
        • +
      - {/*{props.specialist.id}*/} +
      +
      +
      + {/*
      */} + + {/*
      */} + {/* */} + + {/*
      */} + {/*
      {props.specialist.fio}
      */} + {/*
      {props.specialist.specialnost}
      */} + {/*
      */} {/*
      */} {/*
      */} - + {/*
      */} {/* */} {/* Практикующий психолог*/} @@ -33,7 +125,7 @@ const SpecialistItem = (props) => { {/*
      */} {/*
      */} {/*
      */} - + {/*
      */} {/* */} {/* Практикующий психолог*/} @@ -46,7 +138,7 @@ const SpecialistItem = (props) => { {/*
      */} {/*
      */} {/*
      */} - + {/*
      */} {/* */} {/* Практикующий психолог*/} diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx index 79018886..cdb52a3f 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx @@ -4,10 +4,11 @@ import SpecialistItem from "./SpecialistItem"; const SpecialistList = (props) => { return ( + <>
      -

      {props.title}

      -
      +
      +

      {props.title}

      {props.specialists.map((specialist) => )} diff --git a/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js b/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js index ce186a8a..8cebfa5b 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js +++ b/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js @@ -1,21 +1,89 @@ export const specialists = [ { id: 1, fio: 'Paul Mart', + status: "online", + intro:"Want conversation practice with a native English speaker with a standard American accent? Let's chat", + country:{ + location : "Russian" + }, + language:{ + "english": 10, + "russian":5 + }, + rates:{ + trial: 10, + hour: 25 + }, + ratings: { + sessions: 2293, + value: "5.0" + }, specialnost: 'specialist #PF_R', avatar: 'https://images.unsplash.com/photo-1531427186611-ecfd6d936c79?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8OXx8dXNlciUyMHByb2ZpbGV8ZW58MHx8MHx8&auto=format&fit=crop&w=300&q=60' }, { id: 2, fio: 'Marina Oi', + status: "online", + intro:"Certified British TEFL Teacher with over 3 years of experience", + country:{ + location : "Russian" + }, + language:{ + "english": 10, + "russian":5 + }, + rates:{ + trial: 10, + hour: 25 + }, + ratings: { + sessions: 2293, + value: "5.0" + }, specialnost: 'specialist #PF_R', avatar: 'https://images.unsplash.com/photo-1522228115018-d838bcce5c3a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=300&q=60' }, { id: 3, fio: 'Paul Mart', + status: "online", + intro:"Certified British TEFL Teacher with over 3 years of experience", + country:{ + location : "Russian" + }, + language:{ + "english": 10, + "russian":5 + }, + rates:{ + trial: 10, + hour: 25 + }, + ratings: { + sessions: 23, + value: "5.0" + }, specialnost: 'specialist #PF_R', avatar: 'https://images.unsplash.com/photo-1531427186611-ecfd6d936c79?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8OXx8dXNlciUyMHByb2ZpbGV8ZW58MHx8MHx8&auto=format&fit=crop&w=300&q=60' }, { id: 4, fio: 'Paul Mart', + status: "offline", + intro:"Certified British TEFL Teacher with over 3 years of experience", + country:{ + location : "Russian" + }, + language:{ + "english": 10, + "russian":5 + }, + rates:{ + trial: 10, + hour: 25 + }, + ratings: { + sessions: 213, + value: "5.0" + }, specialnost: 'specialist #PF_R', avatar: 'https://images.unsplash.com/photo-1531427186611-ecfd6d936c79?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8OXx8dXNlciUyMHByb2ZpbGV8ZW58MHx8MHx8&auto=format&fit=crop&w=300&q=60' } diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/Home.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/Home.jsx index 587f4071..2539365e 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/Home.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/Home.jsx @@ -99,7 +99,7 @@ const Home = () => { {/* на компьютере Mac или Windows.

      */} {/* */} {/* */} + {/* className="flex items-center space-x-4 p-6 md:px-10 md:py-6 bg-gradient-to-br from-green-400 to-cyan-500 rounded-b-xl leading-6 font-semibold text-white ">*/} {/*
      Скачивайте приложение в магазине приложенией
      */} diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx index de670650..1d2a115e 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx @@ -2,14 +2,36 @@ import React from 'react'; import SpecialistList from "../Components/SpecialistList"; import specialists from "../Data/specialists"; import Header from "../Components/Header"; +import SpecialistItem from "../Components/SpecialistItem"; const Specialists = () => { return ( -
      +
      +
      +
        +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
      + + +
      + +
      +
      + {/*
      */} + {/* */} + {/*
      */}
      ); }; From 7279e02be592ebd3ece86c45bc8de6cb0eaaab89 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Tue, 18 Jan 2022 17:12:13 +0300 Subject: [PATCH 2/5] feat(issue-164): update the header component --- src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx index 0dbc1a29..32d51500 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx @@ -6,8 +6,8 @@ import React from "react"; const Header = () => { return (
      -
      -
      +
      +
      PF_R Community

      #PF_R Community

      @@ -43,7 +43,7 @@ const Header = () => { {/*
    */} {/*
    */}
    -
      +
      • Home
        • From f81f4d95c34b1983dbf7594f8d9ac714c2d1937b Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Tue, 18 Jan 2022 20:42:30 +0300 Subject: [PATCH 3/5] feat(issue-164): update the header & specialists page of pfr-app web version --- .../pfr-app/pfr-app/src/Components/Header.jsx | 27 +++++++++++-------- .../pfr-app/src/Components/SpecialistList.jsx | 7 ++++- .../pfr-app/src/pages/PrivacyStatement.jsx | 6 ++--- .../pfr-app/pfr-app/src/pages/Specialists.jsx | 24 ++++++++--------- .../pfr-app/pfr-app/src/pages/TermsOfUse.jsx | 4 +-- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx index 32d51500..27bc7119 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx @@ -5,12 +5,17 @@ import React from "react"; const Header = () => { return ( -
        +
        - PF_R Community -

        #PF_R Community

        - +
        + PF_R Community +
        +
        +

        #PF_R Community

        +

        Сообщество специалистов

        +
        +
    {/*
    */} {/*
    */} @@ -43,23 +48,23 @@ const Header = () => { {/* */} {/*
    */}
    -
      -
    • +
        +
      • Home
        • -
      • +
      • Specialists
        • -
      • +
      • About
        • -
      • +
      • Community
        • -
      • +
      • Login
        • -
      • +
      • Sign up
      diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx index cdb52a3f..12cf35cf 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistList.jsx @@ -8,7 +8,12 @@ const SpecialistList = (props) => { <>
      -

      {props.title}

      +
      +

      {props.title}

      +

      {props.countSpecialists} Specialists

      +
      + +

      Find the best specialist for you: choose from our experienced specialist online and get the best session.

      {props.specialists.map((specialist) => )} diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/PrivacyStatement.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/PrivacyStatement.jsx index 6391c8c8..71d99d17 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/PrivacyStatement.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/PrivacyStatement.jsx @@ -3,9 +3,9 @@ import Header from "../Components/Header"; const PrivacyStatement = () => { return ( -
      -
      -
      +
      +
      +

      O2 Bionics Privacy Statement

      Last Updated: December 2021 What's new?

      diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx index 1d2a115e..fc6264fa 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx @@ -6,19 +6,19 @@ import SpecialistItem from "../Components/SpecialistItem"; const Specialists = () => { return ( -

      -
      +
      +
        -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
      @@ -27,7 +27,7 @@ const Specialists = () => {
      - +
      {/*
      */} {/* */} diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/TermsOfUse.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/TermsOfUse.jsx index 15e34125..b119626f 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/TermsOfUse.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/TermsOfUse.jsx @@ -3,9 +3,9 @@ import Header from "../Components/Header"; const TermsOfUse = () => { return ( -
      +
      -
      +

      Microsoft Terms of Use

      Last Updated: June 24, 2015 From 257e5ab36eff54f6f582a890295f547fbbebdd9b Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Tue, 18 Jan 2022 20:49:44 +0300 Subject: [PATCH 4/5] feat(issue-164): update the specialists page of pfr-app web version --- src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx index fc6264fa..be4e1fa0 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx @@ -8,7 +8,7 @@ const Specialists = () => { return (
      -
      +
        • From ec5dc12094b143717a2c772f0c5107ee4b516402 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Tue, 18 Jan 2022 22:52:05 +0300 Subject: [PATCH 5/5] feat(issue-164): update test for pages of pfr-app web version --- src/WebApps/pfr-app/pfr-app/src/App.js | 5 +++ .../pfr-app/pfr-app/src/Components/Header.jsx | 2 +- .../pfr-app/src/Components/SpecialistItem.jsx | 2 +- .../pfr-app/pfr-app/src/Data/specialists.js | 2 +- .../pfr-app/src/pages/DetailSpecialist.jsx | 39 +++++++++++++++++++ .../pfr-app/pfr-app/src/pages/Specialists.jsx | 2 +- 6 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 src/WebApps/pfr-app/pfr-app/src/pages/DetailSpecialist.jsx diff --git a/src/WebApps/pfr-app/pfr-app/src/App.js b/src/WebApps/pfr-app/pfr-app/src/App.js index 71a09a93..b53cf1e8 100644 --- a/src/WebApps/pfr-app/pfr-app/src/App.js +++ b/src/WebApps/pfr-app/pfr-app/src/App.js @@ -12,6 +12,7 @@ import Trademarks from "./pages/Trademarks"; import TermsOfUse from "./pages/TermsOfUse"; import PrivacyStatement from "./pages/PrivacyStatement"; import SiteMap from "./pages/SiteMap"; +import DetailSpecialist from "./pages/DetailSpecialist"; function App() { return ( @@ -34,6 +35,10 @@ function App() {
        + + +
        +
        diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx index 27bc7119..8662fe38 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/Header.jsx @@ -13,7 +13,7 @@ const Header = () => {

      #PF_R Community

      -

      Сообщество специалистов

      +

      Community of specialists

      diff --git a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx index 66dcc13f..a02b1b5d 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/Components/SpecialistItem.jsx @@ -95,7 +95,7 @@ const SpecialistItem = (props) => {
    - diff --git a/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js b/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js index 8cebfa5b..edb768df 100644 --- a/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js +++ b/src/WebApps/pfr-app/pfr-app/src/Data/specialists.js @@ -2,7 +2,7 @@ export const specialists = [ { id: 1, fio: 'Paul Mart', status: "online", - intro:"Want conversation practice with a native English speaker with a standard American accent? Let's chat", + intro:"Do you want quality service from a certified specialist? Let's chat", country:{ location : "Russian" }, diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/DetailSpecialist.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/DetailSpecialist.jsx new file mode 100644 index 00000000..a3394a7d --- /dev/null +++ b/src/WebApps/pfr-app/pfr-app/src/pages/DetailSpecialist.jsx @@ -0,0 +1,39 @@ +import React from 'react'; +import Header from "../Components/Header"; + +const DetailSpecialist = () => { + return ( +
    +
    +
    +
    +
    + +
    +
    + Test +
    +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + ); +}; + +export default DetailSpecialist; \ No newline at end of file diff --git a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx index be4e1fa0..6b4951da 100644 --- a/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx +++ b/src/WebApps/pfr-app/pfr-app/src/pages/Specialists.jsx @@ -27,7 +27,7 @@ const Specialists = () => {
    - +
    {/*
    */} {/* */}