Merge branch 'fix_some_bugs'

AhmedHelalAhmed · Sep 4, 2021 · 9d5e730 · 9d5e730
2 parents 5098433 + 99abebc
commit 9d5e730
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/app/Http/Requests/StoreChannelRequest.php b/app/Http/Requests/StoreChannelRequest.php
@@ -42,19 +42,16 @@ public function prepareForValidation()
         $this->merge(['user_id' => auth()->id()]);
     }
 
-    private function getChannelIdFromLink(string $url): string
+    private function getChannelIdFromLink(string $url): ?string
     {
-        $parsed = parse_url(rtrim($url, '/'));
-        if (isset($parsed['path']) && preg_match('/^\/channel\/(([^\/])+?)$/', $parsed['path'], $matches)) {
-            return $matches[1];
-        }
         return (new GettingChannelIdByLinkService)->execute($url);
     }
 
     public function messages()
     {
         return [
-            'remote_identifier.unique' => 'Channel already exists'
+            'remote_identifier.unique' => 'Channel already exists!',
+            'remote_identifier.required' => 'The link is wrong!'
         ];
     }
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=c5fe426fc006be187d57",
+    "/js/app.js": "/js/app.js?id=4c465d3b6a260335f189",
     "/css/app.css": "/css/app.css?id=6cc2e88e64301f36a09f"
 }
diff --git a/resources/js/Pages/Channels/index.vue b/resources/js/Pages/Channels/index.vue
@@ -31,7 +31,10 @@
                                        class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
                                        id="link" type="url" name="link" placeholder="Channel link">
                                 <div v-if="errors.link" class="text-red-600">{{ errors.link }}</div>
-                                <div v-if="errors.remote_identifier" class="text-red-600">{{ errors.remote_identifier }}</div>
+                                <div v-if="errors.remote_identifier" class="text-red-600">{{
+                                        errors.remote_identifier
+                                    }}
+                                </div>
 
                             </div>
                             <div class="flex items-center justify-between">
@@ -79,7 +82,9 @@ export default defineComponent({
         })
 
         function submit() {
-            Inertia.post('/channels', form)
+            Inertia.post('/channels', form);
+            form.name = null;
+            form.link = null;
         }
 
         return {form, submit}