From 9746aa3a96dc3d796d649461ea67bff09d96ef17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0git=20config=20git=20config=20-?= =?UTF-8?q?-helpgit=20config=20--global=20user=2Ename=20=EC=B5=9C=EC=A4=80?= =?UTF-8?q?=ED=9D=A0?= Date: Tue, 1 Aug 2023 22:55:18 +0900 Subject: [PATCH] shoppingmallv2 init... --- app/Config/Routes.php | 18 ++++++++++++++++++ app/Controllers/Admin/UserController.php | 6 +++--- app/Controllers/Admin/UserSNSController.php | 6 +++--- app/Controllers/Front/BoardController.php | 8 ++++---- app/Controllers/Front/OrderController.php | 6 +++--- app/Entities/BoardEntity.php | 4 ++++ app/Models/BaseModel.php | 4 +++- app/Models/OrderModel.php | 2 +- app/Models/UserSNSModel.php | 2 +- app/Views/front/board/index.php | 8 ++++++-- app/Views/front/order/index.php | 3 +-- app/Views/front/product/index.php | 4 ++-- app/Views/layouts/front/left_menu/base.php | 2 +- app/Views/layouts/front/left_menu/board.php | 2 +- 14 files changed, 51 insertions(+), 24 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index d36c29f..2d8ed08 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -125,6 +125,24 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au }); }); $routes->group('front', ['namespace' => 'App\Controllers\Front'], function ($routes) { + $routes->group('user', ['namespace' => 'App\Controllers\Front', 'filter' => 'authFilter:master,director,cloudflare,manager,gold,silver,brone,vip,user'], static function ($routes) { + $routes->get('update', 'UserController::update_form'); + $routes->post('update', 'UserController::update'); + $routes->get('view', 'UserController::view'); + }); + $routes->group('board', static function ($routes) { + $routes->get('', 'BoardController::index'); + $routes->get('excel', 'BoardController::excel/$1'); + $routes->get('insert', 'BoardController::insert_form'); + $routes->post('insert', 'BoardController::insert'); + $routes->get('update/(:num)', 'BoardController::update_form/$1'); + $routes->post('update/(:num)', 'BoardController::update/$1'); + $routes->get('view/(:num)', 'BoardController::view/$1'); + $routes->get('reply/(:num)', 'BoardController::reply_form/$1'); + $routes->post('reply/(:num)', 'BoardController::reply/$1'); + $routes->get('delete/(:num)', 'BoardController::delete/$1', ['filter' => 'authFilter:master']); + $routes->get('download/(:any)/(:num)', 'BoardController::download/$1/$2'); + }); $routes->group('product', static function ($routes) { $routes->get('', 'ProductController::index'); $routes->get('excel', 'ProductController::excel/$1'); diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 2f535c6..c14ba9d 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -35,14 +35,14 @@ class UserController extends AdminController public function getFields(string $action = ""): array { - $fields = ["id", "passwd", $this->_model->getTitleField(), "email", "role", "status"]; + $fields = ["id", "passwd", 'name', "email", "role", "status"]; switch ($action) { case "index": case "excel": - return ["id", $this->_model->getTitleField(), "email", "role", "status", 'created_at']; + return ["id", 'name', "email", "role", "status", 'created_at']; break; case "view": - return ["id", $this->_model->getTitleField(), "email", "role", "status", 'updated_at', 'created_at']; + return ["id", 'name', "email", "role", "status", 'updated_at', 'created_at']; break; default: return $fields; diff --git a/app/Controllers/Admin/UserSNSController.php b/app/Controllers/Admin/UserSNSController.php index a12723b..d7b0e07 100644 --- a/app/Controllers/Admin/UserSNSController.php +++ b/app/Controllers/Admin/UserSNSController.php @@ -11,7 +11,7 @@ class UserSNSController extends AdminController { public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { - $this->_model = new UserSNSModel(); + $this->_model = new UserSNSModel($this->getFields()); parent::initController($request, $response, $logger); $this->_viewDatas['title'] = lang($this->_model->getClassName() . '.title'); $this->_viewPath .= strtolower($this->_model->getClassName()); @@ -19,11 +19,11 @@ class UserSNSController extends AdminController } public function getFields(string $action = ""): array { - $fields = ["site", "id", $this->_model->getTitleField(), "email", "detail", "status"]; + $fields = ["site", "id", 'name', "email", "detail", "status"]; switch ($action) { case "index": case "excel": - return ["user_uid", "site", "id", $this->_model->getTitleField(), "email", "status", "created_at"]; + return ["user_uid", "site", "id", 'name', "email", "status", "created_at"]; break; case "view": return [...$fields, "updated_at", "created_at"]; diff --git a/app/Controllers/Front/BoardController.php b/app/Controllers/Front/BoardController.php index cb463e6..4743f87 100644 --- a/app/Controllers/Front/BoardController.php +++ b/app/Controllers/Front/BoardController.php @@ -21,14 +21,14 @@ class BoardController extends FrontController public function getFields(string $action = ""): array { - $fields = ["board_config_uid", 'title', "board_file", "passwd", "status", "content"]; + $fields = ["board_config_uid", 'title', "board_file", "passwd", "content"]; switch ($action) { case "index": case "excel": - return ["board_config_uid", "user_uid", 'title', "board_file", "view_cnt", "status", "created_at"]; + return ["board_config_uid", "user_uid", 'title', "board_file", "view_cnt", "created_at"]; break; case "view": - return ["board_config_uid", "user_uid", 'title', "board_file", "view_cnt", "status", "created_at", "content"]; + return ["board_config_uid", "user_uid", 'title', "board_file", "view_cnt", "created_at", "content"]; break; default: return $fields; @@ -37,7 +37,7 @@ class BoardController extends FrontController } public function getFieldFilters(): array { - return ["board_config_uid", "user_uid", "status"]; + return ["board_config_uid", "user_uid"]; } public function getFieldBatchFilters(): array { diff --git a/app/Controllers/Front/OrderController.php b/app/Controllers/Front/OrderController.php index 64c4aa3..35c965f 100644 --- a/app/Controllers/Front/OrderController.php +++ b/app/Controllers/Front/OrderController.php @@ -32,7 +32,7 @@ class OrderController extends FrontController case "index": case "excel": case "view": - return ['product_uid', "user_uid", "quantity", "price", "status", "updated_at", "created_at"]; + return ['product_uid', "quantity", "price", "status", "updated_at", "created_at"]; break; default: return $fields; @@ -41,7 +41,7 @@ class OrderController extends FrontController } final public function getFieldFilters(): array { - return ['product_uid', "user_uid", "status"]; + return ['product_uid', "status"]; } final public function getFieldBatchFilters(): array { @@ -105,7 +105,7 @@ class OrderController extends FrontController { $msg = ""; try { - $this->_viewDatas['fields'] = $this->_model->getFields(__FUNCTION__); + $this->_viewDatas['fields'] = $this->getFields(__FUNCTION__); $this->_viewDatas['fieldRules'] = $this->_model->getFieldRules($this->_viewDatas['fields'], __FUNCTION__); $this->insert_process(); //Transaction 시작 diff --git a/app/Entities/BoardEntity.php b/app/Entities/BoardEntity.php index 5ab886d..3580fb3 100644 --- a/app/Entities/BoardEntity.php +++ b/app/Entities/BoardEntity.php @@ -31,4 +31,8 @@ class BoardEntity extends BaseHierarchyEntity { return $this->attributes['view_cnt']; } + public function getUser_Uid() + { + return $this->attributes['user_uid']; + } } diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 5b4f1a6..ec21ed2 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -184,10 +184,12 @@ abstract class BaseModel extends Model $entity->$pk = $this->getUUID(); } break; - case "user_uid": //입력데이터로 있을시 추가, 없을시는 입력의 경우에만 자동으로 추가 + case "user_uid": //입력데이터로 있을시 관리툴에서 (사용자,등)추가, 없을시는 입력의 경우에만 자동(장바구니,등)으로 추가 if (array_key_exists($field, $formDatas) && !is_null($formDatas[$field])) { + //관리툴 USERSNS에서 사용자 연동 시 추가기능등에 사용 $entity->$field = $formDatas[$field]; } elseif ($action == 'create' && $this->_session->get(SESSION_NAMES["ISLOGIN"])) { + //Front에서 장바구니,게시판등에 추가시 로그온한경우 자동 추가기능등에 사용 $auth = $this->_session->get(SESSION_NAMES["AUTH"]); $entity->$field = $auth[AUTH_FIELDS["ID"]]; } diff --git a/app/Models/OrderModel.php b/app/Models/OrderModel.php index ddaa3f5..7e29cfa 100644 --- a/app/Models/OrderModel.php +++ b/app/Models/OrderModel.php @@ -25,9 +25,9 @@ class OrderModel extends BaseModel { switch ($field) { case $this->getTitleField(): - case "user_uid": $rules[$field] = "required|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]"; break; + break; case 'quantity': case 'price': $rules[$field] = "required|numeric"; diff --git a/app/Models/UserSNSModel.php b/app/Models/UserSNSModel.php index 13d72b0..05f96f5 100644 --- a/app/Models/UserSNSModel.php +++ b/app/Models/UserSNSModel.php @@ -8,7 +8,7 @@ class UserSNSModel extends BaseModel { protected $table = "tw_user_sns"; protected $returnType = UserSNSEntity::class; - public function __construct($fields) + public function __construct(array $fields = array()) { parent::__construct('UserSNS'); $this->allowedFields = [...$this->allowedFields, "user_uid", ...$fields]; diff --git a/app/Views/front/board/index.php b/app/Views/front/board/index.php index 1b80fde..5637821 100644 --- a/app/Views/front/board/index.php +++ b/app/Views/front/board/index.php @@ -18,10 +18,14 @@ getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - + get(SESSION_NAMES['ISLOGIN']) && $entity->getUser_Uid() == $session->get(SESSION_NAMES['AUTH'])[AUTH_FIELDS['ID']]) : ?> + getPrimaryKey(), $total_count - (($page - 1) * $per_page + $i), ["target" => "_self"]) ?> + + + - + diff --git a/app/Views/front/order/index.php b/app/Views/front/order/index.php index 7fa08ff..8f710a0 100644 --- a/app/Views/front/order/index.php +++ b/app/Views/front/order/index.php @@ -18,11 +18,10 @@ getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - + diff --git a/app/Views/front/product/index.php b/app/Views/front/product/index.php index 2ba40c6..52c298b 100644 --- a/app/Views/front/product/index.php +++ b/app/Views/front/product/index.php @@ -18,10 +18,10 @@ getStatus() != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this);"> - + - + diff --git a/app/Views/layouts/front/left_menu/base.php b/app/Views/layouts/front/left_menu/base.php index 1f3a2ab..df3a6f3 100644 --- a/app/Views/layouts/front/left_menu/base.php +++ b/app/Views/layouts/front/left_menu/base.php @@ -2,5 +2,5 @@

Main

-

계정 관리

+

계정 관리

\ No newline at end of file diff --git a/app/Views/layouts/front/left_menu/board.php b/app/Views/layouts/front/left_menu/board.php index 517fde2..a285b30 100644 --- a/app/Views/layouts/front/left_menu/board.php +++ b/app/Views/layouts/front/left_menu/board.php @@ -1,3 +1,3 @@
-

게시글 관리

+

게시글 관리

\ No newline at end of file