Skip to content

Commit cc12b3e

Browse files
committed
finish form agency
1 parent e14d29b commit cc12b3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+10073
-599
lines changed

app/Company.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66

77
class Company extends Model
88
{
9-
protected $fillable = ['companyname','email','tel','address','description'];
9+
protected $fillable = ['companyname', 'email', 'tel', 'address', 'description', 'logo'];
1010
}
+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
namespace App\Console\Commands;
4+
5+
use Illuminate\Console\Command;
6+
use Illuminate\Support\Facades\DB;
7+
8+
class InsertDefaultData extends Command
9+
{
10+
/**
11+
* The name and signature of the console command.
12+
*
13+
* @var string
14+
*/
15+
protected $signature = 'insertDefaultData';
16+
17+
/**
18+
* The console command description.
19+
*
20+
* @var string
21+
*/
22+
protected $description = 'Insert the default data for position and role table';
23+
24+
/**
25+
* Create a new command instance.
26+
*
27+
* @return void
28+
*/
29+
public function __construct()
30+
{
31+
parent::__construct();
32+
}
33+
34+
/**
35+
* Execute the console command.
36+
*
37+
* @return mixed
38+
*/
39+
public function handle()
40+
{
41+
DB::unprepared(file_get_contents('database\custom_sql\data.sql'));
42+
}
43+
}

app/Console/Kernel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
1313
* @var array
1414
*/
1515
protected $commands = [
16-
//
16+
Commands\InsertDefaultData::class
1717
];
1818

1919
/**
@@ -35,7 +35,7 @@ protected function schedule(Schedule $schedule)
3535
*/
3636
protected function commands()
3737
{
38-
$this->load(__DIR__.'/Commands');
38+
$this->load(__DIR__ . '/Commands');
3939

4040
require base_path('routes/console.php');
4141
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Admin;
4+
5+
use Illuminate\Http\Request;
6+
use App\Http\Controllers\Controller;
7+
8+
class AgencyController extends Controller
9+
{
10+
/**
11+
* Display a listing of the resource.
12+
*
13+
* @return \Illuminate\Http\Response
14+
*/
15+
public function index()
16+
{
17+
return View('admin.agency.index');
18+
}
19+
20+
/**
21+
* Show the form for creating a new resource.
22+
*
23+
* @return \Illuminate\Http\Response
24+
*/
25+
public function create()
26+
{
27+
return View('admin.agency.create');
28+
}
29+
30+
/**
31+
* Store a newly created resource in storage.
32+
*
33+
* @param \Illuminate\Http\Request $request
34+
* @return \Illuminate\Http\Response
35+
*/
36+
public function store(Request $request)
37+
{
38+
//
39+
}
40+
41+
/**
42+
* Display the specified resource.
43+
*
44+
* @param int $id
45+
* @return \Illuminate\Http\Response
46+
*/
47+
public function show($id)
48+
{
49+
//
50+
}
51+
52+
/**
53+
* Show the form for editing the specified resource.
54+
*
55+
* @param int $id
56+
* @return \Illuminate\Http\Response
57+
*/
58+
public function edit($id)
59+
{
60+
//
61+
}
62+
63+
/**
64+
* Update the specified resource in storage.
65+
*
66+
* @param \Illuminate\Http\Request $request
67+
* @param int $id
68+
* @return \Illuminate\Http\Response
69+
*/
70+
public function update(Request $request, $id)
71+
{
72+
//
73+
}
74+
75+
/**
76+
* Remove the specified resource from storage.
77+
*
78+
* @param int $id
79+
* @return \Illuminate\Http\Response
80+
*/
81+
public function destroy($id)
82+
{
83+
//
84+
}
85+
}

app/Http/Controllers/Admin/StaffController.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ public function store(Request $request)
6767
'date_of_birth' => 'required|date',
6868
'address' => 'required|min:5',
6969
'phone' => 'required|min:10',
70-
'email' => 'required|min:12|unique:staffs'
71-
72-
73-
70+
'email' => 'required|min:12|unique:staffs',
71+
'profile' => 'mimes:jpeg,png '
7472
]);
7573

7674
$path = null;

app/Http/Controllers/Admin/UserController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use App\User;
1111

1212

13+
1314
class UserController extends Controller
1415
{
1516
/**
@@ -22,7 +23,7 @@ public function index()
2223
$user = DB::table('users')
2324
->join('staffs', 'users.staffId', '=', 'staffs.staffId')
2425
->join('roles', 'users.roleId', '=', 'roles.roleId')
25-
->select('username', 'staffs.name', 'role', 'status')
26+
->select('username', 'staffs.name', 'role', 'users.status')
2627
->get();
2728

2829
$data = array('user' => $user);

app/Http/Controllers/Auth/LoginController.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,27 @@ public function index()
6060

6161
public function postCreateStep2()
6262
{
63+
64+
6365
$company = request()->validate([
6466
'companyname' => 'required|min:3|max:50',
6567
'email' => ['required', 'unique:companies', 'min:12'],
6668
'tel' => 'required',
6769
'address' => 'required|min:5',
6870
'description' => 'required',
69-
71+
'logo' => 'required|mimes:jpeg,png'
7072
]);
7173

7274

7375

74-
request()->session()->put('company', $company);
76+
$logo = request()->file('logo')->store('logo');
7577

7678

79+
$company['logo'] = $logo;
80+
81+
82+
request()->session()->put('company', $company);
83+
7784
return redirect('/system/create-step2');
7885
}
7986

app/Http/Controllers/Front/FrontController.php

+11
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44

55
use Illuminate\Http\Request;
66
use App\Http\Controllers\Controller;
7+
use App\Company;
78

89
class FrontController extends Controller
910
{
11+
12+
13+
14+
1015
public function Home()
1116
{
17+
dd(getLogo());
1218
return View('front.index');
1319
}
1420
public function Contact()
@@ -29,4 +35,9 @@ public function showResult()
2935
{
3036
return View('front.show');
3137
}
38+
39+
public function getLogo()
40+
{
41+
return App\Company::select('logo')->get()[0];
42+
}
3243
}
File renamed without changes.

public/admin/css/all.min.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/admin/css/style.css

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*datatable*/
2+
table svg[class*="fa"] {
3+
font-size: 18px; }
4+
5+
svg[class*="fa"] {
6+
margin-right: 5px; }
7+
8+
/*end of datatable*/

public/admin/js/all.min.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)