Przeglądaj źródła

new changes updated

saikiranbolli 2 lat temu
rodzic
commit
32bb01f2e1
4 zmienionych plików z 85 dodań i 78 usunięć
  1. 15
    6
      dist/Js/auth/login.js
  2. 1
    1
      ramproducts.html
  3. 0
    2
      services/bulk-orders.html
  4. 69
    69
      storageproducts.html

+ 15
- 6
dist/Js/auth/login.js Wyświetl plik

@@ -311,15 +311,16 @@ function initLogin() {
311 311
 
312 312
   // function to validate user entered email
313 313
   function validateEmail(userEmail) {
314
-    var pattern =
315
-      /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/;
316
-    return $.trim(userEmail).match(pattern) ? true : false;
314
+    var pattern = /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/;
315
+    // return $.trim(userEmail).test(pattern) ? true : false;
316
+    return pattern.test(userEmail) ? true : false;
317 317
   }
318 318
 
319 319
   // function to validate user entered password
320 320
   function validatepassword(userPassword) {
321 321
     var pattern = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{11,}$/;
322
-    return $.trim(userPassword).match(pattern) ? true : false;
322
+    // return $.trim(userPassword).test(pattern) ? true : false;
323
+    return pattern.test(userPassword) ? true : false;
323 324
   }
324 325
 
325 326
   registerForm.find("#User_Email,#User_password").keypress(function (e) {
@@ -351,15 +352,23 @@ function initLogin() {
351 352
       emailInput.find(".form-floating").removeClass("is-invalid");
352 353
       passwordInput.find("#User_password").removeClass("is-invalid");
353 354
       passwordInput.find(".form-floating").removeClass("is-invalid");
354
-      if (validateEmail(userEmail) && validatepassword(userPassword)) {
355
+      let Email_valid = validateEmail(userEmail);
356
+      let Pwd_valid = validatepassword(userPassword);
357
+      if (Email_valid === true && Pwd_valid === true) {
355 358
         userRegistration();
356 359
         $("#register_form .otp-input-group .otp-sent-email").text(userEmail);
357
-      } else {
360
+      } else if(Email_valid === false) {
358 361
         emailInput.find("#User_Email").addClass("is-invalid");
359 362
         emailInput.find(".form-floating").addClass("is-invalid");
360 363
         emailInput.find(".invalid-feedback").text("Please enter a valid email");
361 364
         registerForm.find(".loader-btn").hide();
362 365
         $(this).show();
366
+      }else if(Pwd_valid === false){
367
+        emailInput.find("#User_password").addClass("is-invalid");
368
+        emailInput.find(".form-floating").addClass("is-invalid");
369
+        emailInput.find(".invalid-feedback").text("Please check the password!");
370
+        registerForm.find(".loader-btn").hide();
371
+        $(this).show();
363 372
       }
364 373
     }
365 374
   });

+ 1
- 1
ramproducts.html Wyświetl plik

@@ -67,7 +67,7 @@
67 67
                         <!------------------------------ RAM-------------------------->
68 68
                         <div class="tab-pane fade show active" id="pills-network-cards" role="tabpanel" aria-labelledby="pills-network-cards-tab">
69 69
                             <div class="py-md-5">
70
-                                <div class="text-center pb-md-5">
70
+                                <div class="text-center">
71 71
                                     <h1 class="satoshi_font pb-md-4 pb-3">Discover the revolution of ORA</h1>
72 72
                                     <p class="fs-6 satoshi_font fw-500 pb-md-4">
73 73
                                         ORA Memory Series, harnessing cutting-edge</br>

+ 0
- 2
services/bulk-orders.html Wyświetl plik

@@ -94,8 +94,6 @@
94 94
     <script src="../libs/axios.min.js"></script>
95 95
     <script src="../dist/js/footer.js"></script>
96 96
     <script src="../libs/cookies.min.js"></script>
97
-
98
-
99 97
     <script src="../dist/js/fontawesome.all.js"></script>
100 98
     <script src="../dist/js/fontawesome.min.js"></script>
101 99
     <script src="../dist/js/vendor/modernizr-3.11.7.min.js"></script>

+ 69
- 69
storageproducts.html Wyświetl plik

@@ -42,7 +42,7 @@
42 42
             color:#ffff !important;
43 43
         }
44 44
         .card-title{
45
-            font-size: 1.2rem;
45
+            font-size: 1.4rem;
46 46
         }
47 47
     </style>
48 48
 </head>
@@ -68,7 +68,7 @@
68 68
                         <!------------------------------ RAM-------------------------->
69 69
                         <div class="tab-pane fade show active" id="pills-network-cards" role="tabpanel" aria-labelledby="pills-network-cards-tab">
70 70
                             <div class="py-md-5">
71
-                                <div class="text-center pb-md-5">
71
+                                <div class="text-center">
72 72
                                     <h1 class="satoshi_font pb-md-4 pb-3">Discover the revolution of ORA</h1>
73 73
                                     <p class="fs-6 satoshi_font fw-500 pb-md-4">
74 74
                                         ORA Memory Series, harnessing cutting-edge</br>
@@ -90,26 +90,19 @@
90 90
                                                     </a>
91 91
                                                     <div class="card-body pt-0">
92 92
                                                         <a href="#" class="text-decoration-none text-dark">
93
-                                                            <h5 class="card-title satoshi_font mb-0">
94
-                                                                ORA3 M.2 NVMe 512GB Internal Solid State Drive with NMVe PCIe Gen 3
93
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
94
+                                                                ORA3 512GB Solid State Drive with NMVe PCIe Gen 3
95 95
                                                             </h5>
96 96
                                                         </a>
97 97
                                                     </div>
98
-                                                    <ul class="bg-gray-3 border-0 list-group-flush ps-3">
98
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
99 99
                                                         <li class="list-group-item border-0 py-0">
100
-                                                            <span class="satoshi_font">PCI Express 3.0</span>
100
+                                                            <p class="mb-0 fs-9">Modal</p>
101
+                                                            <p class="satoshi_font fs-9 mb-0">AWPC33K512GS</p>
101 102
                                                         </li>
102 103
                                                         <li class="list-group-item border-0 py-0">
103
-                                                            <span class="satoshi_font">512GB SSD</span>
104
-                                                        </li>
105
-                                                        <li class="list-group-item border-0 py-0">
106
-                                                            <span class="satoshi_font">Read speed: 3500 MB/sec</span>
107
-                                                        </li>
108
-                                                        <li class="list-group-item border-0 py-0">
109
-                                                            <span class="satoshi_font">Write speed: 3000 MB/sec</span>
110
-                                                        </li>
111
-                                                        <li class="list-group-item border-0 py-0">
112
-                                                            <span class="satoshi_font">GRAPHENE THERMAL PAD</span>
104
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
105
+                                                            <p class="satoshi_font fs-9 mb-0">3500 MHz</p>
113 106
                                                         </li>
114 107
                                                     </ul>
115 108
                                                     <div class="card-body text-center">
@@ -127,31 +120,24 @@
127 120
                                             <div class="col-lg-4 col-md-6 col-md-6">
128 121
                                                 <div class="card border bg-gray-3 rounded-3 p-1 h-100">
129 122
                                                     <a href="#">
130
-                                                        <img src="./dist/assets/imgs/Navbar/ora4_ram.png" class="card-img-top" alt="...">
123
+                                                        <img src="./dist/assets/imgs/Navbar/ora3_ram.png" class="card-img-top" alt="...">
131 124
                                                     </a>
132 125
                                                     <div class="card-body pt-0">
133 126
                                                         <a href="#"
134 127
                                                             class="text-decoration-none text-dark">
135
-                                                            <h5 class="card-title satoshi_font mb-0">
136
-                                                                ORA3 M.2 NVMe 1TB Internal Solid State Drive with NMVe PCIe Gen 3
128
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
129
+                                                                ORA3 1TB Solid State Drive with NMVe PCIe Gen 3
137 130
                                                             </h5>
138 131
                                                         </a>
139 132
                                                     </div>
140
-                                                    <ul class="bg-gray-3 border-0 list-group-flush ps-3">
141
-                                                        <li class="list-group-item border-0 py-0">
142
-                                                            <span class="satoshi_font">PCI Express 3.0</span>
143
-                                                        </li>
144
-                                                        <li class="list-group-item border-0 py-0">
145
-                                                            <span class="satoshi_font">1TB SSD</span>
146
-                                                        </li>
147
-                                                        <li class="list-group-item border-0 py-0">
148
-                                                            <span class="satoshi_font">Read speed: 3500 MB/sec</span>
149
-                                                        </li>
133
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
150 134
                                                         <li class="list-group-item border-0 py-0">
151
-                                                            <span class="satoshi_font">Write speed: 3000 MB/sec</span>
135
+                                                            <p class="mb-0 fs-9">Modal</p>
136
+                                                            <p class="satoshi_font fs-9 mb-0">AWLD43232M</p>
152 137
                                                         </li>
153 138
                                                         <li class="list-group-item border-0 py-0">
154
-                                                            <span class="satoshi_font">GRAPHENE THERMAL PAD</span>
139
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
140
+                                                            <p class="satoshi_font fs-9 mb-0">3500 MHz</p>
155 141
                                                         </li>
156 142
                                                     </ul>
157 143
                                                     <div class="card-body text-center">
@@ -173,26 +159,19 @@
173 159
                                                     </a>
174 160
                                                     <div class="card-body pt-0">
175 161
                                                         <a href="#" class="text-decoration-none text-dark">
176
-                                                            <h5 class="card-title satoshi_font mb-0">
177
-                                                                ORA3 M.2 NVMe 2TB Internal Solid State Drive with NMVe PCIe Gen 3
162
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
163
+                                                                ORA3 2TB Solid State Drive with NMVe PCIe Gen 3
178 164
                                                             </h5>
179 165
                                                         </a>
180 166
                                                     </div>
181
-                                                    <ul class="bg-gray-3 border-0 list-group-flush ps-3">
182
-                                                        <li class="list-group-item border-0 py-0">
183
-                                                            <span class="satoshi_font">PCI Express 3.0</span>
184
-                                                        </li>
185
-                                                        <li class="list-group-item border-0 py-0">
186
-                                                            <span class="satoshi_font">2TB SSD</span>
187
-                                                        </li>
188
-                                                        <li class="list-group-item border-0 py-0">
189
-                                                            <span class="satoshi_font">Read speed:3500 MB/sec</span>
190
-                                                        </li>
167
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
191 168
                                                         <li class="list-group-item border-0 py-0">
192
-                                                            <span class="satoshi_font">Write speed:3000 MB/sec</span>
169
+                                                            <p class="mb-0 fs-9">Modal</p>
170
+                                                            <p class="satoshi_font fs-9 mb-0">AWPC33K002TS</p>
193 171
                                                         </li>
194 172
                                                         <li class="list-group-item border-0 py-0">
195
-                                                            <span class="satoshi_font">GRAPHENE THERMAL PAD</span>
173
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
174
+                                                            <p class="satoshi_font fs-9 mb-0">3500 MHz</p>
196 175
                                                         </li>
197 176
                                                     </ul>
198 177
                                                     <div class="card-body text-center">
@@ -215,26 +194,19 @@
215 194
                                                     <div class="card-body pt-0">
216 195
                                                         <a href="#"
217 196
                                                             class="text-decoration-none text-dark">
218
-                                                            <h5 class="card-title satoshi_font mb-0">
219
-                                                                ORA4 M.2 NVMe 1TB Internal Solid State Drive with NMVe PCIe Gen 4
197
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
198
+                                                                ORA4 512GB Solid State Drive with NMVe PCIe Gen 4
220 199
                                                             </h5>
221 200
                                                         </a>
222 201
                                                     </div>
223
-                                                    <ul class="bg-gray-3 border-0 list-group-flush ps-3">
224
-                                                        <li class="list-group-item border-0 py-0">
225
-                                                            <span class="satoshi_font">PCI Express 4.0</span>
226
-                                                        </li>
227
-                                                        <li class="list-group-item border-0 py-0">
228
-                                                            <span class="satoshi_font">1TB SSD</span>
229
-                                                        </li>
230
-                                                        <li class="list-group-item border-0 py-0">
231
-                                                            <span class="satoshi_font">Read speed:4900 MB/sec</span>
232
-                                                        </li>
202
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
233 203
                                                         <li class="list-group-item border-0 py-0">
234
-                                                            <span class="satoshi_font">Write speed:4400 MB/sec</span>
204
+                                                            <p class="mb-0 fs-9">Modal</p>
205
+                                                            <p class="satoshi_font fs-9 mb-0">AWPC45K512GS</p>
235 206
                                                         </li>
236 207
                                                         <li class="list-group-item border-0 py-0">
237
-                                                            <span class="satoshi_font">GRAPHENE THERMAL PAD</span>
208
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
209
+                                                            <p class="satoshi_font fs-9 mb-0">4900 MHz</p>
238 210
                                                         </li>
239 211
                                                     </ul>
240 212
                                                     <div class="card-body text-center">
@@ -257,26 +229,54 @@
257 229
                                                     <div class="card-body pt-0">
258 230
                                                         <a href="#"
259 231
                                                             class="text-decoration-none text-dark">
260
-                                                            <h5 class="card-title satoshi_font mb-0">
261
-                                                                ORA4 M.2 NVMe 2TB Internal Solid State Drive with NMVe PCIe Gen 4
232
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
233
+                                                                ORA4 1TB Solid State Drive with NMVe PCIe Gen 4
262 234
                                                             </h5>
263 235
                                                         </a>
264 236
                                                     </div>
265
-                                                    <ul class="bg-gray-3 border-0 list-group-flush ps-3">
237
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
266 238
                                                         <li class="list-group-item border-0 py-0">
267
-                                                            <span class="satoshi_font">PCI Express 4.0</span>
239
+                                                            <p class="mb-0 fs-9">Modal</p>
240
+                                                            <p class="satoshi_font fs-9 mb-0">AWPC45K001TS</p>
268 241
                                                         </li>
269 242
                                                         <li class="list-group-item border-0 py-0">
270
-                                                            <span class="satoshi_font">2TB SSD</span>
271
-                                                        </li>
272
-                                                        <li class="list-group-item border-0 py-0">
273
-                                                            <span class="satoshi_font">Read speed: 4900 MB/sec</span>
243
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
244
+                                                            <p class="satoshi_font fs-9 mb-0">4900 MHz</p>
274 245
                                                         </li>
246
+                                                    </ul>
247
+                                                    <div class="card-body text-center">
248
+                                                        <a href="#"
249
+                                                            class="btn bg-white font-1-2 px-5 w-100 satoshi_font"
250
+                                                            data_des="High-speed PCIe Gen 4x4
251
+                                                            interface with read speeds
252
+                                                            up to 4900 MB/s and write
253
+                                                            speeds up to 4400MB/s."
254
+                                                            data_name="ORA4 M.2 NVMe 1TB Internal Solid State Drive with NMVe PCIe Gen 4">Details 
255
+                                                        </a>
256
+                                                    </div>
257
+                                                </div>
258
+                                            </div>
259
+                                            <div class="col-lg-4 col-md-6 col-md-6">
260
+                                                <div class="card border bg-gray-3 rounded-3 p-1 h-100">
261
+                                                    <a href="#">
262
+                                                        <img src="./dist/assets/imgs/Navbar/ora4_ram.png" class="card-img-top" alt="...">
263
+                                                    </a>
264
+                                                    <div class="card-body pt-0">
265
+                                                        <a href="#"
266
+                                                            class="text-decoration-none text-dark">
267
+                                                            <h5 class="card-title text-center fw-600 satoshi_font mb-0">
268
+                                                                ORA4 2TB Solid State Drive with NMVe PCIe Gen 4
269
+                                                            </h5>
270
+                                                        </a>
271
+                                                    </div>
272
+                                                    <ul class="bg-gray-3 border-0 mb-0 list-group-flush px-3 d-flex justify-content-between">
275 273
                                                         <li class="list-group-item border-0 py-0">
276
-                                                            <span class="satoshi_font">Write speed: 4400 MB/sec</span>
274
+                                                            <p class="mb-0 fs-9">Modal</p>
275
+                                                            <p class="satoshi_font fs-9 mb-0">AWPC45K002TS</p>
277 276
                                                         </li>
278 277
                                                         <li class="list-group-item border-0 py-0">
279
-                                                            <span class="satoshi_font">GRAPHENE THERMAL PAD</span>
278
+                                                            <p class="mb-0 fs-9">Memory Speed</p>
279
+                                                            <p class="satoshi_font fs-9 mb-0">4900 MHz</p>
280 280
                                                         </li>
281 281
                                                     </ul>
282 282
                                                     <div class="card-body text-center">

Ładowanie…
Anuluj
Zapisz