Browse Source

cambie el nombre del tab de arriba y los nombres en los searchbars

carlos.diaz44 4 years ago
parent
commit
a37b6d7dac

+ 8
- 4
.idea/workspace.xml View File

@@ -96,13 +96,17 @@
96 96
     <servers />
97 97
   </component>
98 98
   <component name="WindowStateProjectService">
99
-    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1600557814931">
99
+    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1601055392605">
100 100
       <screen x="0" y="0" width="1920" height="1053" />
101 101
     </state>
102
-    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1600557814931" />
103
-    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog" timestamp="1600557633060">
102
+    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1601055392605" />
103
+    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog" timestamp="1601055351725">
104 104
       <screen x="0" y="0" width="1920" height="1053" />
105 105
     </state>
106
-    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1600557633060" />
106
+    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1601055351725" />
107
+    <state x="632" y="275" key="run.anything.popup" timestamp="1601055384225">
108
+      <screen x="0" y="0" width="1920" height="1053" />
109
+    </state>
110
+    <state x="632" y="275" key="run.anything.popup/0.0.1920.1053@0.0.1920.1053" timestamp="1601055384225" />
107 111
   </component>
108 112
 </project>

+ 1
- 1
platforms/android/app/src/main/assets/www/artesano.html View File

@@ -54,7 +54,7 @@
54 54
 
55 55
         document.write("<a href='mailto:" + json[i]["E-mail"] + "'>" + "<h2 align='center'>" + json[i]["E-mail"] + "</h2>" + "</a>");
56 56
 
57
-
57
+        console.log("SE CORRE");
58 58
 
59 59
     });
60 60
 

BIN
platforms/android/app/src/main/assets/www/img/MySpace.png View File


BIN
platforms/android/app/src/main/assets/www/img/internet.jpg View File


+ 43
- 12
platforms/android/app/src/main/assets/www/index.html View File

@@ -53,13 +53,12 @@
53 53
 
54 54
       <script type="text/javascript" src="js/saveLocal.js"></script>
55 55
 
56
-      <script> console.log(window.localStorage.getItem("MADERA")); </script>
57 56
 
58 57
 
59
-        <ons-navigator swipeable animation="slide" id="myNavigator">
58
+
60 59
            <ons-page>
61 60
             <ons-toolbar>
62
-                <div class="center">Directorio Artesanal</div>
61
+                <div class="center">Artesanias PR</div>
63 62
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
64 63
             </ons-toolbar>
65 64
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
@@ -230,7 +229,7 @@
230 229
 
231 230
                             //info a pasar
232 231
                             //'title':'${Artesano.Nombre}','esp': '${info}'
233
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', redes: '${Artesano["E-Commerce1"]}', esp: '${Artesano.Especificacion}' } })" tappable>
232
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
234 233
                         <div class="title">${Artesano.Nombre}</div>
235 234
                     </ons-list-item>`);
236 235
 
@@ -367,9 +366,10 @@
367 366
                                      mun = lot[0],
368 367
                                      tel = lot[1],
369 368
                                      email = lot[2],
370
-                                     esp = lot[3];
369
+                                     esp = lot[3],
370
+                                     redes = lot[4];
371 371
 
372
-                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
372
+                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
373 373
                              }
374 374
 
375 375
 
@@ -475,13 +475,14 @@
475 475
         </script>
476 476
 
477 477
         <template id="search.html">
478
+          <ons-navigator swipeable animation="slide" id="SNavigator">
478 479
             <ons-page id="Buscar">
479 480
                 <p style="text-align: center; margin-top: 10px;">
480
-                    <ons-search-input placeholder="Search anything" id = "searchbar"
481
+                    <ons-search-input placeholder="Busqueda en cualquiera" id = "searchbar"
481 482
                         onkeyup = "filter()"></ons-search-input>
482
-                    <ons-search-input placeholder="Tipo de artesania" id = "searchartesania"
483
+                    <ons-search-input placeholder="Busqueda por artesanias" id = "searchartesania"
483 484
                         onkeyup = "filter()"></ons-search-input>
484
-                    <ons-search-input placeholder = "Municipio" id = "searchbarmunicipio"
485
+                    <ons-search-input placeholder = "Busqueda por municipio" id = "searchbarmunicipio"
485 486
                         onkeyup = "filter()"></ons-search-input>
486 487
                 </p>
487 488
 
@@ -491,7 +492,7 @@
491 492
                 <script>
492 493
                     for (i = 0; i < all_artesanos.length;i++){
493 494
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
494
-                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
495
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
495 496
                         <div>${all_artesanos[i].Nombre}</div>
496 497
                     </ons-list-item>`);
497 498
                         // var artesano = ons.createElement(`
@@ -525,7 +526,8 @@
525 526
                             mun = this.data.mun,
526 527
                             tel = this.data.tel,
527 528
                             em = this.data.email,
528
-                            esp = this.data.esp;
529
+                            esp = this.data.esp,
530
+                            redes = this.data.redes;
529 531
 
530 532
                         email = em.slice(0, em.search("#"));
531 533
                         if(esp.trim() != ""){
@@ -555,6 +557,34 @@
555 557
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
556 558
                         }
557 559
 
560
+                        console.log("Redes: "+redes);
561
+
562
+                        if(redes.includes("facebook")){
563
+
564
+                            console.log(redes.substring(1,redes.length-2));
565
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
566
+                        }
567
+                        else if(redes.includes("instagram")){
568
+                            console.log(redes.substring(1,redes.length-2));
569
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
570
+                        }
571
+                        else if(redes.includes("myspace")){
572
+                            console.log(redes.substring(1,redes.length-2));
573
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
574
+                        }
575
+                        else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
576
+                            redes = redes.substr(redes.indexOf("#")+1,redes.length);
577
+                            redes = redes.substr(0, redes.length-1);
578
+                            console.log(redes);
579
+                            data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
580
+                        }
581
+                        else if(redes.includes("#") || redes.includes("mailto")){
582
+                            console.log("tiene un disparate");
583
+                        } else {
584
+                            console.log("no tiene nada");
585
+                        }
586
+
587
+
558 588
                         document.getElementById("all").innerHTML = `${data}`;
559 589
 
560 590
                     }
@@ -565,6 +595,7 @@
565 595
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
566 596
 
567 597
         <template id="renglones.html">
598
+          <ons-navigator swipeable animation="slide" id="myNavigator">
568 599
             <ons-page id="renglones">
569 600
 
570 601
             <!--div class="search-bar">
@@ -679,4 +710,4 @@
679 710
         <script type="text/javascript" src="cordova.js"></script>
680 711
         <script type="text/javascript" src="js/index.js"></script>
681 712
     </body>
682
-</html>
713
+</html>

+ 4
- 4
www/index.html View File

@@ -58,7 +58,7 @@
58 58
 
59 59
            <ons-page>
60 60
             <ons-toolbar>
61
-                <div class="center">Directorio Artesanal</div>
61
+                <div class="center">Artesanias PR</div>
62 62
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
63 63
             </ons-toolbar>
64 64
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
@@ -478,11 +478,11 @@
478 478
           <ons-navigator swipeable animation="slide" id="SNavigator">
479 479
             <ons-page id="Buscar">
480 480
                 <p style="text-align: center; margin-top: 10px;">
481
-                    <ons-search-input placeholder="Search anything" id = "searchbar"
481
+                    <ons-search-input placeholder="Busqueda en cualquiera" id = "searchbar"
482 482
                         onkeyup = "filter()"></ons-search-input>
483
-                    <ons-search-input placeholder="Tipo de artesania" id = "searchartesania"
483
+                    <ons-search-input placeholder="Busqueda por artesanias" id = "searchartesania"
484 484
                         onkeyup = "filter()"></ons-search-input>
485
-                    <ons-search-input placeholder = "Municipio" id = "searchbarmunicipio"
485
+                    <ons-search-input placeholder = "Busqueda por municipio" id = "searchbarmunicipio"
486 486
                         onkeyup = "filter()"></ons-search-input>
487 487
                 </p>
488 488