Skip to content

User account #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions app/Http/Controllers/Api/V1/Settings/AccountController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?php

namespace App\Http\Controllers\Api\V1\Settings;

use Hash;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Validation\ValidationException;

class AccountController extends Controller
{
/**
* @var App\User
*/
protected $user;

/**
* Create a new AccountController
*/
public function __construct()
{
$this->user = auth()->guard('api')->user();
}

/**
* Update User's login credentials
*
* @param Illuminate\Http\Request $request
*
* @return Illuminate\Http\JsonResponse
*/
public function updateCredentials(Request $request) : JsonResponse
{
$request->validate([
'username' =>
"required|string|unique:users,username,{$this->user->id},id,deleted_at,NULL",
'email' =>
"required|email|unique:users,email,{$this->user->id},id,deleted_at,NULL"
]);

$this->user->username = $request->input('username');
$this->user->email = $request->input('email');
$this->user->update();

return response()->json($this->user);
}

/**
* Update User's password
*
* @param Illuminate\Http\Request $request
*
* @return Illuminate\Http\JsonResponse
*/
public function updatePassword(Request $request) : JsonResponse
{
$request->validate([
'old_password' => 'required|string',
'password' => 'required|string|confirmed|min:8|pwned:100'
]);

if (! Hash::check($request->input('old_password'), $this->user->password)) {
throw ValidationException::withMessages([
'old_password' => [trans('auth.password_mismatch')]
]);

return response()->json('Password was not Changed!', 422);
}

$this->user->password = bcrypt($request->input('password'));
$this->user->update();

return response()->json('Password Changed!');
}
}
40 changes: 40 additions & 0 deletions app/Http/Controllers/Api/V1/Settings/ProfileController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

namespace App\Http\Controllers\Api\V1\Settings;

use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;

class ProfileController extends Controller
{
/**
* Update User's profile
*
* @param Illuminate\Http\Request $request
*
* @return Illuminate\Http\JsonResponse
*/
public function update(Request $request) : JsonResponse
{
$user = auth()->guard('api')->user();

$request->validate([
'firstname' => 'required|string|max:255',
'lastname' => 'required|string|max:255',

'gender' => 'nullable|in:female,male',
'birthdate' =>
'nullable|date:Y-m-d|before:'.now()->subYear(10)->format('Y-m-d'),
'address' => 'nullable|string|max:510',
]);

$attributes = $request->all();
unset($attributes['auth_token']);

$user->fill($attributes);
$user->update();

return response()->json($user);
}
}
2 changes: 2 additions & 0 deletions resources/js/config/locale.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ export default {
'en.actions': require('../../lang/en/actions.php'),
'en.navigation': require('../../lang/en/navigation.php'),
'en.resources': require('../../lang/en/resources.php'),
'en.settings': require('../../lang/en/settings.php'),
'en.table': require('../../lang/en/table.php'),
'en.validation': require('../../lang/en/validation.php'),

// Filipino
'fil.actions': require('../../lang/fil/actions.php'),
'fil.navigation': require('../../lang/fil/navigation.php'),
'fil.resources': require('../../lang/fil/resources.php'),
'fil.settings': require('../../lang/fil/settings.php'),
'fil.table': require('../../lang/fil/table.php'),
'fil.validation': require('../../lang/fil/validation.php'),
};
13 changes: 13 additions & 0 deletions resources/js/routers/backoffice.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Home } from '../views/__backoffice';
import * as Settings from '../views/__backoffice/settings';
import * as Users from '../views/__backoffice/users';

export default [
Expand All @@ -8,6 +9,18 @@ export default [
component: Home,
},

{
name: 'settings.profile',
path: '/settings/profile',
component: Settings.Profile,
},

{
name: 'settings.account',
path: '/settings/account',
component: Settings.Account,
},

{
name: 'users.index',
path: '/users',
Expand Down
1 change: 0 additions & 1 deletion resources/js/views/__backoffice/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Home extends Component {
pageTitle={Lang.get('navigation.dashboard')}
primaryAction={primaryAction}
tabs={tabs}
breadcrumbs={[]}
>
<Typography>There is no place like home</Typography>
</MasterLayout>
Expand Down
165 changes: 165 additions & 0 deletions resources/js/views/__backoffice/layouts/Clean.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';

import {
CircularProgress,
CssBaseline,
Grid,
Hidden,
withStyles,
} from '@material-ui/core';
import classNames from 'classnames';

import { Snackbar } from '../../../ui';
import { LinearDeterminate } from '../../../ui/Loaders';
import { Footer, Header, Sidebar } from '../partials';

function Clean(props) {
const { classes, ...other } = props;
const { history, loading, message } = props;

const [drawerOpen, setDrawer] = useState(false);
const [localeMenuOpen, setLocaleMenu] = useState(false);
const [accountMenuOpen, setAccountMenu] = useState(false);

const sidebarProps = Object.assign(other, {
navigate: path => history.push(path),
PaperProps: { style: { width: drawerWidth } },
open: drawerOpen,
onClose: () => setDrawer(!drawerOpen),
});

const renderLoading = (
<Grid
container
className={classes.root}
justify="center"
alignItems="center"
>
<Grid item>
<CircularProgress color="primary" />
</Grid>
</Grid>
);

return (
<>
{loading && <LinearDeterminate className={classes.loader} />}

<div className={classes.root}>
<CssBaseline />

<nav className={classes.drawer}>
<Hidden smUp implementation="js">
<Sidebar {...sidebarProps} variant="temporary" />
</Hidden>

<Hidden xsDown implementation="css">
<Sidebar {...sidebarProps} variant="persistent" />
</Hidden>
</nav>

<div className={classes.contentWrapper}>
<Header
{...other}
variant="slim"
drawerOpen={drawerOpen}
accountMenuOpen={accountMenuOpen}
localeMenuOpen={localeMenuOpen}
onDrawerToggle={() => setDrawer(!drawerOpen)}
onLocaleMenuToggle={() =>
setLocaleMenu(!localeMenuOpen)
}
onAccountMenuToggle={() =>
setAccountMenu(!accountMenuOpen)
}
/>

<main
className={classNames(classes.content, {
[classes.contentShift]: drawerOpen,
})}
>
{loading ? renderLoading : props.children}
</main>
</div>

<Footer />
</div>

{message && message.hasOwnProperty('type') && (
<Snackbar {...message} />
)}
</>
);
}

Clean.propTypes = {
classes: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
location: PropTypes.object.isRequired,
match: PropTypes.object.isRequired,
pageProps: PropTypes.object.isRequired,

pageTitle: PropTypes.string,
loading: PropTypes.bool,
message: PropTypes.object,
};

Clean.defaultProps = {
pageTitle: '',
loading: false,
message: {},
};

const drawerWidth = 256;

const styles = theme => ({
loader: {
zIndex: 9999,
},

root: {
display: 'flex',
position: 'relative',
minHeight: '100vh',
maxWidth: '100%',
},

drawer: {
drawer: {
width: drawerWidth,
flexShrink: 0,
},
},

contentWrapper: {
flex: 1,
display: 'flex',
flexDirection: 'column',
overflowX: 'scroll',
},

content: {
flex: 1,
padding: `0 ${theme.spacing.unit}px`,
marginBottom: 75,
marginLeft: 0,
[theme.breakpoints.up('sm')]: {
marginBottom: 50,
padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`,
},
},

contentShift: {
[theme.breakpoints.up('sm')]: {
transition: theme.transitions.create('margin', {
easing: theme.transitions.easing.easeOut,
duration: theme.transitions.duration.enteringScreen,
}),
marginLeft: drawerWidth,
},
},
});

export default withStyles(styles)(Clean);
Loading