diff --git a/staff/angelzrc/unsocial/src/components/library/Field.jsx b/staff/angelzrc/unsocial/src/components/library/Field.jsx index fd49ba30..16bca2d3 100644 --- a/staff/angelzrc/unsocial/src/components/library/Field.jsx +++ b/staff/angelzrc/unsocial/src/components/library/Field.jsx @@ -1,7 +1,6 @@ import './Field.css' -function Field({ children }) { +export default ({ children }) => { return
{children}
} -export default Field \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/components/library/Input.css b/staff/angelzrc/unsocial/src/components/library/Input.css index 3f953278..1b9b0fcb 100644 --- a/staff/angelzrc/unsocial/src/components/library/Input.css +++ b/staff/angelzrc/unsocial/src/components/library/Input.css @@ -6,4 +6,13 @@ font-family: inherit; border-color: var(--color); border-style: solid; +} + +::placeholder{ + color: black; + opacity: 1; +} + +input:focus::-webkit-input-placeholder { + opacity : 0; } \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/components/library/Input.jsx b/staff/angelzrc/unsocial/src/components/library/Input.jsx index 8f603d89..0007b245 100644 --- a/staff/angelzrc/unsocial/src/components/library/Input.jsx +++ b/staff/angelzrc/unsocial/src/components/library/Input.jsx @@ -1,7 +1,7 @@ import './Input.css' -export default ({ type, id }) => { +export default ({ type, id, placeholder }) => { // console.log('Input -> render') - return + return } \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/components/library/PasswordInput.css b/staff/angelzrc/unsocial/src/components/library/PasswordInput.css index e69de29b..cc49d69e 100644 --- a/staff/angelzrc/unsocial/src/components/library/PasswordInput.css +++ b/staff/angelzrc/unsocial/src/components/library/PasswordInput.css @@ -0,0 +1,10 @@ +.showpass:hover{ + text-decoration: underline; +} +.showpass{ + font-size: 13px; +} + +.Input{ + border-right: 0px; +} \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/components/library/PasswordInput.jsx b/staff/angelzrc/unsocial/src/components/library/PasswordInput.jsx index 1b1c20da..664dacb9 100644 --- a/staff/angelzrc/unsocial/src/components/library/PasswordInput.jsx +++ b/staff/angelzrc/unsocial/src/components/library/PasswordInput.jsx @@ -8,11 +8,11 @@ export default class extends Component { super(props) // this.props = props - this.state = { status: '😌', type: 'password' } + this.state = { status: 'show', type: 'password' } } handleToggleClick = () => this.setState({ - status: this.state.status === '😌' ? '😳' : '😌', + status: this.state.status === 'show' ? 'hide' : 'show', type: this.state.type === 'password' ? 'text' : 'password' }) @@ -20,11 +20,12 @@ export default class extends Component { // console.log('PasswordInput -> render') return
- - + {this.state.status} +
} } \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/logic/logoutUser.js b/staff/angelzrc/unsocial/src/logic/logoutUser.js index f2c0f224..68dccbb6 100644 --- a/staff/angelzrc/unsocial/src/logic/logoutUser.js +++ b/staff/angelzrc/unsocial/src/logic/logoutUser.js @@ -1,24 +1 @@ -import { validate } from './helpers' - -import uuid from '../data/uuid' - -export default (name, email, username, password, passwordRepeat) => { - validate.name(name) - validate.email(email) - validate.username(username) - validate.password(password) - validate.passwordsMatch(password, passwordRepeat) - - const users = JSON.parse(localStorage.users) - - let user = users.find(user => user.username === username || user.email === email) - - if (user !== undefined) - throw new Error('user already exists') - - user = { id: uuid(), name: name, email: email, username: username, password: password } - - users.push(user) - - localStorage.users = JSON.stringify(users) -} \ No newline at end of file +export default () => delete sessionStorage.userId \ No newline at end of file diff --git a/staff/angelzrc/unsocial/src/view/Login.jsx b/staff/angelzrc/unsocial/src/view/Login.jsx index ee8041b6..20930bdb 100644 --- a/staff/angelzrc/unsocial/src/view/Login.jsx +++ b/staff/angelzrc/unsocial/src/view/Login.jsx @@ -36,12 +36,12 @@ export default props => {
- - + {/* */} + - + {/* */}