From 3368b6ff4e4d5ef9304a3f6d8579cb3c4ba69f3e Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Sun, 30 Oct 2022 14:05:57 +0300 Subject: [PATCH 1/8] first commit --- src/App.js | 4 +++- src/Components/Settings/Settings.css | 0 src/Components/Settings/Settings.js | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/Components/Settings/Settings.css create mode 100644 src/Components/Settings/Settings.js diff --git a/src/App.js b/src/App.js index f4f9207e..7d245502 100644 --- a/src/App.js +++ b/src/App.js @@ -13,6 +13,7 @@ import SideBar from "./Components/SideBar/SideBar"; import Strategy from "./Components/Strategy/Strategy"; import * as BS from "react-bootstrap"; import ToggleVisibility from "./Components/SideBar/ToggleVisibility"; +import Settings from "./Components/Settings/Settings"; function App() { return ( @@ -33,11 +34,12 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> } /> } /> + } /> diff --git a/src/Components/Settings/Settings.css b/src/Components/Settings/Settings.css new file mode 100644 index 00000000..e69de29b diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js new file mode 100644 index 00000000..d6bb61aa --- /dev/null +++ b/src/Components/Settings/Settings.js @@ -0,0 +1,9 @@ +import React from 'react' + +function Settings() { + return ( +
Settings
+ ) +} + +export default Settings From e8a2be8060d31c0985077fcfd9220c3ff34c6d2d Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Sun, 30 Oct 2022 16:16:22 +0300 Subject: [PATCH 2/8] profile updated --- package.json | 1 + src/App.js | 2 +- src/Components/Settings/Settings.js | 101 ++++++++++++++++++++++++++-- src/Components/Settings/anonim.jpg | Bin 0 -> 8446 bytes 4 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 src/Components/Settings/anonim.jpg diff --git a/package.json b/package.json index 8e6e6421..4ee85e36 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.1.2", "bootstrap": "^5.2.2", + "mdb-react-ui-kit": "^4.2.0", "react": "^18.2.0", "react-bootstrap": "^2.5.0", "react-dom": "^18.2.0", diff --git a/src/App.js b/src/App.js index 7d245502..9d10c8e7 100644 --- a/src/App.js +++ b/src/App.js @@ -39,7 +39,7 @@ function App() { } /> } /> } /> - } /> + } /> diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js index d6bb61aa..0c5a7d4f 100644 --- a/src/Components/Settings/Settings.js +++ b/src/Components/Settings/Settings.js @@ -1,9 +1,98 @@ -import React from 'react' +import React, { useState } from 'react'; +import { + MDBTabs, + MDBTabsItem, + MDBTabsLink, + MDBTabsContent, + MDBTabsPane, + MDBFile, + MDBInput, + MDBBtn, +} from "mdb-react-ui-kit"; +import anonim from "./anonim.jpg"; -function Settings() { - return ( -
Settings
- ) +export function Settings() { + const [fillActive, setFillActive] = useState("tab1"); + + const handleFillClick = (value) => { + if (value === fillActive) { + return; + } + + setFillActive(value); + }; + + return ( + <> + + + handleFillClick("tab1")} + active={fillActive === "tab1"} + > + Profile + + + + handleFillClick("tab2")} + active={fillActive === "tab2"} + > + Notifications + + + + handleFillClick("tab3")} + active={fillActive === "tab3"} + > + Security + + + + + + +
GENERAL INFORMATION
+
+ + + +
+
+
+ + + + + + Sign in + + +
+ + Tab 2 content + Tab 3 content + + + ); } -export default Settings +export default Settings; diff --git a/src/Components/Settings/anonim.jpg b/src/Components/Settings/anonim.jpg new file mode 100644 index 0000000000000000000000000000000000000000..41d5c10d7b4c5fab8a9695fb0603b7ca6437aac7 GIT binary patch literal 8446 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 F{}-bTB9H(8 literal 0 HcmV?d00001 From 2b9f3799f4972116989f8ac6527eb7b757cafca1 Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Tue, 1 Nov 2022 02:37:15 +0300 Subject: [PATCH 3/8] security added --- src/Components/Settings/Settings.js | 153 +++++++++++++++++++++------- 1 file changed, 119 insertions(+), 34 deletions(-) diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js index 0c5a7d4f..f6c12b28 100644 --- a/src/Components/Settings/Settings.js +++ b/src/Components/Settings/Settings.js @@ -10,6 +10,7 @@ import { MDBBtn, } from "mdb-react-ui-kit"; import anonim from "./anonim.jpg"; +import * as BS from "react-bootstrap"; export function Settings() { const [fillActive, setFillActive] = useState("tab1"); @@ -53,43 +54,127 @@ export function Settings() { -
GENERAL INFORMATION
-
- + + + +
GENERAL INFORMATION
+
+ - -
-
-
- - - + +
+
+ + + + - - Sign in - - -
+ + Block level button + + +
+ + + + + + + + + +
GENERAL INFORMATION
+
+ + + +
+
+
+ + + + + + Sign in + + +
+ + + + + + + + + +
PASSWORD
+

Change your password to a new one.

+ + + {" "} + + Primary + {" "} + + + + +
MULTI-FACTOR AUTHENTICATION
+

Setup or remove MFA devices.

+ + + {" "} + + Primary + {" "} + + + - Tab 2 content - Tab 3 content ); From 08409352a66a8cf10c7becfdaa0dc4484f85e302 Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Fri, 4 Nov 2022 19:23:32 +0300 Subject: [PATCH 4/8] bg changed --- src/Components/Settings/Settings.js | 166 ++++++++-------------------- 1 file changed, 46 insertions(+), 120 deletions(-) diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js index f6c12b28..2c18d6e4 100644 --- a/src/Components/Settings/Settings.js +++ b/src/Components/Settings/Settings.js @@ -1,59 +1,19 @@ import React, { useState } from 'react'; -import { - MDBTabs, - MDBTabsItem, - MDBTabsLink, - MDBTabsContent, - MDBTabsPane, - MDBFile, - MDBInput, - MDBBtn, -} from "mdb-react-ui-kit"; import anonim from "./anonim.jpg"; import * as BS from "react-bootstrap"; -export function Settings() { - const [fillActive, setFillActive] = useState("tab1"); - const handleFillClick = (value) => { - if (value === fillActive) { - return; - } +export function Settings() { - setFillActive(value); - }; return ( <> - - - handleFillClick("tab1")} - active={fillActive === "tab1"} - > - Profile - - - - handleFillClick("tab2")} - active={fillActive === "tab2"} - > - Notifications - - - - handleFillClick("tab3")} - active={fillActive === "tab3"} - > - Security - - - - - - + + @@ -66,90 +26,57 @@ export function Settings() { width="100" height="100" /> - -
-
- - - + + + Email address + + + We'll never share your email with anyone else. + + + + + Example textarea + + - + Block level button - +
- - + + - -
GENERAL INFORMATION
-
- - - -
-
-
- - - - - - Sign in - - -
- + - - + + - +
PASSWORD

Change your password to a new one.

@@ -161,7 +88,7 @@ export function Settings() { {" "} - +
MULTI-FACTOR AUTHENTICATION

Setup or remove MFA devices.

@@ -174,10 +101,9 @@ export function Settings() { - - + + - ); -} + );} export default Settings; From 5de6bfc110065c0db649fa34ddc0d3ddcc231ccc Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Fri, 4 Nov 2022 19:50:46 +0300 Subject: [PATCH 5/8] button updated --- src/Components/Settings/Settings.js | 209 ++++++++++++++-------------- 1 file changed, 107 insertions(+), 102 deletions(-) diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js index 2c18d6e4..e19ec338 100644 --- a/src/Components/Settings/Settings.js +++ b/src/Components/Settings/Settings.js @@ -1,109 +1,114 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; import anonim from "./anonim.jpg"; import * as BS from "react-bootstrap"; - export function Settings() { + return ( + <> + + + + + +
GENERAL INFORMATION
+
+ +
+
+ + + Email address + + + This will be displayed as your creator name on the + Marketplace.{" "} + + - - return ( - <> - - - - - -
GENERAL INFORMATION
-
- -
-
- - - Email address - - - We'll never share your email with anyone else. - - - - - Example textarea - - - - - Block level button - - -
- - - - - - - - - - - - - - - - - -
PASSWORD
-

Change your password to a new one.

- - - {" "} - - Primary - {" "} - - - - -
MULTI-FACTOR AUTHENTICATION
-

Setup or remove MFA devices.

- - - {" "} - - Primary - {" "} - - - - - - - );} + + Example textarea + + + This will be displayed to all users and followers on the + Marketplace.{" "} + + +
+ + Update my profile + +
+ +
+ + + + + + + + + + + + + + + + + +
PASSWORD
+

Change your password to a new one.

+ + + {" "} + + Primary + {" "} + + + + +
MULTI-FACTOR AUTHENTICATION
+

Setup or remove MFA devices.

+ + + {" "} + + Primary + {" "} + + + + + + + ); +} export default Settings; From 760e04cd1f4dd17cf2ce9c1b0636c4ad22d5ff03 Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Fri, 4 Nov 2022 19:55:09 +0300 Subject: [PATCH 6/8] security updated --- src/Components/Settings/Settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Settings/Settings.js b/src/Components/Settings/Settings.js index e19ec338..173b6d47 100644 --- a/src/Components/Settings/Settings.js +++ b/src/Components/Settings/Settings.js @@ -88,7 +88,7 @@ export function Settings() { {" "} - Primary + Change password {" "} @@ -100,7 +100,7 @@ export function Settings() { {" "} - Primary + Setup or remove {" "} From 1dbfa4dde75f2ec09d635e6e3eaddb2ebed63620 Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Fri, 4 Nov 2022 23:24:45 +0300 Subject: [PATCH 7/8] forgot password imported --- src/App.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 555f7d68..e9ca455a 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ import NameBar from "./Components/NameBar/NameBar"; import TopBar from "./Components/TopBar/TopBar"; import CBASummaryBox from "./Components/SummaryBox/CreateBotAreaSummaryBox/CBASummaryBox"; import CSASummaryBox from "./Components/SummaryBox/CreateStrategyAreaSummaryBox/CSASummaryBox"; - +import ForgotPassword from "./Components/LogIn/ForgotPassword/ForgotPassword"; import CreateStrategyArea from "./Components/CreateStrategyArea/CreateStrategyArea"; import CreateBotArea from "./Components/CreateBotArea/CreateBotArea"; import SideBar from "./Components/SideBar/SideBar"; @@ -46,7 +46,6 @@ function App() { } /> } /> } /> - } From 960f1b0f2fcb024118867d86760a0c0caad60eed Mon Sep 17 00:00:00 2001 From: ezgikarali Date: Sat, 26 Nov 2022 21:21:45 +0300 Subject: [PATCH 8/8] import changed --- src/App.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/App.js b/src/App.js index dd711812..eb5dc87e 100644 --- a/src/App.js +++ b/src/App.js @@ -15,7 +15,6 @@ import SideBar from "./Components/SideBar/SideBar"; import Strategy from "./Components/Strategy/Strategy"; import * as BS from "react-bootstrap"; import ToggleVisibility from "./Components/SideBar/ToggleVisibility"; -import ForgotPassword from "./Components/LogIn/ForgotPassword/ForgotPassword" import Settings from "./Components/Settings/Settings"; import SignIn from "./Components/LogIn/SignIn/SignIn";