diff --git a/laravel52/.idea/workspace.xml b/laravel52/.idea/workspace.xml index dff062fb4034177e8b0bc5af132e9af8398eb002..576869144b443fc4d4c90061ef0ce85883931da8 100644 --- a/laravel52/.idea/workspace.xml +++ b/laravel52/.idea/workspace.xml @@ -21,41 +21,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="routes.php" pinned="false" current-in-tab="false"> + <file leaf-file-name="routes.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="464"> - <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="AuthController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="532"> - <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="login.blade.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="418"> - <caret line="22" column="38" selection-start-line="22" selection-start-column="38" selection-end-line="22" selection-end-column="38" /> + <state relative-caret-position="1311"> + <caret line="78" column="55" selection-start-line="78" selection-start-column="55" selection-end-line="78" selection-end-column="55" /> <folding /> </state> </provider> @@ -64,28 +34,18 @@ <file leaf-file-name="app.blade.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="97"> - <caret line="74" column="60" selection-start-line="74" selection-start-column="54" selection-end-line="74" selection-end-column="60" /> + <state relative-caret-position="475"> + <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ListPage.blade.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/resources/views/ListPage.blade.php"> + <file leaf-file-name="home.blade.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/resources/views/home.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1442"> - <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="style.css" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/public/css/style.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" /> + <state relative-caret-position="-676"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <folding /> </state> </provider> @@ -99,7 +59,15 @@ <option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/database/migrations/2016_12_01_220147_create_objects_table.php" /> <option value="$PROJECT_DIR$/resources/views/Homepage.blade.php" /> + <option value="$PROJECT_DIR$/public/css/style.css" /> + <option value="$PROJECT_DIR$/resources/views/home.blade.php" /> <option value="$PROJECT_DIR$/app/Http/routes.php" /> + <option value="$PROJECT_DIR$/config/app.php" /> + <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" /> + <option value="$PROJECT_DIR$/resources/views/AddArticle.blade.php" /> + <option value="$PROJECT_DIR$/app/Http/Controllers/Add_Article.php" /> + <option value="$PROJECT_DIR$/app/Http/Controllers/Search_Article.php" /> + <option value="$PROJECT_DIR$/app/Article.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/app.blade.php" /> </list> </option> @@ -120,7 +88,6 @@ <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds"> <option name="x" value="-8" /> - <option name="y" value="-8" /> <option name="width" value="1378" /> <option name="height" value="744" /> </component> @@ -149,7 +116,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -168,6 +134,34 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="laravel52" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="laravel52" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="tests" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="laravel52" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="laravel52" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="storage" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="laravel52" /> @@ -340,7 +334,7 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> + <option name="myItemId" value="config" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -357,10 +351,6 @@ <option name="myItemId" value="app" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Http" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -379,10 +369,6 @@ <option name="myItemId" value="Http" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Middleware" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -406,35 +392,10 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="laravel52" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="laravel52" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Http" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Controllers" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Auth" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> <pane id="Scope" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -503,18 +464,24 @@ <workItem from="1480627753903" duration="9245000" /> <workItem from="1480809842620" duration="2393000" /> <workItem from="1480812762814" duration="2025000" /> + <workItem from="1480885833425" duration="2592000" /> + <workItem from="1480889326448" duration="2860000" /> + <workItem from="1480928321474" duration="9690000" /> + <workItem from="1480972319073" duration="1989000" /> + <workItem from="1481226730319" duration="4562000" /> + <workItem from="1481484477706" duration="2873000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="13672000" /> + <option name="totallyTimeSpent" value="38238000" /> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1378" height="744" extended-state="0" /> + <frame x="-8" y="0" width="1378" height="744" extended-state="0" /> <editor active="false" /> <layout> <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2496329" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23054332" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -550,9 +517,62 @@ <watches-manager /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/resources/views/home.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="95"> + <caret line="5" column="47" selection-start-line="5" selection-start-column="47" selection-end-line="5" selection-end-column="47" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="646"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#40#62#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="532"> + <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="437"> + <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2280"> + <caret line="120" column="46" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/ListPage.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2185"> + <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="817"> <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> <folding /> </state> @@ -562,15 +582,69 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#40#62#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="608"> + <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1406"> + <caret line="74" column="60" selection-start-line="74" selection-start-column="54" selection-end-line="74" selection-end-column="60" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/ListPage.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2185"> + <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/public/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="646"> + <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#40#62#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="532"> <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> - <folding /> </state> </provider> </entry> @@ -578,7 +652,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="931"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -586,7 +659,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="437"> <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" /> - <folding /> </state> </provider> </entry> @@ -594,7 +666,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -611,7 +682,9 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#40#62#0#PHP" expanded="true" /> + </folding> </state> </provider> </entry> @@ -619,7 +692,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="494"> <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" /> - <folding /> </state> </provider> </entry> @@ -627,11 +699,17 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="931"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -639,14 +717,16 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/.env"> + <entry file="file://$PROJECT_DIR$/database/migrations/2016_12_01_220147_create_objects_table.php" /> + <entry file="file://$PROJECT_DIR$/resources/views/Homepage.blade.php" /> + <entry file="file://$PROJECT_DIR$/composer.json"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="190"> - <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> + <state relative-caret-position="-228"> + <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/User.php"> + <entry file="file://$PROJECT_DIR$/app/Borrow.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -654,68 +734,162 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Article.php"> + <entry file="file://$PROJECT_DIR$/public/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="57"> + <caret line="3" column="23" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/config/auth.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2033"> + <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/database/migrations/2016_12_01_220147_create_objects_table.php" /> - <entry file="file://$PROJECT_DIR$/resources/views/Homepage.blade.php" /> - <entry file="file://$PROJECT_DIR$/public/css/style.css"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> - <caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" /> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1311"> + <caret line="69" column="8" selection-start-line="69" selection-start-column="8" selection-end-line="69" selection-end-column="8" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/.env"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="190"> + <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="779"> + <caret line="41" column="66" selection-start-line="41" selection-start-column="66" selection-end-line="41" selection-end-column="66" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="76"> + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="3" /> + <folding> + <element signature="e#40#85#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/config/app.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="3762"> + <caret line="198" column="29" selection-start-line="198" selection-start-column="29" selection-end-line="198" selection-end-column="29" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="304"> + <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/resources/views/ListPage.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1442"> - <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> + <state relative-caret-position="893"> + <caret line="47" column="28" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="28" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Search_Article.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="97"> - <caret line="74" column="60" selection-start-line="74" selection-start-column="54" selection-end-line="74" selection-end-column="60" /> + <state relative-caret-position="1235"> + <caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> + <entry file="file://$PROJECT_DIR$/resources/views/AddArticle.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="464"> - <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> + <state relative-caret-position="209"> + <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Add_Article.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="133"> + <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" /> + <folding> + <element signature="e#118#134#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Article.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="152"> + <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> + <folding> + <element signature="e#6#84#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="19"> + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> + <folding> + <element signature="e#40#62#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="475"> + <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <entry file="file://$PROJECT_DIR$/resources/views/home.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="532"> - <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> + <state relative-caret-position="-676"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="418"> - <caret line="22" column="38" selection-start-line="22" selection-start-column="38" selection-end-line="22" selection-end-column="38" /> + <state relative-caret-position="1311"> + <caret line="78" column="55" selection-start-line="78" selection-start-column="55" selection-end-line="78" selection-end-column="55" /> <folding /> </state> </provider> diff --git a/laravel52/app/Article.php b/laravel52/app/Article.php index 649b2838565e4fa46e77585f41da220b8d0a418a..7a8e06a7324b9956e53abf3418eb6381b76a99b5 100644 --- a/laravel52/app/Article.php +++ b/laravel52/app/Article.php @@ -1,10 +1,20 @@ <?php +/** + * Created by PhpStorm. + * User: cool + * Date: 04/12/16 + * Time: 21:42 + */ namespace App; -use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\model; class Article extends Model { - // -} + + protected $table = 'objects'; + + protected $primaryKey = 'object_id'; + +} \ No newline at end of file diff --git a/laravel52/app/Borrow.php b/laravel52/app/Borrow.php new file mode 100644 index 0000000000000000000000000000000000000000..cd81ed29ba98a457bfab1a410f513a11e5d3ac66 --- /dev/null +++ b/laravel52/app/Borrow.php @@ -0,0 +1,19 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 04/12/16 + * Time: 22:45 + */ +namespace App; + +use Illuminate\Database\Eloquent\model; + +class Borrow extends Model +{ + + protected $table = 'borrows'; + + protected $primaryKey = 'borrow_id'; + +} \ No newline at end of file diff --git a/laravel52/app/Comment.php b/laravel52/app/Comment.php new file mode 100644 index 0000000000000000000000000000000000000000..5faeed3a7be14ba0a4f2f57b2b90c179a3dd12da --- /dev/null +++ b/laravel52/app/Comment.php @@ -0,0 +1,19 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 11/12/16 + * Time: 16:53 + */ +namespace App; + +use Illuminate\Database\Eloquent\model; + +class Comment extends Model +{ + + protected $table = 'comments'; + + protected $primaryKey = 'comment_id'; + +} \ No newline at end of file diff --git a/laravel52/app/Exceptions/Handler.php b/laravel52/app/Exceptions/Handler.php index 53617ef4adc1d171d542aeb6f3c525ddc6f83e21..8bc0b64d3335dd9b94ac09c5f5c2c26530a02c3d 100644 Binary files a/laravel52/app/Exceptions/Handler.php and b/laravel52/app/Exceptions/Handler.php differ diff --git a/laravel52/app/Http/Controllers/Add_Article.php b/laravel52/app/Http/Controllers/Add_Article.php new file mode 100644 index 0000000000000000000000000000000000000000..3150dd2e9d26d3d52bd80468e17f6b55576fe604 --- /dev/null +++ b/laravel52/app/Http/Controllers/Add_Article.php @@ -0,0 +1,38 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 04/12/16 + * Time: 21:26 + */ +namespace App\Http\Controllers; + +use App\Article; +use Request; + +use Auth; + +/*use Illuminate\Support\Facades\DB;*/ + +class Add_Article extends Controller +{ + public function add_article() + { + $object_name = Request::get('object_name'); + $object_titre = Request::get('object_titre'); + $type = Request::get('type'); + $description = Request::get('description'); + $user_id = Auth::user()->id; + + $object = new Article(); + $object -> name = $object_name; + $object -> titre = $object_titre; + $object -> type = $type; + $object -> description = $description; + $object -> owner_id = $user_id; + $object -> status = 0; + $object -> save(); + return view('home'); + } +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Add_Borrow.php b/laravel52/app/Http/Controllers/Add_Borrow.php new file mode 100644 index 0000000000000000000000000000000000000000..4baec7569543820229ef6c5ab8f661f55d4986dc --- /dev/null +++ b/laravel52/app/Http/Controllers/Add_Borrow.php @@ -0,0 +1,49 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 08/12/16 + * Time: 22:25 + */ +namespace App\Http\Controllers; + +use App\Article; +use App\Borrow; +use Request; +use Auth; + +/*use Illuminate\Support\Facades\DB;*/ + +class Add_Borrow extends Controller +{ + public function add_borrow() + { + $object_id = Request::get('object_id'); + $start_date = Request::get('start_date'); + $day = Request::get('Day'); + $month = Request::get('Month'); + $year = Request::get('Year'); + $user_id = Auth::user()->id; + $olddate = $year."-". $month."-".$day; + $end_date= date("Y/m/d H:i:s",strtotime($olddate)); + $start_date= date("Y/m/d H:i:s",$start_date); + /*echo 'object_id',$object_id; + echo 'start_date',$start_date; + echo 'user_id',$user_id ; + echo $day; + echo $month; + echo $year;*/ + $borrow = new Borrow(); + $borrow -> user_id = $user_id; + $borrow -> object_id = $object_id; + $borrow -> date_begin = $start_date; + $borrow -> date_end = $end_date; + $borrow -> save(); + + $article = Article::find($object_id); + $article -> status = 1; + $article -> save(); + return view('home'); + } +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Add_Com.php b/laravel52/app/Http/Controllers/Add_Com.php new file mode 100644 index 0000000000000000000000000000000000000000..0f6a3f8a818ae27a88fea3161f52e8ccfda3a29d --- /dev/null +++ b/laravel52/app/Http/Controllers/Add_Com.php @@ -0,0 +1,42 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 11/12/16 + * Time: 17:48 + */ +namespace App\Http\Controllers; + +use App\Article; +use App\Borrow; +use App\Comment; +use Request; +use Auth; + +/*use Illuminate\Support\Facades\DB;*/ + +class Add_Com extends Controller +{ + public function add_com() + { + $object_id = Request::get('object_id'); + $com = Request::get('com'); + $degree = Request::get('degree'); + $user_id = Auth::user()->id; + echo 'com',$com; + echo 'user_id',$user_id; + echo 'degree',$degree; + + $comment= new Comment(); + $comment -> user_id = $user_id; + $comment -> object_id = $object_id; + $comment -> com = $com; + $comment -> degree = $degree; + $comment -> save(); + + $object = Article::find($object_id); + $Comments = Comment::where('object_id', $object_id) -> get(); + return view('Article',compact('object','Comments')); + } +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Delete.php b/laravel52/app/Http/Controllers/Delete.php new file mode 100644 index 0000000000000000000000000000000000000000..bcd0a688d4b1a3d1efd0a5ee62d473e2c7c4788f --- /dev/null +++ b/laravel52/app/Http/Controllers/Delete.php @@ -0,0 +1,34 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 11/12/16 + * Time: 00:06 + */ +namespace App\Http\Controllers; + +use Illuminate\Support\Facades\DB; +use App\Article; +use Request; + +use Auth; + + +class Delete extends Controller +{ + public function delete() + { + $object_id = Request::get('object_id'); + $object = Article::find($object_id); + $object -> delete(); + $user_id = Auth::user()->id; + $Articles = DB::table('users') + ->join('objects', 'users.id', '=', 'objects.owner_id') + ->where('id', $user_id) + ->get(); + /* dd($Borrows);*/ + return view('My_History',compact('Articles')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Search_Article.php b/laravel52/app/Http/Controllers/Search_Article.php new file mode 100644 index 0000000000000000000000000000000000000000..dd3c0e17f7c5aab3cd69c03d16aada93dff74bb0 --- /dev/null +++ b/laravel52/app/Http/Controllers/Search_Article.php @@ -0,0 +1,82 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 04/12/16 + * Time: 21:26 + */ +namespace App\Http\Controllers; + +use App\Article; +use Request; + +use Auth; + + +class Search_Article extends Controller +{ + public function Search_Livres() + { + $Articles = Article::where('type', 'Livres') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Outils() + { + $Articles = Article::where('type', 'Outils') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Joujous() + { + $Articles = Article::where('type', 'Joujous') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Vetements() + { + $Articles = Article::where('type', 'Vetements') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Articles() + { + $Articles = Article::where('type', 'Articles') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Chaussures() + { + $Articles = Article::where('type', 'Chaussures') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Portables() + { + $Articles = Article::where('type', 'Portables') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Maquillages() + { + $Articles = Article::where('type', 'Maquillages') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + + public function Search_Sacs() + { + $Articles = Article::where('type', 'Sacs') -> get(); + /*dd($Livres);*/ + return view('ListPage',compact('Articles')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Show_Article.php b/laravel52/app/Http/Controllers/Show_Article.php new file mode 100644 index 0000000000000000000000000000000000000000..b8ffe0542657e65e980c0571a8495858b9d2233c --- /dev/null +++ b/laravel52/app/Http/Controllers/Show_Article.php @@ -0,0 +1,29 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 08/12/16 + * Time: 20:52 + */ +namespace App\Http\Controllers; + +use App\Article; + +use App\Comment; +use Request; + +use Auth; + + +class Show_Article extends Controller +{ + public function show_article() + { + $object_id = Request::get('object_id'); + $object = Article::find($object_id); + $Comments = Comment::where('object_id', $object_id) -> get(); + return view('Article',compact('object','Comments')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Show_Borrow_Confirme.php b/laravel52/app/Http/Controllers/Show_Borrow_Confirme.php new file mode 100644 index 0000000000000000000000000000000000000000..9aa0a203bb86f81e4fc8252c0513fd5d5246dcad --- /dev/null +++ b/laravel52/app/Http/Controllers/Show_Borrow_Confirme.php @@ -0,0 +1,26 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 08/12/16 + * Time: 22:16 + */ +namespace App\Http\Controllers; + +use App\Article; +use Request; + +use Auth; + + +class Show_Borrow_Confirme extends Controller +{ + public function show_borrow_confirme() + { + $object_id = Request::get('object_id'); + $object = Article::find($object_id); + return view('Borrow_confirmer',compact('object')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Show_Borrow_History.php b/laravel52/app/Http/Controllers/Show_Borrow_History.php new file mode 100644 index 0000000000000000000000000000000000000000..f8ec206c62e9a8092a4f14fe09eb2d6202d5c7d3 --- /dev/null +++ b/laravel52/app/Http/Controllers/Show_Borrow_History.php @@ -0,0 +1,31 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 10/12/16 + * Time: 22:12 + */ +namespace App\Http\Controllers; + + +use Illuminate\Support\Facades\DB; +use Request; + +use Auth; + + +class Show_Borrow_History extends Controller +{ + public function show_borrow_history() + { + $user_id = Auth::user()->id; + $Borrows = DB::table('borrows') + ->join('objects', 'borrows.object_id', '=', 'objects.object_id') + ->where('user_id', $user_id) + ->get(); + /* dd($Borrows);*/ + return view('Borrow_History',compact('Borrows')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Show_Upload_History.php b/laravel52/app/Http/Controllers/Show_Upload_History.php new file mode 100644 index 0000000000000000000000000000000000000000..c1196ef270fc6f02c8583bc5444dd5e32470654c --- /dev/null +++ b/laravel52/app/Http/Controllers/Show_Upload_History.php @@ -0,0 +1,31 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 10/12/16 + * Time: 22:12 + */ +namespace App\Http\Controllers; + + +use Illuminate\Support\Facades\DB; +use Request; + +use Auth; + + +class Show_Upload_History extends Controller +{ + public function show_upload_history() + { + $user_id = Auth::user()->id; + $Articles = DB::table('users') + ->join('objects', 'users.id', '=', 'objects.owner_id') + ->where('id', $user_id) + ->get(); + /* dd($Borrows);*/ + return view('My_History',compact('Articles')); + } + +} +?> \ No newline at end of file diff --git a/laravel52/app/Http/Controllers/Test.php b/laravel52/app/Http/Controllers/Test.php new file mode 100644 index 0000000000000000000000000000000000000000..2f74615b78aae5113757e0af9f9f4a68eecb30ba --- /dev/null +++ b/laravel52/app/Http/Controllers/Test.php @@ -0,0 +1,34 @@ +<?php +/** + * Created by PhpStorm. + * User: cool + * Date: 05/12/16 + * Time: 00:07 + */ +namespace App\Http\Controllers; + +use Request; + +class Test extends Controller +{ + /** + * Create a new controller instance. + * + * @return void + */ + /* public function __construct() + { + $this->middleware('auth'); + }*/ + + /** + * Show the application dashboard. + * + * @return \Illuminate\Http\Response + */ + public function test($type) + { + + echo $type; + } +} \ No newline at end of file diff --git a/laravel52/app/Http/routes.php b/laravel52/app/Http/routes.php index d171ffc144f080d4bcca887e019a8954fb49c938..dab39b1ee7e4e4415f36fe7442fa7bef4242f56b 100644 --- a/laravel52/app/Http/routes.php +++ b/laravel52/app/Http/routes.php @@ -31,13 +31,56 @@ Route::group(['middleware' => ['web']], function () { }); Route::group(['middleware' => 'web'], function () { - Route::auth(); + Route::auth(); Route::get('List', array('as' => 'list',function () { return view('ListPage'); })); + Route::get('AddArticle', array('as' => 'addarticle',function () + { + return view('AddArticle'); + })); + + Route::get('MySpace', array('as' => 'myspace',function () + { + return view('Myspace'); + })); + + Route::get('BorrowHistory', array('as' => 'borrowhistory', 'uses' => 'Show_Borrow_History@show_borrow_history')); + + Route::get('MyHistory', array('as' => 'myhistory', 'uses' => 'Show_Upload_History@show_upload_history')); + + Route::post('add_article', 'Add_Article@add_article'); + + Route::post('Add_Com', array('as' => 'add_com', 'uses' => 'Add_Com@add_com')); + Route::get('/home', 'HomeController@index'); -}); + Route::get('List1', 'Search_Article@Search_Livres'); + + Route::get('List2', 'Search_Article@Search_Outils'); + + Route::get('List3', 'Search_Article@Search_Joujous'); + + Route::get('List4', 'Search_Article@Search_Vetements'); + + Route::get('List5', 'Search_Article@Search_Articles'); + + Route::get('List6', 'Search_Article@Search_Chaussures'); + + Route::get('List7', 'Search_Article@Search_Portables'); + + Route::get('List8', 'Search_Article@Search_Maquillages'); + + Route::get('List9', 'Search_Article@Search_Sacs'); + + Route::get('Article', array('as' => 'article', 'uses' => 'Show_Article@show_article')); + + Route::get('Borrow', array('as' => 'borrow', 'uses' => 'Show_Borrow_Confirme@show_borrow_confirme')); + + Route::any('Add_Borrow', array('as' => 'add_borrow', 'uses' => 'Add_Borrow@add_borrow')); + + Route::get('Delete', array('as' => 'delete', 'uses' => 'Delete@delete')); +}); diff --git a/laravel52/app/Listeners/.gitkeep b/laravel52/app/Listeners/.gitkeep index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/laravel52/app/Listeners/.gitkeep +++ b/laravel52/app/Listeners/.gitkeep @@ -1 +0,0 @@ - diff --git a/laravel52/app/Policies/.gitkeep b/laravel52/app/Policies/.gitkeep index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/laravel52/app/Policies/.gitkeep +++ b/laravel52/app/Policies/.gitkeep @@ -1 +0,0 @@ - diff --git a/laravel52/app/Providers/RouteServiceProvider.php b/laravel52/app/Providers/RouteServiceProvider.php index bde08819a9042c9999fafb0075317b75f6594627..d50b1c0f8d6ffc60a3acefe20e7e97976537d637 100644 --- a/laravel52/app/Providers/RouteServiceProvider.php +++ b/laravel52/app/Providers/RouteServiceProvider.php @@ -8,7 +8,7 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvi class RouteServiceProvider extends ServiceProvider { /** - * This namespace is applied to your controller routes. + * This namespace is applied to the controller routes in your routes file. * * In addition, it is set as the URL generator's root namespace. * @@ -37,24 +37,7 @@ class RouteServiceProvider extends ServiceProvider */ public function map(Router $router) { - $this->mapWebRoutes($router); - - // - } - - /** - * Define the "web" routes for the application. - * - * These routes all receive session state, CSRF protection, etc. - * - * @param \Illuminate\Routing\Router $router - * @return void - */ - protected function mapWebRoutes(Router $router) - { - $router->group([ - 'namespace' => $this->namespace, 'middleware' => 'web', - ], function ($router) { + $router->group(['namespace' => $this->namespace], function ($router) { require app_path('Http/routes.php'); }); } diff --git a/laravel52/app/User.php b/laravel52/app/User.php index 75741ae4285959552fc2099c112f2e7a0f7ec0c0..ef6fe91ef1aed22ca471833fad88807f1ce4b271 100644 --- a/laravel52/app/User.php +++ b/laravel52/app/User.php @@ -16,7 +16,7 @@ class User extends Authenticatable ]; /** - * The attributes that should be hidden for arrays. + * The attributes excluded from the model's JSON form. * * @var array */ diff --git a/laravel52/config/app.php b/laravel52/config/app.php index 4fc7a63ffea4ec8ad7b8e6dabc45600ef6b24cf9..d18a916b3676dbcab3f87c9d0c12383eb89f975a 100644 --- a/laravel52/config/app.php +++ b/laravel52/config/app.php @@ -147,6 +147,7 @@ return [ Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, + Collective\Html\HtmlServiceProvider::class, /* * Application Service Providers... @@ -201,6 +202,8 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, + 'Form' => Collective\Html\FormFacade::class, + 'Html' => Collective\Html\HtmlFacade::class, ], diff --git a/laravel52/database/factories/ModelFactory.php b/laravel52/database/factories/ModelFactory.php index f596d0b59b5004c8eb0e6fac529fc9fd3fa933b6..0876c70c74f9223f5823cb7572015791ad125394 100644 --- a/laravel52/database/factories/ModelFactory.php +++ b/laravel52/database/factories/ModelFactory.php @@ -14,7 +14,7 @@ $factory->define(App\User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, - 'email' => $faker->safeEmail, + 'email' => $faker->email, 'password' => bcrypt(str_random(10)), 'remember_token' => str_random(10), ]; diff --git a/laravel52/database/migrations/.gitkeep b/laravel52/database/migrations/.gitkeep index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/laravel52/database/migrations/.gitkeep +++ b/laravel52/database/migrations/.gitkeep @@ -1 +0,0 @@ - diff --git a/laravel52/database/migrations/2014_10_12_000000_create_users_table.php b/laravel52/database/migrations/2014_10_12_000000_create_users_table.php index 59aa01a5591488bc7e964615a12616db98c52164..65d3d083882138e3d24113d29b6f575dae014231 100644 --- a/laravel52/database/migrations/2014_10_12_000000_create_users_table.php +++ b/laravel52/database/migrations/2014_10_12_000000_create_users_table.php @@ -16,7 +16,7 @@ class CreateUsersTable extends Migration $table->increments('id'); $table->string('name'); $table->string('email')->unique(); - $table->string('password'); + $table->string('password', 60); $table->rememberToken(); $table->timestamps(); }); diff --git a/laravel52/database/migrations/2016_12_11_154854_create_comment_table.php b/laravel52/database/migrations/2016_12_11_154854_create_comment_table.php new file mode 100644 index 0000000000000000000000000000000000000000..b602f40429f9903d00587948bd2c7424d596a152 --- /dev/null +++ b/laravel52/database/migrations/2016_12_11_154854_create_comment_table.php @@ -0,0 +1,37 @@ +<?php + +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreateCommentTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('comments', function (Blueprint $table) { + $table->increments('comment_id'); + $table->integer('user_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users'); + $table->integer('object_id')->unsigned(); + $table->foreign('object_id')->references('object_id')->on('objects'); + $table->string('com',3000); + $table->integer('degree'); + $table->rememberToken(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('comments'); + } +} diff --git a/laravel52/database/seeds/.gitkeep b/laravel52/database/seeds/.gitkeep index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/laravel52/database/seeds/.gitkeep +++ b/laravel52/database/seeds/.gitkeep @@ -1 +0,0 @@ - diff --git a/laravel52/database/seeds/DatabaseSeeder.php b/laravel52/database/seeds/DatabaseSeeder.php index e119db624aa8f894d74ef57283c4947e734015b0..2a28edd7f250eb5b3c4c832ffbef038630759d2a 100644 --- a/laravel52/database/seeds/DatabaseSeeder.php +++ b/laravel52/database/seeds/DatabaseSeeder.php @@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - // $this->call(UsersTableSeeder::class); + // $this->call(UserTableSeeder::class); } } diff --git a/laravel52/public/css/style.css b/laravel52/public/css/style.css index 360c4f6aabe43f96719b1c3ae855a78d56572aaf..ffbc905782fdc099bd8a5a558cdc5bbc329ba2e9 100644 --- a/laravel52/public/css/style.css +++ b/laravel52/public/css/style.css @@ -1 +1,11 @@ -# Empty CSS file for your own CSS \ No newline at end of file +.logo{ + font-family: "Arial"; + font-size: 40px; + font-style: normal; + font-variant: normal; + font-weight: 500; + line-height: 25px; + color: #000000; + letter-spacing: 0; + text-shadow: 0px 1px 0px #999, 0px 2px 0px #888, 0px 3px 0px #777, 0px 4px 0px #666, 0px 5px 0px #555, 0px 6px 0px #444, 0px 7px 0px #333, 0px 8px 7px #001135 +} \ No newline at end of file diff --git a/laravel52/public/homepage/images/portfolio/1.jpg b/laravel52/public/homepage/images/portfolio/1.jpg index cd655efba073bdcf06f66a2c2f94aa6801e18ddb..b25ed57c6d37cc0784cdbf22e2a3d0535c518767 100644 Binary files a/laravel52/public/homepage/images/portfolio/1.jpg and b/laravel52/public/homepage/images/portfolio/1.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/2.jpg b/laravel52/public/homepage/images/portfolio/2.jpg index 7bd32170c778a7f00c51d08c5e4a715b22e10791..fa4cc7255aa781de1052366a083695e8041ce51f 100644 Binary files a/laravel52/public/homepage/images/portfolio/2.jpg and b/laravel52/public/homepage/images/portfolio/2.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/3.jpg b/laravel52/public/homepage/images/portfolio/3.jpg index b1ef559ef49c9e0e8b8a489f04aac747d464d7d6..caeeae852413e9de64966e75f86521bd8761594b 100644 Binary files a/laravel52/public/homepage/images/portfolio/3.jpg and b/laravel52/public/homepage/images/portfolio/3.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/4.jpg b/laravel52/public/homepage/images/portfolio/4.jpg index 2040fc70737c50c5a00389d33cab33adc2558486..ec6b13b4ec184500b287c2effec2328e443394a6 100644 Binary files a/laravel52/public/homepage/images/portfolio/4.jpg and b/laravel52/public/homepage/images/portfolio/4.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/5.jpg b/laravel52/public/homepage/images/portfolio/5.jpg index 910801ca7dac9f2c8cd72d38f7f1753c5494ac76..da4bee968c18d1681b4da7a8f68d15ba471d81ce 100644 Binary files a/laravel52/public/homepage/images/portfolio/5.jpg and b/laravel52/public/homepage/images/portfolio/5.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/6.jpg b/laravel52/public/homepage/images/portfolio/6.jpg index 904e92d712977d66817bdf0a5e7e2d958a43c799..94443d02bfa5084440680cd264308bda9dd8e2e6 100644 Binary files a/laravel52/public/homepage/images/portfolio/6.jpg and b/laravel52/public/homepage/images/portfolio/6.jpg differ diff --git a/laravel52/public/homepage/images/portfolio/7.jpg b/laravel52/public/homepage/images/portfolio/7.jpg index f5b83b6f6dca85d878e2466cc84b7190074646c3..30d21bd929ed35192aaabf5b82d30543992566f7 100644 Binary files a/laravel52/public/homepage/images/portfolio/7.jpg and b/laravel52/public/homepage/images/portfolio/7.jpg differ diff --git a/laravel52/public/image/add_article.jpg b/laravel52/public/image/add_article.jpg new file mode 100644 index 0000000000000000000000000000000000000000..94280f93f51b5145ad7e415481105c43eaf2445f Binary files /dev/null and b/laravel52/public/image/add_article.jpg differ diff --git a/laravel52/public/image/borrow_history.jpg b/laravel52/public/image/borrow_history.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d33264dc4baf9fa7d2678d244d658410aa9ac309 Binary files /dev/null and b/laravel52/public/image/borrow_history.jpg differ diff --git a/laravel52/public/image/donner4.jpg b/laravel52/public/image/donner4.jpg index b196f25fec8713cb61bb7b06dbe41ebb7374d6c3..97e1e0dfb8fdd61992b12c6892ca229d193f5bb4 100644 Binary files a/laravel52/public/image/donner4.jpg and b/laravel52/public/image/donner4.jpg differ diff --git a/laravel52/public/image/facebook.png b/laravel52/public/image/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..566dd1cf9ff9679cd754deda16a1c20b17a1722e Binary files /dev/null and b/laravel52/public/image/facebook.png differ diff --git a/laravel52/public/image/lines.jpg b/laravel52/public/image/lines.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a8a2196f0385cfd98128154d131839126e6df7ec Binary files /dev/null and b/laravel52/public/image/lines.jpg differ diff --git a/laravel52/public/image/logo.jpg b/laravel52/public/image/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6927f30e79b018c3010bae2ba99d2563dda0fb83 Binary files /dev/null and b/laravel52/public/image/logo.jpg differ diff --git a/laravel52/public/image/my_article.jpg b/laravel52/public/image/my_article.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fb8e3c02c5a8560d20c1984d5a2667dcb5495c71 Binary files /dev/null and b/laravel52/public/image/my_article.jpg differ diff --git a/laravel52/public/image/twitter.jpg b/laravel52/public/image/twitter.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1963065146e8bb9d5f11de635475b6311bd7aeb9 Binary files /dev/null and b/laravel52/public/image/twitter.jpg differ diff --git a/laravel52/resources/views/AddArticle.blade.php b/laravel52/resources/views/AddArticle.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..3f4cad3d333c6639b3d389dc2e77c290fb67bea6 --- /dev/null +++ b/laravel52/resources/views/AddArticle.blade.php @@ -0,0 +1,107 @@ +@extends('layouts.app') + +@section('content') + <div class="container-fluid"> + <div class="row"> + <div class="col-md-12"> + <h2>Ajouter votre nouvel article!</h2> + </div> + </div> + <hr /> + <div class="row"> + <div class="col-md-12"> + {!! Form::open(['url' => 'add_article','role' => 'form']) !!} + <label for="name">Choisissez une catégorie:</label> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Livres" checked>Livres + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Outils">Outils + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Joujous" checked>Joujous + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Vetêments" checked>Vetêments + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Articles" checked>Articles + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Chaussures" checked>Chaussures + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Portables" checked>Portables + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Maquillages" checked>Maquillages + </label> + </div> + <div class="radio"> + <label> + <input type="radio" name="type" id="optionsRadios1" value="Sacs" checked>Sacs + </label> + </div> + + + <div class="form-group"> + + <label for="name"> + Votre nom de l'article: + </label> + <input type="text" name="object_name" class="form-control" placeholder="max 5 mots"> + </div> + <div class="form-group"> + + <label for="titre"> + Votre titre: + </label> + <input type="text" name="object_titre" class="form-control" placeholder="max 20 mots"> + </div> + <div class="form-group"> + + <label for="name"> + Les descriptions: + </label> + <textarea name="description" class="form-control" rows="5" placeholder="max 400 mots"></textarea> + </div> + <div class="form-group"> + + <label for="name"> + Input une photo: + </label> + <input type="file" name= "image" id="exampleInputFile"> + <p class="help-block"> + Choississez une et une seule photo:.jpg/.png/.jpeg + </p> + </div> + + {!! Form::submit('Submit',['class'=>'btn btn-primary']) !!} + <a class="btn btn-default" href="{{route('addarticle')}}" role="btn btn-default"> + Cancel + </a> + {!! Form::close() !!} + </div> + </div> + </div> + + + {{-- <script src="js/jquery.min.js"></script> + <script src="js/bootstrap.min.js"></script> + <script src="js/scripts.js"></script>--}} +@endsection('content') diff --git a/laravel52/resources/views/Article.blade.php b/laravel52/resources/views/Article.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..6285dadcda460e99024e59f9b0ed177f52b8c9de --- /dev/null +++ b/laravel52/resources/views/Article.blade.php @@ -0,0 +1,105 @@ +@extends('layouts.app') + +@section('content') + + <!-- Page Content --> + <div class="container"> + + <div class="row"> + + {{--<div class="col-md-3"> + <p class="logo">Sac d'homme</p> + </div>--}} + + <div class="col-md-9"> + <img class="img-product" src="image/example1.jpg" height="315" width="315" alt=""> + <div class="thumbnail"> + + <div class="caption-full"> + <h1 class="pull-right">€270</h1> + <h1>{{$object -> name}}</h1> + <br/> + <p> + <strong>Description about this article + </strong> + </p> + <p>{{--Porte-documents en cuir Saffiano<br> + Ornements acier poli<br> + Doublure en cuir de mouflon<br> + Étiquette avec logo à l’intérieur et logo gravé sur la fermeture par cadenas à code<br> + Une poignée<br> + Deux compartiments avec plis organisés en vue d’un usage professionnel : une poche pour iPad, deux poches pour téléphone portable et une poche zippée<br> + Une poche extérieure au dos<br> + Dimension <br> + l. 40.0 h. 29.0 p. 9.0 cm--}} + {{$object -> description}} + </p> + </div> + <br/> + <div class="ratings"> + <p class="pull-right">3 reviews</p> + <p> + <span class="glyphicon glyphicon-star"></span> + <span class="glyphicon glyphicon-star"></span> + <span class="glyphicon glyphicon-star"></span> + <span class="glyphicon glyphicon-star"></span> + <span class="glyphicon glyphicon-star-empty"></span> + 4.0 stars + </p> + </div> + </div> + + <div class="well"> + {!! Form::open(['route' => ['add_com', 'object_id' => $object -> object_id]]) !!} + <textarea name="com" class="form-control" rows="5" placeholder="max 400 mots"></textarea> + <label for="name"> + The degree of satisfication: + </label> + <select name="degree"> + <option selected value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + </select> + <div class="text-right"> + {!! Form::submit('Comment it',['class'=>'btn btn-success']) !!} + </div> + + <hr/> + @foreach($Comments as $comment) + <div class="row"> + <div class="col-md-12"> + <?php + $degree = $comment -> degree; + $empty_degree = 5 - $degree; + ?> + @while($degree > 0) + <span class="glyphicon glyphicon-star"></span> + <?php $degree = $degree -1; ?> + @endwhile + @while($empty_degree > 0) + <span class="glyphicon glyphicon-star-empty"></span> + <?php $empty_degree = $empty_degree -1; ?> + @endwhile + {{\App\User::find($comment -> user_id) -> name}} + <span class="pull-right">{{$comment -> updated_at}}</span> + <p>{{$comment -> com}}</p> + </div> + </div> + <hr/> + @endforeach + @if ($object -> status == 0) + <div class="text-right"> + <a class="btn btn-success" href="{{route('borrow',['object_id' => $object -> object_id])}}" >Borrow it</a> + </div> + @endif + </div> + + </div> + + </div> + + </div> + +@endsection \ No newline at end of file diff --git a/laravel52/resources/views/Borrow_History.blade.php b/laravel52/resources/views/Borrow_History.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..8b0211b6c8aaed4d04ccf5456c5469dcd693e392 --- /dev/null +++ b/laravel52/resources/views/Borrow_History.blade.php @@ -0,0 +1,188 @@ +@extends('layouts.app') + +@section('content') + + <div class="container-fluid"> + <div class="row"> + <div class="btn-group"> + <p><h2>My Borrow History</h2></p> + <br/> + <button class="btn btn-default"> + Trier + </button> + <button data-toggle="dropdown" class="btn btn-default dropdown-toggle"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li> + <a href="#">By Date</a> + </li> + <li> + <a href="#">By Name</a> + </li> + </ul> + </div> + <br/> + <br/> + <table class="table"> + <thead> + <tr> + <th> + Product + </th> + <th> + Borrow Date + </th> + <th> + Return Date + </th> + <th> + Status + </th> + <th> + IMG + </th> + </tr> + </thead> + <tbody> + <?php $count=0; ?> + @foreach($Borrows as $borrow) + <?php ?> + @if($count%2 == 0) + <tr class="success"> + <td> + <a href="#"><h5>{{$borrow -> titre }}</h5></a> + </td> + <td> + {{$borrow -> date_begin}} + </td> + <td> + {{$borrow -> date_end}} + </td> + <td> + @if(strtotime($borrow -> date_end) > time()) + En cours + @else + Terminé + @endif + </td> + <td> + <a href="#"><img src="image/example1.jpg" width="150" height="150"></a> + </td> + </tr> + <?php $count=$count + 1; ?> + @else + <tr class="warning"> + <td> + <a href="#"><h5>{{$borrow -> titre }}</h5></a> + </td> + <td> + {{$borrow -> date_begin}} + </td> + <td> + {{$borrow -> date_end}} + </td> + <td> + @if(strtotime($borrow -> date_end) > time()) + En cours + @else + Terminé + @endif + </td> + <td> + <a href="#"><img src="image/example1.jpg" width="150" height="150"></a> + </td> + </tr> + <?php $count=$count - 1; ?> + @endif + @endforeach + </tbody> + </table> + <ul class="pagination pagination-sm"> + <li> + <a href="#">Prev</a> + </li> + <li> + <a href="#">1</a> + </li> + <li> + <a href="#">2</a> + </li> + <li> + <a href="#">3</a> + </li> + <li> + <a href="#">4</a> + </li> + <li> + <a href="#">5</a> + </li> + <li> + <a href="#">Next</a> + </li> + </ul> + </div> + </div> + <hr /> + + <div class="row"> + <div class="col-md-12"> + <div class="carousel slide" id="carousel-933434"> + <ol class="carousel-indicators"> + <li data-slide-to="0" data-target="#carousel-933434"> + </li> + <li data-slide-to="1" data-target="#carousel-933434" class="active"> + </li> + <li data-slide-to="2" data-target="#carousel-933434"> + </li> + </ol> + <div class="carousel-inner"> + <div class="item"> + <img alt="Carousel Bootstrap First" src="image/donner1.png" /> + <div class="carousel-caption"> + <h4> + EASY!! + </h4> + <p> + Contacter Online + Prêter ou Emprunter “face to face” + </p> + </div> + </div> + <div class="item active"> + <img alt="Carousel Bootstrap Second" src="image/donner5.jpg" width="400" height="300" /> + <div class="carousel-caption"> + <h4> + Petits Frais ou GRATUIT!! + </h4> + <p> + Les chooses que vous allez emprunter chargent peu mais coûtent plus! Quelquel sont gratuits à vous! + </p> + </div> + </div> + <div class="item"> + <img alt="Carousel Bootstrap Third" src="image/donner2.jpg" width="400" height="300"/> + <div class="carousel-caption"> + <h4> + Crédit!! + </h4> + <p> + Nous empruntons et prêtons. Nous utilisons notre crédit! C'est crédible et fiable! + </p> + </div> + </div> + </div> + <a class="left carousel-control" href="#carousel-933434" data-slide="prev"> + <span class="glyphicon glyphicon-chevron-left"></span> + </a> + <a class="right carousel-control" href="#carousel-933434" data-slide="next"> + <span class="glyphicon glyphicon-chevron-right"></span> + </a> + </div> + </div> + </div> + + <hr /> + <br /> + +@endsection \ No newline at end of file diff --git a/laravel52/resources/views/Borrow_confirmer.blade.php b/laravel52/resources/views/Borrow_confirmer.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..5c43c63d286b2a8504e74ddfd7017bab8bfa5f65 --- /dev/null +++ b/laravel52/resources/views/Borrow_confirmer.blade.php @@ -0,0 +1,120 @@ +@extends('layouts.app') + +@section('content') + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> + <div class="container-fluid"> + <div class="row"> + <div class="col-md-12"> + <table class="table"> + <thead> + <tr> + <th> + Image + </th> + <th> + Produit + </th> + <th> + Date d'emprunt + </th> + <th> + Date de retour + </th> + <th> + Confirmer + </th> + </tr> + </thead> + <tbody> + <tr class="success"> + <td> + <img class="img-product" src="image\example1.jpg" height="40" width="40" alt="Photo perdue"> + </td> + <td> + {{$object -> name}} + </td> + <td> + <?php $start_date = time(); echo date('m/d/Y');?> + </td> + {!! Form::open(['route' => ['add_borrow', 'object_id' => $object -> object_id, 'start_date' => $start_date]]) !!} + <td> + <select name="Day"> + <option selected value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + <option value="6">6</option> + <option value="7">7</option> + <option value="8">8</option> + <option value="9">9</option> + <option value="10">10</option> + <option value="11">11</option> + <option value="12">12</option> + <option value="13">13</option> + <option value="14">14</option> + <option value="15">15</option> + <option value="16">16</option> + <option value="17">17</option> + <option value="18">18</option> + <option value="19">19</option> + <option value="20">20</option> + <option value="21">21</option> + <option value="22">22</option> + <option value="23">23</option> + <option value="24">24</option> + <option value="25">25</option> + <option value="26">26</option> + <option value="27">27</option> + <option value="28">28</option> + <option value="29">29</option> + <option value="30">30</option> + <option value="31">31</option> + </select> + <select name="Month"> + <option selected value="1">Janvier</option> + <option value="2">Février</option> + <option value="3">Mars</option> + <option value="4">Avril</option> + <option value="5">Mai</option> + <option value="6">Juin</option> + <option value="7">Juillet</option> + <option value="8">Août</option> + <option value="9">Septembre</option> + <option value="10">Octobre</option> + <option value="11">Novembre</option> + <option value="12">Décembre</option> + </select> + <select name="Year"> + <option selected value="16">2016</option> + <option value="17">2017</option> + </select> + </td> + <td> + <div class="text-left"> + {!! Form::submit('Borrow it',['class'=>'btn btn-success']) !!} + </div> + </td> + {!! Form::close() !!} + </tr> + </tbody> + </table> + </div> + </div> + </div> + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> + <br/> +@endsection \ No newline at end of file diff --git a/laravel52/resources/views/ListPage.blade.php b/laravel52/resources/views/ListPage.blade.php index 639c9465dc7f60df12a7f5c866336aaf9aa29677..3484ad0df558ac328f852e1f7b0d435d7f9375e6 100644 --- a/laravel52/resources/views/ListPage.blade.php +++ b/laravel52/resources/views/ListPage.blade.php @@ -1,6 +1,7 @@ @extends('layouts.app') @section('content') + <div class="container-fluid"> <div class="row"> <div class="col-md-12"> @@ -60,95 +61,52 @@ </tr> </thead> <tbody> - <tr class="success"> - <td> - <a href="#"><img src="image/example1.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Un Sac à dos acheté un an peut être prêté MAX. UNE SEMAINE.</a> - </td> - <td> - 01/04/2012 - </td> - <td> - Occupé - </td> - </tr> - <tr class="warning"> - <td> - <a href="#"><img src="image/example2.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Un sac de CHANEL peut être prêté avec rémunération.</a> - </td> - <td> - 01/04/2012 - </td> - <td> - À louer - </td> - </tr> - <tr class="success"> - <td> - <a href="#"><img src="image/example3.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Céline Box à louer...</a> - </td> - <td> - 01/04/2012 - </td> - <td> - À louer - </td> - </tr> - <tr class="warning"> - <td> - <a href="#"><img src="image/example4.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Vous pouvez emprunter mon Hermès par récompenser!</a> - </td> - <td> - 01/04/2012 - </td> - <td> - Occupé - </td> - </tr> - <tr class="success"> - <td> - <a href="#"><img src="image/example5.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Voulez vous un sac pour des cas importants? Connectez-moi!</a> - </td> - <td> - 02/04/2012 - </td> - <td> - Occupé - </td> - </tr> - <tr class="warning"> - <td> - <a href="#"><img src="image/example6.jpg" width="200" height="200"></a> - </td> - <td> - <a href="#">Faire votre voyage avec ce bagage. Petits frais!</a> - </td> - <td> - 02/04/2012 - </td> - <td> - Occupé - </td> - </tr> - - - - - </tr> + <?php $count=0; ?> + @foreach($Articles as $article) + @if($count%2 == 0) + <tr class="success"> + <td> + <a href="{{route('article',['object_id' => $article -> object_id ])}}"><img src="image/example1.jpg" width="200" height="200"></a> + </td> + <td> + {{--<a href="#">Un Sac à dos acheté un an peut être prêté MAX. UNE SEMAINE.</a>--}} + <a href="{{route('article',['object_id' => $article -> object_id ])}}">{{$article -> titre}}</a> + </td> + <td> + {{$article -> created_at}} + </td> + <td> + @if ($article -> status == 1) + Occupé + @else + À louer + @endif + </td> + </tr> + <?php $count=$count + 1; ?> + @else + <tr class="warning"> + <td> + <a href="{{route('article',['object_id' => $article -> object_id ])}}"><img src="image/example1.jpg" width="200" height="200"></a> + </td> + <td> + {{--<a href="#">Un Sac à dos acheté un an peut être prêté MAX. UNE SEMAINE.</a>--}} + <a href="{{route('article',['object_id' => $article -> object_id ])}}">{{$article -> titre}}</a> + </td> + <td> + {{$article -> created_at}} + </td> + <td> + @if ($article -> status == 1) + Occupé + @else + À louer + @endif + </td> + </tr> + <?php $count=$count - 1; ?> + @endif + @endforeach </tbody> </table> <ul class="pagination pagination-sm"> @@ -174,9 +132,6 @@ <a href="#">Next</a> </li> </ul> - <div> - <a href="#" class="btn btn-primary" role="button">Ajouter un Article</a> - </div> </div> </div> <hr /> diff --git a/laravel52/resources/views/My_History.blade.php b/laravel52/resources/views/My_History.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..e919dd33afda68c04fc92ab8d64e13814de9901d --- /dev/null +++ b/laravel52/resources/views/My_History.blade.php @@ -0,0 +1,197 @@ +@extends('layouts.app') + +@section('content') + + <div class="container-fluid"> + <div class="row"> + <div class="btn-group"> + <p><h2>Upload History</h2></p> + <br/> + <button class="btn btn-default"> + Trier + </button> + <button data-toggle="dropdown" class="btn btn-default dropdown-toggle"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li> + <a href="#">By Date</a> + </li> + <li> + <a href="#">By Name</a> + </li> + </ul> + </div> + <br/> + <br/> + <table class="table"> + <thead> + <tr> + <th> + IMG + </th> + <th> + Product + </th> + <th> + Upload Date + </th> + <th> + Status + </th> + <th> + Option + </th> + </tr> + </thead> + <tbody> + <?php $count=0; ?> + @foreach($Articles as $article) + @if($count%2 == 0) + <tr class="success"> + <td> + <a href="{{route('article',['object_id' => $article -> object_id ])}}"><img src="image/example1.jpg" width="200" height="200"></a> + </td> + <td> + {{--<a href="#">Un Sac à dos acheté un an peut être prêté MAX. UNE SEMAINE.</a>--}} + <a href="{{route('article',['object_id' => $article -> object_id ])}}">{{$article -> titre}}</a> + </td> + <td> + {{$article -> created_at}} + </td> + <td> + @if ($article -> status == 1) + Occupé + @else + À louer + @endif + </td> + <td> + @if ($article -> status == 0) + <a href="{{route('delete', ['object_id' => $article -> object_id])}}" class="btn btn-primary" role="button">Remove it now</a> + @else + <a href="#" class="btn btn-primary" role="button">Remove it later</a> + @endif + </td> + </tr> + <?php $count=$count + 1; ?> + @else + <tr class="warning"> + <td> + <a href="{{route('article',['object_id' => $article -> object_id ])}}"><img src="image/example1.jpg" width="200" height="200"></a> + </td> + <td> + {{--<a href="#">Un Sac à dos acheté un an peut être prêté MAX. UNE SEMAINE.</a>--}} + <a href="{{route('article',['object_id' => $article -> object_id ])}}">{{$article -> titre}}</a> + </td> + <td> + {{$article -> created_at}} + </td> + <td> + @if ($article -> status == 1) + Occupé + @else + À louer + @endif + </td> + <td> + @if ($article -> status == 0) + <a href="{{route('delete', ['object_id' => $article -> object_id])}}" class="btn btn-primary" role="button">Remove it now</a> + @else + <a href="#" class="btn btn-primary" role="button">Remove it later</a> + @endif + </td> + </tr> + <?php $count=$count - 1; ?> + @endif + @endforeach + </tbody> + </table> + <ul class="pagination pagination-sm"> + <li> + <a href="#">Prev</a> + </li> + <li> + <a href="#">1</a> + </li> + <li> + <a href="#">2</a> + </li> + <li> + <a href="#">3</a> + </li> + <li> + <a href="#">4</a> + </li> + <li> + <a href="#">5</a> + </li> + <li> + <a href="#">Next</a> + </li> + </ul> + </div> + </div> + <hr /> + + <div class="row"> + <div class="col-md-12"> + <div class="carousel slide" id="carousel-933434"> + <ol class="carousel-indicators"> + <li data-slide-to="0" data-target="#carousel-933434"> + </li> + <li data-slide-to="1" data-target="#carousel-933434" class="active"> + </li> + <li data-slide-to="2" data-target="#carousel-933434"> + </li> + </ol> + <div class="carousel-inner"> + <div class="item"> + <img alt="Carousel Bootstrap First" src="image/donner1.png" /> + <div class="carousel-caption"> + <h4> + EASY!! + </h4> + <p> + Contacter Online + Prêter ou Emprunter “face to face” + </p> + </div> + </div> + <div class="item active"> + <img alt="Carousel Bootstrap Second" src="image/donner5.jpg" width="400" height="300" /> + <div class="carousel-caption"> + <h4> + Petits Frais ou GRATUIT!! + </h4> + <p> + Les chooses que vous allez emprunter chargent peu mais coûtent plus! Quelquel sont gratuits à vous! + </p> + </div> + </div> + <div class="item"> + <img alt="Carousel Bootstrap Third" src="image/donner2.jpg" width="400" height="300"/> + <div class="carousel-caption"> + <h4> + Crédit!! + </h4> + <p> + Nous empruntons et prêtons. Nous utilisons notre crédit! C'est crédible et fiable! + </p> + </div> + </div> + </div> + <a class="left carousel-control" href="#carousel-933434" data-slide="prev"> + <span class="glyphicon glyphicon-chevron-left"></span> + </a> + <a class="right carousel-control" href="#carousel-933434" data-slide="next"> + <span class="glyphicon glyphicon-chevron-right"></span> + </a> + </div> + </div> + </div> + + <hr /> + <br /> + +@endsection \ No newline at end of file diff --git a/laravel52/resources/views/Myspace.blade.php b/laravel52/resources/views/Myspace.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..4dda17d65623ea8314d3a70a8b20c63a32a3ec45 Binary files /dev/null and b/laravel52/resources/views/Myspace.blade.php differ diff --git a/laravel52/resources/views/auth/passwords/email.blade.php b/laravel52/resources/views/auth/passwords/email.blade.php index 33df8e32223ab47181f262303ef4497ae6c52279..9833600abdbe04833e10e3ff6779ed46ccbc4c1d 100644 --- a/laravel52/resources/views/auth/passwords/email.blade.php +++ b/laravel52/resources/views/auth/passwords/email.blade.php @@ -15,13 +15,13 @@ @endif <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}"> - {{ csrf_field() }} + {!! csrf_field() !!} <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> + <label class="col-md-4 control-label">E-Mail Address</label> <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}"> + <input type="email" class="form-control" name="email" value="{{ old('email') }}"> @if ($errors->has('email')) <span class="help-block"> @@ -34,7 +34,7 @@ <div class="form-group"> <div class="col-md-6 col-md-offset-4"> <button type="submit" class="btn btn-primary"> - <i class="fa fa-btn fa-envelope"></i> Send Password Reset Link + <i class="fa fa-btn fa-envelope"></i>Send Password Reset Link </button> </div> </div> diff --git a/laravel52/resources/views/auth/passwords/reset.blade.php b/laravel52/resources/views/auth/passwords/reset.blade.php index 64e82970c3ece63192259ce505e59f9e04cee6ce..3e7d960b93b51da491453d393260a9f8c3c21a82 100644 --- a/laravel52/resources/views/auth/passwords/reset.blade.php +++ b/laravel52/resources/views/auth/passwords/reset.blade.php @@ -9,15 +9,15 @@ <div class="panel-body"> <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/reset') }}"> - {{ csrf_field() }} + {!! csrf_field() !!} <input type="hidden" name="token" value="{{ $token }}"> <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> + <label class="col-md-4 control-label">E-Mail Address</label> <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}"> + <input type="email" class="form-control" name="email" value="{{ $email or old('email') }}"> @if ($errors->has('email')) <span class="help-block"> @@ -28,10 +28,10 @@ </div> <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> - <label for="password" class="col-md-4 control-label">Password</label> + <label class="col-md-4 control-label">Password</label> <div class="col-md-6"> - <input id="password" type="password" class="form-control" name="password"> + <input type="password" class="form-control" name="password"> @if ($errors->has('password')) <span class="help-block"> @@ -42,9 +42,9 @@ </div> <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}"> - <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label> + <label class="col-md-4 control-label">Confirm Password</label> <div class="col-md-6"> - <input id="password-confirm" type="password" class="form-control" name="password_confirmation"> + <input type="password" class="form-control" name="password_confirmation"> @if ($errors->has('password_confirmation')) <span class="help-block"> @@ -57,7 +57,7 @@ <div class="form-group"> <div class="col-md-6 col-md-offset-4"> <button type="submit" class="btn btn-primary"> - <i class="fa fa-btn fa-refresh"></i> Reset Password + <i class="fa fa-btn fa-refresh"></i>Reset Password </button> </div> </div> diff --git a/laravel52/resources/views/errors/503.blade.php b/laravel52/resources/views/errors/503.blade.php index 4a4150592d41e7059ff87d200fe3bb9362642537..be3068ee7d151c9f8ebf196166eeed25060ed82b 100644 --- a/laravel52/resources/views/errors/503.blade.php +++ b/laravel52/resources/views/errors/503.blade.php @@ -3,7 +3,7 @@ <head> <title>Be right back.</title> - <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> + <style> html, body { diff --git a/laravel52/resources/views/home.blade.php b/laravel52/resources/views/home.blade.php index 33d0915f2ba235d45fb2a78008053f51ee743110..03911ed9b1261fff55c5f82e01e2e5a2c003ad29 100644 --- a/laravel52/resources/views/home.blade.php +++ b/laravel52/resources/views/home.blade.php @@ -1,82 +1,73 @@ @extends('layouts.app') @section('content') -{{--<div class="container"> - <div class="row"> - <div class="col-md-10 col-md-offset-1"> - <div class="panel panel-default"> - <div class="panel-heading">Dashboard</div> - <div class="panel-body"> - You are logged in! - </div> - </div> - </div> - </div> -</div>--}} +<br/> +<br/> <div id="works" class=" clearfix grid"> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/1.jpg" alt="img01"/> <figcaption> <h2>Livres</h2> - <a href="{{route('list')}}" title="1" data-gallery>View more</a></p> + <a href="{{url('List1')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/2.jpg" alt="img01"/> <figcaption> <h2>Outils</h2> - <a href="homepage/images/portfolio/2.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List2')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/3.jpg" alt="img01"/> <figcaption> <h2>Joujous</h2> - <a href="homepage/images/portfolio/3.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List3')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/4.jpg" alt="img01"/> <figcaption> <h2>Vetements</h2> - <a href="homepage/images/portfolio/4.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List4')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/5.jpg" alt="img01"/> <figcaption> <h2>Articles</h2> - <a href="homepage/images/portfolio/5.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List5')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/6.jpg" alt="img01"/> <figcaption> <h2>Chaussures</h2> - <a href="homepage/images/portfolio/6.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List6')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/7.jpg" alt="img01"/> <figcaption> <h2>Portables</h2> - <a href="homepage/images/portfolio/7.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List7')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/8.jpg" alt="img01"/> <figcaption> <h2>Maquillages</h2> - <a href="homepage/images/portfolio/8.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List8')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> <figure class="effect-oscar wowload fadeInUp"> <img src="homepage/images/portfolio/9.jpg" alt="img01"/> <figcaption> <h2>Sacs</h2> - <a href="homepage/images/portfolio/9.jpg" title="1" data-gallery>View more</a></p> + <a href="{{url('List9')}}" title="1" data-gallery>View more</a></p> </figcaption> </figure> </div> + @endsection diff --git a/laravel52/resources/views/layouts/app.blade.php b/laravel52/resources/views/layouts/app.blade.php index c84001ae9f0182e649ff945f1829382ad940c10f..39981d9ab8e211a784d4da2aa82c36deee744ef9 100644 --- a/laravel52/resources/views/layouts/app.blade.php +++ b/laravel52/resources/views/layouts/app.blade.php @@ -5,7 +5,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>就是干</title> + <title>eBorrow</title> <!-- Fonts --> <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel='stylesheet' type='text/css'> @@ -18,9 +18,7 @@ {{--for homepage--}} <link rel="stylesheet" href="homepage/assets/animate/set.css" /> <link rel="stylesheet" href="homepage/assets/animate/animate.css" /> - {{--<script src="js/jquery.min.js"></script>--}} - {{--<script src="js/bootstrap.min.js"></script>--}} - {{--<script src="js/scripts.js"></script>--}} + <style> body { font-family: 'Lato'; @@ -32,6 +30,7 @@ </style> </head> <body id="app-layout"> +<img src="image/lines.jpg" width="2400" height="8"/> <div class="topbar animated fadeInLeftBig"></div> <nav class="navbar navbar-default"> <div class="container"> @@ -44,20 +43,13 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <!-- Branding Image --> - {{-- <a class="navbar-brand" href="{{ url('/') }}"> - Laravel - </a>--}} + <a class="logo" href="{{ url('/home') }}"> + Eborrow + </a> </div> - <div class="collapse navbar-collapse" id="app-navbar-collapse"> - <!-- Left Side Of Navbar --> - {{--<ul class="nav navbar-nav"> - <li><a href="{{ url('/home') }}">Home</a></li> - </ul>--}} - - <!-- Right Side Of Navbar --> + <div class="collapse navbar-collapse" id="app-navbar-collapse" > <ul class="nav navbar-nav navbar-right"> <!-- Authentication Links --> <li><a href="{{ url('/home') }}">Home</a></li> @@ -72,6 +64,8 @@ </a> <ul class="dropdown-menu" role="menu"> + <li><a href="{{route('myspace')}}"><i class="fa fa-btn fa-sign-out"></i>My space</a></li> + <li class="divider"></li> <li><a href="{{ url('/logout') }}"><i class="fa fa-btn fa-sign-out"></i>Logout</a></li> </ul> </li> @@ -83,9 +77,62 @@ @yield('content') - <!-- JavaScripts --> - <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> - {{-- <script src="{{ elixir('js/app.js') }}"></script> --}} + <br/> + <br/> + <br/> + <div class="row"> + <div class="col-md-12"> + <div class="row"> + <div class="col-md-6"> + <div class="row"> + <div class="col-md-4"> + </div> + <div class="col-md-4"> + <h5>ABOUT</h5> + <p><a href="#">About eBorrow</a></p> + <p><a href="#">News</a></p> + <p><a href="#">Conditions Générales</a></p> + <p><a href="#">Join us?</a></p> + </div> + <div class="col-md-4"> + <h5>Support</h5> + <p><a href="#">Contact us</a></p> + <p><a href="#">My Account</a></p> + <p><a href="#">Advice</a></p> + </div> + </div> + </div> + <div class="col-md-6"> + <div class="row"> + <div class="col-md-4"> + <p> + <h6>Suivez-Nous:</h6> + <img src="image/facebook.png" class="img-rounded" width="62" height="62"> + <img src="image/twitter.jpg" class="img-rounded" width="50" height="50"> + </p> + </div> + <div class="col-md-4"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" id="name" placeholder="You want?"> + </div> + <button type="submit" class="btn btn-primary">Research</button>' + </form> + </div> + <div class="col-md-4"> + </div> + </div> + </div> + </div> + </div> + </div> + +<!-- JavaScripts --> + {{--<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>--}} + {{--<script src="{{ elixir('js/app.js') }}"></script>--}} + <script src="js/jquery.min.js"></script> + <script src="js/bootstrap.min.js"></script> + <script src="js/scripts.js"></script> </body> </html> diff --git a/laravel52/resources/views/vendor/.gitkeep b/laravel52/resources/views/vendor/.gitkeep index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/laravel52/resources/views/vendor/.gitkeep +++ b/laravel52/resources/views/vendor/.gitkeep @@ -1 +0,0 @@ -