Merge branch 'master' of ssh.dev.azure.com:v3/Foster-X/project_one/project_one
fixed merges
This commit is contained in:
commit
22b8a1351f
1 changed files with 14 additions and 5 deletions
|
@ -6,9 +6,15 @@ Route::get('/', function () {
|
||||||
return view('home', ['greeting'=>'Hello']);
|
return view('home', ['greeting'=>'Hello']);
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::get('/jobs', function() {
|
Route::get('/jobs', function () {
|
||||||
$jobs=[
|
return view('jobs', [
|
||||||
[
|
'jobs'=> Job::all()
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
class Job {
|
||||||
|
public static function all():array
|
||||||
|
{
|
||||||
|
return [[
|
||||||
'id'=>1,
|
'id'=>1,
|
||||||
'title'=>'Manager',
|
'title'=>'Manager',
|
||||||
'salary'=>'$50,000'
|
'salary'=>'$50,000'
|
||||||
|
@ -24,8 +30,11 @@ Route::get('/jobs', function() {
|
||||||
'salary'=>'$30,000'
|
'salary'=>'$30,000'
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
return view('jobs', $jobs);
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
|
// return view('jobs', ['jobs' => $jobs]);
|
||||||
|
// });
|
||||||
|
|
||||||
Route::get('/contact', function() {
|
Route::get('/contact', function() {
|
||||||
return view('contact');
|
return view('contact');
|
||||||
|
|
Loading…
Add table
Reference in a new issue