solved-conflict

app/Http/Controllers/Admin/ServiceSectionController.php

@@ -210,7 +210,7 @@ class ServiceSectionController extends Controller
             $icons = $request->icons ?? [];
             
             
-            if($points[0] != null && $point_ids != null){
+            if($points != null && $point_ids != null){
                foreach($request['point_ids'] as $key => $pid){
                 $service_section_point = new ServiceSectionPoint();
                 $service_section_point = $service_section_point->findorfail($pid);
@@ -235,12 +235,12 @@ class ServiceSectionController extends Controller
                 }
             }    
             else{
-                foreach($points as $key => $point){
-                    $service_section_point = new ServiceSectionPoint();
-                    $service_section_point->service_section_id = $service_section->id;
-                    $service_section_point->point = $point;
-                    $service_section_point->save();
-                }
+                // foreach($points as $key => $point){
+                //     $service_section_point = new ServiceSectionPoint();
+                //     $service_section_point->service_section_id = $service_section->id;
+                //     $service_section_point->point = $point;
+                //     $service_section_point->save();
+                // }
             }
                 // $service_point = $service_section->service_section_point();
                 // $service_point->delete();

public/frontend/css/style.css

@@ -405,8 +405,12 @@ Responsive Codes
     box-shadow: 0px 4px 21px rgba(0, 0, 0, 0.07);
     border-radius: 12px;
     padding: 20px;
+    min-height: 22pc;
     align-items: center;
 }
+.services-cards a{
+    text-decoration: none;
+}
 .services-icon{
     padding: 20px;
     width: 100px;
@@ -1393,7 +1397,7 @@ Responsive Codes
     margin-right: 25px;
 }
 .service-secondary{
-    padding: 3rem 6rem;
+    padding: 3rem 6rem 0 6rem;
     background: #4D57C3;
 }
 .service-secondary-desc h3{

public/images/service/2022/12/13/264cdf613ec36f72f3807a0914b57eb8.svg

@@ -0,0 +1,8 @@
+<svg width="74" height="68" viewBox="0 0 74 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.54983 48.5906C6.30531 48.5906 5.44969 46.0846 5.44969 43.7494C5.44969 42.895 4.5163 42.5533 4.32184 43.1229C3.92944 44.2722 3.38845 46.6541 3.81625 50.755C4.24406 54.8558 7.27758 55.3115 9.10548 55.1976C10.9334 55.0837 29.9512 52.3498 31.2347 52.065C32.5181 51.7802 32.5959 50.4133 32.7903 48.5906C32.9848 46.768 31.9347 40.5029 31.5069 38.7942C31.0791 37.0855 30.4957 35.8894 29.5234 35.8894C28.5512 35.8894 17.9727 35.092 14.8614 34.4655C11.7501 33.839 3.38845 31.6177 1.40499 37.5981C-0.578467 43.5785 -0.267336 51.6663 1.13275 55.881C2.53284 60.0958 6.3442 60.9501 8.36654 60.6654C10.3889 60.3806 16.9615 59.1276 18.8283 59.1276C20.6951 59.1276 26.801 59.2415 28.5901 59.1276C30.3791 59.0136 33.5293 54.2863 31.2347 54.5711C28.9401 54.8558 8.59989 59.811 5.21635 57.0202C1.8328 54.2293 2.18282 51.2106 2.06615 46.6541C1.94947 42.0976 3.85515 37.4842 6.3442 37.5981C8.83325 37.712 9.84441 40.6168 9.9222 43.7494C9.99917 46.8487 8.79435 48.5906 7.54983 48.5906Z" fill="white"/>
+<path d="M32.5181 58.0455C34.0737 50.1856 33.9959 45.1165 32.2069 36.2313C35.046 35.263 40.7864 35.8326 41.3464 35.8326C42.0465 35.8326 42.9979 36.2313 43.291 37.4274C45.6633 47.1099 43.4465 56.3369 43.291 57.2482C43.1665 57.9772 42.5391 58.0835 42.2409 58.0455C39.9852 58.0455 36.6794 58.5581 32.5181 58.0455Z" fill="white"/>
+<path d="M45.3522 50.5843C45.7023 46.7682 44.5744 37.9969 44.2633 36.0604C51.3285 35.3959 65.8986 33.7252 67.4036 33.7252C69.426 33.7252 70.9573 34.8597 71.6817 36.2882C74.582 42.0081 73.9063 49.7552 73.6692 52.4747L73.6651 52.5208C73.4318 55.1977 73.004 56.2799 71.2928 56.166C69.9238 56.0748 54.6991 53.6979 47.2579 52.5208C46.3245 52.2929 45.1171 53.1473 45.3522 50.5843Z" fill="white"/>
+<path d="M70.7483 58.1594C69.5815 57.9316 47.6468 55.0838 46.0912 54.9129C43.291 55.3116 44.66 58.5923 46.0912 58.729C47.5224 58.8657 53.1694 59.0897 55.814 59.1846C58.3808 59.4124 65.4202 60.8933 68.3759 60.6085C73.4318 59.5264 71.915 58.3872 70.7483 58.1594Z" fill="white"/>
+<path d="M35.6683 66.3041C35.396 63.4563 33.4126 61.0641 32.0125 60.0389C34.4237 59.944 39.5263 59.7541 40.6464 59.7541C42.0465 59.7541 42.1631 59.6402 42.8632 60.6654C43.5632 61.6906 44.9244 66.8737 44.1855 66.3041C43.4465 65.7345 40.7241 64.0828 39.713 63.0576C38.7018 62.0324 38.274 62.9437 37.9629 63.7411C37.6517 64.5385 35.9405 69.1519 35.6683 66.3041Z" fill="white"/>
+<path d="M19.4506 13.7906C19.6717 19.1347 24.5453 21.2519 25.4787 19.828C26.9177 21.7647 27.8511 29.9091 28.1233 31.333C28.3956 32.7569 29.1345 33.1556 30.4179 32.8708C31.7013 32.5861 34.9293 32.0735 36.9517 32.0735C38.974 32.0735 42.8243 32.7569 43.991 33.1556C45.1577 33.5543 45.8578 31.4469 45.9356 30.7065C46.0134 29.9661 46.13 28.2004 46.8301 24.7831C47.3901 22.0492 48.4635 19.733 48.9302 18.9166C57.0585 24.2135 55.1528 3.08275 48.4246 4.50666C49.8247 9.10872 48.4376 12.6135 47.569 13.7906C51.0303 4.50666 43.0965 -1.132 40.763 1.37419C43.6565 6.65982 42.1501 10.5632 41.0353 11.8541C44.4966 1.37413 35.2793 -2.27107 33.4514 1.37419C36.7183 4.50666 35.6294 10.544 34.9293 11.2846C36.4072 6.72808 34.2682 2.05766 30.5346 1.88679C27.5477 1.7501 26.101 4.25996 25.751 5.53199C28.5122 6.15851 29.1734 9.17718 29.4067 11.2846C25.9454 2.57027 19.2172 8.15186 19.4506 13.7906Z" fill="white"/>
+</svg>

public/images/service/2022/12/13/461acd25b85ca60c6311b67e3bb23d59.svg

@@ -0,0 +1,7 @@
+<svg width="61" height="79" viewBox="0 0 61 79" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.5282 22.5425C6.38372 22.5425 3.57032 26.1597 3.40956 30.0984C3.40956 31.8668 0.596196 32.4778 0.596191 30.0984C0.596176 22.5425 6.78562 1 29.9358 1C56.6227 1 59.838 28.6515 59.838 30.0984C59.838 31.5453 57.6677 32.1884 57.4266 30.0984C57.1854 28.0085 55.3366 22.5425 48.906 22.5425C42.4754 22.5425 41.1089 28.4104 41.1089 30.0984C41.1089 31.7865 38.3759 32.5903 38.3759 30.0984C38.3759 24.7932 33.9549 22.5425 31.463 22.5425V37.8151H28.8908V22.5425C23.9875 22.5425 22.219 28.1693 22.219 29.6965C22.219 31.9472 19.486 32.0276 19.486 29.6965C19.486 26.7224 16.6727 22.5425 11.5282 22.5425Z" fill="white" stroke="#6898DB"/>
+<path d="M30.418 56.3031C14.1004 56.3031 9.84013 70.6915 9.84013 76.7202C9.54539 77.2293 9.56683 78.2475 12.0105 78.2475H47.6199C49.1471 78.2475 50.6744 78.7298 50.6744 77.4436C50.6744 74.5499 46.7357 56.3031 30.418 56.3031Z" fill="white"/>
+<path d="M40.707 47.461C40.707 53.2322 36.0285 57.9107 30.2573 57.9107C24.486 57.9107 19.8075 53.2322 19.8075 47.461C19.8075 41.6898 24.486 37.0113 30.2573 37.0113C36.0285 37.0113 40.707 41.6898 40.707 47.461Z" fill="white"/>
+<path d="M49.5862 54.1999L58.3176 57.9636C58.5195 58.0506 58.6408 58.2592 58.6167 58.4776L57.5613 68.0308C57.4058 69.4387 56.7131 70.7322 55.6276 71.6421L49.7094 76.6024C49.5236 76.7582 49.2529 76.7582 49.0671 76.6024L43.1489 71.6421C42.0634 70.7322 41.3707 69.4387 41.2152 68.0308L40.1598 58.4776C40.1357 58.2592 40.257 58.0506 40.4589 57.9636L49.1903 54.1999C49.3167 54.1454 49.4599 54.1454 49.5862 54.1999L49.7841 53.7407L49.5862 54.1999Z" fill="white" stroke="#6898DB" stroke-linecap="round"/>
+<path d="M47 65.1534L48.54 66.3735C48.9755 66.7186 49.6089 66.6424 49.9502 66.2039L54 61" stroke="#6898DB" stroke-linecap="round"/>
+</svg>

public/images/service/2022/12/13/592c19c00462901b03490114d438e65f.svg

@@ -0,0 +1,7 @@
+<svg width="80" height="64" viewBox="0 0 80 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M51 42.5368L58.8937 48.4304C59.321 48.7494 59.9235 48.677 60.2631 48.2658L77 28" stroke="white" stroke-width="5" stroke-linecap="round"/>
+<path d="M75.5 44.5C75.5 48.052 74.3874 51.5149 72.3184 54.4021C70.2494 57.2894 67.328 59.456 63.9645 60.5978C60.6009 61.7396 56.9642 61.7991 53.5652 60.768C50.1661 59.7369 47.1753 57.667 45.013 54.8489C42.8506 52.0309 41.6253 48.6064 41.5091 45.0562C41.3929 41.5061 42.3916 38.0087 44.365 35.0553C46.3384 32.1019 49.1874 29.8408 52.5117 28.5896C55.8361 27.3384 59.4689 27.1599 62.8999 28.0793" stroke="white" stroke-width="5" stroke-linecap="round"/>
+<path d="M18.7579 7.27551C18.1442 8.85714 18.1442 11.0714 18.7579 15.5C16.6099 18.9796 19.6785 20.2449 19.9854 21.1939C20.2922 22.1429 22.7471 31 31.0324 31C39.3177 31 39.6245 21.1939 40.5451 21.1939C41.4657 21.1939 43 19.9286 43 18.0306C43 16.1327 42.0794 16.7653 42.0794 15.5C42.0794 14.2347 42.3863 8.54082 41.1588 6.32653C39.9314 4.11224 36.5559 0 29.8049 0C23.054 0 19.3716 5.69388 18.7579 7.27551Z" fill="white"/>
+<path d="M21.7323 33C17.9528 35.0357 9.70079 39.4929 6.92913 41.0357C5.98425 41.4643 3.90551 43.0286 3.14961 45.8571C2.3937 48.6857 0.734908 56.4643 0 60H40C37.7953 57.4286 36.5354 54.5357 35.5905 51.3214C34.8346 52.6071 31.706 56.5714 30.2362 58.3929L24.8819 50.6786L21.7323 33Z" fill="white"/>
+<path d="M27 49.3158C27.7778 46.7895 29.2 41.5474 28.6667 40.7895L27.6667 39.2105L30 37C31 37.5263 33 38.7053 33 39.2105C33 39.7158 32.3333 40.8947 32 41.4211L34 49.3158L30 55L27 49.3158Z" fill="white"/>
+</svg>

public/images/service/2022/12/13/a7447451a116af4287c410b4c80e86f2.svg

@@ -0,0 +1,9 @@
+<svg width="55" height="73" viewBox="0 0 55 73" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.92847 40.864C3.38783 42.0125 4.76594 44.9983 4.30657 45.228C3.38784 46.3764 4.07689 48.2139 5.91436 48.6733C6.33336 49.5113 6.29716 50.8936 6.37372 51.4295H3.38784V53.2669H0.861314C-0.287105 53.2669 -0.287105 55.5638 0.861314 55.5638H3.38784V56.4825H23.8297V55.5638H25.8968C27.5046 55.5638 26.8156 53.2669 26.1265 53.2669H23.8297V51.4295H8.44088C8.21119 50.5107 7.98151 49.592 7.75183 48.2139C10.508 46.0089 18.4704 40.7875 22.2219 38.5672L22.4516 49.8217H26.1265V51.6592C28.653 52.3482 29.5718 55.1044 26.1265 57.4013H42.2044C41.745 50.817 43.3528 46.3764 43.3528 40.864C45.8793 44.0796 49.0949 47.0655 49.0949 49.1326C49.0949 51.1998 47.0277 54.8747 46.3387 58.5497C45.6496 62.2246 49.5543 61.3059 50.473 59.4684C51.3917 57.6309 53.2292 52.3482 53.9183 49.8217C54.6073 47.2952 52.9995 44.0796 51.8511 42.7015C50.7027 41.3234 40.5966 30.5283 38.7591 30.5283C36.9217 30.5283 27.7343 29.6095 26.1265 30.5283C24.8403 31.2632 12.1158 39.4094 5.91436 43.3906C5.68467 42.7781 5.04156 41.2315 4.30657 39.9453C3.78157 39.0266 2.4691 39.7156 2.92847 40.864Z" fill="white"/>
+<path d="M2.2394 30.5283C3.6175 27.5424 3.15813 26.1643 2.69877 23.6378C4.30655 25.7049 4.76592 28.3692 3.84719 30.758C2.92845 33.1467 4.22999 35.8876 4.9956 36.9594C3.6175 35.811 1.13692 32.917 2.2394 30.5283Z" fill="white"/>
+<path d="M6.12256 34.1478C7.16688 31.8826 6.81878 30.8371 6.47067 28.9205C7.68905 30.4887 8.03715 32.5099 7.34094 34.322C6.64473 36.1341 7.63103 38.2134 8.21121 39.0266C7.16688 38.1553 5.28711 35.9599 6.12256 34.1478Z" fill="white"/>
+<path d="M6.55748 63.373C3.3419 63.373 2.92847 59.9278 3.15815 58.32L23.8297 58.5497V61.0762C23.8297 62.9137 20.3844 63.1434 20.3844 63.373C20.3844 63.6027 20.1548 64.7512 20.8438 64.7512H28.4234C29.8015 64.7512 30.0312 63.0941 28.8827 62.684C26.3103 61.7653 26.5859 59.8512 27.0453 59.0091H43.8122C43.8122 61.9949 41.745 61.9949 41.745 62.684C41.745 63.2352 42.0513 64.2918 42.2044 64.7512H48.1762V68.6558C48.1762 70.0339 47.4871 72.101 44.9606 72.101H4.07689C1.32069 72.101 1.091 69.8042 1.091 69.1151V64.7512H6.8331C7.52215 64.7512 7.98152 63.6027 6.55748 63.373Z" fill="white"/>
+<path d="M42.2044 60.3871C42.2044 60.0066 42.5129 59.6981 42.8934 59.6981H52.0808C52.4613 59.6981 52.7698 60.0066 52.7698 60.3871C52.7698 60.7677 52.4613 61.0762 52.0808 61.0762H42.8934C42.5129 61.0762 42.2044 60.7677 42.2044 60.3871Z" fill="white"/>
+<path d="M24.8672 14.9147C24.8672 16.0615 25.0554 15.6792 24.8672 18.355H40.1097V14.1502C40.6742 12.0478 44.2496 11.0921 44.8142 8.79856C45.9903 4.02034 39.7333 2.49131 38.4161 4.4026C37.0988 6.31389 37.287 10.5187 37.287 12.6211C37.287 14.3031 36.2834 13.322 35.7816 12.6211C35.5934 10.3276 35.9697 6.12276 37.287 4.02034C34.6525 -2.09579 26.3726 2.30018 27.6899 4.4026C29.0071 6.50502 29.0071 10.1365 29.0071 12.0478C29.0071 13.959 27.6899 13.5768 27.6899 12.6211V7.46066C27.6899 5.7405 25.9962 3.44695 23.1736 4.02034C20.3509 4.59373 19.5982 8.03405 20.539 10.1365C21.4799 12.2389 24.8672 13.7679 24.8672 14.9147Z" fill="white"/>
+<path d="M32.328 28.0017C27.0453 28.0017 26.1265 22.2596 26.1265 20.6519H39.4482C39.4482 23.4081 38.2998 28.0017 32.328 28.0017Z" fill="white"/>
+</svg>

public/images/service/2022/12/13/cfad0833ce20c2e835c39ccdda2dad3e.svg

@@ -0,0 +1,8 @@
+<svg width="74" height="68" viewBox="0 0 74 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.54983 48.5906C6.30531 48.5906 5.44969 46.0846 5.44969 43.7494C5.44969 42.895 4.5163 42.5533 4.32184 43.1229C3.92944 44.2722 3.38845 46.6541 3.81625 50.755C4.24406 54.8558 7.27758 55.3115 9.10548 55.1976C10.9334 55.0837 29.9512 52.3498 31.2347 52.065C32.5181 51.7802 32.5959 50.4133 32.7903 48.5906C32.9848 46.768 31.9347 40.5029 31.5069 38.7942C31.0791 37.0855 30.4957 35.8894 29.5234 35.8894C28.5512 35.8894 17.9727 35.092 14.8614 34.4655C11.7501 33.839 3.38845 31.6177 1.40499 37.5981C-0.578467 43.5785 -0.267336 51.6663 1.13275 55.881C2.53284 60.0958 6.3442 60.9501 8.36654 60.6654C10.3889 60.3806 16.9615 59.1276 18.8283 59.1276C20.6951 59.1276 26.801 59.2415 28.5901 59.1276C30.3791 59.0136 33.5293 54.2863 31.2347 54.5711C28.9401 54.8558 8.59989 59.811 5.21635 57.0202C1.8328 54.2293 2.18282 51.2106 2.06615 46.6541C1.94947 42.0976 3.85515 37.4842 6.3442 37.5981C8.83325 37.712 9.84441 40.6168 9.9222 43.7494C9.99917 46.8487 8.79435 48.5906 7.54983 48.5906Z" fill="white"/>
+<path d="M32.5181 58.0455C34.0737 50.1856 33.9959 45.1165 32.2069 36.2313C35.046 35.263 40.7864 35.8326 41.3464 35.8326C42.0465 35.8326 42.9979 36.2313 43.291 37.4274C45.6633 47.1099 43.4465 56.3369 43.291 57.2482C43.1665 57.9772 42.5391 58.0835 42.2409 58.0455C39.9852 58.0455 36.6794 58.5581 32.5181 58.0455Z" fill="white"/>
+<path d="M45.3522 50.5843C45.7023 46.7682 44.5744 37.9969 44.2633 36.0604C51.3285 35.3959 65.8986 33.7252 67.4036 33.7252C69.426 33.7252 70.9573 34.8597 71.6817 36.2882C74.582 42.0081 73.9063 49.7552 73.6692 52.4747L73.6651 52.5208C73.4318 55.1977 73.004 56.2799 71.2928 56.166C69.9238 56.0748 54.6991 53.6979 47.2579 52.5208C46.3245 52.2929 45.1171 53.1473 45.3522 50.5843Z" fill="white"/>
+<path d="M70.7483 58.1594C69.5815 57.9316 47.6468 55.0838 46.0912 54.9129C43.291 55.3116 44.66 58.5923 46.0912 58.729C47.5224 58.8657 53.1694 59.0897 55.814 59.1846C58.3808 59.4124 65.4202 60.8933 68.3759 60.6085C73.4318 59.5264 71.915 58.3872 70.7483 58.1594Z" fill="white"/>
+<path d="M35.6683 66.3041C35.396 63.4563 33.4126 61.0641 32.0125 60.0389C34.4237 59.944 39.5263 59.7541 40.6464 59.7541C42.0465 59.7541 42.1631 59.6402 42.8632 60.6654C43.5632 61.6906 44.9244 66.8737 44.1855 66.3041C43.4465 65.7345 40.7241 64.0828 39.713 63.0576C38.7018 62.0324 38.274 62.9437 37.9629 63.7411C37.6517 64.5385 35.9405 69.1519 35.6683 66.3041Z" fill="white"/>
+<path d="M19.4506 13.7906C19.6717 19.1347 24.5453 21.2519 25.4787 19.828C26.9177 21.7647 27.8511 29.9091 28.1233 31.333C28.3956 32.7569 29.1345 33.1556 30.4179 32.8708C31.7013 32.5861 34.9293 32.0735 36.9517 32.0735C38.974 32.0735 42.8243 32.7569 43.991 33.1556C45.1577 33.5543 45.8578 31.4469 45.9356 30.7065C46.0134 29.9661 46.13 28.2004 46.8301 24.7831C47.3901 22.0492 48.4635 19.733 48.9302 18.9166C57.0585 24.2135 55.1528 3.08275 48.4246 4.50666C49.8247 9.10872 48.4376 12.6135 47.569 13.7906C51.0303 4.50666 43.0965 -1.132 40.763 1.37419C43.6565 6.65982 42.1501 10.5632 41.0353 11.8541C44.4966 1.37413 35.2793 -2.27107 33.4514 1.37419C36.7183 4.50666 35.6294 10.544 34.9293 11.2846C36.4072 6.72808 34.2682 2.05766 30.5346 1.88679C27.5477 1.7501 26.101 4.25996 25.751 5.53199C28.5122 6.15851 29.1734 9.17718 29.4067 11.2846C25.9454 2.57027 19.2172 8.15186 19.4506 13.7906Z" fill="white"/>
+</svg>

public/images/service/2022/12/13/db0e78f99c425ea7c2e387db4394edbd.svg

@@ -0,0 +1,8 @@
+<svg width="74" height="68" viewBox="0 0 74 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.54983 48.5906C6.30531 48.5906 5.44969 46.0846 5.44969 43.7494C5.44969 42.895 4.5163 42.5533 4.32184 43.1229C3.92944 44.2722 3.38845 46.6541 3.81625 50.755C4.24406 54.8558 7.27758 55.3115 9.10548 55.1976C10.9334 55.0837 29.9512 52.3498 31.2347 52.065C32.5181 51.7802 32.5959 50.4133 32.7903 48.5906C32.9848 46.768 31.9347 40.5029 31.5069 38.7942C31.0791 37.0855 30.4957 35.8894 29.5234 35.8894C28.5512 35.8894 17.9727 35.092 14.8614 34.4655C11.7501 33.839 3.38845 31.6177 1.40499 37.5981C-0.578467 43.5785 -0.267336 51.6663 1.13275 55.881C2.53284 60.0958 6.3442 60.9501 8.36654 60.6654C10.3889 60.3806 16.9615 59.1276 18.8283 59.1276C20.6951 59.1276 26.801 59.2415 28.5901 59.1276C30.3791 59.0136 33.5293 54.2863 31.2347 54.5711C28.9401 54.8558 8.59989 59.811 5.21635 57.0202C1.8328 54.2293 2.18282 51.2106 2.06615 46.6541C1.94947 42.0976 3.85515 37.4842 6.3442 37.5981C8.83325 37.712 9.84441 40.6168 9.9222 43.7494C9.99917 46.8487 8.79435 48.5906 7.54983 48.5906Z" fill="white"/>
+<path d="M32.5181 58.0455C34.0737 50.1856 33.9959 45.1165 32.2069 36.2313C35.046 35.263 40.7864 35.8326 41.3464 35.8326C42.0465 35.8326 42.9979 36.2313 43.291 37.4274C45.6633 47.1099 43.4465 56.3369 43.291 57.2482C43.1665 57.9772 42.5391 58.0835 42.2409 58.0455C39.9852 58.0455 36.6794 58.5581 32.5181 58.0455Z" fill="white"/>
+<path d="M45.3522 50.5843C45.7023 46.7682 44.5744 37.9969 44.2633 36.0604C51.3285 35.3959 65.8986 33.7252 67.4036 33.7252C69.426 33.7252 70.9573 34.8597 71.6817 36.2882C74.582 42.0081 73.9063 49.7552 73.6692 52.4747L73.6651 52.5208C73.4318 55.1977 73.004 56.2799 71.2928 56.166C69.9238 56.0748 54.6991 53.6979 47.2579 52.5208C46.3245 52.2929 45.1171 53.1473 45.3522 50.5843Z" fill="white"/>
+<path d="M70.7483 58.1594C69.5815 57.9316 47.6468 55.0838 46.0912 54.9129C43.291 55.3116 44.66 58.5923 46.0912 58.729C47.5224 58.8657 53.1694 59.0897 55.814 59.1846C58.3808 59.4124 65.4202 60.8933 68.3759 60.6085C73.4318 59.5264 71.915 58.3872 70.7483 58.1594Z" fill="white"/>
+<path d="M35.6683 66.3041C35.396 63.4563 33.4126 61.0641 32.0125 60.0389C34.4237 59.944 39.5263 59.7541 40.6464 59.7541C42.0465 59.7541 42.1631 59.6402 42.8632 60.6654C43.5632 61.6906 44.9244 66.8737 44.1855 66.3041C43.4465 65.7345 40.7241 64.0828 39.713 63.0576C38.7018 62.0324 38.274 62.9437 37.9629 63.7411C37.6517 64.5385 35.9405 69.1519 35.6683 66.3041Z" fill="white"/>
+<path d="M19.4506 13.7906C19.6717 19.1347 24.5453 21.2519 25.4787 19.828C26.9177 21.7647 27.8511 29.9091 28.1233 31.333C28.3956 32.7569 29.1345 33.1556 30.4179 32.8708C31.7013 32.5861 34.9293 32.0735 36.9517 32.0735C38.974 32.0735 42.8243 32.7569 43.991 33.1556C45.1577 33.5543 45.8578 31.4469 45.9356 30.7065C46.0134 29.9661 46.13 28.2004 46.8301 24.7831C47.3901 22.0492 48.4635 19.733 48.9302 18.9166C57.0585 24.2135 55.1528 3.08275 48.4246 4.50666C49.8247 9.10872 48.4376 12.6135 47.569 13.7906C51.0303 4.50666 43.0965 -1.132 40.763 1.37419C43.6565 6.65982 42.1501 10.5632 41.0353 11.8541C44.4966 1.37413 35.2793 -2.27107 33.4514 1.37419C36.7183 4.50666 35.6294 10.544 34.9293 11.2846C36.4072 6.72808 34.2682 2.05766 30.5346 1.88679C27.5477 1.7501 26.101 4.25996 25.751 5.53199C28.5122 6.15851 29.1734 9.17718 29.4067 11.2846C25.9454 2.57027 19.2172 8.15186 19.4506 13.7906Z" fill="white"/>
+</svg>

resources/views/layout/app.blade.php

@@ -50,7 +50,15 @@
             </a>
             <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
             @foreach($services as $service)
-                <li><a class="dropdown-item" href="{{url('/service/'.$service->slug)}}">{{$service->name}}</a></li>
+                <li>
+                    @if($service->name == "Recruitment")
+                        <a class="dropdown-item"  href="{{url('/recruitment')}}">
+                    @elseif($service->name === "Insurance")
+                        <a class="dropdown-item"  href="{{url('/insurance')}}">
+                    @else
+                        <a class="dropdown-item"  href="{{url('/service/'.$service->slug)}}">
+                    @endif
+                    {{$service->name}}</a>
             @endforeach
                 <!-- <li><a class="dropdown-item" href="/service_view">Skill Assessment</a></li>
                 <li><a class="dropdown-item" href="/service_detail">Permanent Work Visa</a></li> -->

resources/views/news.blade.php

@@ -24,7 +24,7 @@
                 <div class="featured-news-desc">
                     <h3>{{$news_and_updates->first()->title}}</h3>
                     <h5>{{$news_and_updates->first()->created_at}}</h5>
-                    <p>{{\Illuminate\Support\Str::limit($news_and_updates->first()->description, 150, $end='...')}}</p>
+                    <p>{!!strip_tags(\Illuminate\Support\Str::limit($news_and_updates->first()->description, 150, $end='...'))!!}</p>
                     <a href="{{url('news/'.$news_and_updates->first()->slug)}}">Read More</a>
                 </div>
             </div>

resources/views/news_detail.blade.php

@@ -28,8 +28,9 @@
         </div>
     </section>
     <section class="related-article">
-        <h3>More Articles</h3>
-        <div class="row g-4">
+        <h3>Related Articles</h3>
+        <h2 class="mt-4">Coming soon......</h2>
+        {{-- <div class="row g-4">
             <div class="col-md-4">
                 <div class="news-page-card">
                     <a href="/news_detail">
@@ -108,6 +109,6 @@
                     </a>
                 </div>
             </div>
-        </div>
+        </div> --}}
     </section>
 @endsection

resources/views/service_view.blade.php

@@ -14,12 +14,12 @@
         <div class="row">
             <div class="col-md-6">
                 <div class="service-primary-img">
-                    <img src="{{url('frontend/images/test-img.png')}}" class="w-100" alt="">
+                    <img src="{{url($service_sections->first()->image ?? '')}}" class="w-100" alt="">
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="service-primary-desc">
-                    <h5><img src="{{url($service_sections->first()->image ?? '')}}" alt=""> Skill Assessment</h5>
+                    <h5><img src="{{url('frontend/icons/double-slash.svg')}}" alt=""> Skill Assessment</h5>
                     <h3>{{$service_sections->first()->title}}</h3>
                     <p>{{$service_sections->first()->description}}</p>
                     <ul>
@@ -45,7 +45,7 @@
                     <h5><hr> {{$service->name}}</h5>
                     <h3>{{$second_service->title}}</h3>
                     <p>{{$second_service->description}}</p>
-                    <a href="/">Book An Appointment</a>
+                    <a href="/contact">Book An Appointment</a>
                 </div>
             </div>
         </div>
@@ -61,7 +61,7 @@
                     <h3>{{$third_service->title}}</h3>
                     <p>{{$third_service->description}}</p>
                     <ul>
-                    @foreach($third_service->service_section_point() as $section_point)
+                    @foreach($third_service->service_section_point as $section_point)
                         <li>{{$section_point->point}}</li>
                     @endforeach
                     </ul>

resources/views/services.blade.php

@@ -19,7 +19,13 @@
             @foreach($services as $service)
             <div class="col-md-3">
                 <div class="our-service-card">
+                    @if($service->name === "Recruitment")
+                        <a href="{{url('/recruitment')}}">
+                    @elseif($service->name === "Insurance")
+                        <a href="{{url('/insurance')}}">
+                    @else
                         <a href="{{url('service/'.$service->slug)}}">
+                    @endif
                         <div class="our-service-img">
                             <img src="{{url('frontend/images/skill-assessment.png')}}" class="img-fluid" alt="">
                         </div>

resources/views/welcome.blade.php

@@ -81,6 +81,13 @@
       </div>
       <div class="services-cards">
         @foreach($services as $service)
+        @if($service->name === "Recruitment")
+          <a href="{{url('/recruitment')}}">
+        @elseif($service->name === "Insurance")
+          <a href="{{url('/insurance')}}">
+        @else
+          <a href="{{url('service/'.$service->slug)}}">
+        @endif
           <div class="services-card">
             <div class="services-icon">
               <img src="{{$service->icon}}" class="img-fluid" alt="">
@@ -90,6 +97,7 @@
               <p>{!!strip_tags($service->short_description)!!}</p>
             </div>
           </div>
+        </a>
         @endforeach
         <!-- <div class="services-card">
           <div class="services-icon">