Changes

platforms/android/app/src/main/assets/www/index.html

@@ -53,6 +53,9 @@
 
       <script type="text/javascript" src="js/saveLocal.js"></script>
 
+
+
+
         <ons-navigator swipeable animation="slide" id="myNavigator">
            <ons-page>
             <ons-toolbar>
@@ -114,8 +117,10 @@
                     ons.getScriptPage().onInit = function () {
                         this.querySelector('ons-toolbar div.center').textContent = this.data.title;
 
+                        console.log("test");
+
                         //var File = this.data.title.toUpperCase() + '.json' ;
-                        var Esp = this.data.esp.split(', ');
+                        var Esp = this.data.esp.split(';');
                         var artesanos_json = this.data.json;
 
                         //Convertir en mayuscula primera letra del string.
@@ -155,7 +160,7 @@
                             var searchVal = "my Name";
                             for (var i=0 ; i < artesanos_json.length ; i++)
                             {
-                                if (artesanos_json[i].Especificaciones.includes(Esp[num])) {
+                                if (artesanos_json[i].Especificaciones1.includes(Esp[num])) {
                                     results.push(artesanos_json[i]);
                                 }
                             }
@@ -193,8 +198,8 @@
               <ons-list-item expandable tappable>
                 <div class="center" >${Artesano.Nombre}</div>
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
-                                                 Tel\u00e9fono: ${Artesano["Tel\u00e9fono 1"]}<br>
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
+                                                 Tel\u00e9fono: ${Artesano["Telefono1"]}<br>
+                                                 Correo Electr\u00f3nico: ${Artesano["E-mail1"]}<br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -212,20 +217,20 @@
                             if (Artesano.Municipio.trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["Tel\u00e9fono 1"].trim().length != 0) {
+                            if (Artesano["Telefono1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["E-mail"].trim().length != 0) {
+                            if (Artesano["E-mail1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano.Especificaciones.trim().length != 0) {
+                            if (Artesano.Especificaciones1.trim().length != 0) {
                                 cont ++;
                             }
 
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Tel\u00e9fono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificaciones}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono1"]}', email: '${Artesano["E-mail1"]}', esp: '${Artesano.Especificaciones1}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -319,7 +324,7 @@
                              var searchVal = "my Name";
                              for (var i=0 ; i < artesanos_json.length ; i++)
                              {
-                                 if (artesanos_json[i].Especificaciones1.includes(Esp[num])) {
+                                 if (artesanos_json[i].Especificaciones.includes(Esp[num])) {
                                      results.push(artesanos_json[i]);
                                  }
                              }
@@ -332,7 +337,7 @@
 
                                  //if(Esp[num] in artesanos_json.) {}
                                  Artesanos+=`${results[i].Nombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Tel\u00e9fono1"]}|${results[i]["E-mail"]}|${results[i].Especificaciones}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Tel\u00e9fono 1"]}|${results[i]["E-mail"]}|${results[i].Especificaciones}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -449,9 +454,7 @@
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
 
         <script>
-
-            var todos = window.localStorage.getItem("TODOS");
-
+            var Madera = JSON.parse(window.localStorage.getItem("TODOS"));
             function filter(){
 
 
@@ -468,17 +471,17 @@
                 var x = document.getElementsByClassName('artists');
                 input = input.trim().toLowerCase();
                 if (input.length == 0){
-                    for (i = 0; todos.length; i++){
+                    for (i = 0; Madera.length; i++){
                         x[i].style.display = "list-item";
                     }
                 }
                 else{
                     var foundesp = 0;
-                    for (i = 0; i < todos.length; i++){
+                    for (i = 0; i < Madera.length; i++){
                         console.log("damn")
                         //try checking the especificacion first
-                        var especificaciones = todos[i].Especificaciones1;
-                        especificaciones = especificaciones.split(',');
+                        var especificaciones = Madera[i].Especificaciones1;
+                        especificaciones = especificaciones.split(';');
                         for (var j = 0; j < especificaciones.length; j++){
                             var especificacion = especificaciones[j];
                             especificacion = especificacion.trim().toLowerCase();
@@ -499,9 +502,9 @@
                             input[i] = input[i].charAt(0).toUpperCase() + input[i].slice(1);
                         }
                         console.log(input);
-                        for(var i = 0; i < todos.length; i++){
+                        for(var i = 0; i < Madera.length; i++){
                             count = 0;
-                            artist = todos[i].Nombre.trim().split(' ');
+                            artist = Madera[i].Nombre.trim().split(' ');
                             for (k = 0; k < input.length; k++){
                                 for (var l = 0; l < artist.length; l++){
                                     if(artist[l] == input[k]){
@@ -532,10 +535,10 @@
                 </ons-list>
 
                 <script>
-                    for (i = 0; i < todos.length;i++){
+                    for (i = 0; i < Madera.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${todos[i].Nombre}', mun: '${todos[i].Municipio}', tel: '${todos[i]["Tel\u00e9fono 1"]}', email: '${todos[i]["E-mail"]}', esp: '${todos[i].Especificaciones}' } })" tappable>
-                        <div>${todos[i].Nombre}</div>
+                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${Madera[i].Nombre}', mun: '${Madera[i].Municipio}', tel: '${Madera[i]["Telefono1"]}', email: '${Madera[i]["E-mail1"]}', esp: '${Madera[i].Especificaciones1}' } })" tappable>
+                        <div>${Madera[i].Nombre}</div>
                     </ons-list-item>`);
                         // var artesano = ons.createElement(`
                         //   <ons-list-item class = "artists">

platforms/android/app/src/main/assets/www/js/azar.js

@@ -1,17 +1,17 @@
 var request = new XMLHttpRequest()
 
                         request.open('GET', 'json/azar.json', true)
-    
+
                         request.onload = function() {
                             // begin accessing JSON data here
                             var data = JSON.parse(this.response)
-                            
+
                             var page = document.getElementById("home");
-                            
+
                                 var aleatorio = Math.floor(Math.random()*32);
                                 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
                                 document.getElementById("Content").innerHTML = data[aleatorio].Renglones + "<br>" + data[aleatorio].Artesano + "<br>" + data[aleatorio].Municipio;
-                          
+
                             page.addEventListener("show", function(event){
                                 document.getElementById("image").innerHTML='';
                                 document.getElementById("Content").innerHTML='';
@@ -23,7 +23,7 @@ var request = new XMLHttpRequest()
                                 document.getElementById("Content").innerHTML = data[aleatorio].Renglones + "<br>" + data[aleatorio].Artesano + "<br>" + data[aleatorio].Municipio;
                                 //azar.appendChild(img);
                             });
-                            
+
                             }
-    
-request.send() 
+
+request.send()

platforms/android/app/src/main/assets/www/js/renglones.js

@@ -1,8 +1,9 @@
 var info = JSON.parse(window.localStorage.getItem("RENGLONES"));
-
+console.log("TEST!!!");
 var list = document.getElementById("list");
 
-  for (var i = 0; i < info.length; i++) {
+console.log(info.length);
+  for (var i = 0; i < info.length(); i++) {
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
                       <div class="center">${info[i].Renglones}</div>

platforms/android/app/src/main/assets/www/js/saveLocal.js

@@ -13,7 +13,7 @@ function loadFile(filePath) {
 
 
 function checkDate() {
-  var date = loadFile("https://artesaniaspr.online/date.txt");
+  var date = loadFile("https://136.145.181.12/date.txt");
   if (window.localStorage.getItem("DATE") == null || window.localStorage.getItem("DATE") != date) {
   window.localStorage.setItem("DATE", date);
     return false;
@@ -27,13 +27,13 @@ function checkDate() {
 try {
   if (checkDate() == false) {
 
-    window.localStorage.setItem("RENGLONES", loadFile("https://artesaniaspr.online/renglones.json"));
-    window.localStorage.setItem("TODOS", loadFile("https://artesaniaspr.online/artesanias.json"))
+    window.localStorage.setItem("RENGLONES", loadFile("https://136.145.181.12/renglones.json"));
+    window.localStorage.setItem("TODOS", loadFile("https://136.145.181.12/artesanias.json"))
 
     var renglones = JSON.parse(window.localStorage.getItem("RENGLONES"));
 
     for (var i = 0; i < renglones.length; i++) {
-      window.localStorage.setItem(renglones[i].Renglones, loadFile("https://artesaniaspr.online/" + renglones[i].Renglones + ".json"));
+      window.localStorage.setItem(renglones[i].Renglones, loadFile("https://136.145.181.12/" + renglones[i].Renglones + ".json"));
     }
   }
   } catch {

platforms/browser/www/index.html

@@ -51,9 +51,7 @@
     </head>
     <body>
 
-      <script type="text/javascript" src="js/saveLocal.js"></script>
-
-
+      <script type="text/javascript" src="js/saveLocal.js">console.log("DATA: "+window.localStorage.getItem("DATE"));</script>
 
 
         <ons-navigator swipeable animation="slide" id="myNavigator">

platforms/browser/www/js/renglones.js

@@ -1,12 +1,9 @@
 var info = JSON.parse(window.localStorage.getItem("RENGLONES"));
-
-
-
+console.log("TEST!!!");
 var list = document.getElementById("list");
 
-  for (var i = 0; i < info.length; i++) {
-
-          
+console.log(info.length);
+  for (var i = 0; i < info.length(); i++) {
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
                       <div class="center">${info[i].Renglones}</div>

www/index.html

@@ -51,9 +51,7 @@
     </head>
     <body>
 
-      <script type="text/javascript" src="js/saveLocal.js"></script>
-
-
+      <script type="text/javascript" src="js/saveLocal.js">console.log("DATA: "+window.localStorage.getItem("DATE"));</script>
 
 
         <ons-navigator swipeable animation="slide" id="myNavigator">

www/js/renglones.js

@@ -1,12 +1,9 @@
 var info = JSON.parse(window.localStorage.getItem("RENGLONES"));
-
-
-
+console.log("TEST!!!");
 var list = document.getElementById("list");
 
-  for (var i = 0; i < info.length; i++) {
-
-          
+console.log(info.length);
+  for (var i = 0; i < info.length(); i++) {
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
                       <div class="center">${info[i].Renglones}</div>