From b11390d65e15ca8ca7542956d1d62eac36a26811 Mon Sep 17 00:00:00 2001 From: "[lambert lambo]" <[lygobalambert@gmail.com]> Date: Mon, 7 Oct 2019 11:07:29 +0300 Subject: [PATCH 1/2] new changes --- src/components/AuthForm1.js | 2 +- src/components/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AuthForm1.js b/src/components/AuthForm1.js index 2c3a465..facf968 100644 --- a/src/components/AuthForm1.js +++ b/src/components/AuthForm1.js @@ -84,7 +84,7 @@ class AuthForm1 extends React.Component {
- +
diff --git a/src/components/index.js b/src/components/index.js index 48500ca..0af6622 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,7 +1,7 @@ import React from "react"; import "../App.css"; -function () { +function home() { return (

Home Page

From 70e1637ab07aac7511523f5d51111796460114d6 Mon Sep 17 00:00:00 2001 From: "[lambert lambo]" <[lygobalambert@gmail.com]> Date: Tue, 22 Oct 2019 18:56:02 +0300 Subject: [PATCH 2/2] change password --- .vscode/launch.json | 14 ++++++++ src/App.css | 54 +++++++++++++++++++++------- src/App.js | 3 +- src/components/ChangePasswordBody.js | 24 +++---------- src/components/SignUpBody.js | 2 -- src/components/password.js | 52 ++++++++++++++------------- 6 files changed, 89 insertions(+), 60 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..ece904f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,14 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "program": "${workspaceFolder}\\start" + } + ] +} \ No newline at end of file diff --git a/src/App.css b/src/App.css index f8562b8..253f90c 100644 --- a/src/App.css +++ b/src/App.css @@ -153,15 +153,16 @@ label { color: #542a52; } -#login-button { - margin-left: 60%; -} +/* #login-button { + margin-left: 5%; +} */ #login-button, #signup-btn { width: 100%; background-color: #fff; color: #542a52; + margin-left: -2%; border: 1px solid #542a52; text-transform: capitalize; font-size: 18px; @@ -216,30 +217,57 @@ label { color: #542a52; line-height: 2em; } -/* .MuiInputBase-root { - color: #542a52; -} */ -/* .MuiFormControl-fullwidth { - width: 100%; -} */ + +.changePassword-wrapper { + border: 1px solid #542a52; +} + .changePassword-Header { width: 100%; + height: 65px; + padding: 20px; + margin-top: 0%; + background-color: #542a52; border-bottom: 2px solid #542a52; /* margin-left: 8%; */ } .changePassword-Header h4 strong { color: #fff; - background-color: #542a52; - padding: 10px; + /* background-color: #542a52; */ + padding: 16px; width: 50%; + height: 65px; } .MuiInput-underline::before { - position: relative; + position: absolute; transition: border-bottom-color 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; border-bottom: 1px solid #542a52; + width: 100%; } - +.MuiInput-underline::after { + border-bottom: 1px solid #542a52; +} +/* .MuiFormLabel-root { color: #542a52; } +.MuiInputLabel-shrink { + color: #542a52; +} */ +/* .MuiInputLabel-root::after { + color: #542a52; +} */ +/* .makeStyles-textField-4 { + flex-basis: 100%; +} */ +/* .MuiFormLabel-root, +.MuiInputLabel-root, +.MuiInputLabel-formControl, +.MuiInputLabel-animated { + color: #542a52; +} */ + +.MuiFormLabel-root.Mui-focused { + color: rgba(0, 0, 0, 0.54); +} diff --git a/src/App.js b/src/App.js index 01f9884..023f536 100644 --- a/src/App.js +++ b/src/App.js @@ -16,7 +16,7 @@ import selection from "./components/selection"; import admission from "./components/admission"; import interview from "./components/interview"; import changePassword from "./components/ChangePassword"; -import Password from "./components/password"; + import { BrowserRouter as Router, Switch, @@ -53,7 +53,6 @@ class App extends React.Component { - diff --git a/src/components/ChangePasswordBody.js b/src/components/ChangePasswordBody.js index 2414f3b..6e17b78 100644 --- a/src/components/ChangePasswordBody.js +++ b/src/components/ChangePasswordBody.js @@ -1,22 +1,16 @@ import React from "react"; -import AuthButton1 from "./AuthButton1"; -import AuthButton2 from "./AuthButton2"; -// import AuthButton3 from "./AuthButton2"; import "bootstrap/dist/css/bootstrap.css"; import "../App.css"; -import { Link } from "react-router-dom"; import InputAdornments from "./password"; import Loginbutton from "./Loginbutton"; class changePasswordBody extends React.Component { - // state = { title: undefined }; - render() { return (
- q
+
@@ -28,14 +22,14 @@ class changePasswordBody extends React.Component {

- change Password + {this.props.formType}

Failed: Invalid credentials!
-
+
@@ -70,17 +64,9 @@ class changePasswordBody extends React.Component {
-
- {/*
- */} +
+
- {/*
*/}
diff --git a/src/components/SignUpBody.js b/src/components/SignUpBody.js index fc454bb..ce2e556 100644 --- a/src/components/SignUpBody.js +++ b/src/components/SignUpBody.js @@ -14,5 +14,3 @@ function SignupBody() { ); } export default SignupBody; - - diff --git a/src/components/password.js b/src/components/password.js index 4d65ff3..e543688 100644 --- a/src/components/password.js +++ b/src/components/password.js @@ -1,5 +1,6 @@ import React from "react"; import clsx from "clsx"; +import TextField from "@material-ui/core/TextField"; import { makeStyles } from "@material-ui/core/styles"; import IconButton from "@material-ui/core/IconButton"; import Input from "@material-ui/core/Input"; @@ -7,11 +8,12 @@ import InputLabel from "@material-ui/core/InputLabel"; import InputAdornment from "@material-ui/core/InputAdornment"; import FormHelperText from "@material-ui/core/FormHelperText"; import FormControl from "@material-ui/core/FormControl"; -import TextField from "@material-ui/core/TextField"; +// import TextField from "@material-ui/core/TextField"; import MenuItem from "@material-ui/core/MenuItem"; import Visibility from "@material-ui/icons/Visibility"; import VisibilityOff from "@material-ui/icons/VisibilityOff"; import "../App.css"; +import { StylesProvider } from "@material-ui/styles"; const ranges = [ { @@ -40,7 +42,7 @@ const useStyles = makeStyles(theme => ({ marginTop: theme.spacing(3) }, textField: { - flexBasis: 200 + // flexBasis: 200 } })); @@ -67,27 +69,29 @@ export default function InputAdornments(props) { }; return ( -
- - {props.password} - - - {values.showPassword ? : } - - - } - /> - -
+ +
+ + {props.password} + + + {values.showPassword ? : } + + + } + /> + +
+ ); }