diff --git a/src/app/core/PDOHandler.php b/src/app/core/PDOHandler.php index 1a7e2dc83dc84038278967d859788cbbff8f9394..e664e2a7c68de8af388f8bdc7ed521acf1e1f790 100644 --- a/src/app/core/PDOHandler.php +++ b/src/app/core/PDOHandler.php @@ -20,7 +20,8 @@ class PDOHandler $option = [ PDO::ATTR_PERSISTENT => true, - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC ]; $retry = CONNECT_RETRIES; diff --git a/src/app/view/home.php b/src/app/view/home.php index 4c35bae83e4b31f25cd9805968b4be7a91d89e0d..9f9d49479153ff3d193ab989513ae52c1aa39766 100644 --- a/src/app/view/home.php +++ b/src/app/view/home.php @@ -1,3 +1,7 @@ +<?php +require_once PAGE_PATH . "/templates/navbar.php"; +?> + <!DOCTYPE html> <html> @@ -5,31 +9,14 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Home</title> - <link rel="stylesheet" href="../../public/css/home.css" /> + <link rel="stylesheet" href="/public/css/home.css" /> + <link rel="stylesheet" href="/public/css/shared.css" /> </head> <body> - <div class="layout"> - <div class="layout__left-sidebar"> - <img src="../../public/assets/github_home_logo.png" class="brand" /> - <div class="sidebar-menu"> - <div class="sidebar-menu__item sidebar-menu__item--active"> - <img src="../../public/assets/home.svg" class="sidebar-menu__item-icon" /> - Home - </div> - <div class="sidebar-menu__item"> - <img src="../../public/assets/followed.jpg" class="sidebar-menu__item-icon" /> - Followed - </div> - <div class="../../public/assets/sidebar-menu__item"> - <img src="../../public/assets/profile.svg" class="sidebar-menu__item-icon" /> - Profile - </div> - </div> - </div> - <div id="list-post"> - </div> - </div> + <?php + echo Navbar(); + ?> <script src="/public/js/home.js"></script> </body> </html> \ No newline at end of file diff --git a/src/public/assets/github_home_logo.png b/src/public/assets/github_home_logo.png deleted file mode 100644 index 792b8be43ff5bd007188a526aee924bf8c93a0e7..0000000000000000000000000000000000000000 Binary files a/src/public/assets/github_home_logo.png and /dev/null differ diff --git a/src/public/assets/github_post_logo.jpg b/src/public/assets/github_post_logo.jpg deleted file mode 100644 index b0fae0e500ca4fd3ff0949eec0be059673e14c9d..0000000000000000000000000000000000000000 Binary files a/src/public/assets/github_post_logo.jpg and /dev/null differ diff --git a/src/public/js/home.js b/src/public/js/home.js index 3b47afdfb05eba8898227b4f1a52fd7d0ee2eae7..54925e725ba39ef0397ff066c5f03454a85c751d 100644 --- a/src/public/js/home.js +++ b/src/public/js/home.js @@ -73,7 +73,7 @@ function createPost(data,totalsemuapage,pagenow){ makePagination(totalsemuapage,pagenow); } const xhr = new XMLHttpRequest(); -const url = 'http://localhost:8008/api/getpost/0'; +const url = '/api/getpost/0'; xhr.open('GET', url, true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); @@ -154,7 +154,7 @@ function klikPagination(totalPages,page){ function changePage(page){ const xhr = new XMLHttpRequest(); var getpage = (page-1); - const url = 'http://localhost:8008/api/getpost/'+getpage.toString(); + const url = '/api/getpost/'+getpage.toString(); xhr.open('GET', url, true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');