Selaa lähdekoodia

Added the appropriate pictures that Jessabet wanted for Artesanias section, and changed the width of the Searchbars to 300px so that the descriptions fit in them

carlos.diaz44 3 vuotta sitten
vanhempi
commit
031d6672ee
36 muutettua tiedostoa jossa 161 lisäystä ja 52 poistoa
  1. BIN
      platforms/android/app/src/main/assets/www/.index.html.swp
  2. BIN
      platforms/android/app/src/main/assets/www/img/BARRO.jpg
  3. BIN
      platforms/android/app/src/main/assets/www/img/CRISTAL.jpg
  4. BIN
      platforms/android/app/src/main/assets/www/img/CUERO.jpg
  5. BIN
      platforms/android/app/src/main/assets/www/img/Cerámica, Lizzette Aponte, Trujillo Alto.jpg
  6. BIN
      platforms/android/app/src/main/assets/www/img/FIBRAS.jpg
  7. BIN
      platforms/android/app/src/main/assets/www/img/HIGÜERA.jpg
  8. BIN
      platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg
  9. BIN
      platforms/android/app/src/main/assets/www/img/JUGUETES TRADICIONALES.jpg
  10. BIN
      platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg
  11. BIN
      platforms/android/app/src/main/assets/www/img/MADERA.jpg
  12. BIN
      platforms/android/app/src/main/assets/www/img/METAL.jpg
  13. BIN
      platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg
  14. BIN
      platforms/android/app/src/main/assets/www/img/PAPEL.jpg
  15. BIN
      platforms/android/app/src/main/assets/www/img/TABACOS.jpg
  16. BIN
      platforms/android/app/src/main/assets/www/img/TEXTILES.jpg
  17. BIN
      platforms/android/app/src/main/assets/www/img/internet.jpg
  18. BIN
      platforms/android/app/src/main/assets/www/img/linkedin.png
  19. 35
    0
      platforms/android/app/src/main/assets/www/img/sfpr.svg
  20. 82
    32
      platforms/android/app/src/main/assets/www/index.html
  21. 4
    4
      platforms/android/app/src/main/assets/www/js/azar.js
  22. 25
    1
      platforms/android/app/src/main/assets/www/js/searchfunctions.js
  23. 1
    1
      platforms/android/app/src/main/res/values/strings.xml
  24. 1
    1
      platforms/android/app/src/main/res/xml/config.xml
  25. BIN
      www/img/BARRO.jpg
  26. BIN
      www/img/CRISTAL.jpg
  27. BIN
      www/img/CUERO.jpg
  28. BIN
      www/img/FIBRAS.jpg
  29. BIN
      www/img/INSTRUMENTOS TÍPICOS.jpg
  30. BIN
      www/img/JUGUETES TRADICIONALES.jpg
  31. BIN
      www/img/LABORES EN AGUJA.jpg
  32. BIN
      www/img/METAL.jpg
  33. BIN
      www/img/MÁSCARAS.jpg
  34. BIN
      www/img/PAPEL.jpg
  35. BIN
      www/img/TABACOS.jpg
  36. 13
    13
      www/index.html

BIN
platforms/android/app/src/main/assets/www/.index.html.swp Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/BARRO.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/CRISTAL.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/CUERO.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/Cerámica, Lizzette Aponte, Trujillo Alto.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/FIBRAS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/HIGÜERA.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/JUGUETES TRADICIONALES.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/MADERA.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/METAL.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/PAPEL.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/TABACOS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/TEXTILES.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/internet.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/linkedin.png Näytä tiedosto


+ 35
- 0
platforms/android/app/src/main/assets/www/img/sfpr.svg Näytä tiedosto

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>

+ 82
- 32
platforms/android/app/src/main/assets/www/index.html Näytä tiedosto

57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
57
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58
            <ons-page>
58
            <ons-page>
59
             <ons-toolbar>
59
             <ons-toolbar>
60
-                <div class="center">Artesanias PR</div>
60
+                <div class="center">ArtesaníasICP</div>
61
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
61
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
62
             </ons-toolbar>
62
             </ons-toolbar>
63
             <!--The tabbar is the place where the user can get acces to the different sections of the app-->
63
             <!--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-->
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-->
65
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
65
             <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>
66
+                <ons-tab page="home.html" label="Hogar" icon = "md-home" active></ons-tab>
67
+                <ons-tab page="renglones.html" label="Artesanías" icon = "fa-paint-brush"></ons-tab>
68
+                <ons-tab page ="search.html" label="Buscar" icon = "fa-search"> </ons-tab>
69
+                <ons-tab page ="ferias.html" label="Eventos" icon = "fa-calendar-alt"> </ons-tab>
70
+                <ons-tab page="colaboradores.html" label="Colab" icon = "fa-users"></ons-tab>
71
             </ons-tabbar>
71
             </ons-tabbar>
72
         </ons-page>
72
         </ons-page>
73
 
73
 
81
                 <ons-card id="azar"><!--style="height: 100%"-->
81
                 <ons-card id="azar"><!--style="height: 100%"-->
82
 
82
 
83
                     <!--<div class="title" id="Title"></div>-->
83
                     <!--<div class="title" id="Title"></div>-->
84
-                    <div id="image"></div><br>
84
+                    <div id="image" style= "max-height:500px"></div><br>
85
                     <div class="content" id="Content"></div>
85
                     <div class="content" id="Content"></div>
86
                     <!--This javascript will randomly choose an image and information of a certain type of artesania used by a certain artists-->
86
                     <!--This javascript will randomly choose an image and information of a certain type of artesania used by a certain artists-->
87
                     <!--For now all this information is stored inside a .csv file-->
87
                     <!--For now all this information is stored inside a .csv file-->
254
                             //'title':'${Artesano.Nombre}','esp': '${info}'
254
                             //'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)
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)
256
                             //And puts this into the 'item' variable
256
                             //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>
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"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
258
                         <div class="title">${Artesano.Nombre}</div>
258
                         <div class="title">${Artesano.Nombre}</div>
259
                     </ons-list-item>`);
259
                     </ons-list-item>`);
260
 
260
 
362
 
362
 
363
                                  //if(Esp[num] in artesanos_json.) {}
363
                                  //if(Esp[num] in artesanos_json.) {}
364
                                  Artesanos+=`${results[i].Nombre}|`
364
                                  Artesanos+=`${results[i].Nombre}|`
365
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
365
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367
                              }
367
                              }
368
 
368
 
393
                                      tel = lot[1],
393
                                      tel = lot[1],
394
                                      email = lot[2],
394
                                      email = lot[2],
395
                                      esp = lot[3],
395
                                      esp = lot[3],
396
-                                     redes = lot[4];
396
+                                     redes = lot[4],
397
+                                     tecnicas = lot[5];
397
 
398
 
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>`;
399
+                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}', tecnicas: '${tecnicas}' }} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
399
                              }
400
                              }
400
 
401
 
401
 
402
 
521
                     The third searchbar is to find by the municipio where the artists works or lives
522
                     The third searchbar is to find by the municipio where the artists works or lives
522
                 -->
523
                 -->
523
                 <p style="text-align: center; margin-top: 10px;">
524
                 <p style="text-align: center; margin-top: 10px;">
524
-                    <ons-search-input placeholder="Busqueda en cualquiera" id = "searchbar"
525
-                        onkeyup = "filter()"></ons-search-input>
526
-                    <ons-search-input placeholder="Busqueda por artesanias" id = "searchartesania"
527
-                        onkeyup = "filter()"></ons-search-input>
528
-                    <ons-search-input placeholder = "Busqueda por municipio" id = "searchbarmunicipio"
529
-                        onkeyup = "filter()"></ons-search-input>
525
+                    <ons-search-input placeholder="Búsqueda con cualquier término" id = "searchbar"
526
+                        onkeyup = "filter()" style = "width: 300px;" ></ons-search-input>
527
+                    <ons-search-input placeholder="Búsqueda por artesanias" id = "searchartesania"
528
+                        onkeyup = "filter()" style = "width: 300px;"></ons-search-input>
529
+                    <ons-search-input placeholder = "Búsqueda por municipio" id = "searchbarmunicipio"
530
+                        onkeyup = "filter()" style = "width: 300px;"></ons-search-input>
530
                 </p>
531
                 </p>
531
 
532
 
532
                 <ons-list id="results" src="">
533
                 <ons-list id="results" src="">
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.
538
                     //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++){
539
                     for (i = 0; i < all_artesanos.length;i++){
539
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
540
                         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>
541
+                        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"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
541
                         <div>${all_artesanos[i].Nombre}</div>
542
                         <div>${all_artesanos[i].Nombre}</div>
542
                     </ons-list-item>`);
543
                     </ons-list-item>`);
543
                         document.getElementById('results').appendChild(artesano);
544
                         document.getElementById('results').appendChild(artesano);
571
                             tel = this.data.tel,
572
                             tel = this.data.tel,
572
                             em = this.data.email,
573
                             em = this.data.email,
573
                             esp = this.data.esp,
574
                             esp = this.data.esp,
574
-                            redes = this.data.redes;
575
+                            redes = this.data.redes,
576
+                            tecnicas = this.data.tecnicas;
575
 
577
 
576
                         //here the email is the string made from the start to where the '#' is.
578
                         //here the email is the string made from the start to where the '#' is.
577
                         email = em.slice(0, em.search("#"));
579
                         email = em.slice(0, em.search("#"));
582
                         if(esp.trim() != ""){
584
                         if(esp.trim() != ""){
583
                             if(esp.includes(";", 0)){
585
                             if(esp.includes(";", 0)){
584
                                 esp=esp.replace(/;/g,", ");
586
                                 esp=esp.replace(/;/g,", ");
585
-                                data+='Tipos de artesanias: '+esp+'<br>';
587
+                                data+='Tipos de artesanías: '+esp+'<br>';
586
                             }
588
                             }
587
                             else {
589
                             else {
588
-                                data+='Tipo de artesania: '+esp+'<br>';
590
+                                data+='Tipo de artesanía: '+esp+'<br>';
589
                             }
591
                             }
590
                         }
592
                         }
591
 
593
 
594
+                        if(tecnicas.trim() != ''){
595
+                            if(tecnicas.includes(";", 0)){
596
+                                tecnicas = tecnicas.replace(/;/g,", ");
597
+                                data+='Técnicas que usan: '+tecnicas+'<br>';
598
+                            }
599
+                            else {
600
+                                data+='Técnicas que usan: '+tecnicas+'<br>';
601
+                            }
602
+                        }
592
                         //console.log("Las redes son..."+this.data.redes);
603
                         //console.log("Las redes son..."+this.data.redes);
593
                         //Here it's making sure theres something in municipio and writing their municipio into the page
604
                         //Here it's making sure theres something in municipio and writing their municipio into the page
594
                         if(mun.trim() != ""){
605
                         if(mun.trim() != ""){
699
 
710
 
700
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
711
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
701
 
712
 
702
-        <!--<template id="ferias.html">
713
+        <template id="ferias.html">
703
             <ons-page id="ferias">
714
             <ons-page id="ferias">
704
                 <!--<ons-card>
715
                 <!--<ons-card>
705
 
716
 
708
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
719
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
709
                 </div>
720
                 </div>
710
 
721
 
711
-                </ons-card>--
722
+                </ons-card>-->
712
                 <br><br><br>
723
                 <br><br><br>
713
-                <button onclick="redirect()">Pasar a la pagina de eventos</button>
724
+                <button onclick="redirect()">Pasar a la página de eventos</button>
714
 
725
 
715
               <script>
726
               <script>
716
               function redirect() {
727
               function redirect() {
718
               }
729
               }
719
               </script>
730
               </script>
720
             </ons-page>
731
             </ons-page>
721
-        </template>-->
732
+        </template>
722
 
733
 
723
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
734
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
724
 
735
 
725
-        <template id="instituto.html">
726
-            <ons-page id="instituto">
736
+        <template id="colaboradores.html">
737
+            <ons-page id="colaboradores">
727
                 <ons-card>
738
                 <ons-card>
728
 
739
 
729
                     <h1>Colaboradores</h1>
740
                     <h1>Colaboradores</h1>
744
                         Directorio Artesanal Cultural PR <img src="img/gobierno.png" style="width:35px;height:35px;border:0;">
755
                         Directorio Artesanal Cultural PR <img src="img/gobierno.png" style="width:35px;height:35px;border:0;">
745
                         <br><br>
756
                         <br><br>
746
                     </body>
757
                     </body>
747
-
758
+                    
748
 
759
 
749
 
760
 
750
                     Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
761
                     Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
756
                     </a>
767
                     </a>
757
                     <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
768
                     <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
758
                     </a>
769
                     </a>
759
-
770
+                    
760
                     <br><br><br>
771
                     <br><br><br>
761
-                    <button onclick="redirect()">Pasar a la pagina de eventos</button>
772
+                    <button onclick="redirect()">Pasar a la página de eventos</button>
762
 
773
 
763
                     <script>
774
                     <script>
764
                         function redirect() {
775
                         function redirect() {
765
                             location.replace("https://facebook.com/icppr")
776
                             location.replace("https://facebook.com/icppr")
766
                         }
777
                         }
767
                     </script>
778
                     </script>
768
-
779
+                    
769
                     <br><br>
780
                     <br><br>
781
+                    <style>
782
+                        .column {
783
+                            float: left;
784
+                            width: 50%;
785
+                        }
786
+                        .row {
787
+                            width: 100%;
788
+                        }
789
+                    </style>
770
                     <h2>SINFINESPR</h2>
790
                     <h2>SINFINESPR</h2>
791
+                    <div class = "column">
792
+                        SINFINESPR es un programa de Titín Foundation que responde a nuestro interés y compromiso con el fortalecimiento del tercer sector.
793
+                        <br><br>
794
+                        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.
795
+                        <br><br>
796
+                        Saludos Cordiales,
797
+                                Aziria
798
+                    </div>   
799
+                    <div class = "column"> 
800
+                        <img src="img/sfpr.svg" style="width:150px;height:100px">
801
+                    </div>
802
+                    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
803
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
804
+                    <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
805
+                    </a>
806
+                    <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
807
+                    </a>
808
+                    <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
809
+                    </a>
810
+                    <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
811
+                    </a>
812
+                    <br><br>
813
+                    <h2>Centro de Desarrollo y Consultoría Computacional</h2>
814
+                    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>
815
                     <br><br>
772
-                    <h2>Fundación Titín</h2>
816
+                    Si tiene alguna duda nos puede contactar por:
817
+                    <br>
818
+                    Teléfono: 787-764-0000 Ext. 88341, 88349
819
+                    <br>
820
+                    o
821
+                    <br>
822
+                    Correo electrónico: <a href = "mailto:carlos.corrada2@upr.edu" style ="color:#0000EE;text-decoration: underline;">carlos.corrada2@upr.edu</a>
773
 
823
 
774
                 </ons-card>
824
                 </ons-card>
775
             </ons-page>
825
             </ons-page>

+ 4
- 4
platforms/android/app/src/main/assets/www/js/azar.js Näytä tiedosto

6
 var page = document.getElementById("home");
6
 var page = document.getElementById("home");
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">`;
10
-document.getElementById("Content").innerHTML = data[aleatorio].titulo + "<br>" + data[aleatorio].texto; 
9
+document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="auto">`;
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='';
15
     var aleatorio = Math.floor(Math.random()*32);
15
     var aleatorio = Math.floor(Math.random()*32);
16
     //var azar = document.getElementById("azar");
16
     //var azar = document.getElementById("azar");
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="auto">`;
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
 

+ 25
- 1
platforms/android/app/src/main/assets/www/js/searchfunctions.js Näytä tiedosto

53
             x[i].style.display = "list-item";
53
             x[i].style.display = "list-item";
54
             continue;
54
             continue;
55
         }
55
         }
56
+        else if (find_tecnicas(i,input)){
57
+            x[i].style.display = "list-item";
58
+            continue;
59
+        }
56
         else if (find_artesania(i,input)){
60
         else if (find_artesania(i,input)){
57
             x[i].style.display = "list-item";
61
             x[i].style.display = "list-item";
58
             continue;
62
             continue;
76
 //Te trata de buscar si cualquiera de ellos tienen el input que se dio aplica a ese artista especifico (i)
80
 //Te trata de buscar si cualquiera de ellos tienen el input que se dio aplica a ese artista especifico (i)
77
 function find_any(i,input){
81
 function find_any(i,input){
78
     //if you find any of these in that space then return 1 if you didnt find that anything matched with the input then return 0
82
     //if you find any of these in that space then return 1 if you didnt find that anything matched with the input then return 0
79
-    if (find_name(i,input) || find_telefono(i,input) || find_email(i,input) || find_artesania(i,input) || find_municipio(i,input)){
83
+    if (find_tecnicas(i,input) || find_name(i,input) || find_telefono(i,input) || find_email(i,input) || find_artesania(i,input) || find_municipio(i,input)){
80
         return 1;
84
         return 1;
81
     }
85
     }
82
     else{
86
     else{
117
     return 0;
121
     return 0;
118
 }
122
 }
119
 
123
 
124
+
125
+function find_tecnicas(i,input){
126
+    var tecnicas = all_artesanos[i]["Tecnica 1"];
127
+    tecnicas = tecnicas.trim().toLowerCase();
128
+    tecnicas = acento_replace(tecnicas);
129
+    if(tecnicas.search(input) != -1){
130
+        return 1;
131
+    }
132
+    //artesanias = artesanias.split(',');
133
+    //for (var j = 0; j < artesanias.length; j++){
134
+        //var artesania = artesanias[j];
135
+        //artesania = artesania.trim().toLowerCase();
136
+        //artesania = acento_replace(artesania);
137
+        //if (artesania.search(input) != -1){
138
+            //return 1;
139
+        //}
140
+    //}
141
+    return 0;
142
+}
143
+
120
 //trata de ver si el input es parte del municipio del artista i
144
 //trata de ver si el input es parte del municipio del artista i
121
 //Mayuscula y acento proof
145
 //Mayuscula y acento proof
122
 function find_municipio(i,input){
146
 function find_municipio(i,input){

+ 1
- 1
platforms/android/app/src/main/res/values/strings.xml Näytä tiedosto

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 Näytä tiedosto

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>

BIN
www/img/BARRO.jpg Näytä tiedosto


BIN
www/img/CRISTAL.jpg Näytä tiedosto


BIN
www/img/CUERO.jpg Näytä tiedosto


BIN
www/img/FIBRAS.jpg Näytä tiedosto


BIN
www/img/INSTRUMENTOS TÍPICOS.jpg Näytä tiedosto


BIN
www/img/JUGUETES TRADICIONALES.jpg Näytä tiedosto


BIN
www/img/LABORES EN AGUJA.jpg Näytä tiedosto


BIN
www/img/METAL.jpg Näytä tiedosto


BIN
www/img/MÁSCARAS.jpg Näytä tiedosto


BIN
www/img/PAPEL.jpg Näytä tiedosto


BIN
www/img/TABACOS.jpg Näytä tiedosto


+ 13
- 13
www/index.html Näytä tiedosto

362
 
362
 
363
                                  //if(Esp[num] in artesanos_json.) {}
363
                                  //if(Esp[num] in artesanos_json.) {}
364
                                  Artesanos+=`${results[i].Nombre}|`
364
                                  Artesanos+=`${results[i].Nombre}|`
365
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
365
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
366
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367
                              }
367
                              }
368
 
368
 
522
                     The third searchbar is to find by the municipio where the artists works or lives
522
                     The third searchbar is to find by the municipio where the artists works or lives
523
                 -->
523
                 -->
524
                 <p style="text-align: center; margin-top: 10px;">
524
                 <p style="text-align: center; margin-top: 10px;">
525
-                    <ons-search-input placeholder="Busqueda en cualquiera" id = "searchbar"
526
-                        onkeyup = "filter()"></ons-search-input>
527
-                    <ons-search-input placeholder="Busqueda por artesanias" id = "searchartesania"
528
-                        onkeyup = "filter()"></ons-search-input>
529
-                    <ons-search-input placeholder = "Busqueda por municipio" id = "searchbarmunicipio"
530
-                        onkeyup = "filter()"></ons-search-input>
525
+                    <ons-search-input placeholder="Búsqueda con cualquier término" id = "searchbar"
526
+                        onkeyup = "filter()" style = "width: 300px;" ></ons-search-input>
527
+                    <ons-search-input placeholder="Búsqueda por artesanias" id = "searchartesania"
528
+                        onkeyup = "filter()" style = "width: 300px;"></ons-search-input>
529
+                    <ons-search-input placeholder = "Búsqueda por municipio" id = "searchbarmunicipio"
530
+                        onkeyup = "filter()" style = "width: 300px;"></ons-search-input>
531
                 </p>
531
                 </p>
532
 
532
 
533
                 <ons-list id="results" src="">
533
                 <ons-list id="results" src="">
584
                         if(esp.trim() != ""){
584
                         if(esp.trim() != ""){
585
                             if(esp.includes(";", 0)){
585
                             if(esp.includes(";", 0)){
586
                                 esp=esp.replace(/;/g,", ");
586
                                 esp=esp.replace(/;/g,", ");
587
-                                data+='Tipos de artesanias: '+esp+'<br>';
587
+                                data+='Tipos de artesanías: '+esp+'<br>';
588
                             }
588
                             }
589
                             else {
589
                             else {
590
-                                data+='Tipo de artesania: '+esp+'<br>';
590
+                                data+='Tipo de artesanía: '+esp+'<br>';
591
                             }
591
                             }
592
                         }
592
                         }
593
 
593
 
721
 
721
 
722
                 </ons-card>-->
722
                 </ons-card>-->
723
                 <br><br><br>
723
                 <br><br><br>
724
-                <button onclick="redirect()">Pasar a la pagina de eventos</button>
724
+                <button onclick="redirect()">Pasar a la página de eventos</button>
725
 
725
 
726
               <script>
726
               <script>
727
               function redirect() {
727
               function redirect() {
769
                     </a>
769
                     </a>
770
                     
770
                     
771
                     <br><br><br>
771
                     <br><br><br>
772
-                    <button onclick="redirect()">Pasar a la pagina de eventos</button>
772
+                    <button onclick="redirect()">Pasar a la página de eventos</button>
773
 
773
 
774
                     <script>
774
                     <script>
775
                         function redirect() {
775
                         function redirect() {
810
                     <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
810
                     <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
811
                     </a>
811
                     </a>
812
                     <br><br>
812
                     <br><br>
813
-                    <h2>Centro de Desarrollo y Consultoria Computacional</h2>
813
+                    <h2>Centro de Desarrollo y Consultoría Computacional</h2>
814
                     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.
814
                     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.
815
                     <br><br>
815
                     <br><br>
816
-                    Si tiene alguna duda nos puede conactar por:
816
+                    Si tiene alguna duda nos puede contactar por:
817
                     <br>
817
                     <br>
818
                     Teléfono: 787-764-0000 Ext. 88341, 88349
818
                     Teléfono: 787-764-0000 Ext. 88341, 88349
819
                     <br>
819
                     <br>