Skip to content

Commit 821d75f

Browse files
Ivan LiIvan Li
Ivan Li
authored and
Ivan Li
committed
profile update finished
1 parent 3a81210 commit 821d75f

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

app/Http/Controllers/User/ProfileController.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Illuminate\Http\JsonResponse;
1010
use Illuminate\Http\Request;
1111
use Illuminate\Support\Facades\Auth;
12+
use Illuminate\Support\Facades\Config;
1213
use Illuminate\Support\Facades\Log;
1314
use Mockery\CountValidator\Exception;
1415

@@ -78,7 +79,8 @@ public function edit()
7879
{
7980
$user = Auth::user();
8081
return view('user.profile.edit')->with(array(
81-
"user" => $user
82+
"user" => $user,
83+
"countries" => Config::get("constants.countries"),
8284
));
8385
}
8486

@@ -87,7 +89,7 @@ public function update(Request $request)
8789
try {
8890
$input = $request->all();
8991
$user = Auth::user();
90-
if(is_null($user->info)){
92+
if (is_null($user->info)) {
9193
$userInfo = new UserInfo();
9294
$userInfo->user_id = $user->id;
9395
$userInfo->save();

config/constants.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
*/
88

99
return [
10-
'countries' => [
11-
'es' => 'www.domain.es',
12-
'en' => 'www.domain.us'
13-
// etc
14-
]
10+
'countries' => array("Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegowina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cambodia", "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo", "Congo, the Democratic Republic of the", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Croatia (Hrvatska)", "Cuba", "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)", "Faroe Islands", "Fiji", "Finland", "France", "France Metropolitan", "French Guiana", "French Polynesia", "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Heard and Mc Donald Islands", "Holy See (Vatican City State)", "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran (Islamic Republic of)", "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Kyrgyzstan", "Lao, People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libyan Arab Jamahiriya", "Liechtenstein", "Lithuania", "Luxembourg", "Macau", "Macedonia, The Former Yugoslav Republic of", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia, Federated States of", "Moldova, Republic of", "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Seychelles", "Sierra Leone", "Singapore", "Slovakia (Slovak Republic)", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Georgia and the South Sandwich Islands", "Spain", "Sri Lanka", "St. Helena", "St. Pierre and Miquelon", "Sudan", "Suriname", "Svalbard and Jan Mayen Islands", "Swaziland", "Sweden", "Switzerland", "Syrian Arab Republic", "Taiwan, Province of China", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela", "Vietnam", "Virgin Islands (British)", "Virgin Islands (U.S.)", "Wallis and Futuna Islands", "Western Sahara", "Yemen", "Yugoslavia", "Zambia", "Zimbabwe")
1511
];

database/migrations/2016_06_28_071140_create_user_info_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function up()
1818
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
1919
$table->enum('title', array("mr", "mrs", "ms", "mx", "miss", "madam", "dr", "prof"))->nullable();
2020
$table->string('description')->nullable();
21-
$table->timestamp("dob")->nullable();
21+
$table->date("dob")->nullable();
2222
$table->enum('gender', array("male", "female", "other"))->nullable();
2323
$table->string('phone')->nullable();
2424
$table->string('suburb')->nullable();

resources/views/user/profile/edit.blade.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
</div>
3636
</div>
3737
</div>
38-
3938
<div class="col-md-8 col-sm-6">
4039
<div class="tile">
4140
<h2 class="tile-title">Personal Details</h2>
@@ -60,14 +59,14 @@
6059
<div class="form-group">
6160
{!! Form::label('dob', 'Date of birth') !!}
6261
<div class="input-icon datetime-pick date-only">
63-
{!! Form::text('dob', old('dob'), ['class' => 'form-control input-sm', 'placeholder' => 'dob']) !!}
62+
{!! Form::text('dob', old('dob'), ['class' => 'form-control input-sm', 'placeholder' => 'dob', 'data-format' => "yyyy-MM-dd"]) !!}
6463
<span class="add-on">
6564
<i class="sa-plus icon-calendar"></i>
6665
</span>
6766
</div>
6867
</div>
6968
<div class="form-group">
70-
{!! Form::label('gender', 'Date of birth') !!} &nbsp;
69+
{!! Form::label('gender', 'Gender') !!} &nbsp;
7170
{!! Form::select('gender', array("male"=>"male","female"=>"female","other"=>"other"), old('gender'), ['class' => 'control-inline form-control input-sm']) !!}
7271
</div>
7372
<div class="form-group">
@@ -76,7 +75,7 @@
7675
</div>
7776
<div class="form-group">
7877
{!! Form::label('country', 'Country') !!} &nbsp;
79-
{!! Form::select('country', array(), old('country'), ['class' => 'form-control input-sm', 'id' => 'sel-country']) !!}
78+
{!! Form::select('country', $countries, old('country'), ['class' => 'form-control input-sm', 'id' => 'sel-country']) !!}
8079
</div>
8180
<div class="form-group">
8281
{!! Form::label('state', 'State') !!} &nbsp;

0 commit comments

Comments
 (0)