diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9c23084812003062c696d62c14e84064e7476c0e..afaf3576842730486babfb8e0488d1f7662f260a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,9 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="97544618-4bb5-471f-b62a-ec86a2a69f7b" name="Default" comment=""> - <change afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/PIMA.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/PIMA.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/facto.php" beforeDir="false" afterPath="$PROJECT_DIR$/facto.php" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/page_user/user.php" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/user.php" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/page_welcome/userpage.php" beforeDir="false" afterPath="$PROJECT_DIR$/page_welcome/userpage.php" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/page_user/js/snacks.js" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/js/snacks.js" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -21,11 +18,11 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="user.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="user.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_user/user.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="239" column="92" selection-start-line="239" selection-start-column="92" selection-end-line="239" selection-end-column="92" /> + <state relative-caret-position="3812"> + <caret line="247" column="40" lean-forward="true" selection-start-line="247" selection-start-column="40" selection-end-line="247" selection-end-column="40" /> <folding> <element signature="n#style#0;n#img#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#span#0;n#button#0;n#!!top" expanded="true" /> @@ -37,6 +34,32 @@ </provider> </entry> </file> + <file leaf-file-name="facto.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/facto.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="298"> + <caret line="50" column="22" selection-start-line="50" selection-start-column="20" selection-end-line="50" selection-end-column="22" /> + <folding> + <element signature="n#style#0;n#span#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#1;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#1;n#section#0;n#div#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#2;n#section#0;n#div#0;n#!!top" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="index.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/page_welcome/index.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="8"> + <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -47,6 +70,8 @@ <find>home</find> <find>'../page_welcome/index.php'</find> <find>if (!isset($_SESSION['username']))</find> + <find>js</find> + <find>user information</find> </findStrings> </component> <component name="Git.Settings"> @@ -55,9 +80,9 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/facto.php" /> <option value="$PROJECT_DIR$/page_welcome/userpage.php" /> <option value="$PROJECT_DIR$/page_user/user.php" /> + <option value="$PROJECT_DIR$/facto.php" /> </list> </option> </component> @@ -150,16 +175,15 @@ <option name="presentableId" value="Default" /> <updated>1542235831670</updated> <workItem from="1542235834902" duration="440000" /> - <workItem from="1543347772750" duration="5595000" /> + <workItem from="1543347772750" duration="6694000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="6035000" /> + <option name="totallyTimeSpent" value="7134000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="1680" height="1050" extended-state="0" /> - <editor active="true" /> <layout> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12881564" /> <window_info anchor="bottom" id="TODO" order="6" /> @@ -214,23 +238,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/facto.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="521"> - <caret line="101" column="21" lean-forward="true" selection-start-line="101" selection-start-column="21" selection-end-line="101" selection-end-column="21" /> - <folding> - <element signature="n#style#0;n#h1#0;n#div#0;n#nav#0;n#header#0;n#!!top" expanded="true" /> - <element signature="e#318#324#0" expanded="true" /> - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#1;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#1;n#section#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#2;n#section#0;n#div#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="324"> @@ -267,27 +274,32 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/page_welcome/index.php"> + <entry file="file://$PROJECT_DIR$/page_user/login.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-187"> - <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" /> - <folding> - <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> + <state relative-caret-position="660"> + <caret line="30" column="47" selection-start-line="30" selection-start-column="47" selection-end-line="30" selection-end-column="47" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/page_user/login.php"> + <entry file="file://$PROJECT_DIR$/facto.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="660"> - <caret line="30" column="47" selection-start-line="30" selection-start-column="47" selection-end-line="30" selection-end-column="47" /> + <state relative-caret-position="298"> + <caret line="50" column="22" selection-start-line="50" selection-start-column="20" selection-end-line="50" selection-end-column="22" /> + <folding> + <element signature="n#style#0;n#span#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#1;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#1;n#section#0;n#div#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#2;n#section#0;n#div#0;n#!!top" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/page_user/user.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="239" column="92" selection-start-line="239" selection-start-column="92" selection-end-line="239" selection-end-column="92" /> + <state relative-caret-position="3812"> + <caret line="247" column="40" lean-forward="true" selection-start-line="247" selection-start-column="40" selection-end-line="247" selection-end-column="40" /> <folding> <element signature="n#style#0;n#img#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#span#0;n#button#0;n#!!top" expanded="true" /> @@ -298,5 +310,12 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/page_welcome/index.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="8"> + <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" /> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/facto.php b/facto.php index 3bee3e1df9c09babc3aa440f272a94b962bb2533..eb3871220e9c974e5b2afd49982c3aa53f6b7854 100644 --- a/facto.php +++ b/facto.php @@ -87,11 +87,7 @@ function header2($where){ <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">'; -<<<<<<< HEAD if (!($_SESSION['username'])) -======= - if (!$_SESSION['username']) ->>>>>>> favo_inf 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>'; diff --git a/page_user/js/jquery.leanModal.min_.js b/page_user/js/jquery.leanModal.min_.js new file mode 100644 index 0000000000000000000000000000000000000000..79d1ea92b0b5865cbc5738ac48c86f372ef162e6 --- /dev/null +++ b/page_user/js/jquery.leanModal.min_.js @@ -0,0 +1,2 @@ +(function($){$.fn.extend({leanModal:function(options){var defaults={top:100,overlay:0.5,closeButton:null};var overlay=$("<div id='lean_overlay'></div>");$("body").append(overlay);options=$.extend(defaults,options);return this.each(function(){var o=options;$(this).click(function(e){var modal_id=$(this).attr("href");$("#lean_overlay").click(function(){close_modal(modal_id)});$(o.closeButton).click(function(){close_modal(modal_id)});var modal_height=$(modal_id).outerHeight();var modal_width=$(modal_id).outerWidth(); +$("#lean_overlay").css({"display":"block",opacity:0});$("#lean_overlay").fadeTo(200,o.overlay);$(modal_id).css({"display":"block","position":"fixed","opacity":0,"z-index":11000,"left":50+"%","margin-left":-(modal_width/2)+"px","top":o.top+"px"});$(modal_id).fadeTo(200,1);e.preventDefault()})});function close_modal(modal_id){$("#lean_overlay").fadeOut(200);$(modal_id).css({"display":"none"})}}})})(jQuery); diff --git a/page_user/js/recherche.js b/page_user/js/recherche.js new file mode 100644 index 0000000000000000000000000000000000000000..eace6c168c7fe386671dd7ea1785e368d5831ccb --- /dev/null +++ b/page_user/js/recherche.js @@ -0,0 +1,47 @@ +<script> + // function for suggestions of the research + function showSuggestions(){ + var field = document.getElementById("searchField"); + var keyword = field.value; + + var xhttp; + if (keyword.length == 0) { + document.getElementById('usernames').innerHTML = ""; + return; + } + xhttp = new XMLHttpRequest(); + xhttp.onreadystatechange = function() { + if (this.readyState == 4 && this.status == 200) {// 4 = request finished and response is ready, 200 = "OK" + + var tab = JSON.parse(this.responseText); + //document.getElementById("h1").innerHTML = tab; + + var options = ""; + for(var i = 0; i < tab.length; i++) { + options += '<button id="userSuggesBtn" class="suggestionButton" onclick="window.location.href=\'../page_profile/profil.php?username='+tab[i].username+'\'"><img src="'+ + tab[i].profile_image + + '" alt="icone" style="vertical-align:middle; position:relative; width:50px; height: 50px;" /><span style="margin-left:10px;">'+ + tab[i].username + + '</span></button>'; + } + + document.getElementById('suggestionButtons').innerHTML = options; + } + }; + + var API = "API_Twitter"; + if (document.getElementById("radio_3").checked == true) { + API = "API_Twitter"; + } + else if (document.getElementById("radio_2").checked == true) { + API = "youtube-api" + } + else { + document.getElementById("erreur").innerHTML = "Please select a social network."; + return 0; + } + document.getElementById("erreur").innerHTML = ""; + xhttp.open("GET", "../"+API+"/userSuggestions.php?w="+keyword, true); + xhttp.send(); + } +</script> diff --git a/page_user/js/snacks.js b/page_user/js/snacks.js index d1dae0f5d19a6ccb6d6edd05ba96bd5ae742ba03..d6b0b62cc3877eaa74a83702f66e32f625b6698a 100644 --- a/page_user/js/snacks.js +++ b/page_user/js/snacks.js @@ -1,30 +1,30 @@ - $(document).ready(function () { - - - //script for smooth scrolling - jQuery(document).ready(function ($) { - $(".scroll ").click(function (event) { - event.preventDefault(); - - $('html,body').animate({ - scrollTop: $(this.hash).offset().top - }, 1000); - }); - }); - //script for ease - $(document).ready(function () { - /* - var defaults = { - containerID: 'toTop', // fading element id - containerHoverID: 'toTopHover', // fading element hover id - scrollSpeed: 1200, - easingType: 'linear' - }; - */ - - $().UItoTop({ - easingType: 'easeOutQuart' - }); - - }); + $(document).ready(function () { + + + //script for smooth scrolling + jQuery(document).ready(function ($) { + $(".scroll ").click(function (event) { + event.preventDefault(); + + $('html,body').animate({ + scrollTop: $(this.hash).offset().top + }, 1000); + }); + }); + //script for ease + $(document).ready(function () { + /* + var defaults = { + containerID: 'toTop', // fading element id + containerHoverID: 'toTopHover', // fading element hover id + scrollSpeed: 1200, + easingType: 'linear' + }; + */ + + $().UItoTop({ + easingType: 'easeOutQuart' + }); + + }); }); \ No newline at end of file