diff --git a/.idea/PIMA.iml b/.idea/PIMA.iml index c956989b29ad0767edc6cf3a202545927c3d1e76..1158fc04cb342439b79d09ea1d12aff8fa5122c4 100644 --- a/.idea/PIMA.iml +++ b/.idea/PIMA.iml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="WEB_MODULE" version="4"> <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/youtube-api/src" isTestSource="false" packagePrefix="Madcoda\Youtube\" /> + </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000000000000000000000000000000000000..015149591f55c9707255afb9402b27f4ed823510 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="PhpProjectSharedConfiguration" php_language_level="5.3.0" /> +</project> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1c90c6f5ca8c31af97444ff0ffe0974750699eeb..9c23084812003062c696d62c14e84064e7476c0e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="97544618-4bb5-471f-b62a-ec86a2a69f7b" name="Default" comment="" /> + <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" /> + </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -9,12 +16,51 @@ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> + <component name="ComposerSettings" synchronizationState="SYNCHRONIZE"> + <pharConfigPath>$PROJECT_DIR$/youtube-api/composer.json</pharConfigPath> + </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="user.php" pinned="false" current-in-tab="true"> + <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" /> + <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" /> + <element signature="e#4195#4224#0#PHP" 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" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FindInProjectRecents"> + <findStrings> + <find>button</find> + <find>profile</find> + <find>suggestionButtons</find> + <find>home</find> + <find>'../page_welcome/index.php'</find> + <find>if (!isset($_SESSION['username']))</find> + </findStrings> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> + <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" /> + </list> + </option> + </component> <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> <component name="JsGulpfileManager"> @@ -22,25 +68,64 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="NodePackageJsonFileManager"> - <packageJsonPaths /> + <packageJsonPaths> + <path value="$PROJECT_DIR$/graphs/fusioncharts-suite-xt/integrations/rubyonrails/samples/package.json" /> + </packageJsonPaths> + </component> + <component name="PhpServers"> + <servers /> + </component> + <component name="ProjectFrameBounds" fullScreen="true"> + <option name="y" value="23" /> + <option name="width" value="80" /> + <option name="height" value="22" /> </component> - <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="-1920" /> - <option name="width" value="1920" /> - <option name="height" value="1080" /> + <component name="ProjectLevelVcsManager" settingsEditedManually="true"> + <ConfirmationsSetting value="1" id="Add" /> </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> <navigator proportions="" version="1"> <foldersAlwaysOnTop value="true" /> </navigator> <panes> <pane id="Scope" /> - <pane id="ProjectPane" /> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + <item name="API_Twitter" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + <item name="page_profile" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + <item name="page_user" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + <item name="page_welcome" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> </panes> </component> <component name="PropertiesComponent"> + <property name="SearchEverywhereHistoryKey" value="suggestion	FILE	file:///Applications/MAMP/htdocs/PIMA/API_Twitter/userSuggestions.php profile	null	null" /> <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -65,34 +150,36 @@ <option name="presentableId" value="Default" /> <updated>1542235831670</updated> <workItem from="1542235834902" duration="440000" /> + <workItem from="1543347772750" duration="5595000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="440000" /> + <option name="totallyTimeSpent" value="6035000" /> </component> <component name="ToolWindowManager"> - <frame x="-1920" y="0" width="1920" height="1080" extended-state="0" /> + <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.21778488" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12881564" /> <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> - <window_info anchor="bottom" id="Event Log" side_tool="true" /> - <window_info anchor="right" id="Database" /> - <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" /> + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> + <window_info anchor="right" id="Database" order="3" /> + <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Run" order="2" /> - <window_info anchor="bottom" id="Version Control" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info anchor="bottom" id="Terminal" /> + <window_info anchor="bottom" id="Terminal" order="7" /> + <window_info id="Favorites" order="2" side_tool="true" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info id="Favorites" side_tool="true" /> - <window_info anchor="bottom" id="Find" order="1" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Find" order="1" /> </layout> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -102,13 +189,109 @@ <option name="myLimit" value="2678400000" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/page_user/index.php"> + <entry file="file://$PROJECT_DIR$/page_user/index.php" /> + <entry file="file://$PROJECT_DIR$/Prototype_MockingBot/webpack/font-icons-2d07ed3776e17a19540f.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1605"> + <caret line="2875" column="1" selection-start-line="2875" selection-start-column="1" selection-end-line="2875" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="310"> + <caret line="1448" column="1" selection-start-line="1448" selection-start-column="1" selection-end-line="1448" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_welcome/login.php"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/page_profile/profil.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="298"> + <caret line="28" column="41" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="41" /> + </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"> + <caret line="18" column="118" lean-forward="true" selection-start-line="18" selection-start-column="118" selection-end-line="18" selection-end-column="118" /> + <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" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/API_Twitter/userSuggestions.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="161"> + <caret line="7" column="22" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="22" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/page_welcome/index.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="91"> + <caret line="31" column="15" lean-forward="true" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_user/register.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-44"> + <caret line="16" column="26" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="26" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_welcome/index.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> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_user/login.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> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_user/user.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="224"> - <caret line="40" column="15" lean-forward="true" selection-end-line="367" /> + <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" /> <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" /> + <element signature="e#4195#4224#0#PHP" 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" /> </folding> diff --git a/facto.php b/facto.php index 1945a8c10c0bd7b5e7f0dc20ec74193dcb3e3ba9..2a0e7a502e8b93161a0dc491cfe13b3f116a71c8 100644 --- a/facto.php +++ b/facto.php @@ -17,6 +17,14 @@ function head(){ } </script> <!--// Meta tag Keywords --> + + <!-- go to user_page--> + <script> + function tz(){ + window.location.href=\'../page_user/user.php\'; + } + + </script> <!-- icon --> <link rel="shortcut icon" href="../images/logo.png" type="image/x-icon"> @@ -79,15 +87,25 @@ 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">'; - if (!isset($_SESSION['username'])) + if (!$_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 ' + echo ' </li> </ul> </div> + + <div>'; + + if ($_SESSION['username']) + echo '<button onclick="tz()">user</button>'; + + echo ' + </div> + + </div> </div> </nav> diff --git a/page_user/user.php b/page_user/user.php index 9e9666525504549a3ef7d0eb700641e3043b331c..ac527307db6260db252954fdc7f06b1336935f50 100644 --- a/page_user/user.php +++ b/page_user/user.php @@ -102,28 +102,28 @@ session_start(); <span class="navbar-toggler-icon"></span> </button> - <div class="collapse navbar-collapse" id="navbarSupportedContent"> - - <ul class="navbar-nav mx-auto text-center"> - <li class="nav-item active"> - <a class="nav-link" href="../page_welcome/index.php">Home - <span class="sr-only">(current)</span> - </a> - </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"> - <?php if (!$_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">'.$_SESSION['username'] .' | <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>'; - } - ?> - </li> - </ul> - </div> - </div> +<!-- <div class="collapse navbar-collapse" id="navbarSupportedContent">--> +<!----> +<!-- <ul class="navbar-nav mx-auto text-center">--> +<!-- <li class="nav-item active">--> +<!-- <a class="nav-link" href="../page_welcome/index.php">Home--> +<!-- <span class="sr-only">(current)</span>--> +<!-- </a>--> +<!-- </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">--> +<!-- --><?php //if (!$_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">'.$_SESSION['username'] .' | <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>'; +// } +// ?> +<!-- </li>--> +<!-- </ul>--> +<!-- </div>--> +<!-- </div>--> </div> </nav> </header> @@ -237,7 +237,7 @@ session_start(); </h3> <div class="search-agile"> <div> - <span><img src="images/abc.png" width="500" height="500"/></span> + <span><img src="images/abc.png" width="500" height="1000"/></span> <!-- <input type="submit" value="Search"> --> <!-- <div style="display: inline-flex;"> diff --git a/page_welcome/userpage.php b/page_welcome/userpage.php index 83b138735b694d0e6159512f6d9dbf27889577a0..d44a6a77e6e40a9211bab239cc64de54220c1b83 100644 --- a/page_welcome/userpage.php +++ b/page_welcome/userpage.php @@ -117,6 +117,16 @@ session_start(); </li> </ul> </div> + + <div> + <?php if ($_SESSION['username']) + echo '<button onclick="tz()">跳转</button>'; + ?> + + + </div> + + </div> </div> </nav> @@ -183,7 +193,14 @@ session_start(); <!-- Default-JavaScript-File --> - <!-- banner slider --> + <!-- go to user_page--> + <script> + function tz(){ + window.location.href='../page_user/user.php'; + } + + </script> + <!-- banner slider --> <script src="js/responsiveslides.min.js"></script> <script> // You can also use "$(window).load(function() {"