Skip to content

S
SS-Web-Version1
Commit 90a3582b authored by Bruce's avatar Bruce
Browse files
Options

Version 0.1.1 commit

parent 14bf7764
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 9 deletions
laravel/.idea/vcs.xml 0 → 100644
View file @ 90a3582b
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
laravel/.idea/workspace.xml
View file @ 90a3582b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ccffb0a3-d6a9-4118-8ce6-f9348d490a78" name="Default Changelist" comment="" /> <list default="true" id="ccffb0a3-d6a9-4118-8ce6-f9348d490a78" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../laradock" beforeDir="false" afterPath="$PROJECT_DIR$/../laradock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/configcam.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/configcam.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/playrealtime.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/playrealtime.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/recordconfig.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/recordconfig.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/replay.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/replay.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -28,6 +38,9 @@ ...@@ -28,6 +38,9 @@
<expand /> <expand />
<select /> <select />
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="PhpWorkspaceProjectConfiguration"> <component name="PhpWorkspaceProjectConfiguration">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" /> <path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" />
...@@ -114,7 +127,9 @@ ...@@ -114,7 +127,9 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectId" id="1P2quamM847bUQ01vsJRRgAE38c" /> <component name="ProjectId" id="1P2quamM847bUQ01vsJRRgAE38c" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
...@@ -167,10 +182,25 @@ ...@@ -167,10 +182,25 @@
<updated>1565082762601</updated> <updated>1565082762601</updated>
<workItem from="1565082764825" duration="2889000" /> <workItem from="1565082764825" duration="2889000" />
<workItem from="1566541087225" duration="143532000" /> <workItem from="1566541087225" duration="143532000" />
<workItem from="1569315765768" duration="1290000" />
<workItem from="1570605127444" duration="3721000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
</component>
</project> </project>
\ No newline at end of file
laravel/app/Http/Controllers/UserController.php
View file @ 90a3582b
...@@ -23,7 +23,7 @@ class UserController extends Controller ...@@ -23,7 +23,7 @@ class UserController extends Controller
// printf($login_user); // printf($login_user);
if($login_user !==null){ if($login_user !==null){
Auth::loginUsingId($login_user->id); Auth::loginUsingId($login_user->id);
return redirect('index'); return redirect('');
} }
return view('login',['title'=>'登入後使用','msg'=>'帳號或密碼錯誤']); return view('login',['title'=>'登入後使用','msg'=>'帳號或密碼錯誤']);
......
laravel/resources/views/configcam.blade.php
View file @ 90a3582b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
@include('layout.menubtn') @include('layout.menubtn')
<div class="collapse" id="collapseExample" style="margin: 5%"> <div class="collapse" id="collapseExample" style="margin: 5%">
<div class="card card-body border border-white"style="background-color:steelblue;padding-bottom: 5%"> <div class="card card-body border border-white"style="background-color:steelblue;padding-bottom: 5%">
<form id="send" action="http://60.249.6.104:10300/insert_cam" method="POST" onsubmit="return false"> <form id="send" action="http://192.168.5.217:8001/insert_cam" method="POST" onsubmit="return false">
<div class="form-group"> <div class="form-group">
<label for="cam_id">Camera_ID</label> <label for="cam_id">Camera_ID</label>
<input type="text" class="form-control" id="cam_id" name="camera_id" placeholder="XXXnnnn"required> <input type="text" class="form-control" id="cam_id" name="camera_id" placeholder="XXXnnnn"required>
......
laravel/resources/views/playrealtime.blade.php
View file @ 90a3582b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<form id="send" action="http://60.249.6.104:10300/realtime/play" method="POST" onsubmit="return false"> <form id="send" action="http://192.168.5.217:8001/realtime/play" method="POST" onsubmit="return false">
@csrf @csrf
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
......
laravel/resources/views/recordconfig.blade.php
View file @ 90a3582b
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
<div class="row" style="margin-top:3%;margin-left:3%;font-weight: bolder;font-size:24pt;text-align: center;color:white;">新增儲存錄製設備</div> <div class="row" style="margin-top:3%;margin-left:3%;font-weight: bolder;font-size:24pt;text-align: center;color:white;">新增儲存錄製設備</div>
<div class="row" style="margin-left: 3%;font-size:18pt;"> <div class="row" style="margin-left: 3%;font-size:18pt;">
<form id="send" action="http://60.249.6.104:10300/storage_cam" method="POST" onsubmit="return false"> <form id="send" action="http://192.168.5.217:8001/storage_cam" method="POST" onsubmit="return false">
<div class="form-group row"> <div class="form-group row">
<div class="col-auto"> <div class="col-auto">
<div class="row"> <div class="row">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</form> </form>
</div> </div>
</div> </div>
<form hidden="hidden" id="cancel_form" action="http://60.249.6.104:10300/rm_container" method="POST" onsubmit="return false"> <form hidden="hidden" id="cancel_form" action="http://192.168.5.217:8001/rm_container" method="POST" onsubmit="return false">
<input id="cancel_id" name="camera_id"> <input id="cancel_id" name="camera_id">
<input id="cancel_submit" type="submit"> <input id="cancel_submit" type="submit">
</form> </form>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<script> <script>
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "http://60.249.6.104:10300/storage/list", url: "http://192.168.5.217:8001/storage/list",
dataType: 'json', dataType: 'json',
success: function(data) success: function(data)
{ {
......
laravel/resources/views/replay.blade.php
View file @ 90a3582b
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<form id="send" action="http://60.249.6.104:10300/replay2" method="POST" onsubmit="return false"> <form id="send" action="http://192.168.5.217:8001/replay2" method="POST" onsubmit="return false">
<div class="row" > <div class="row" >
<div class="col-xs-6 col-md-3"> <div class="col-xs-6 col-md-3">
<label id="arg" for="stime">選擇所需要回播片段的</label> <label id="arg" for="stime">選擇所需要回播片段的</label>
......
laravel/routes/web.php
View file @ 90a3582b
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
*/ */
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
Route::group(['prefix'=>'/index','middleware'=>'auth'],function(){ Route::group(['prefix'=>'/','middleware'=>'auth'],function(){
Route::get('/',function (){return view('index',['title'=>'歡迎使用影像調閱系統']);})->name('index'); Route::get('/',function (){return view('index',['title'=>'歡迎使用影像調閱系統']);})->name('index');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment