diff --git a/css/style.css b/css/style.css index a082ed58cbff3d15d9f2ddad3fcc774487f1fd86..55abdea25ca6564a02e5fa409b03ae0bf3c5ea76 100644 --- a/css/style.css +++ b/css/style.css @@ -248,7 +248,7 @@ button.submit:hover { } .bg2 { - background: url(../images/1.jpg)no-repeat center; + background: url(../images/1.jpg)repeat center; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; @@ -1427,7 +1427,7 @@ input.img { input.img + label { border: 3px dotted transparent; display: inline-block; - opacity: .7; + opacity: .7; } input.img:checked + label { border-color: red; @@ -1438,11 +1438,11 @@ input.img:checked + label { /* AJOUT DE KEVIN : PAGE ACCUEIL */ #suggestionButtons { - width: 400px; - margin:auto; - display: flex; - align-items: center; - justify-content: flex-start; + width: 400px; + margin:auto; + display: flex; + align-items: center; + justify-content: flex-start; flex-direction: column; } @@ -1495,4 +1495,4 @@ input.img:checked + label { -/* -- //Responsive code -- */ \ No newline at end of file +/* -- //Responsive code -- */ diff --git a/facto.php b/facto.php index eb3871220e9c974e5b2afd49982c3aa53f6b7854..e587619cb3b9b47c82c7974673881b2e46c2c059 100644 --- a/facto.php +++ b/facto.php @@ -17,7 +17,7 @@ function head(){ } </script> <!--// Meta tag Keywords --> - + <!-- go to user_page--> <script> function tz(){ @@ -80,32 +80,31 @@ function header2($where){ <span class="sr-only">(current)</span> </a> </li> - <li class="nav-item"> - <a class="nav-link scroll" href="#semaine">Influencer</a> - </li> + <li class="nav-item">'; + if (isset($_SESSION['username'])) + echo '<a class="nav-link" href="../page_user/user.php">My influencers</a>'; + else + echo '<a class="nav-link scroll" href="../page_user/user.php"></a>'; + echo' + </li> </ul> <div class="forms-w3ls-agilesm text-center mt-lg-0 mt-4"> <ul> - <li class="login-list-w3ls d-inline border-right pr-3 mr-3">'; - if (!($_SESSION['username'])) + <li class="login-list-w3ls d-inline pr-3 mr-3">'; + if (!isset($_SESSION['username'])) echo '<a id="modal_trigger" href="#modal" class="text-white">Login | Register</a>'; else { - echo '<span style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif"><a href="userpage.php" style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif">'.$_SESSION['username'] .'</a> | <a href="logout.php" style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif">Log out</a></span>'; + echo '<span style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif"><a href="../page_welcome/userpage.php" style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif">'.$_SESSION['username'] .'</a> | <a href="../page_welcome/logout.php" style="color: #fff; letter-spacing: 2px; font-size: 15px; padding: 0.5em 0; font-family: "Source Sans Pro", sans-serif">Log out</a></span>'; } echo ' </li> </ul> </div> - - <div>'; - - if ($_SESSION['username']) - echo '<button onclick="tz()">user</button>'; - echo ' + <div> </div> - - + + </div> </div> </nav> @@ -146,7 +145,7 @@ function header2($where){ <!-- Username & Password Login form --> <div class="user_login"> - <form action="login.php" method="post"> + <form action="../page_welcome/login.php" method="post"> <label>Username</label> <input type="text" name="username"/> <br /> @@ -171,7 +170,7 @@ function header2($where){ <!-- Register Form --> <div class="user_register"> - <form action="register.php" method="post"> + <form action="../page_welcome/register.php" method="post"> <!-- <label>First name</label> <input type="text" name="firstname" /> <br /> diff --git a/page_profile/profil.css b/page_profile/profil.css index eef143f4007cc3ed3bb7d6d3cd59fc05e1053006..0617a8e68e6035c32e59dd2cbdc79e7902decd9c 100644 --- a/page_profile/profil.css +++ b/page_profile/profil.css @@ -3,10 +3,6 @@ body { margin:0; } -nav.navbar { - border-bottom: 2px solid rgba(132, 132, 132, 0.53); - background: rgba(140, 140, 140, 0.63); -} div a:link{ color:#99c1ff; @@ -16,7 +12,6 @@ div a:link{ padding: 115px 10px 10px; text-align: left; height: 547px; - background: url(../images/2.jpg); } #photoprofil{ @@ -46,6 +41,7 @@ div a:link{ height:60px; border:0; margin-bottom: 10px; + z-index: 2; } #divindex div{ @@ -117,7 +113,6 @@ a:link { #stats{ padding: 10px 20px; text-align:center; - background: url(../images/1.jpg)repeat; } .flex{ diff --git a/page_profile/profil.php b/page_profile/profil.php index 24797547c4261676658bf9ed9db08b91b0c19829..c1d3be88281a899a0ae707dc84b4212b9f0f142e 100644 --- a/page_profile/profil.php +++ b/page_profile/profil.php @@ -50,8 +50,7 @@ $youtube_fav = $_SESSION['youtube']; <?php head(); ?> -<body> - +<body class="bg2"> <?php header2('../page_welcome/index.php'); ?> <div id='profile'> @@ -76,7 +75,7 @@ $youtube_fav = $_SESSION['youtube']; <br/> <?php if (!$_SESSION['username']){ - echo '<a id="modal_trigger" href="#modal" class="text-white">Login to add to favorites</a>'; + echo '<a id="modal_trigger" href="#modal">Login to add to favorites</a>'; } elseif ( in_array($id, $twitter_fav) || in_array($id, $youtube_fav) ){ echo '<button style="margin-left:10px">Subscribed</button>'; @@ -129,7 +128,7 @@ $youtube_fav = $_SESSION['youtube']; echo "Number of videos <br/> <h5>".number_format(getChannelVideoCount($id), 0, ".", " ").'<br/> <h5></h5> </div>'; echo "<div>Number of total views <br/> <h5>".number_format(getChannelViewCount($id), 0, ".", " "); } - ?> + ?> <br/> <h5></h5> </div> </div> </div> @@ -184,14 +183,8 @@ $youtube_fav = $_SESSION['youtube']; </div> - -<!-- Js files --> -<!-- JavaScript --> -<script src="../page_welcome/js/jquery-2.2.3.min.js"></script> -<!-- Default-JavaScript-File --> - <!-- banner slider --> -<script src="../page_welcome/js/responsiveslides.min.js"></script> +<script src="../js/responsiveslides.min.js"></script> <script> // You can also use "$(window).load(function() {" $(function () { @@ -234,24 +227,23 @@ $youtube_fav = $_SESSION['youtube']; <!-- //password-script --> <!-- gallery light box --> -<script src="../page_welcome/js/smoothbox.jquery2.js"></script> +<script src="../js/smoothbox.jquery2.js"></script> <!-- //gallery light box --> <!-- smooth scrolling --> -<script src="../page_welcome/js/SmoothScroll.min.js"></script> +<script src="../js/SmoothScroll.min.js"></script> <!-- //smooth scrolling --> <!-- move-top --> -<script src="../page_welcome/js/move-top.js"></script> +<script src="../js/move-top.js"></script> <!-- easing --> -<script src="../page_welcome/js/easing.js"></script> +<script src="../js/easing.js"></script> <!-- necessary snippets for few javascript files --> -<script src="../page_welcome/js/snacks.js"></script> +<script src="../js/snacks.js"></script> -<script src="../page_welcome/js/bootstrap.js"></script> +<script src="../js/bootstrap.js"></script> <!-- Necessary-JavaScript-File-For-Bootstrap --> <!-- //Js files --> - </body> </html> diff --git a/page_welcome/index.php b/page_welcome/index.php index 87d4d04f286a8dc5658b0d3914b399c85655372b..e39f7ab92fbc3cdbe0bbf0426333be6b10e36324 100644 --- a/page_welcome/index.php +++ b/page_welcome/index.php @@ -7,7 +7,6 @@ require_once('../API_Twitter/requestsFunctions.php'); require_once('../js/recherche.js'); require_once('../facto.php'); -require_once('index.js'); session_start(); ?> @@ -58,7 +57,7 @@ session_start(); </datalist> - + </div> </div> @@ -76,18 +75,6 @@ session_start(); </div> <!-- //banner --> - - <!-- semaine --> - <div class="w3ls-middle pt-5" id="semaine"> - <div class="container py-xl-5 py-lg-3"> - <h3 class="title text-center text-dark mb-sm-5 mb-4"> - <br><br> - <span>influence de la semaine</span> </h3> - - </div> - </div> - <!-- //semaine --> - <!-- Js files --> <!-- JavaScript --> diff --git a/page_welcome/logout.php b/page_welcome/logout.php index d2b9c137cdaeeaee1aa3e712819a1e1ece3969b1..54828812bd9f4a755aea35ae6cad36c0d97bbfb3 100644 --- a/page_welcome/logout.php +++ b/page_welcome/logout.php @@ -1,5 +1,5 @@ <?php session_start(); -$_SESSION['username'] = ""; +session_destroy(); header('location: index.php'); ?>