Christian Matos 4 роки тому
джерело
коміт
5ce76e56c5

+ 21
- 18
platforms/browser/www/index.html Переглянути файл

@@ -657,29 +657,29 @@
657 657
                             data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
658 658
                         }
659 659
                         else if(red1.includes("instagram")){
660
-                            data+='<a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
660
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
661 661
                         }
662 662
                         else if(red1.includes("myspace")){
663
-                            data+='<a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
663
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
664 664
                         }
665 665
 
666 666
                         //Second Social Media
667 667
                         if(red2.includes("facebook")){
668
-                            data+='<a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
668
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
669 669
                         }
670 670
                         else if(red2.includes("instagram")){
671
-                            data+='<a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
671
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
672 672
                         }
673 673
                         else if(red2.includes("myspace")){
674
-                            data+='<a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
674
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
675 675
                         }
676 676
                         
677 677
                         //E-commerce 
678 678
                         if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
679 679
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
680 680
                             ecom = ecom.substr(0, ecom.length-1);
681
-                            console.log(ecom);
682
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
681
+                            
682
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
683 683
                         }
684 684
                         
685 685
 
@@ -726,6 +726,11 @@
726 726
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
727 727
                         //but if theres only one then you just write it into the page
728 728
                         if(esp.trim() != ""){
729
+
730
+                            if(esp.includes("Figuras y simbolos indigenas")) {
731
+                                esp = esp.replace("Figuras y simbolos indigenas", "Figuras y símbolos indígenas")
732
+                            }
733
+
729 734
                             if(esp.includes(";", 0)){
730 735
                                 esp=esp.replace(/;/g,", ");
731 736
                                 data+='Tipos de artesanías: '+esp+'<br>';
@@ -768,27 +773,25 @@
768 773
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
769 774
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
770 775
                         //If it's none of them then it will not display anything
771
-                        if(red1.includes("facebook")) {
772
-                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
776
+                        if(red1.includes("facebook")){
777
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
773 778
                         }
774 779
                         else if(red1.includes("instagram")){
775
-                            
776
-                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
780
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
777 781
                         }
778 782
                         else if(red1.includes("myspace")){
779
-                            
780
-                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
783
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
781 784
                         }
782 785
 
783
-
786
+                        //Second Social Media
784 787
                         if(red2.includes("facebook")){
785
-                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
788
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
786 789
                         }
787 790
                         else if(red2.includes("instagram")){
788
-                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
791
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
789 792
                         }
790 793
                         else if(red2.includes("myspace")){
791
-                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
794
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
792 795
                         }
793 796
 
794 797
 
@@ -796,7 +799,7 @@
796 799
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
797 800
                             ecom = ecom.substr(0, ecom.length-1);
798 801
 
799
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
802
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
800 803
                         }
801 804
                         
802 805
 

+ 8
- 2
platforms/browser/www/js/saveLocal.js Переглянути файл

@@ -1,5 +1,11 @@
1
-localStorage.setItem("RENGLONES", loadFile("https://artesaniaspr.website/renglones2.json"));
2
-localStorage.setItem("AZAR", loadFile("https://artesaniaspr.website/azar.json"));
1
+try {
2
+  localStorage.setItem("RENGLONES", loadFile("https://artesaniaspr.website/renglones2.json"));
3
+  localStorage.setItem("AZAR", loadFile("https://artesaniaspr.website/azar.json"));
4
+  
5
+} catch {
6
+  console.log("Files not found")
7
+}
8
+
3 9
 let renglones = JSON.parse(window.localStorage.getItem("RENGLONES"));
4 10
 
5 11
 //A synchronous request to the server 

+ 15
- 15
platforms/ios/ArtesaníasICP.xcodeproj/project.pbxproj Переглянути файл

@@ -20,21 +20,21 @@
20 20
 /* Begin PBXContainerItemProxy section */
21 21
 		301BF534109A57CC0062928A /* PBXContainerItemProxy */ = {
22 22
 			isa = PBXContainerItemProxy;
23
-			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */;
23
+			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */;
24 24
 			proxyType = 2;
25 25
 			remoteGlobalIDString = D2AAC07E0554694100DB518D;
26 26
 			remoteInfo = CordovaLib;
27 27
 		};
28 28
 		301BF550109A68C00062928A /* PBXContainerItemProxy */ = {
29 29
 			isa = PBXContainerItemProxy;
30
-			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */;
30
+			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */;
31 31
 			proxyType = 1;
32 32
 			remoteGlobalIDString = D2AAC07D0554694100DB518D;
33 33
 			remoteInfo = CordovaLib;
34 34
 		};
35 35
 		907D8123214C687600058A10 /* PBXContainerItemProxy */ = {
36 36
 			isa = PBXContainerItemProxy;
37
-			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */;
37
+			containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */;
38 38
 			proxyType = 2;
39 39
 			remoteGlobalIDString = C0C01EB21E3911D50056E6CB;
40 40
 			remoteInfo = Cordova;
@@ -47,7 +47,7 @@
47 47
 		1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
48 48
 		1D6058910D05DD3D006BFB54 /* ArtesaníasICP.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ArtesaníasICP.app"; sourceTree = BUILT_PRODUCTS_DIR; };
49 49
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
50
-		301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = "<group>"; };
50
+		301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = "<group>"; };
51 51
 		301BF56E109A69640062928A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = SOURCE_ROOT; };
52 52
 		302D95EE14D2391D003F00A1 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
53 53
 		302D95EF14D2391D003F00A1 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
@@ -56,14 +56,14 @@
56 56
 		3047A5101AB8059700498E2A /* build-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-release.xcconfig"; path = "cordova/build-release.xcconfig"; sourceTree = SOURCE_ROOT; };
57 57
 		3047A5111AB8059700498E2A /* build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = build.xcconfig; path = cordova/build.xcconfig; sourceTree = SOURCE_ROOT; };
58 58
 		32CA4F630368D1EE00C91783 /* ArtesaníasICP-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ArtesaníasICP-Prefix.pch"; sourceTree = "<group>"; };
59
+		41757C63B0214F72B885F8C7 /* CDVDevice.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVDevice.m; path = "cordova-plugin-device/CDVDevice.m"; sourceTree = "<group>"; };
59 60
 		6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = "ArtesaníasICP/CDVLaunchScreen.storyboard"; sourceTree = SOURCE_ROOT; };
60 61
 		8D1107310486CEB800E47090 /* ArtesaníasICP-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "ArtesaníasICP-Info.plist"; path = "ArtesaníasICP/ArtesaníasICP-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = SOURCE_ROOT; };
62
+		9FAEB57ED7114476814D1D74 /* CDVDevice.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVDevice.h; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = "<group>"; };
61 63
 		EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = "<group>"; };
62 64
 		EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = "<group>"; };
63 65
 		ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
64 66
 		F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "ArtesaníasICP/config.xml"; sourceTree = "<group>"; };
65
-		41757C63B0214F72B885F8C7 /* CDVDevice.m */ = {isa = PBXFileReference; name = "CDVDevice.m"; path = "cordova-plugin-device/CDVDevice.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
66
-		9FAEB57ED7114476814D1D74 /* CDVDevice.h */ = {isa = PBXFileReference; name = "CDVDevice.h"; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
67 67
 /* End PBXFileReference section */
68 68
 
69 69
 /* Begin PBXFrameworksBuildPhase section */
@@ -105,7 +105,7 @@
105 105
 				EB87FDF41871DAF40020F90C /* config.xml */,
106 106
 				EB87FDF31871DA8E0020F90C /* www */,
107 107
 				EB87FDF11871DA420020F90C /* Staging */,
108
-				301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */,
108
+				301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */,
109 109
 				080E96DDFE201D6D7F000001 /* Classes */,
110 110
 				307C750510C5A3420062BCA9 /* Plugins */,
111 111
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -213,11 +213,6 @@
213 213
 			isa = PBXProject;
214 214
 			attributes = {
215 215
 				LastUpgradeCheck = 1130;
216
-				TargetAttributes = {
217
-					1D6058900D05DD3D006BFB54 = {
218
-						ProvisioningStyle = Automatic;
219
-					};
220
-				};
221 216
 			};
222 217
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ArtesaníasICP" */;
223 218
 			compatibilityVersion = "Xcode 11.0";
@@ -232,7 +227,7 @@
232 227
 			projectReferences = (
233 228
 				{
234 229
 					ProductGroup = 301BF52E109A57CC0062928A /* Products */;
235
-					ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */;
230
+					ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */;
236 231
 				},
237 232
 			);
238 233
 			projectRoot = "";
@@ -322,6 +317,7 @@
322 317
 				CLANG_ENABLE_MODULES = YES;
323 318
 				CLANG_ENABLE_OBJC_ARC = YES;
324 319
 				COPY_PHASE_STRIP = NO;
320
+				DEVELOPMENT_TEAM = "";
325 321
 				GCC_DYNAMIC_NO_PIC = NO;
326 322
 				GCC_OPTIMIZATION_LEVEL = 0;
327 323
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -331,7 +327,7 @@
331 327
 				INFOPLIST_FILE = "ArtesaníasICP/ArtesaníasICP-Info.plist";
332 328
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
333 329
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
334
-				PRODUCT_BUNDLE_IDENTIFIER = "io.cordova.hellocordova";
330
+				PRODUCT_BUNDLE_IDENTIFIER = io.cordova.artesaniasICP;
335 331
 				PRODUCT_NAME = "$(TARGET_NAME)";
336 332
 				TARGETED_DEVICE_FAMILY = "1,2";
337 333
 			};
@@ -345,7 +341,10 @@
345 341
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
346 342
 				CLANG_ENABLE_MODULES = YES;
347 343
 				CLANG_ENABLE_OBJC_ARC = YES;
344
+				CODE_SIGN_IDENTITY = "Apple Development";
345
+				CODE_SIGN_STYLE = Automatic;
348 346
 				COPY_PHASE_STRIP = YES;
347
+				DEVELOPMENT_TEAM = "";
349 348
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
350 349
 				GCC_PREFIX_HEADER = "ArtesaníasICP/ArtesaníasICP-Prefix.pch";
351 350
 				GCC_THUMB_SUPPORT = NO;
@@ -353,8 +352,9 @@
353 352
 				INFOPLIST_FILE = "ArtesaníasICP/ArtesaníasICP-Info.plist";
354 353
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
355 354
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
356
-				PRODUCT_BUNDLE_IDENTIFIER = "io.cordova.hellocordova";
355
+				PRODUCT_BUNDLE_IDENTIFIER = io.cordova.artesaniasICP;
357 356
 				PRODUCT_NAME = "$(TARGET_NAME)";
357
+				PROVISIONING_PROFILE_SPECIFIER = "";
358 358
 				TARGETED_DEVICE_FAMILY = "1,2";
359 359
 			};
360 360
 			name = Release;

BIN
platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate Переглянути файл


+ 8
- 8
platforms/ios/ArtesaníasICP/ArtesaníasICP-Info.plist Переглянути файл

@@ -24,10 +24,15 @@
24 24
 	<string>1.0.0</string>
25 25
 	<key>LSRequiresIPhoneOS</key>
26 26
 	<true/>
27
+	<key>NSAppTransportSecurity</key>
28
+	<dict>
29
+		<key>NSAllowsArbitraryLoads</key>
30
+		<true/>
31
+	</dict>
27 32
 	<key>NSMainNibFile</key>
28
-	<string/>
33
+	<string></string>
29 34
 	<key>NSMainNibFile~ipad</key>
30
-	<string/>
35
+	<string></string>
31 36
 	<key>UILaunchStoryboardName</key>
32 37
 	<string>CDVLaunchScreen</string>
33 38
 	<key>UIRequiresFullScreen</key>
@@ -45,10 +50,5 @@
45 50
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
46 51
 		<string>UIInterfaceOrientationLandscapeRight</string>
47 52
 	</array>
48
-	<key>NSAppTransportSecurity</key>
49
-	<dict>
50
-		<key>NSAllowsArbitraryLoads</key>
51
-		<true/>
52
-	</dict>
53 53
 </dict>
54
-</plist>
54
+</plist>

+ 2
- 2
platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist Переглянути файл

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

+ 9
- 3
www/js/saveLocal.js Переглянути файл

@@ -1,5 +1,11 @@
1
-localStorage.setItem("RENGLONES", loadFile("https://artesaniaspr.website/renglones2.json"));
2
-localStorage.setItem("AZAR", loadFile("https://artesaniaspr.website/azar.json"));
1
+try {
2
+  localStorage.setItem("RENGLONES", loadFile("https://artesaniaspr.website/renglones2.json"));
3
+  localStorage.setItem("AZAR", loadFile("https://artesaniaspr.website/azar.json"));
4
+  
5
+} catch {
6
+  console.log("Files not found")
7
+}
8
+
3 9
 let renglones = JSON.parse(window.localStorage.getItem("RENGLONES"));
4 10
 
5 11
 //A synchronous request to the server 
@@ -18,7 +24,7 @@ function loadFile(filePath) {
18 24
 //Checks if date has changed in the server or if number or renglones has been shortened (since local storage can be erased when the device runs out of memory)
19 25
 function checkDate() {
20 26
   var date = loadFile("https://artesaniaspr.website/date.txt");
21
-  if (localStorage.getItem("DATE") == null || localStorage.getItem("DATE") != date || localStorage.length < 17) {
27
+  if (localStorage.getItem("DATE") == null || localStorage.getItem("DATE") != date || localStorage.length < 18) {
22 28
   localStorage.setItem("DATE", date);
23 29
     return false;
24 30
   }