Browse Source

Cambios en nombres

Christian Matos 3 years ago
parent
commit
b8ce011dc7
35 changed files with 204 additions and 61 deletions
  1. BIN
      platforms/android/app/src/main/assets/www/img/BARRO.jpg
  2. BIN
      platforms/android/app/src/main/assets/www/img/CRISTAL.jpg
  3. BIN
      platforms/android/app/src/main/assets/www/img/CUERO.jpg
  4. BIN
      platforms/android/app/src/main/assets/www/img/Cerámica, Lizzette Aponte, Trujillo Alto.jpg
  5. BIN
      platforms/android/app/src/main/assets/www/img/FIBRAS.jpg
  6. BIN
      platforms/android/app/src/main/assets/www/img/HIGÜERA.jpg
  7. BIN
      platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg
  8. BIN
      platforms/android/app/src/main/assets/www/img/JUGUETES TRADICIONALES.jpg
  9. BIN
      platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg
  10. BIN
      platforms/android/app/src/main/assets/www/img/MADERA.jpg
  11. BIN
      platforms/android/app/src/main/assets/www/img/METAL.jpg
  12. BIN
      platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg
  13. BIN
      platforms/android/app/src/main/assets/www/img/TABACOS.jpg
  14. BIN
      platforms/android/app/src/main/assets/www/img/TEXTILES.jpg
  15. BIN
      platforms/android/app/src/main/assets/www/img/internet.jpg
  16. BIN
      platforms/android/app/src/main/assets/www/img/linkedin.png
  17. 35
    0
      platforms/android/app/src/main/assets/www/img/sfpr.svg
  18. 72
    23
      platforms/android/app/src/main/assets/www/index.html
  19. 2
    2
      platforms/android/app/src/main/assets/www/js/azar.js
  20. 4
    0
      platforms/android/app/src/main/assets/www/js/renglones.js
  21. 2
    0
      platforms/android/app/src/main/assets/www/js/saveLocal.js
  22. 1
    1
      platforms/android/app/src/main/res/values/strings.xml
  23. 1
    1
      platforms/android/app/src/main/res/xml/config.xml
  24. 28
    13
      platforms/browser/www/index.html
  25. 4
    0
      platforms/browser/www/js/renglones.js
  26. 2
    0
      platforms/browser/www/js/saveLocal.js
  27. BIN
      platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate
  28. 2
    2
      platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist
  29. 1
    1
      platforms/ios/www/css/index.css
  30. 10
    5
      platforms/ios/www/index.html
  31. 4
    0
      platforms/ios/www/js/renglones.js
  32. 2
    0
      platforms/ios/www/js/saveLocal.js
  33. 28
    13
      www/index.html
  34. 4
    0
      www/js/renglones.js
  35. 2
    0
      www/js/saveLocal.js

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


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


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


BIN
platforms/android/app/src/main/assets/www/img/Cerámica, Lizzette Aponte, Trujillo Alto.jpg View File


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


BIN
platforms/android/app/src/main/assets/www/img/HIGÜERA.jpg View File


BIN
platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg View File


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


BIN
platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg View File


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


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


BIN
platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg View File


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


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


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


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


+ 35
- 0
platforms/android/app/src/main/assets/www/img/sfpr.svg View File

1
+<svg xmlns="http://www.w3.org/2000/svg" width="13.714in" height="8.712in" viewBox="0 0 987.427 627.239">
2
+  <g>
3
+    <path d="M275.659,273.4c19.821,0,35.89-14.958,35.89-33.409s-16.069-33.408-35.89-33.408-35.89,14.957-35.89,33.408S255.837,273.4,275.659,273.4Z" fill="#facf2a"/>
4
+    <path d="M165.04,335.473c-19.176,0-34.722,14.47-34.722,32.32s15.546,32.32,34.722,32.32,34.721-14.47,34.721-32.32S184.216,335.473,165.04,335.473Z" fill="#facf2a"/>
5
+    <path d="M313.209,350.705c-.556-11.734-5.391-21.775-12.831-30.548-22.758-26.833-108.187-91.651-89.857-111.282.052-.056.012-.15.012-.226-.017-.218-.056-.423-.066-.645-20.8-2.466-41.02,1.883-56.256,14.025-13.063,10.411-18.633,23.862-15.757,40.525,2.078,12.037,8,22.081,15.709,31.367,18.455,22.232,81.184,77.285,81.184,98.668a30.763,30.763,0,0,1-.619,6.027c.069.363.151.716.208,1.087,7.978-.425,15.758-.6,23.489-1.3,13.845-1.252,26.778-5.4,38.068-13.694C307.9,376.322,313.891,365.1,313.209,350.705Z" fill="#facf2a"/>
6
+    <g>
7
+      <path d="M489.532,130.939c-18.977,0-34.361,14.319-34.361,31.985s15.384,31.985,34.361,31.985,34.362-14.32,34.362-31.985S508.51,130.939,489.532,130.939Z" fill="#599eba"/>
8
+      <path d="M445.309,132.3c-18.014.262-36.451,2.836-52.637,11.383-12.973,6.851-22.867,16.461-27.829,30.613-2.58,7.361-2.962,14.96-2.987,22.63-.01,3.182,0,6.364,0,10.208H332.524v22.627h29.353V398.409h83.432V229.377h26.139V207.06H445.309Z" fill="#599eba"/>
9
+    </g>
10
+    <g>
11
+      <path d="M822.747,207.765c-18.977,0-34.361,14.32-34.361,31.986s15.384,31.985,34.361,31.985,34.361-14.32,34.361-31.985S841.724,207.765,822.747,207.765Z" fill="#5a863c"/>
12
+      <path d="M774.2,249.335c-4.962-14.151-14.856-23.76-27.829-30.612-16.186-8.548-33.7-11.121-51.709-11.382a12.965,12.965,0,0,0-2.251.472c0,24.475-.313,114.646-.313,190.884,20.546,0,59.221.487,85.068.487,0-76.5.031-124.036.021-127.219C777.166,264.3,776.784,256.7,774.2,249.335Z" fill="#5a863c"/>
13
+    </g>
14
+    <g>
15
+      <path d="M577.022,249.335c-4.962-14.151-14.856-23.76-27.829-30.612-16.186-8.548-33.695-11.121-51.709-11.382a12.99,12.99,0,0,0-2.252.472c0,24.475-.312,211.762-.312,288,22.855,0,62.107.486,85.067.486,0-76.5.032-221.152.022-224.335C579.984,264.3,579.6,256.7,577.022,249.335Z" fill="#e65f25"/>
16
+      <path d="M590.362,207.869V395.193c39.525-1.74,85.366-39.736,84.614-95.207C674.237,245.575,627.354,208.983,590.362,207.869Z" fill="#e65f25"/>
17
+    </g>
18
+    <g>
19
+      <path d="M142.725,446.577l-3.071-.86c-2.512-.7-3.632-2.024-3.632-4.3s1.756-3.763,4.473-3.763a4.448,4.448,0,0,1,4.593,3.876l.062.279H148.8l-.05-.4c-.587-4.646-3.594-7.311-8.251-7.311-4.771,0-8.1,3.009-8.1,7.32a7.663,7.663,0,0,0,5.761,7.791l3.332.937c2.783.774,3.971,2.047,3.971,4.258,0,2.415-1.7,3.8-4.661,3.8-2.791,0-4.779-1.9-5.188-4.968l-.042-.308h-3.649l.028.382c.382,5.134,3.856,8.452,8.851,8.452,5.192,0,8.291-2.75,8.291-7.358C149.085,450.405,146.945,447.771,142.725,446.577Z" fill="#231f20"/>
20
+      <polygon points="155.723 438.027 161.75 438.027 161.75 457.832 155.723 457.832 155.723 461.387 171.368 461.387 171.368 457.832 165.342 457.832 165.342 438.027 171.368 438.027 171.368 434.473 155.723 434.473 155.723 438.027" fill="#231f20"/>
21
+      <polygon points="191.52 454.049 180.932 434.473 177.483 434.473 177.483 461.387 181.075 461.387 181.075 441.811 191.663 461.387 195.112 461.387 195.112 434.473 191.52 434.473 191.52 454.049" fill="#231f20"/>
22
+      <polygon points="202.312 461.387 205.905 461.387 205.905 449.558 215.3 449.558 215.3 446.003 205.905 446.003 205.905 438.027 217.921 438.027 217.921 434.473 202.312 434.473 202.312 461.387" fill="#231f20"/>
23
+      <polygon points="224.034 438.027 230.061 438.027 230.061 457.832 224.034 457.832 224.034 461.387 239.68 461.387 239.68 457.832 233.654 457.832 233.654 438.027 239.68 438.027 239.68 434.473 224.034 434.473 224.034 438.027" fill="#231f20"/>
24
+      <polygon points="259.831 454.049 249.244 434.473 245.794 434.473 245.794 461.387 249.387 461.387 249.387 441.811 259.975 461.387 263.424 461.387 263.424 434.473 259.831 434.473 259.831 454.049" fill="#231f20"/>
25
+      <polygon points="269.95 461.387 285.559 461.387 285.559 457.831 273.543 457.831 273.543 449.558 282.938 449.558 282.938 446.003 273.543 446.003 273.543 438.027 285.559 438.027 285.559 434.473 269.95 434.473 269.95 461.387" fill="#231f20"/>
26
+      <path d="M302.118,446.577l-3.071-.86c-2.511-.7-3.631-2.025-3.631-4.3s1.755-3.763,4.472-3.763a4.449,4.449,0,0,1,4.594,3.876l.062.279h3.646l-.051-.4c-.586-4.646-3.594-7.311-8.251-7.311-4.771,0-8.1,3.009-8.1,7.32a7.665,7.665,0,0,0,5.76,7.791l3.333.937c2.783.773,3.97,2.046,3.97,4.258,0,2.414-1.7,3.8-4.66,3.8-2.791,0-4.78-1.9-5.188-4.967l-.042-.308h-3.65l.028.382c.382,5.133,3.857,8.451,8.852,8.451,5.191,0,8.291-2.75,8.291-7.357C308.479,450.405,306.338,447.771,302.118,446.577Z" fill="#231f20"/>
27
+      <path d="M323.82,434.473H315v26.914h3.6V451.206h5.222c5.684,0,8.814-2.972,8.814-8.368S329.5,434.473,323.82,434.473Zm5.146,8.365c0,2.194-.893,4.81-5.146,4.81H318.6v-9.621h5.222C328.073,438.027,328.966,440.644,328.966,442.838Z" fill="#231f20"/>
28
+      <path d="M354.806,442.015c0-3.647-2.08-7.542-7.917-7.542h-9.264v26.914h3.592V449.521h3.6l6.961,11.866h4.157l-7.052-12.03C352.6,448.658,354.806,445.948,354.806,442.015Zm-3.631,0c0,2.444-1.682,4.024-4.286,4.024h-5.672v-8.012h5.672C349.533,438.027,351.175,439.556,351.175,442.015Z" fill="#231f20"/>
29
+      <rect x="366.16" y="456.743" width="4.641" height="4.644" fill="#231f20"/>
30
+      <path d="M391.232,434.1c-5.355,0-8.814,3.622-8.814,9.227v9.208c0,5.606,3.459,9.228,8.814,9.228s8.815-3.622,8.815-9.228v-9.208C400.047,437.72,396.587,434.1,391.232,434.1Zm5.222,9.227v9.208c0,3.5-2,5.67-5.222,5.67a4.943,4.943,0,0,1-4.185-1.994l9.376-13.587C396.444,442.854,396.454,443.09,396.454,443.325Zm-10.444,9.208v-9.208c0-3.5,2-5.67,5.222-5.67a4.9,4.9,0,0,1,4.508,2.514l-9.584,13.888A7.727,7.727,0,0,1,386.01,452.533Z" fill="#231f20"/>
31
+      <path d="M423.118,442.015c0-3.647-2.08-7.542-7.918-7.542h-9.264v26.913h3.593V449.521h3.6l6.961,11.865h4.157l-7.053-12.029C420.914,448.657,423.118,445.947,423.118,442.015Zm-3.631,0c0,2.444-1.683,4.024-4.287,4.024h-5.671v-8.012H415.2C417.844,438.027,419.487,439.556,419.487,442.015Z" fill="#231f20"/>
32
+      <path d="M436.492,446.749v3.558h5.578v2.226c0,3.5-2,5.67-5.222,5.67s-5.222-2.173-5.222-5.67v-9.208c0-3.5,2-5.67,5.222-5.67a4.986,4.986,0,0,1,5.187,4.951l.028.326h3.586l-.022-.377c-.307-5.138-3.753-8.457-8.779-8.457-5.355,0-8.815,3.622-8.815,9.227v9.208c0,5.606,3.46,9.228,8.815,9.228s8.816-3.622,8.816-9.228v-5.784Z" fill="#231f20"/>
33
+    </g>
34
+  </g>
35
+</svg>

+ 72
- 23
platforms/android/app/src/main/assets/www/index.html View File

41
         <meta name="format-detection" content="telephone=no">
41
         <meta name="format-detection" content="telephone=no">
42
         <meta name="msapplication-tap-highlight" content="no">
42
         <meta name="msapplication-tap-highlight" content="no">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44
+        <meta charset="UTF-8">
44
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
47
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52
     </head>
53
     </head>
53
     <body>
54
     <body>
54
 
55
 
55
-
56
+        <script> 
57
+        
58
+        
59
+        
60
+        </script>
56
 
61
 
57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
62
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58
            <ons-page>
63
            <ons-page>
59
             <ons-toolbar>
64
             <ons-toolbar>
60
-                <div class="center">Artesanias PR</div>
65
+                <div class="center">ArtesaníasICP</div>
61
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
66
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
62
             </ons-toolbar>
67
             </ons-toolbar>
63
             <!--The tabbar is the place where the user can get acces to the different sections of the app-->
68
             <!--The tabbar is the place where the user can get acces to the different sections of the app-->
64
             <!--Each tab will hace a page name (which we use to reference and define them later one), then we have a laber, this is what will be used as a name for that page in the tabbar-->
69
             <!--Each tab will hace a page name (which we use to reference and define them later one), then we have a laber, this is what will be used as a name for that page in the tabbar-->
65
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
70
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
66
-                <ons-tab page="home.html" label="Hogar" active></ons-tab>
67
-                <ons-tab page="renglones.html" label="Artesanías"></ons-tab>
68
-                <ons-tab page ="search.html" label="Buscar"> </ons-tab>
69
-                <!--<ons-tab page="ferias.html" label="Eventos"></ons-tab>-->
70
-                <ons-tab page="instituto.html" label="Colab"></ons-tab>
71
+                <ons-tab page="home.html" label="Hogar" icon = "md-home" active></ons-tab>
72
+                <ons-tab page="renglones.html" label="Artesanías" icon = "fa-paint-brush"></ons-tab>
73
+                <ons-tab page ="search.html" label="Buscar" icon = "fa-search"> </ons-tab>
74
+                <ons-tab page ="ferias.html" label="Eventos" icon = "fa-calendar-alt"> </ons-tab>
75
+                <ons-tab page="colaboradores.html" label="Colab" icon = "fa-users"></ons-tab>
71
             </ons-tabbar>
76
             </ons-tabbar>
72
         </ons-page>
77
         </ons-page>
73
 
78
 
219
                 <div class="center" >${Artesano.Nombre}</div>
224
                 <div class="center" >${Artesano.Nombre}</div>
220
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
225
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
226
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223
                                                  </div>
228
                                                  </div>
224
               </ons-list-item>`
229
               </ons-list-item>`
225
                                                     );
230
                                                     );
242
                             if (Artesano["Telefono 1"].trim().length != 0) {
247
                             if (Artesano["Telefono 1"].trim().length != 0) {
243
                                 cont ++;
248
                                 cont ++;
244
                             }
249
                             }
245
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246
                                 cont ++;
251
                                 cont ++;
247
                             }
252
                             }
248
                             if (Artesano.Especificacion.trim().length != 0) {
253
                             if (Artesano.Especificacion.trim().length != 0) {
254
                             //'title':'${Artesano.Nombre}','esp': '${info}'
259
                             //'title':'${Artesano.Nombre}','esp': '${info}'
255
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
260
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
256
                             //And puts this into the 'item' variable
261
                             //And puts this into the 'item' variable
257
-                            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>
262
+                            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["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
258
                         <div class="title">${Artesano.Nombre}</div>
263
                         <div class="title">${Artesano.Nombre}</div>
259
                     </ons-list-item>`);
264
                     </ons-list-item>`);
260
 
265
 
362
 
367
 
363
                                  //if(Esp[num] in artesanos_json.) {}
368
                                  //if(Esp[num] in artesanos_json.) {}
364
                                  Artesanos+=`${results[i].Nombre}|`
369
                                  Artesanos+=`${results[i].Nombre}|`
365
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
370
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
371
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367
                              }
372
                              }
368
 
373
 
398
                                  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>`;
403
                                  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>`;
399
                              }
404
                              }
400
 
405
 
406
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
407
+                                 Artesania.name = "Figuras y símbolos indígenas";
408
+                             } 
409
+
410
+                             console.log(Artesania.name);
401
 
411
 
402
                              return ons.createElement(`
412
                              return ons.createElement(`
403
               <ons-list-item expandable tappable>
413
               <ons-list-item expandable tappable>
537
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
547
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
538
                     for (i = 0; i < all_artesanos.length;i++){
548
                     for (i = 0; i < all_artesanos.length;i++){
539
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
549
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
540
-                        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>
550
+                        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]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
541
                         <div>${all_artesanos[i].Nombre}</div>
551
                         <div>${all_artesanos[i].Nombre}</div>
542
                     </ons-list-item>`);
552
                     </ons-list-item>`);
543
                         document.getElementById('results').appendChild(artesano);
553
                         document.getElementById('results').appendChild(artesano);
699
 
709
 
700
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
710
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
701
 
711
 
702
-        <!--<template id="ferias.html">
712
+        <template id="ferias.html">
703
             <ons-page id="ferias">
713
             <ons-page id="ferias">
704
                 <!--<ons-card>
714
                 <!--<ons-card>
705
 
715
 
708
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
718
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
709
                 </div>
719
                 </div>
710
 
720
 
711
-                </ons-card>--
721
+                </ons-card>-->
712
                 <br><br><br>
722
                 <br><br><br>
713
                 <button onclick="redirect()">Pasar a la pagina de eventos</button>
723
                 <button onclick="redirect()">Pasar a la pagina de eventos</button>
714
 
724
 
718
               }
728
               }
719
               </script>
729
               </script>
720
             </ons-page>
730
             </ons-page>
721
-        </template>-->
731
+        </template>
722
 
732
 
723
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
733
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
724
 
734
 
725
-        <template id="instituto.html">
726
-            <ons-page id="instituto">
735
+        <template id="colaboradores.html">
736
+            <ons-page id="colaboradores">
727
                 <ons-card>
737
                 <ons-card>
728
 
738
 
729
                     <h1>Colaboradores</h1>
739
                     <h1>Colaboradores</h1>
744
                         Directorio Artesanal Cultural PR <img src="img/gobierno.png" style="width:35px;height:35px;border:0;">
754
                         Directorio Artesanal Cultural PR <img src="img/gobierno.png" style="width:35px;height:35px;border:0;">
745
                         <br><br>
755
                         <br><br>
746
                     </body>
756
                     </body>
757
+                    
747
 
758
 
748
 
759
 
749
-
750
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
760
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
751
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
761
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
752
-                    </a>
762
+                    </a> 
753
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
763
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
754
                     </a>
764
                     </a>
755
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
765
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
756
                     </a>
766
                     </a>
757
                     <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
767
                     <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
758
                     </a>
768
                     </a>
759
-
769
+                    
760
                     <br><br><br>
770
                     <br><br><br>
761
                     <button onclick="redirect()">Pasar a la pagina de eventos</button>
771
                     <button onclick="redirect()">Pasar a la pagina de eventos</button>
762
 
772
 
765
                             location.replace("https://facebook.com/icppr")
775
                             location.replace("https://facebook.com/icppr")
766
                         }
776
                         }
767
                     </script>
777
                     </script>
768
-
778
+                    
769
                     <br><br>
779
                     <br><br>
780
+                    <style>
781
+                        .column {
782
+                            float: left;
783
+                            width: 50%;
784
+                        }
785
+                        .row {
786
+                            width: 100%;
787
+                        }
788
+                    </style>
770
                     <h2>SINFINESPR</h2>
789
                     <h2>SINFINESPR</h2>
790
+                    <div class = "column">
791
+                        SINFINESPR es un programa de Titín Foundation que responde a nuestro interés y compromiso con el fortalecimiento del tercer sector.
792
+                        <br><br>
793
+                        En esta plataforma agrupamos herramientas que permitirán que tu organización adquiera mayor visibilidad, recursos, conexiones, capacidad para una operación más eficiente y efectiva.
794
+                        <br><br>
795
+                        Saludos Cordiales,
796
+                                Aziria
797
+                    </div>   
798
+                    <div class = "column"> 
799
+                        <img src="img/sfpr.svg" style="width:150px;height:100px">
800
+                    </div>
801
+                    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
802
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
803
+                    <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
804
+                    </a>
805
+                    <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
806
+                    </a>
807
+                    <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
808
+                    </a>
809
+                    <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
810
+                    </a>
811
+                    <br><br>
812
+                    <h2>Centro de Desarrollo y Consultoria Computacional</h2>
813
+                    El Centro de Desarrollo y Consultoría Computacional está compuesto por profesores y estudiantes del departamento de Ciencia de Cómputos de la Universidad de Puerto Rico Recinto de Río Piedras. Nuestra meta es aportar al desarrollo computacional de la Universidad y de Puerto Rico al proveer servicios al día, de calidad y con precios accesibles, a la misma vez que se le ofrece experiencias prácticas a los estudiantes del departamento de Ciencia de Cómputos.
771
                     <br><br>
814
                     <br><br>
772
-                    <h2>Fundación Titín</h2>
815
+                    Si tiene alguna duda nos puede conactar por:
816
+                    <br>
817
+                    Teléfono: 787-764-0000 Ext. 88341, 88349
818
+                    <br>
819
+                    o
820
+                    <br>
821
+                    Correo electrónico: <a href = "mailto:carlos.corrada2@upr.edu" style ="color:#0000EE;text-decoration: underline;">carlos.corrada2@upr.edu</a>
773
 
822
 
774
                 </ons-card>
823
                 </ons-card>
775
             </ons-page>
824
             </ons-page>

+ 2
- 2
platforms/android/app/src/main/assets/www/js/azar.js View File

7
 
7
 
8
 var aleatorio = Math.floor(Math.random()*52);
8
 var aleatorio = Math.floor(Math.random()*52);
9
 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
9
 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
10
-document.getElementById("Content").innerHTML = data[aleatorio].titulo + "<br>" + data[aleatorio].texto; 
10
+document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto; 
11
 
11
 
12
 page.addEventListener("show", function(event){
12
 page.addEventListener("show", function(event){
13
     document.getElementById("image").innerHTML='';
13
     document.getElementById("image").innerHTML='';
17
     //var img = ons.createElement(`<img src="img/${aleatorio}.png">`);
17
     //var img = ons.createElement(`<img src="img/${aleatorio}.png">`);
18
     document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
18
     document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
19
     //document.getElementById("Title").innerHTML = data[aleatorio].Renglones;
19
     //document.getElementById("Title").innerHTML = data[aleatorio].Renglones;
20
-    document.getElementById("Content").innerHTML = data[aleatorio].titulo + "<br>" + data[aleatorio].texto;
20
+    document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto;
21
     //azar.appendChild(img);
21
     //azar.appendChild(img);
22
     });
22
     });
23
 
23
 

+ 4
- 0
platforms/android/app/src/main/assets/www/js/renglones.js View File

7
           var renglonLower = info[i].Renglones.toLowerCase()
7
           var renglonLower = info[i].Renglones.toLowerCase()
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
 
9
 
10
+          if (renglonCap == "Metal") {
11
+                  renglonCap = "Joyería y orfebrería"
12
+          }
13
+
10
 
14
 
11
 
15
 
12
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
16
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/android/app/src/main/assets/www/js/saveLocal.js View File

41
   } catch {
41
   } catch {
42
     console.log("error");
42
     console.log("error");
43
   }
43
   }
44
+
45
+  

+ 1
- 1
platforms/android/app/src/main/res/values/strings.xml View File

1
 <?xml version='1.0' encoding='utf-8'?>
1
 <?xml version='1.0' encoding='utf-8'?>
2
 <resources>
2
 <resources>
3
-    <string name="app_name">HelloCordova</string>
3
+    <string name="app_name">ArtesaníasICP</string>
4
     <string name="launcher_name">@string/app_name</string>
4
     <string name="launcher_name">@string/app_name</string>
5
     <string name="activity_name">@string/launcher_name</string>
5
     <string name="activity_name">@string/launcher_name</string>
6
 </resources>
6
 </resources>

+ 1
- 1
platforms/android/app/src/main/res/xml/config.xml View File

4
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
4
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
5
         <param name="onload" value="true" />
5
         <param name="onload" value="true" />
6
     </feature>
6
     </feature>
7
-    <name>HelloCordova</name>
7
+    <name>ArtesaníasICP</name>
8
     <description>
8
     <description>
9
         A sample Apache Cordova application that responds to the deviceready event.
9
         A sample Apache Cordova application that responds to the deviceready event.
10
     </description>
10
     </description>

+ 28
- 13
platforms/browser/www/index.html View File

41
         <meta name="format-detection" content="telephone=no">
41
         <meta name="format-detection" content="telephone=no">
42
         <meta name="msapplication-tap-highlight" content="no">
42
         <meta name="msapplication-tap-highlight" content="no">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44
+        <meta charset="UTF-8">
44
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
47
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52
     </head>
53
     </head>
53
     <body>
54
     <body>
54
 
55
 
55
-
56
+        <script> 
57
+        
58
+        
59
+        
60
+        </script>
56
 
61
 
57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
62
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58
            <ons-page>
63
            <ons-page>
219
                 <div class="center" >${Artesano.Nombre}</div>
224
                 <div class="center" >${Artesano.Nombre}</div>
220
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
225
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
226
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223
                                                  </div>
228
                                                  </div>
224
               </ons-list-item>`
229
               </ons-list-item>`
225
                                                     );
230
                                                     );
242
                             if (Artesano["Telefono 1"].trim().length != 0) {
247
                             if (Artesano["Telefono 1"].trim().length != 0) {
243
                                 cont ++;
248
                                 cont ++;
244
                             }
249
                             }
245
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246
                                 cont ++;
251
                                 cont ++;
247
                             }
252
                             }
248
                             if (Artesano.Especificacion.trim().length != 0) {
253
                             if (Artesano.Especificacion.trim().length != 0) {
249
                                 cont ++;
254
                                 cont ++;
250
                             }
255
                             }
251
-
256
+                            
257
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
252
 
258
 
253
                             //info a pasar
259
                             //info a pasar
254
                             //'title':'${Artesano.Nombre}','esp': '${info}'
260
                             //'title':'${Artesano.Nombre}','esp': '${info}'
255
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
261
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
256
                             //And puts this into the 'item' variable
262
                             //And puts this into the 'item' variable
257
-                            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>
263
+                            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["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
258
                         <div class="title">${Artesano.Nombre}</div>
264
                         <div class="title">${Artesano.Nombre}</div>
259
                     </ons-list-item>`);
265
                     </ons-list-item>`);
260
 
266
 
361
                              for(var i=0; i<results.length; i++) {
367
                              for(var i=0; i<results.length; i++) {
362
 
368
 
363
                                  //if(Esp[num] in artesanos_json.) {}
369
                                  //if(Esp[num] in artesanos_json.) {}
370
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
364
                                  Artesanos+=`${results[i].Nombre}|`
371
                                  Artesanos+=`${results[i].Nombre}|`
365
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
372
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
373
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367
                              }
374
                              }
368
 
375
 
396
                                      redes = lot[4];
403
                                      redes = lot[4];
397
 
404
 
398
                                  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>`;
405
                                  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>`;
406
+                                 console.log(listaArt)
399
                              }
407
                              }
400
 
408
 
409
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
410
+                                 Artesania.name = "Figuras y símbolos indígenas";
411
+                             } 
412
+
413
+                             console.log(Artesania.name);
401
 
414
 
402
                              return ons.createElement(`
415
                              return ons.createElement(`
403
               <ons-list-item expandable tappable>
416
               <ons-list-item expandable tappable>
536
                     //This is basically declaring what we refer to as informacion in the filter() function
549
                     //This is basically declaring what we refer to as informacion in the filter() function
537
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
550
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
538
                     for (i = 0; i < all_artesanos.length;i++){
551
                     for (i = 0; i < all_artesanos.length;i++){
552
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
539
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
553
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
540
-                        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>
554
+                        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]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
541
                         <div>${all_artesanos[i].Nombre}</div>
555
                         <div>${all_artesanos[i].Nombre}</div>
542
                     </ons-list-item>`);
556
                     </ons-list-item>`);
543
                         document.getElementById('results').appendChild(artesano);
557
                         document.getElementById('results').appendChild(artesano);
572
                             em = this.data.email,
586
                             em = this.data.email,
573
                             esp = this.data.esp,
587
                             esp = this.data.esp,
574
                             redes = this.data.redes;
588
                             redes = this.data.redes;
589
+                    
575
 
590
 
576
                         //here the email is the string made from the start to where the '#' is.
591
                         //here the email is the string made from the start to where the '#' is.
577
-                        email = em.slice(0, em.search("#"));
592
+                        
578
 
593
 
579
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
594
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
580
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
595
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
597
 
612
 
598
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
613
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
599
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
614
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
600
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
601
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
615
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
616
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
602
                         }
617
                         }
603
 
618
 
604
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
619
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
747
                     
762
                     
748
 
763
 
749
 
764
 
750
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
765
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
751
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
766
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
752
-                    </a>
767
+                    </a> 
753
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
768
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
754
                     </a>
769
                     </a>
755
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
770
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
789
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
804
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
790
                     </div>
805
                     </div>
791
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
806
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
792
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
807
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
793
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
808
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
794
                     </a>
809
                     </a>
795
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
810
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
platforms/browser/www/js/renglones.js View File

7
           var renglonLower = info[i].Renglones.toLowerCase()
7
           var renglonLower = info[i].Renglones.toLowerCase()
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
 
9
 
10
+          if (renglonCap == "Metal") {
11
+                  renglonCap = "Joyería y orfebrería"
12
+          }
13
+
10
 
14
 
11
 
15
 
12
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
16
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/browser/www/js/saveLocal.js View File

41
   } catch {
41
   } catch {
42
     console.log("error");
42
     console.log("error");
43
   }
43
   }
44
+
45
+  

BIN
platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate View File


+ 2
- 2
platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist View File

7
 		<key>Cordova.xcscheme_^#shared#^_</key>
7
 		<key>Cordova.xcscheme_^#shared#^_</key>
8
 		<dict>
8
 		<dict>
9
 			<key>orderHint</key>
9
 			<key>orderHint</key>
10
-			<integer>2</integer>
10
+			<integer>1</integer>
11
 		</dict>
11
 		</dict>
12
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
12
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
13
 		<dict>
13
 		<dict>
14
 			<key>orderHint</key>
14
 			<key>orderHint</key>
15
-			<integer>1</integer>
15
+			<integer>2</integer>
16
 		</dict>
16
 		</dict>
17
 	</dict>
17
 	</dict>
18
 </dict>
18
 </dict>

+ 1
- 1
platforms/ios/www/css/index.css View File

32
     margin:0px;
32
     margin:0px;
33
     padding:0px;
33
     padding:0px;
34
     /* Padding to avoid the "unsafe" areas behind notches in the screen */
34
     /* Padding to avoid the "unsafe" areas behind notches in the screen */
35
-    padding: env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-right, 0px);
35
+    padding: env(safe-area-inset-top, 10px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 10px) env(safe-area-inset-right, 0px);
36
     text-transform:none;
36
     text-transform:none;
37
     width:100%;
37
     width:100%;
38
 }
38
 }

+ 10
- 5
platforms/ios/www/index.html View File

41
         <meta name="format-detection" content="telephone=no">
41
         <meta name="format-detection" content="telephone=no">
42
         <meta name="msapplication-tap-highlight" content="no">
42
         <meta name="msapplication-tap-highlight" content="no">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44
+        <meta charset="UTF-8">
44
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
47
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52
     </head>
53
     </head>
53
     <body>
54
     <body>
54
 
55
 
55
-
56
+        <script> 
57
+        
58
+        
59
+        
60
+        </script>
56
 
61
 
57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
62
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58
            <ons-page>
63
            <ons-page>
726
             <ons-page id="colaboradores">
731
             <ons-page id="colaboradores">
727
                 <ons-card>
732
                 <ons-card>
728
 
733
 
729
-                    <h1>Colaboradoress</h1>
734
+                    <h1>Colaboradores</h1>
730
                     <h2>Instituto de Cultura Puertorriqueña</h2>
735
                     <h2>Instituto de Cultura Puertorriqueña</h2>
731
                     <h3>Ven, descubre lo que nuestra riqueza cultural puertorriqueña tiene para tí.<br> Disfrútala, es tu identidad.
736
                     <h3>Ven, descubre lo que nuestra riqueza cultural puertorriqueña tiene para tí.<br> Disfrútala, es tu identidad.
732
                     </h3>
737
                     </h3>
747
                     
752
                     
748
 
753
 
749
 
754
 
750
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
755
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
751
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
756
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
752
-                    </a>
757
+                    </a> 
753
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
758
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
754
                     </a>
759
                     </a>
755
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
760
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
789
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
794
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
790
                     </div>
795
                     </div>
791
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
796
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
792
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
797
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
793
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
798
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
794
                     </a>
799
                     </a>
795
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
800
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
platforms/ios/www/js/renglones.js View File

7
           var renglonLower = info[i].Renglones.toLowerCase()
7
           var renglonLower = info[i].Renglones.toLowerCase()
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
 
9
 
10
+          if (renglonCap == "Metal") {
11
+                  renglonCap = "Joyería y orfebrería"
12
+          }
13
+
10
 
14
 
11
 
15
 
12
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
16
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/ios/www/js/saveLocal.js View File

41
   } catch {
41
   } catch {
42
     console.log("error");
42
     console.log("error");
43
   }
43
   }
44
+
45
+  

+ 28
- 13
www/index.html View File

41
         <meta name="format-detection" content="telephone=no">
41
         <meta name="format-detection" content="telephone=no">
42
         <meta name="msapplication-tap-highlight" content="no">
42
         <meta name="msapplication-tap-highlight" content="no">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
43
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44
+        <meta charset="UTF-8">
44
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" type="text/css" href="css/index.css">
45
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
47
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52
     </head>
53
     </head>
53
     <body>
54
     <body>
54
 
55
 
55
-
56
+        <script> 
57
+        
58
+        
59
+        
60
+        </script>
56
 
61
 
57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
62
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58
            <ons-page>
63
            <ons-page>
219
                 <div class="center" >${Artesano.Nombre}</div>
224
                 <div class="center" >${Artesano.Nombre}</div>
220
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
225
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
226
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223
                                                  </div>
228
                                                  </div>
224
               </ons-list-item>`
229
               </ons-list-item>`
225
                                                     );
230
                                                     );
242
                             if (Artesano["Telefono 1"].trim().length != 0) {
247
                             if (Artesano["Telefono 1"].trim().length != 0) {
243
                                 cont ++;
248
                                 cont ++;
244
                             }
249
                             }
245
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246
                                 cont ++;
251
                                 cont ++;
247
                             }
252
                             }
248
                             if (Artesano.Especificacion.trim().length != 0) {
253
                             if (Artesano.Especificacion.trim().length != 0) {
249
                                 cont ++;
254
                                 cont ++;
250
                             }
255
                             }
251
-
256
+                            
257
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
252
 
258
 
253
                             //info a pasar
259
                             //info a pasar
254
                             //'title':'${Artesano.Nombre}','esp': '${info}'
260
                             //'title':'${Artesano.Nombre}','esp': '${info}'
255
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
261
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
256
                             //And puts this into the 'item' variable
262
                             //And puts this into the 'item' variable
257
-                            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>
263
+                            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["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
258
                         <div class="title">${Artesano.Nombre}</div>
264
                         <div class="title">${Artesano.Nombre}</div>
259
                     </ons-list-item>`);
265
                     </ons-list-item>`);
260
 
266
 
361
                              for(var i=0; i<results.length; i++) {
367
                              for(var i=0; i<results.length; i++) {
362
 
368
 
363
                                  //if(Esp[num] in artesanos_json.) {}
369
                                  //if(Esp[num] in artesanos_json.) {}
370
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
364
                                  Artesanos+=`${results[i].Nombre}|`
371
                                  Artesanos+=`${results[i].Nombre}|`
365
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
372
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
373
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367
                              }
374
                              }
368
 
375
 
396
                                      redes = lot[4];
403
                                      redes = lot[4];
397
 
404
 
398
                                  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>`;
405
                                  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>`;
406
+                                 console.log(listaArt)
399
                              }
407
                              }
400
 
408
 
409
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
410
+                                 Artesania.name = "Figuras y símbolos indígenas";
411
+                             } 
412
+
413
+                             console.log(Artesania.name);
401
 
414
 
402
                              return ons.createElement(`
415
                              return ons.createElement(`
403
               <ons-list-item expandable tappable>
416
               <ons-list-item expandable tappable>
536
                     //This is basically declaring what we refer to as informacion in the filter() function
549
                     //This is basically declaring what we refer to as informacion in the filter() function
537
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
550
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
538
                     for (i = 0; i < all_artesanos.length;i++){
551
                     for (i = 0; i < all_artesanos.length;i++){
552
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
539
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
553
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
540
-                        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>
554
+                        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]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
541
                         <div>${all_artesanos[i].Nombre}</div>
555
                         <div>${all_artesanos[i].Nombre}</div>
542
                     </ons-list-item>`);
556
                     </ons-list-item>`);
543
                         document.getElementById('results').appendChild(artesano);
557
                         document.getElementById('results').appendChild(artesano);
572
                             em = this.data.email,
586
                             em = this.data.email,
573
                             esp = this.data.esp,
587
                             esp = this.data.esp,
574
                             redes = this.data.redes;
588
                             redes = this.data.redes;
589
+                    
575
 
590
 
576
                         //here the email is the string made from the start to where the '#' is.
591
                         //here the email is the string made from the start to where the '#' is.
577
-                        email = em.slice(0, em.search("#"));
592
+                        
578
 
593
 
579
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
594
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
580
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
595
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
597
 
612
 
598
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
613
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
599
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
614
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
600
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
601
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
615
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
616
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
602
                         }
617
                         }
603
 
618
 
604
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
619
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
747
                     
762
                     
748
 
763
 
749
 
764
 
750
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
765
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
751
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
766
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
752
-                    </a>
767
+                    </a> 
753
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
768
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
754
                     </a>
769
                     </a>
755
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
770
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
789
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
804
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
790
                     </div>
805
                     </div>
791
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
806
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
792
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
807
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
793
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
808
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
794
                     </a>
809
                     </a>
795
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
810
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
www/js/renglones.js View File

7
           var renglonLower = info[i].Renglones.toLowerCase()
7
           var renglonLower = info[i].Renglones.toLowerCase()
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
8
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
 
9
 
10
+          if (renglonCap == "Metal") {
11
+                  renglonCap = "Joyería y orfebrería"
12
+          }
13
+
10
 
14
 
11
 
15
 
12
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
16
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
www/js/saveLocal.js View File

41
   } catch {
41
   } catch {
42
     console.log("error");
42
     console.log("error");
43
   }
43
   }
44
+
45
+