diff --git a/easyk/.idea/workspace.xml b/easyk/.idea/workspace.xml index 33cd785308473f3836769b40107f0cb5a2fe53b2..6892133c021e07029d96909f821860f96772369f 100755 --- a/easyk/.idea/workspace.xml +++ b/easyk/.idea/workspace.xml @@ -2,6 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0de5200a-83fb-47ff-b5e2-5d7f5732ecc9" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/UserController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserController.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" afterPath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php" /> </list> <ignored path="easyk.iws" /> @@ -34,91 +39,97 @@ </provider> </entry> </file> - <file leaf-file-name="KTPController.php" pinned="false" current-in-tab="false"> + <file leaf-file-name="KTPController.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KTPController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> - <folding /> + <state relative-caret-position="487"> + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" /> + <folding> + <element signature="e#40#59#0#PHP" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> + <file leaf-file-name="register.blade.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> + <state relative-caret-position="240"> + <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.php"> + <file leaf-file-name="ktpbaru.blade.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="382"> - <caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" /> + <state relative-caret-position="255"> + <caret line="27" column="96" selection-start-line="27" selection-start-column="96" selection-end-line="27" selection-end-column="96" /> <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"> + <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-255"> - <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" /> + <state relative-caret-position="360"> + <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="RouteServiceProvider.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php"> + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.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 relative-caret-position="45"> + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="8" selection-end-column="30" /> + <folding> + <element signature="e#40#68#0#PHP" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="EventServiceProvider.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.php"> + <file leaf-file-name="AppServiceProvider.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.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 relative-caret-position="121"> + <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" /> + <folding> + <element signature="e#33#46#0#PHP" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ktpbaru.blade.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> + <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="337"> - <caret line="62" column="60" selection-start-line="62" selection-start-column="60" selection-end-line="62" selection-end-column="60" /> + <state relative-caret-position="-248"> + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="validation.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/resources/lang/en/validation.php"> + <file leaf-file-name="PasswordController.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="96" column="9" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" /> + <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="AppServiceProvider.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> + <file leaf-file-name="Controller.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> + <state relative-caret-position="150"> + <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> <folding /> </state> </provider> @@ -132,7 +143,6 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/database/seeds/KotaTableSeeder.php" /> <option value="$PROJECT_DIR$/database/seeds/ProvinsiTableSeeder.php" /> <option value="$PROJECT_DIR$/database/seeds/UserSeeder.php" /> <option value="$PROJECT_DIR$/database/seeds/KelurahanTableSeeder.php" /> @@ -157,7 +167,6 @@ <option value="$PROJECT_DIR$/config/app.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/register.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" /> - <option value="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/scripts.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/styles.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/head.blade.php" /> @@ -176,13 +185,15 @@ <option value="$PROJECT_DIR$/resources/views/bdgwebkit/layout/nonWarga/layout.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/nonWarga/header.blade.php" /> <option value="$PROJECT_DIR$/app/User.php" /> - <option value="$PROJECT_DIR$/app/Http/routes.php" /> - <option value="$PROJECT_DIR$/resources/views/auth/register.blade.php" /> - <option value="$PROJECT_DIR$/app/Http/Controllers/UserController.php" /> <option value="$PROJECT_DIR$/resources/lang/en/validation.php" /> + <option value="$PROJECT_DIR$/app/Http/Controllers/UserController.php" /> <option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" /> + <option value="$PROJECT_DIR$/app/Http/Requests/CreateKtpRequest.php" /> + <option value="$PROJECT_DIR$/app/Http/routes.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" /> + <option value="$PROJECT_DIR$/resources/views/auth/register.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php" /> + <option value="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" /> </list> </option> </component> @@ -463,6 +474,100 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <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="Policies" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <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="Listeners" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <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="Jobs" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <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> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="easyk" /> + <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="Requests" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="easyk" /> @@ -480,6 +585,10 @@ <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> @@ -622,7 +731,7 @@ <workItem from="1459479350248" duration="6257000" /> <workItem from="1459733901505" duration="15281000" /> <workItem from="1459763252326" duration="47701000" /> - <workItem from="1459962805412" duration="10877000" /> + <workItem from="1459962805412" duration="15675000" /> </task> <servers /> </component> @@ -653,7 +762,7 @@ </history-entry> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="95125000" /> + <option name="totallyTimeSpent" value="99923000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="1366" height="738" extended-state="0" /> @@ -717,68 +826,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/config/app.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-713"> - <caret line="128" column="45" selection-start-line="128" selection-start-column="45" selection-end-line="128" selection-end-column="45" /> - </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="465"> - <caret line="41" column="135" selection-start-line="41" selection-start-column="135" selection-end-line="41" selection-end-column="135" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/auth/loginNw.blade.php" /> - <entry file="file://$PROJECT_DIR$/app/Kelurahan.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> - <caret line="12" column="53" selection-start-line="12" selection-start-column="53" selection-end-line="12" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/Notifikasi.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$/app/Rt.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$/resources/views/bdgwebkit/index-a.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="188"> - <caret line="138" column="57" selection-start-line="138" selection-start-column="55" selection-end-line="138" selection-end-column="57" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/index.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="90"> - <caret line="6" column="55" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="55" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/welcome.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" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/home.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -851,14 +898,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/home.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="720"> - <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/ktpbaru.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="383"> @@ -867,14 +906,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="825"> - <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/profile.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="45"> @@ -1004,16 +1035,63 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/resources/lang/en/validation.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="345"> + <caret line="96" column="9" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/config/auth.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-1103"> + <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/Ktp.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$/app/Http/Requests/CreateKtpRequest.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="442"> + <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="586"> + <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/home.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="586"> + <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="341"> - <caret line="81" column="17" selection-start-line="81" selection-start-column="17" selection-end-line="81" selection-end-column="17" /> + <state relative-caret-position="145"> + <caret line="51" column="41" selection-start-line="51" selection-start-column="41" selection-end-line="51" selection-end-column="41" /> <folding> <element signature="e#7#35#0#PHP" expanded="true" /> <element signature="e#120#963#1#PHP" expanded="false" /> <element signature="e#987#1027#1#PHP" expanded="false" /> <element signature="e#1050#1479#1#PHP" expanded="false" /> - <element signature="e#1718#2493#1#PHP" expanded="false" /> <element signature="e#2690#6048#1#PHP" expanded="false" /> <element signature="n#createStatus#0;n#!!top" expanded="false" /> <element signature="n#createStatuses#0;n#!!top" expanded="false" /> @@ -1021,7 +1099,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Requests/Request.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" /> @@ -1029,87 +1107,107 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="337"> - <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> + <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/Controller.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/EncryptCookies.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> - <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> + <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"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> - <caret line="19" column="7" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" /> + <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/KTPController.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/VerifyCsrfToken.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> + <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/NotifikasiController.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> + <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/UserController.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="382"> - <caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" /> + <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$/resources/lang/en/validation.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="96" column="9" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" /> + <state relative-caret-position="-398"> + <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/Providers/AppServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> + <state relative-caret-position="270"> + <caret line="19" column="7" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-255"> - <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" /> + <state relative-caret-position="360"> + <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.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="121"> + <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" /> + <folding> + <element signature="e#33#46#0#PHP" expanded="true" /> + </folding> + </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="150"> + <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="45"> + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="8" selection-end-column="30" /> + <folding> + <element signature="e#40#68#0#PHP" expanded="true" /> + </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" /> @@ -1117,13 +1215,39 @@ </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="-248"> + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> + <folding /> + </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="240"> + <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="337"> - <caret line="62" column="60" selection-start-line="62" selection-start-column="60" selection-end-line="62" selection-end-column="60" /> + <state relative-caret-position="255"> + <caret line="27" column="96" selection-start-line="27" selection-start-column="96" selection-end-line="27" selection-end-column="96" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KTPController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="487"> + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" /> + <folding> + <element signature="e#40#59#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/easyk/app/Http/Controllers/Auth/AuthController.php b/easyk/app/Http/Controllers/Auth/AuthController.php index 021da5bd7b438b1de002cb7eb186648be1b6cf0d..5b660e206e5c07cd2d0c9f1fbf4ea08977d1c489 100755 --- a/easyk/app/Http/Controllers/Auth/AuthController.php +++ b/easyk/app/Http/Controllers/Auth/AuthController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Auth; use App\User; -use Validator; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\ThrottlesLogins; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; @@ -54,6 +53,8 @@ class AuthController extends Controller 'password' => 'required|min:6|confirmed', 'agree' => 'accepted' ], [ + 'nik.numeric' => 'Format NIK Salah (5 Digit Angka)', + 'nik.digits' => 'Format NIK Salah (5 Digit Angka)', 'email.unique' => 'Email tersebut Sudah Pernah Terdaftar sebagai User !', 'nik.nik_validation' => 'NIK tersebut Sudah Pernah Terdaftar sebagai Warga !', 'nik.is_penduduk_validation' => 'NIK tersebut tidak Terdaftar dalam Database Kependudukan !', diff --git a/easyk/app/Http/Controllers/KTPController.php b/easyk/app/Http/Controllers/KTPController.php index 9de4d33f14a89cf207e0b2cfdd25db0a5c742a68..0765889de6577f9c21e7f1f7c21a8da3ede78999 100644 --- a/easyk/app/Http/Controllers/KTPController.php +++ b/easyk/app/Http/Controllers/KTPController.php @@ -6,6 +6,8 @@ use App\Notifikasi; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Input; +use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Facades\Redirect; use App\Ktp; use App\Http\Requests; @@ -14,69 +16,51 @@ use App\Http\Requests; class KTPController extends Controller { public function create(Request $request) { + var_dump($request->mynik); + $rules = [ + 'nik' => 'numeric|digits:5|bail|same:mynik', + 'agama' => 'required', + 'pekerjaan' => 'required', + 'alamat' => 'required' + ]; + + + $messages = [ + 'nik.numeric' => 'Format NIK Salah (5 Digit Angka)', + 'nik.digits' => 'Format NIK Salah (5 Digit Angka)', + 'nik.same' => 'NIK input Berbeda dengan NIK anda', + ]; + + $validator = Validator::make(Input::all(), $rules, $messages); + + + if ($validator->fails()) + { + return Redirect::to('/ktp') + ->withErrors($validator) + ->withInput(); + } else { +// $ktp = new Ktp; +// +// $ktp->nik = Input::get('nik'); +// $ktp->nama = Input::get('nama'); +// $ktp->alamat = Input::get('alamat'); +// $ktp->rt = Input::get('rt'); +// $ktp->rw = Input::get('rw'); +// $ktp->kelurahan = Input::get('kelurahan'); +// $ktp->kecamatan = Input::get('kecamatan'); +// $ktp->agama = Input::get('agama'); +// $ktp->status_perkawinan = Input::get('status_perkawinan'); +// $ktp->pekerjaan = Input::get('pekerjaan'); +// $ktp->alasan_edit = Input::get('alasan_edit'); +// $ktp->no_dokumen = Input::get('no_dokumen'); +// +// $ktp->save(); +// +// $notifController = new NotifikasiController; +// $notifController->create($ktp, "createktp", $request); + } - $ktp = new Ktp; - - $ktp->nik = Input::get('nik'); - $ktp->nama = Input::get('nama'); - $ktp->alamat = Input::get('alamat'); - $ktp->rt = Input::get('rt'); - $ktp->rw = Input::get('rw'); - $ktp->kelurahan = Input::get('kelurahan'); - $ktp->kecamatan = Input::get('kecamatan'); - $ktp->agama = Input::get('agama'); - $ktp->status_perkawinan = Input::get('status_perkawinan'); - $ktp->pekerjaan = Input::get('pekerjaan'); - $ktp->alasan_edit = Input::get('alasan_edit'); - $ktp->no_dokumen = Input::get('no_dokumen'); - - $ktp->save(); - - $notifController = new NotifikasiController; - $notifController->create($ktp, "createktp", $request); return redirect('/'); } - - public function update() { - - } - - /** - * Display a listing of the resource. - * - * @return Response - */ - public function index($id) { - return $this->show($id); - } - - /** - * Store a newly created resource in storage. - * - * @param Request $request - * @return Response - */ - public function createKTP(Request $request) { - - } - - public function editKTP(Request $request) { - $ktp = new Ktp; - - $ktp->nik = Input::get('nik'); - $ktp->nama = Input::get('nama'); - $ktp->alasan_edit = Input::get('alasan_edit'); - $ktp->no_dokumen = Input::get('no_dokumen'); - $ktp->alamat = Input::get('alamat'); - $ktp->rt = Input::get('rt'); - $ktp->rw = Input::get('rw'); - $ktp->kelurahan = Input::get('kelurahan'); - $ktp->kecamatan = Input::get('kecamatan'); - $ktp->agama = Input::get('agama'); - $ktp->status_perkawinan = Input::get('status_perkawinan'); - $ktp->pekerjaan = Input::get('pekerjaan'); - - $ktp->save(); - return 'yes edit'; - } } \ No newline at end of file diff --git a/easyk/app/Http/Controllers/UserController.php b/easyk/app/Http/Controllers/UserController.php index 1517b2a38f865bffb5dd6e2a3783a5bdfc234345..e1dec9374d5715f02ac8a3b068973ea0acb5e703 100755 --- a/easyk/app/Http/Controllers/UserController.php +++ b/easyk/app/Http/Controllers/UserController.php @@ -34,7 +34,7 @@ class UserController extends Controller // validasi $rules = array( 'username' => 'required|nama', - 'password' => 'required|alphaNum|min:3' + 'password' => 'required|alphaNum|min:6' ); // run validator diff --git a/easyk/app/Providers/AppServiceProvider.php b/easyk/app/Providers/AppServiceProvider.php index 4764a5e1d2b5e7aef9618c63f66f11fe84e1d86a..da7f5f82eeda869dbad5c28741835e1dc21fa62b 100755 --- a/easyk/app/Providers/AppServiceProvider.php +++ b/easyk/app/Providers/AppServiceProvider.php @@ -25,6 +25,10 @@ class AppServiceProvider extends ServiceProvider $countPenduduk = Penduduk::where('id', $value) -> count(); return $countPenduduk != 0; }); + + Validator::extend('isMeValidation', function($attribute, $value, $parameters, $validator) { + return $value == Auth::user()->nik; + }); } /** diff --git a/easyk/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php b/easyk/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php index a03645bd0b2da6614b87f99096f4db66035142b8..968f4ddd3990d9e398774ff178dc356da9effda5 100644 --- a/easyk/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php +++ b/easyk/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php @@ -24,18 +24,26 @@ <div class="panel-heading font-bold">Ajukan Permohonan</div> <div class="panel-body"> <form role="form" action="/ktp" method="post"> + {!! csrf_field() !!} + <input type="hidden" name="mynik" value="{{Auth::user()->nik}}"> {{--<input id="_token" name="_token" type="hidden" value="{{ csrf_token() }}" > <div class="form-group"> <label>Nama</label> <input name="nama" type="text" class="form-control" placeholder="Masukan Nama"> </div>--}} - <div class="form-group"> + <div class="form-group{{ $errors->has('nik') ? ' has-error' : '' }}"> <label>NIK</label> - <input name="nik" type="text" class="form-control" placeholder="NIK"> + <input name="nik" type="text" class="form-control" placeholder="NIK" required> + @foreach ($errors->get('nik') as $error) + <span class="help-block"> + <strong>{{ $error }}</strong> + </span> + @endforeach </div> + <div class="form-group"> <label>Alamat</label> - <input name="alamat" class="form-control" placeholder="Alamat"> + <input name="alamat" class="form-control" placeholder="Alamat" required> </div> {{--<div class="form-group"> <div class="col-md-4"><label>RT / RW</label></div> @@ -53,11 +61,11 @@ </div>--}} <div class="form-group"> <label>Agama</label> - <input name="agama" type="text" class="form-control" placeholder="Agama"> + <input name="agama" type="text" class="form-control" placeholder="Agama" required> </div> <div class="form-group"> <label>Pekerjaan</label> - <input name="pekerjaan" type="text" class="form-control" placeholder="Pekerjaan"> + <input name="pekerjaan" type="text" class="form-control" placeholder="Pekerjaan" required> </div> <div class="form-group"> <label>Status Perkawinan</label>