Skip to content

Issue24 Change Picture Option #152

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.

Sign up for GitHub

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

Open
ghost wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Issue24 Change Picture Option #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c19d93c
Replaced <div/> with </div>
May 4, 2016
a812c75
Added Picture Modification
May 4, 2016
9490f26
Merge branch 'master' of github.com:uidaho/squireproject into issue24
May 4, 2016
8fe4fc3
Updated to Master
May 4, 2016
487840a
Fixed Minor Bug Upload bug
May 4, 2016
e0fb737
Removed local images
May 4, 2016
e4497a0
Merge branch 'master' into issue24
backburn May 5, 2016
1f4d376
Merge branch 'master' into issue24
backburn May 6, 2016
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
35 changes: 34 additions & 1 deletion app/Http/Controllers/ProfileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,40 @@ public function updateProfile(Request $request)

$user = Auth::user();

$user->profile->update($request->all());
$picture = $request->file('picture');

if ($picture)
{
$newEntry = [
'date_of_birth' => $request['date_of_birth'],
'first_name' => $request['first_name'],
'last_name' => $request['last_name'],
'picture' => $user->username . '.jpg',
'phone' => $request['phone'],
'address' => $request['address'],
'gender' => $request['gender'],
'biography' => $request['biography']
];


$picture->move(base_path() . '/public/images/users', $user->username . '.jpg');
}

else
{
$newEntry = [
'date_of_birth' => $request['date_of_birth'],
'first_name' => $request['first_name'],
'last_name' => $request['last_name'],
'picture' => $user->profile->picture,
'phone' => $request['phone'],
'address' => $request['address'],
'gender' => $request['gender'],
'biography' => $request['biography']
];
}

$user->profile->update($newEntry);

return redirect('/profile/' . $user->username);
}
Expand Down
179 changes: 95 additions & 84 deletions resources/views/profile/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,92 +16,103 @@
</ul>
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" action="{{url('profile/update')}}" method="POST">
<form class="form-horizontal" action="{{url('profile/update')}}" method="POST" enctype="multipart/form-data">
{!! csrf_field() !!}

<fieldset>
<div class="form-group row">
<label for="first_name" class="col-md-1 control-label">First Name</label>
<div class="col-md-4">
<input type="text" class="form-control" id="first_name" name="first_name"
value="{{$user->profile->first_name}}">
</div>
</div>
<div class="form-group row">
<label for="last_name" class="col-md-1 control-label">Last Name</label>
<div class="col-md-4">
<input type="text" class="form-control" id="last_name" name="last_name"
value="{{$user->profile->last_name}}">
</div>
</div>
<div class="form-group row">
<label for="date_of_birth" class="col-md-1 control-label">Birth Date</label>
<div class="col-md-4">
<input type="text" class="form-control" id="date_of_birth" name="date_of_birth"
value="{{$user->profile->date_of_birth}}">
</div>
</div>
<div class="form-group row">
<label for="phone" class="col-md-1 control-label">Phone</label>
<div class="col-md-4">
<input type="text" class="form-control" id="phone" name="phone"
value="{{$user->profile->phone}}">
</div>
</div>
<div class="form-group row">
<label for="address" class="col-md-1 control-label">Address</label>
<div class="col-md-4">
<input type="text" class="form-control" id="address" name="address"
value="{{$user->profile->address}}">
</div>
</div>
<div class="form-group row">
<label class="col-md-1 control-label">Gender</label>
<div class="col-md-4">
@if ($user->profile->gender)
<div class="row">
<div class="col-md-1"><label class="control-label" for="male">Male</label></div>
<div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
value="1" checked=""></div>
</div>
<div class="row">
<div class="col-md-1"><label class="control-label" for="female">Female</label>
</div>
<div class="col-md-1"><input class="radio" type="radio" name="gender"
id="female" value="0"></div>
</div>
@else
<div class="row">
<div class="col-md-1"><label class="control-label" for="male">Male</label></div>
<div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
value="1"></div>
</div>
<div class="row">
<div class="col-md-1"><label class="control-label" for="female">Female</label>
</div>
<div class="col-md-1"><input class="radio" type="radio" name="gender"
id="female" value="0" checked=""></div>
</div>
@endif
</div>
</div>
<div class="form-group row">
<label for="biography" class="col-md-1 control-label">About Me</label>
<div class="col-md-4">
<textarea class="form-control" rows="3" id="biography" name="biography"
placeholder="{{$user->profile->biography}}"></textarea>
<grammarly-btn>
<div style="z-index: 2; opacity: 1; transform: translate(409px, 50px);"
class="_9b5ef6-textarea_btn _9b5ef6-not_focused" data-grammarly-reactid=".0">
<div class="_9b5ef6-transform_wrap" data-grammarly-reactid=".0.0">
<div title="Protected by Grammarly" class="_9b5ef6-status"
data-grammarly-reactid=".0.0.0">
&nbsp;
</div>
</div>
</div>
</grammarly-btn>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="row">
<div class="col-md-12 well-lg">
<div class="center-block project-image"
style="background-image: url({{$user->profile->getProfileImagePath()}});">
</div>
</div>
</div>
<div class="row well-lg">
<div class="col-md-12">
<label for="thumbnail" class="col-md-4 control-label">Change Photo</label>
<div class="col-md-8">
<input class="" type="file" id="picture" name="picture">
</div>
</div>
</div>
</div>

<div class="col-md-9">
<div class="form-group row">
<label for="first_name" class="col-md-1 control-label">First Name</label>
<div class="col-md-4">
<input type="text" class="form-control" id="first_name" name="first_name"
value="{{$user->profile->first_name}}">
</div>
</div>
<div class="form-group row">
<label for="last_name" class="col-md-1 control-label">Last Name</label>
<div class="col-md-4">
<input type="text" class="form-control" id="last_name" name="last_name"
value="{{$user->profile->last_name}}">
</div>
</div>
<div class="form-group row">
<label for="date_of_birth" class="col-md-1 control-label">Birth Date</label>
<div class="col-md-4">
<input type="text" class="form-control" id="date_of_birth" name="date_of_birth"
value="{{$user->profile->date_of_birth}}">
</div>
</div>
<div class="form-group row">
<label for="phone" class="col-md-1 control-label">Phone</label>
<div class="col-md-4">
<input type="text" class="form-control" id="phone" name="phone"
value="{{$user->profile->phone}}">
</div>
</div>
<div class="form-group row">
<label for="address" class="col-md-1 control-label">Address</label>
<div class="col-md-4">
<input type="text" class="form-control" id="address" name="address"
value="{{$user->profile->address}}">
</div>
</div>
<div class="form-group row">
<label class="col-md-1 control-label">Gender</label>
<div class="col-md-4">
@if ($user->profile->gender)
<div class="row">
<div class="col-md-2"><label class="control-label" for="male">Male</label></div>
<div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
value="1" checked=""></div>
</div>
<div class="row">
<div class="col-md-2"><label class="control-label" for="female">Female</label></div>
<div class="col-md-1"><input class="radio" type="radio" name="gender"
id="female" value="0"></div>
</div>
@else
<div class="row">
<div class="col-md-2"><label class="control-label" for="male">Male</label></div>
<div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
value="1"></div>
</div>
<div class="row">
<div class="col-md-2"><label class="control-label" for="female">Female</label>
</div>
<div class="col-md-1"><input class="radio" type="radio" name="gender"
id="female" value="0" checked=""></div>
</div>
@endif
</div>
</div>
<div class="form-group row">
<label for="biography" class="col-md-1 control-label">About Me</label>
<div class="col-md-4">
<textarea class="form-control" rows="3" id="biography" name="biography"
placeholder="{{$user->profile->biography}}"></textarea>
</div>
</div>
</div>
</div>
<button type="submit" id="submit" class="btn btn-default">Submit</button>
</fieldset>
</form>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/profile/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
<div class="panel-heading">About Me</div>
<div class="panel-body"><p>{{$user->profile->biography}}</p></div>
</div>
<div/>
<div/>
<div/>
</div>
</div>
</div>
</div>
</div>
</div>
@stop