Merge pull request #210 from FiveMods/phil

Phil
FiveMods · Apr 7, 2021 · e16059b · e16059b
2 parents af91298 + 91fe8cc
commit e16059b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/include/header-normal.php b/include/header-normal.php
@@ -25,10 +25,10 @@
       <div class="collapse navbar-collapse" id="navbarTogglerDemo02">
          <span class="navbar-nav mr-auto mt-2 mt-lg-0">
             <li class="nav-item mr-1">
-               <a class="nav-link" href="/"><?php echo $lang['home']; ?></a>
+               <a class="nav-link text-white" href="/"><?php echo $lang['home']; ?></a>
             </li>
             <li class="nav-item dropdown has-megamenu">
-               <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown"> <?php echo $lang['categories']; ?> </a>
+               <a class="nav-link text-white dropdown-toggle" href="#" data-toggle="dropdown"> <?php echo $lang['categories']; ?> </a>
                <div class="dropdown-menu megamenu <?php echo $darkmode; ?>" role="menu">
                   <div class="row">
                      <div class="col-md-navbar">
@@ -157,7 +157,7 @@
                <!-- End Dropdown Menu -->
             </li>
             <div class="nav-item dropdown show">
-               <a class="nav-link dropdown-toggle" style="color:rgba(255, 255, 255, 0.5);" href="#" id="dropdownMenuLinkCommunity" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+               <a class="nav-link text-white dropdown-toggle" style="color:rgba(255, 255, 255, 0.5);" href="#" id="dropdownMenuLinkCommunity" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <?php echo $lang['community']; ?>
                </a>
 
@@ -185,7 +185,7 @@
                      </div>
                   </div> -->
             <div class="nav-item dropdown show">
-               <a class="nav-link dropdown-toggle" style="color:rgba(255, 255, 255, 0.5);" href="#" id="dropdownMenuLinkFiveM" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+               <a class="nav-link text-white dropdown-toggle" style="color:rgba(255, 255, 255, 0.5);" href="#" id="dropdownMenuLinkFiveM" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <?php echo $lang['fivem-stuff']; ?> Links
                </a>
 

diff --git a/index.php b/index.php
@@ -604,6 +604,15 @@ function swapStyleSheet(sheet) {
          height: 100vh;
          width: 100vw;
          z-index: 99999;
+         -ms-overflow-style: none;
+         scrollbar-width: none;
+         overflow: hidden;
+
+      }
+
+      #preloader::-webkit-scrollbar {
+         display: none; 
+         overflow: hidden;
       }
    </style>
 </head>

diff --git a/pages/.php b/pages/.php
@@ -227,7 +227,7 @@
                     <div class="col-md-4 d-flex align-items-stretch">
                         <div class="card mb-4 shadow-sm rounded shadow1 <?php echo $do; ?>">
                             <a href="/product/<?php echo $article['m_id']; ?>/">
-                                <img class="card-img-top img-fluid cover rounded" async=on src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo explode(" ", $article['m_picture'])[0]; ?>" alt="<?php echo $article['m_name']; ?>-IMAGE">
+                                <img class="card-img-top img-fluid cover rounded" loading="lazy" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo explode(" ", $article['m_picture'])[0]; ?>" alt="<?php echo $article['m_name']; ?>-IMAGE">
 
                             </a>
                             <div class="card-body">

diff --git a/pages/product.php b/pages/product.php
@@ -75,9 +75,9 @@
          // Links
          $description = preg_replace('/(^(?!\()|\s)(https?:\/\/(?:www\.|(?!www))(youtube\.com\/watch\?v\=|youtu\.be\/))([A-Za-z0-9-_][^\s|<]{1,})/', "<iframe id=\"ytplayer\" allowFullScreen=\"allowFullScreen\" type=\"text/html\" width=\"544\" height=\"306\" src=\"https://www.youtube.com/embed/$4\"></iframe>", $description);
 
-         $description = preg_replace('/(^(?!\()|\s)((https?).*\.(gif|jpe?g|bmp|png))/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$2\" alt=\"$2\" style=\"max-width: 100%;\">", $description);
-         $description = preg_replace('/\[img\](.+)\[\/img\]/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$1\" style=\"max-width: 100%;\">", $description);
-         $description = preg_replace('/(\!\[\])\((.+)\)/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$2\" style=\"max-width: 100%;\">", $description);
+         $description = preg_replace('/(^(?!\()|\s)((https?).*\.(gif|jpe?g|bmp|png))/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$2\" loading=lazy alt=\"$2\" style=\"max-width: 100%;\">", $description);
+         $description = preg_replace('/\[img\](.+)\[\/img\]/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$1\" loading=lazy style=\"max-width: 100%;\">", $description);
+         $description = preg_replace('/(\!\[\])\((.+)\)/', "<img src=https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/\"$2\" loading=lazy style=\"max-width: 100%;\">", $description);
 
          $description = preg_replace('/\[url\](.+)\[\/url\]/', "<a href=\"/ref?rdc=$1\">$1</a>", $description);
          $description = preg_replace('/\[(.+)\]\((.+)\)/', "<a href=\"/ref?rdc=$2\">$1</a>", $description);
@@ -295,12 +295,12 @@
             </ol>
                <div class="carousel-inner">
                   <div class="carousel-item active">
-                     <img src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $imgArray[0]; ?>" class="d-block w-100 img-fluid cover" style="width:540px;height:304px;" alt="Mod Picture">
+                     <img src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $imgArray[0]; ?>" loading="lazy" class="d-block w-100 img-fluid cover" style="width:540px;height:304px;" alt="Mod Picture">
                   </div>
                   <?php
                      for ($i=1; $i < count($imgArray); $i++) {
                         echo '<div class="carousel-item">
-                                 <img src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $imgArray[$i] . '" class="d-block w-100 img-fluid cover" style="width:540px;height:304px;" alt="Mod Picture">
+                                 <img src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $imgArray[$i] . '" loading="lazy" class="d-block w-100 img-fluid cover" style="width:540px;height:304px;" alt="Mod Picture">
                               </div>';
                      }
                   ?>
@@ -469,7 +469,7 @@ function getRating() {
             <div class="card bg-transparent text-light text-center border-0">
                <div class="card-body pt-3 pb-1">
 
-                  <p class="lead pb-0 mb-1"><a href="/user/<?php echo $username; ?>"><img class="pr-3" async=on src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $userimg; ?>" height="32" alt="Profile Picture"></a><?php echo $lang['made-by']; ?>
+                  <p class="lead pb-0 mb-1"><a href="/user/<?php echo $username; ?>"><img class="pr-3" loading="lazy" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $userimg; ?>" height="32" alt="Profile Picture"></a><?php echo $lang['made-by']; ?>
                      <a href="/user/<?php echo $username; ?>"><?php echo $username; ?></a>.
                      <a href="/user/<?php echo $username; ?>" class="btn btn-xs rounded btn-sm btn-light btn-rised ml-md-4">Show more </a>
                   </p>
@@ -524,7 +524,7 @@ function getRating() {
                   echo '<div class="col-md-4 d-flex align-items-stretch">
                                  <div class="card mb-4 shadow-sm ">
                                     <a href="/product/' . $id . '/">
-                                    <img async=on class="card-img-top img-fluid rounded shadow1 cover"  src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">';
+                                    <img loading=lazy class="card-img-top img-fluid rounded shadow1 cover"  src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">';
                   echo '</a>
                                     <div class="card-body">
                                        <a href="/product/' . $id . '/" class="text text-dark">
@@ -546,7 +546,7 @@ function getRating() {
                   echo '<div class="col-md-4 d-flex align-items-stretch">
                                  <div class="card mb-4 shadow-sm '.$do.'">
                                     <a href="/product/' . $id . '/">
-                                    <img async=on class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
+                                    <img loading=lazy class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
                                     <small class="badge badge-info ml-2" style="font-size:9px;">Paid product</small>
                                     <small class="badge badge-primary ml-2" style="font-size:9px;margin-top: 10px; margin-bottom: -10px"><i class="fas fa-tag mr-1"></i> ' . $cat . ' </small>';
                   for ($i = 0; $i < count($tags); $i++) {
@@ -587,7 +587,7 @@ function getRating() {
                      echo '<div class="col-md-4 d-flex align-items-stretch">
                                     <div class="card mb-4 shadow-sm">
                                        <a href="/product/' . $id . '/">
-                                       <img async=on class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
+                                       <img loading=lazy class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
                                        </a>
                                        <div class="card-body">
                                           <a href="/product/' . $id . '/" class="text text-dark">
@@ -607,7 +607,7 @@ function getRating() {
                   echo '<div class="col-md-4 d-flex align-items-stretch">
                                  <div class="card mb-4 shadow-sm '.$do.'">
                                     <a href="/product/' . $id . '/">
-                                    <img async=on class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
+                                    <img loading=lazy class="card-img-top img-fluid rounded shadow1 cover" src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $img . '" alt="' . $img . '-Image (display)">
                                     <small class="badge badge-info ml-2" style="font-size:9px;">Paid product</small>
                                     <small class="badge badge-primary ml-2" style="font-size:9px;margin-top: 10px; margin-bottom: -10px"><i class="fas fa-tag mr-1"></i> ' . $cat . ' </small>';
                   for ($i = 0; $i < count($tags); $i++) {
@@ -734,12 +734,12 @@ function getRating() {
                <div class="carousel-inner">
                   <div class="carousel-item active">
                      <a href="#" data-toggle="modal" data-target="#myModal">
-                        <img async=on src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $imgArray[0]; ?>" class="img-fluid" alt="Mod Picture">
+                        <img loading=lazy src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/<?php echo $imgArray[0]; ?>" class="img-fluid" alt="Mod Picture">
                   </div>
                   <?php
                   for ($i = 1; $i < count($imgArray); $i++) {
                      echo '<div class="carousel-item">
-                                 <img async=on src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $imgArray[$i] . '" class="img-fluid" alt="Mod Picture">
+                                 <img loading=lazy src="https://img-cdn.fivemods.net/unsafe/filters:format(webp):quality(95):sharpen(0.2,0.5,true)/' . $imgArray[$i] . '" class="img-fluid" alt="Mod Picture">
                               </div>';
                   }
                   ?>

diff --git a/pages/upload2.php b/pages/upload2.php
@@ -32,7 +32,7 @@
                     <div class="row">
                         <div class="col-lg-5 mx-auto">
 
-                            <div class="p-5 bg-white shadow rounded-lg"><img src="/static-assets/img/svg/upload_brand.svg" loading="lazy" alt="FiveMods upload brand" width="200" class="d-block mx-auto mb-4 rounded-pill">
+                            <div class="p-5 bg-white shadow rounded-lg"><img src="/static-assets/img/svg/brand/svg/fivemods_brand_icon_watermark_primary_1500x1500.svg" loading="lazy" alt="FiveMods upload brand" width="100px" class="d-block mx-auto mb-4 rounded-pill">
 
                                 <h6 class="text-center mb-4 text-muted">
                                     Upload your resource here