From b00f803670a420f5c40800f2f779090be99ded69 Mon Sep 17 00:00:00 2001 From: Fil Cesana Date: Tue, 24 Mar 2020 15:57:22 +0100 Subject: [PATCH 1/2] confirm reset password page done --- smart-hut/public/title8.png | Bin 0 -> 3259 bytes smart-hut/src/App.js | 4 + smart-hut/src/views/ConfirmResetPassword.js | 82 ++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 smart-hut/public/title8.png create mode 100644 smart-hut/src/views/ConfirmResetPassword.js diff --git a/smart-hut/public/title8.png b/smart-hut/public/title8.png new file mode 100644 index 0000000000000000000000000000000000000000..0d3c3957e55399c54a92d93b199eb7a63923b1e1 GIT binary patch literal 3259 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 literal 0 HcmV?d00001 diff --git a/smart-hut/src/App.js b/smart-hut/src/App.js index 7ea3911..cadc1db 100644 --- a/smart-hut/src/App.js +++ b/smart-hut/src/App.js @@ -9,6 +9,7 @@ import ForgotPass from "./views/Forgot-password"; import ChangePass from "./views/Forgot-pass-reset"; import ConfirmForgotPasswrod from "./views/ConfirmForgotPassword"; import ConfirmRegistration from "./views/ConfirmRegistration"; +import ConfirmResetPassword from "./views/ConfirmResetPassword"; import Instruction from "./views/Instruction"; import queryString from "query-string"; @@ -134,6 +135,9 @@ class App extends Component { + + + diff --git a/smart-hut/src/views/ConfirmResetPassword.js b/smart-hut/src/views/ConfirmResetPassword.js new file mode 100644 index 0000000..72d6628 --- /dev/null +++ b/smart-hut/src/views/ConfirmResetPassword.js @@ -0,0 +1,82 @@ +import React, { Component } from "react"; +import HomeNavbar from "./../components/HomeNavbar"; +import { Image, Divider, Message, Grid } from "semantic-ui-react"; + +class Paragraph extends Component { + state = { visible: true }; + + handleDismiss = () => { + this.setState({ visible: false }); + + setTimeout(() => { + this.setState({ visible: true }); + }, 2000); + }; + + render() { + if (this.state.visible) { + return ( + + ); + } + + return ( +

+
+ The message will return in 2s +
+
+

+ ); + } + } + + const MessageReg = () => ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); + + + + + +export default class ConfirmResetPassword extends Component { + render() { + return ; + } + } \ No newline at end of file From 733d2ee44f365c08e9095d2174f2480f68a3b6fc Mon Sep 17 00:00:00 2001 From: Fil Cesana Date: Tue, 24 Mar 2020 17:37:05 +0100 Subject: [PATCH 2/2] fix --- smart-hut/src/components/HeaderController.js | 68 ++++------ smart-hut/src/views/ConfirmResetPassword.js | 136 +++++++++---------- 2 files changed, 93 insertions(+), 111 deletions(-) diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js index 4391de6..acc4259 100644 --- a/smart-hut/src/components/HeaderController.js +++ b/smart-hut/src/components/HeaderController.js @@ -5,14 +5,11 @@ import { BrowserView, MobileView, isBrowser, - isMobile + isMobile, } from "react-device-detect"; const AvatarImage = () => ( - + ); const IconHomeImage = () => ( @@ -35,15 +32,9 @@ const IconHomeImageMobile = () => ( /> ); -const TitleImage = () => ( - -); +const TitleImage = () => ; -const BrowserStructure = (props) => ( +const BrowserStructure = (props) => ( @@ -76,10 +67,10 @@ const BrowserStructure = (props) => ( - + ); -const MobileStructure = (props) => ( +const MobileStructure = (props) => ( @@ -90,36 +81,29 @@ const MobileStructure = (props) => ( - - - - - - - - Settings - - Document - Image - - - See profile... - - Logout - - + + + + + + + + Settings + + Document + Image + + + See profile... + + Logout + + - - + + ); - - - - - - - export default class MyHeader extends React.Component { render() { return ( diff --git a/smart-hut/src/views/ConfirmResetPassword.js b/smart-hut/src/views/ConfirmResetPassword.js index 72d6628..6e09fc8 100644 --- a/smart-hut/src/views/ConfirmResetPassword.js +++ b/smart-hut/src/views/ConfirmResetPassword.js @@ -3,80 +3,78 @@ import HomeNavbar from "./../components/HomeNavbar"; import { Image, Divider, Message, Grid } from "semantic-ui-react"; class Paragraph extends Component { - state = { visible: true }; - - handleDismiss = () => { - this.setState({ visible: false }); - - setTimeout(() => { - this.setState({ visible: true }); - }, 2000); - }; - - render() { - if (this.state.visible) { - return ( - - ); - } - + state = { visible: true }; + + handleDismiss = () => { + this.setState({ visible: false }); + + setTimeout(() => { + this.setState({ visible: true }); + }, 2000); + }; + + render() { + if (this.state.visible) { return ( -

-
- The message will return in 2s -
-
-

+ + + Congratulations! + + Your password has been succesffuly + successfully reset + ); } + + return ( +

+
+ The message will return in 2s +
+
+

+ ); } - - const MessageReg = () => ( - - - - - - - - - - - - - - - +} + +const MessageReg = () => ( + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - ); - - - - + + + +); export default class ConfirmResetPassword extends Component { - render() { - return ; - } - } \ No newline at end of file + render() { + return ; + } +}