Merge branch 'main' of https://gitlab.informatika.org/if3110-2023-01-32/if-3110-2023-01-32

0fd29d0a · Genvictus · e41caee6 · 313d1fe9 · 0fd29d0a · 0fd29d0a
Commit 0fd29d0a authored 1 year ago by Genvictus
--- a/src/app/view/home.php
+++ b/src/app/view/home.php
@@ -5,45 +5,45 @@
    <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" />
 </head>

 <body>
    <div class="layout">
        <div class="layout__left-sidebar">
-            <img src="/public/assets/github.png" class="brand" />
+            <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" />
+                    <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" />
+                    <img src="../../public/assets/followed.jpg" class="sidebar-menu__item-icon" />
                    Followed
                </div>
-                <div class="sidebar-menu__item">
-                    <img src="/public/assets/profile.svg" class="sidebar-menu__item-icon" />
+                <div class="../../public/assets/sidebar-menu__item">
+                    <img src="../../public/assets/profile.svg" class="sidebar-menu__item-icon" />
                    Profile
                </div>
            </div>
        </div>
        <div class="layout__main">
-            <img class="post__author-logo" src="./images/profile-image-1.jpg" />
+            <!-- <img class="post__author-logo" src="profile-image.jpg" /> -->
            <div class="post">
                <div class="post__main">
                    <div class="post__header">
                        <div class="post__user-name">
-                           
+
                        </div>
                        <div class="post__user-username">
-                         
+
                        </div>
                        <div class="post__publish-time">
-                          
+
                        </div>
                    </div>
                    <div class="post__content">
-                   
+
                    </div>
                </div>
            </div>

--- a/src/index.php
+++ b/src/index.php
@@ -21,6 +21,8 @@ require_once CONTROLLER_PATH . "/Page/ComposePage.php";
 require_once CONTROLLER_PATH . "/Page/SettingsPage.php";
 require_once CONTROLLER_PATH . "/Page/AdminPage.php";
 require_once CONTROLLER_PATH . "/Page/UserPage.php";
+require_once CONTROLLER_PATH . "/Page/HomePage.php";
+require_once CONTROLLER_PATH . "/Page/PostPage.php";

 $router = new Router();


--- a/src/public/assets/github_post_logo.jpg
+++ b/src/public/assets/github_post_logo.jpg
--- a/src/public/js/login.js
+++ b/src/public/js/login.js
@@ -36,10 +36,10 @@ document.getElementById('tmblbuatlogin').addEventListener('click', function() {
                }
                else if(response.status==="sukses"){
                    if(response.role==="admin"){
-                        window.location.href = "admin.html";//nanti diganti
+                        window.location.href = "/admin";//nanti diganti
                    }
                    else if(response.role==="user"){
-                        window.location.href = "user.html";//nanti diganti
+                        window.location.href = "/user";//nanti diganti
                    }
                }
            } else {