|
@@ -2,14 +2,7 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
- <change afterPath="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurfaceCamera.php" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/web.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" afterDir="false" />
|
|
</list>
|
|
</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" />
|
|
@@ -43,7 +36,7 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="487">
|
|
<state relative-caret-position="487">
|
|
@@ -56,6 +49,33 @@
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/app/menulist.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="2188">
|
|
|
|
+ <caret line="192" column="4" lean-forward="true" selection-start-line="86" selection-start-column="2" selection-end-line="192" selection-end-column="4" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="1850">
|
|
|
|
+ <caret line="208" column="14" selection-start-line="208" selection-start-column="14" selection-end-line="208" selection-end-column="14" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="613">
|
|
|
|
+ <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="462">
|
|
<state relative-caret-position="462">
|
|
@@ -100,20 +120,10 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="105">
|
|
|
|
- <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
</leaf>
|
|
</leaf>
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
- <find>sendLoginResponse</find>
|
|
|
|
<find>queue:work</find>
|
|
<find>queue:work</find>
|
|
<find>queue</find>
|
|
<find>queue</find>
|
|
<find>Module</find>
|
|
<find>Module</find>
|
|
@@ -143,6 +153,7 @@
|
|
<find>getCamerasUrl</find>
|
|
<find>getCamerasUrl</find>
|
|
<find>select</find>
|
|
<find>select</find>
|
|
<find>title</find>
|
|
<find>title</find>
|
|
|
|
+ <find>menu</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -152,7 +163,6 @@
|
|
<option name="CHANGED_PATHS">
|
|
<option name="CHANGED_PATHS">
|
|
<list>
|
|
<list>
|
|
<option value="$PROJECT_DIR$/storage/app/menulist.php" />
|
|
<option value="$PROJECT_DIR$/storage/app/menulist.php" />
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
|
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log" />
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log" />
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
|
|
@@ -202,6 +212,7 @@
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -383,6 +394,34 @@
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Database" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Database" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Seeders" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Routes" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
<item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
<item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
@@ -485,7 +524,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="288147000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="288598000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -516,27 +555,6 @@
|
|
<option name="version" value="1" />
|
|
<option name="version" value="1" />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/helpers.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="260">
|
|
|
|
- <caret line="640" column="13" selection-start-line="640" selection-start-column="13" selection-end-line="640" selection-end-column="13" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="222">
|
|
|
|
- <caret line="61" column="43" selection-start-line="61" selection-start-column="43" selection-end-line="61" selection-end-column="43" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="718">
|
|
|
|
- <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="189">
|
|
<state relative-caret-position="189">
|
|
@@ -890,5 +908,26 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="613">
|
|
|
|
+ <caret line="45" column="22" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/app/menulist.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="2188">
|
|
|
|
+ <caret line="192" column="4" lean-forward="true" selection-start-line="86" selection-start-column="2" selection-end-line="192" selection-end-column="4" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="1850">
|
|
|
|
+ <caret line="208" column="14" selection-start-line="208" selection-start-column="14" selection-end-line="208" selection-end-column="14" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
</component>
|
|
</component>
|
|
</project>
|
|
</project>
|