Merge pull request 'master' (#2 ) from master into BackEnd

Reviewed-on: #2
Merge pull request 'FrontEndDev' (#1 ) from FrontEndDev into master
2021-02-19 13:21:41 +01:00 · 2021-02-19 13:17:30 +01:00 · 2021-02-19 13:06:52 +01:00 · 2021-02-10 15:45:25 +01:00 · 2021-02-09 17:48:07 +01:00 · 2021-02-02 16:42:38 +01:00
43 changed files with 1308 additions and 308 deletions
--- a/config.xml
+++ b/config.xml
@ -91,6 +91,53 @@
        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+        <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
+        <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
+        <icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
+        <icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
+        <icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
+        <icon height="58" src="resources/ios/icon/icon-29@2x.png" width="58" />
+        <icon height="87" src="resources/ios/icon/icon-29@3x.png" width="87" />
+        <icon height="48" src="resources/ios/icon/icon-24@2x.png" width="48" />
+        <icon height="55" src="resources/ios/icon/icon-27.5@2x.png" width="55" />
+        <icon height="88" src="resources/ios/icon/icon-44@2x.png" width="88" />
+        <icon height="172" src="resources/ios/icon/icon-86@2x.png" width="172" />
+        <icon height="196" src="resources/ios/icon/icon-98@2x.png" width="196" />
+        <icon height="216" src="resources/ios/icon/icon-108@2x.png" width="216" />
+        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+        <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
+        <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
+        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+        <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
+        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+        <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+        <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
+        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+        <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
+        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+        <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
+        <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
+        <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
+        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+        <splash height="2688" src="resources/ios/splash/Default-2688h~iphone.png" width="1242" />
+        <splash height="1242" src="resources/ios/splash/Default-Landscape-2688h~iphone.png" width="2688" />
+        <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
+        <splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
+        <splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
+        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+        <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
+        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
+        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
    </platform>
    <plugin name="cordova-plugin-whitelist" spec="1.3.3" />
    <plugin name="cordova-plugin-statusbar" spec="2.4.2" />
--- a/package-lock.json
+++ b/package-lock.json
@ -2020,6 +2020,25 @@
        }
      }
    },
+    "@netflix/nerror": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
+      "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "extsprintf": "^1.4.0",
+        "lodash": "^4.17.15"
+      },
+      "dependencies": {
+        "extsprintf": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+          "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
+          "dev": true
+        }
+      }
+    },
    "@ngtools/webpack": {
      "version": "10.0.8",
      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
@ -2404,6 +2423,12 @@
      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
      "dev": true
    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
    "accepts": {
      "version": "1.3.7",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@ -2537,6 +2562,21 @@
      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
      "dev": true
    },
+    "android-versions": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
+      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.7.1"
+      }
+    },
+    "ansi": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=",
+      "dev": true
+    },
    "ansi-colors": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@ -2774,6 +2814,12 @@
      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
      "dev": true
    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
    "atob": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@ -2980,6 +3026,12 @@
        "callsite": "1.0.0"
      }
    },
+    "big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
+      "dev": true
+    },
    "big.js": {
      "version": "5.2.2",
      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@ -3080,6 +3132,15 @@
      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
      "dev": true
    },
+    "bplist-parser": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
+      "dev": true,
+      "requires": {
+        "big-integer": "^1.6.44"
+      }
+    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -4049,6 +4110,241 @@
        }
      }
    },
+    "cordova-android": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz",
+      "integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==",
+      "dev": true,
+      "requires": {
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fs-extra": "^9.0.1",
+        "nopt": "^4.0.3",
+        "properties-parser": "^0.3.1",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cordova-common": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz",
+      "integrity": "sha512-od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q==",
+      "dev": true,
+      "requires": {
+        "@netflix/nerror": "^1.1.3",
+        "ansi": "^0.3.1",
+        "bplist-parser": "^0.2.0",
+        "cross-spawn": "^7.0.1",
+        "elementtree": "^0.1.7",
+        "endent": "^1.4.1",
+        "fast-glob": "^3.2.2",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "plist": "^3.0.1",
+        "q": "^1.5.1",
+        "read-chunk": "^3.2.0",
+        "strip-bom": "^4.0.0",
+        "underscore": "^1.9.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
    "cordova-plugin-device": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz",
@ -4556,6 +4852,12 @@
      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
      "dev": true
    },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
    "deep-equal": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@ -4928,6 +5230,23 @@
      "integrity": "sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==",
      "dev": true
    },
+    "elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
+      "dev": true,
+      "requires": {
+        "sax": "1.1.4"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+          "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
+          "dev": true
+        }
+      }
+    },
    "elliptic": {
      "version": "6.5.3",
      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
@ -4998,6 +5317,17 @@
        "once": "^1.4.0"
      }
    },
+    "endent": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
+      "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
+      "dev": true,
+      "requires": {
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.4"
+      }
+    },
    "engine.io": {
      "version": "3.4.2",
      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.2.tgz",
@ -5608,6 +5938,12 @@
        "picomatch": "^2.2.1"
      }
    },
+    "fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
+      "dev": true
+    },
    "fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@ -6526,6 +6862,12 @@
        }
      }
    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true
+    },
    "humanize-ms": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
@ -8433,6 +8775,16 @@
      "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==",
      "dev": true
    },
+    "nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dev": true,
+      "requires": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      }
+    },
    "normalize-package-data": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@ -8783,6 +9135,12 @@
        "has": "^1.0.3"
      }
    },
+    "objectorarray": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==",
+      "dev": true
+    },
    "obuf": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@ -10030,6 +10388,15 @@
        }
      }
    },
+    "properties-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
+      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "dev": true,
+      "requires": {
+        "string.prototype.codepointat": "^0.2.0"
+      }
+    },
    "protoduck": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
@ -10611,6 +10978,16 @@
        }
      }
    },
+    "read-chunk": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.6"
+      }
+    },
    "read-package-json": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
@ -12219,6 +12596,12 @@
        }
      }
    },
+    "string.prototype.codepointat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
+      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==",
+      "dev": true
+    },
    "string.prototype.trimend": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
@ -12265,12 +12648,24 @@
        }
      }
    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
    "strip-eof": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
      "dev": true
    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
    "style-loader": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
@ -12773,6 +13168,12 @@
      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
      "dev": true
    },
+    "underscore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz",
+      "integrity": "sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==",
+      "dev": true
+    },
    "unicode-canonical-property-names-ecmascript": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@ -14057,6 +14458,17 @@
      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
      "dev": true
    },
+    "with-open-file": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      }
+    },
    "worker-farm": {
      "version": "1.7.0",
      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
--- a/package.json
+++ b/package.json
@ -40,6 +40,7 @@
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "^12.11.1",
    "codelyzer": "^6.0.0",
+    "cordova-android": "^9.0.0",
    "cordova-plugin-device": "^2.0.2",
    "cordova-plugin-ionic-keyboard": "^2.2.0",
    "cordova-plugin-ionic-webview": "^4.2.1",
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -1,21 +1,35 @@
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { LoginPage } from './login/login.page';


 const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
-  },

  {
-    path: 'prompt-evento',
-    loadChildren: () => import('./prompt-evento/prompt-evento.module').then( m => m.PromptEventoPageModule)
+    path: 'login',
+    component: LoginPage
  },
  {
-    path: 'perfil-discoteca',
-    loadChildren: () => import('./perfil-discoteca/perfil-discoteca.module').then( m => m.PerfilDiscotecaPageModule)
+    path: 'tabs',
+    loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
  },
+  {
+    path: 'view-evento',
+    loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
+  },
+  {
+    path: 'galeriamodal',
+    loadChildren: () => import('./galeriamodal/galeriamodal.module').then( m => m.GaleriamodalPageModule)
+  },
+  {
+    path:'',
+    redirectTo: 'tabs',
+    pathMatch: 'full'
+  },
+
+
+
+ 
 ];
@NgModule({
  imports: [
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@ -10,4 +10,14 @@
    margin-right: auto;
    text-align: center;
    margin: auto;
+
+    --ion-color-primary: #c4b700;
+    --ion-color-primary-rgb: 196, 183, 0;
+    --ion-color-primary-contrast: #ffffff;
+    --ion-color-primary-contrast-rgb: 255,255,255;
+    --ion-color-primary-shade: #695100;
+    --ion-color-primary-tint: #8a8b39;
 }
+
+
+
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,18 +1,21 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
-
+import { ReactiveFormsModule } from '@angular/forms';
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
+import { PerfilDiscotecaPage } from './perfil-discoteca/perfil-discoteca.page';
+import { PromptEventoPage} from './prompt-evento/prompt-evento.page'
+import { GaleriamodalPageModule } from './galeriamodal/galeriamodal.module';
+import { LoginPage } from './login/login.page';

@NgModule({
-  declarations: [AppComponent],
+  declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage, LoginPage],
  entryComponents: [],
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
+  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule],
  providers: [
    StatusBar,
    SplashScreen,
--- a/src/app/evento.ts
+++ b/src/app/evento.ts
@ -1,9 +1,13 @@
 export class Evento {
    private id: number;
-    private nombre: string;
-    private localizacion: string;
-    private fecha: Date;
-    private desc: string;
+    nombre: string;
+    localizacion: string;
+    fecha: Date;
+    dia: string;
+    hora: string;
+    descripcion: string;
+    precio1: number;
+    precio2: number;

    setNombre(nombre: string): void{
        this.nombre = nombre;
@ -30,10 +34,42 @@ export class Evento {
    }

    setDesc(desc: string): void{
-        this.desc = desc;
+        this.descripcion = desc;
    }

    getDesc(): string{
-        return this.desc;
+        return this.descripcion;
+    }
+
+    setDia(fecha: Date): void{
+        this.dia = fecha.getDate()+"/"+fecha.getMonth();
+    }
+
+    getDia(): string{
+        return this.dia;
+    }
+
+    setHora(fecha: Date): void{
+        this.hora = fecha.getHours()+":"+fecha.getMinutes();
+    }
+
+    getHora(): string{
+        return this.hora;
+    }
+
+    setPrecio1(precio: number): void{
+        this.precio1 = precio;
+    }
+
+    getPrecio1(): number{
+        return this.precio1;
+    }
+
+    setPrecio2(precio: number): void{
+        this.precio2 = precio;
+    }
+
+    getPrecio2(): number{
+        return this.precio2;
    }
 }
--- a/src/app/galeriamodal/galeriamodal-routing.module.ts
+++ b/src/app/galeriamodal/galeriamodal-routing.module.ts
@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GaleriamodalPage } from './galeriamodal.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: GaleriamodalPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class GaleriamodalPageRoutingModule {}
--- a/src/app/galeriamodal/galeriamodal.module.ts
+++ b/src/app/galeriamodal/galeriamodal.module.ts
@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { GaleriamodalPageRoutingModule } from './galeriamodal-routing.module';
+
+import { GaleriamodalPage } from './galeriamodal.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    GaleriamodalPageRoutingModule
+  ],
+  declarations: [GaleriamodalPage]
+})
+export class GaleriamodalPageModule {}
--- a/src/app/galeriamodal/galeriamodal.page.html
+++ b/src/app/galeriamodal/galeriamodal.page.html
@ -0,0 +1,15 @@
+
+<ion-content fullscreen>
+
+  <ion-button (click)="close()">
+    <ion-icon name="close" slot="start"></ion-icon>
+  </ion-button>
+
+  <ion-slide>
+    <img src="{{foto}}">
+  </ion-slide>
+
+  <ion-button (click)="borrar()">
+    <ion-icon name="trash-outline"></ion-icon>
+  </ion-button>
+</ion-content>
--- a/src/app/galeriamodal/galeriamodal.page.scss
+++ b/src/app/galeriamodal/galeriamodal.page.scss
@ -0,0 +1,4 @@
+ion-content {
+    background: rgba(0, 0, 0, 0.589)
+    
+}
--- a/src/app/galeriamodal/galeriamodal.page.spec.ts
+++ b/src/app/galeriamodal/galeriamodal.page.spec.ts
@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { GaleriamodalPage } from './galeriamodal.page';
+
+describe('GaleriamodalPage', () => {
+  let component: GaleriamodalPage;
+  let fixture: ComponentFixture<GaleriamodalPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ GaleriamodalPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(GaleriamodalPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/galeriamodal/galeriamodal.page.ts
+++ b/src/app/galeriamodal/galeriamodal.page.ts
@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { ModalController, NavParams } from '@ionic/angular';
+import { Tab1Service } from '../tab1/tab1.service';
+
+@Component({
+  selector: 'app-galeriamodal',
+  templateUrl: './galeriamodal.page.html',
+  styleUrls: ['./galeriamodal.page.scss'],
+})
+export class GaleriamodalPage implements OnInit {
+
+  foto: string;
+
+  sliderOpts = {
+    
+  }
+  constructor(private navParams: NavParams, private modalController: ModalController, private tab1Service: Tab1Service,
+    private router: Router) { }
+
+  ngOnInit() {
+    this.foto = this.navParams.get('foto');
+  }
+
+
+  borrar(){
+    let index = this.tab1Service.galeria.indexOf('foto');
+    this.tab1Service.galeria.slice[index];
+    this.close();
+  }
+
+  close(){
+    this.modalController.dismiss();
+  }
+
+}
--- a/src/app/login.service.spec.ts
+++ b/src/app/login.service.spec.ts
@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoginService } from './login.service';
+
+describe('LoginService', () => {
+  let service: LoginService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoginService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
--- a/src/app/login.service.ts
+++ b/src/app/login.service.ts
@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LoginService {
+
+  constructor() { }
+}
--- a/src/app/login/login-routing.module.ts
+++ b/src/app/login/login-routing.module.ts
@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { LoginPage } from './login.page';
+
+const routes: Routes = [
+      {
+        path: '',
+        component: LoginPage,
+      },
+      {
+        path: 'tabs',
+        loadChildren: () => import('../tabs/tabs.module').then(m => m.TabsPageModule)
+      },
+
+      {
+        path: '',
+        redirectTo: 'login'
+      }
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class LoginPageRoutingModule {}
--- a/src/app/login/login.module.ts
+++ b/src/app/login/login.module.ts
@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { LoginPageRoutingModule } from './login-routing.module';
+import { LoginPage } from './login.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    LoginPageRoutingModule
+  ],
+  declarations: [LoginPage]
+})
+export class LoginPageModule {}
--- a/src/app/login/login.page.html
+++ b/src/app/login/login.page.html
@ -0,0 +1,11 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Login</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-button (click)="login()">
+    Login
+  </ion-button>
+</ion-content>
--- a/src/app/login/login.page.scss
+++ b/src/app/login/login.page.scss
--- a/src/app/login/login.page.spec.ts
+++ b/src/app/login/login.page.spec.ts
@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { LoginPage } from './login.page';
+
+describe('LoginPage', () => {
+  let component: LoginPage;
+  let fixture: ComponentFixture<LoginPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LoginPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(LoginPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/login/login.page.ts
+++ b/src/app/login/login.page.ts
@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-login',
+  templateUrl: './login.page.html',
+  styleUrls: ['./login.page.scss'],
+})
+export class LoginPage implements OnInit {
+
+  constructor(private router: Router) { }
+
+  ngOnInit() {
+  }
+
+  login(){
+    this.router.navigate(['/tabs']);
+  }
+
+}
--- a/src/app/perfil-discoteca/perfil-discoteca-routing.module.ts
+++ b/src/app/perfil-discoteca/perfil-discoteca-routing.module.ts
@ -1,13 +1,17 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
+import { Routes, RouterModule, ChildrenOutletContexts } from '@angular/router';
 import { PerfilDiscotecaPage } from './perfil-discoteca.page';
+import { PromptEventoPage} from '../prompt-evento/prompt-evento.page'

 const routes: Routes = [
  {
    path: '',
-    component: PerfilDiscotecaPage
-  }
+    component: PerfilDiscotecaPage,
+
+  },
+
+
+ 
 ];

@NgModule({
--- a/src/app/perfil-discoteca/perfil-discoteca.module.ts
+++ b/src/app/perfil-discoteca/perfil-discoteca.module.ts
@ -1,19 +1,22 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-
 import { IonicModule } from '@ionic/angular';
-
 import { PerfilDiscotecaPageRoutingModule } from './perfil-discoteca-routing.module';
-
 import { PerfilDiscotecaPage } from './perfil-discoteca.page';
+import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';

@NgModule({
  imports: [
    CommonModule,
    FormsModule,
    IonicModule,
-    PerfilDiscotecaPageRoutingModule
+    PerfilDiscotecaPageRoutingModule,
+    ExploreContainerComponentModule,
+  ],
+
+  exports: [
+      PerfilDiscotecaPage
  ],
  declarations: [PerfilDiscotecaPage]
 })
--- a/src/app/perfil-discoteca/perfil-discoteca.page.html
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.html
@ -1,21 +1,19 @@
-<ion-header>
+<ion-header [translucent]="true">
  <ion-toolbar>
-    <ion-title>Mi Perfil</ion-title>
+    <ion-title>
+      Mi Perfil
+    </ion-title>
  </ion-toolbar>
 </ion-header>

 <ion-content [fullscreen]="true">
-  <ion-header collapse="condense">
-    <ion-toolbar>
-      <ion-title class="titulo" size="large">Mi Perfil</ion-title>
-    </ion-toolbar>
-  </ion-header>

-  <ion-grid>
+
+  
    <div class='fotoPerfil'>
+      <ion-grid>
      <ion-row>
        <ion-col>
-
          <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
          <div class="textoPie">{{nombre}}</div>

@ -54,16 +52,20 @@
            <div [contentEditable]='editEnabled'>{{localizacion}}</div>
          </div>
        </ion-col>
+
        <ion-col>
          <div class="galeria">
+            Galería de Fotos
            <input type="file" (change)="loadImageFromDevice($event)" id="file-input-galeria" accept="image/png, image/jpeg">
-            <ion-slides (ionDrag)="onSlideChanged()">
+            <ion-slides (ionDrag)="onSlideChanged()" [options]="sliderOpts">
              <ion-slide *ngFor="let foto of galeriaFotos">
-                <div class="fotoGaleria"><img src="{{foto}}">
+                <div class="fotoGaleria"><img src="{{foto}}" tappable (click)="openPreview(foto)">
+                  <div class="botonesHidden"  id="botonesHidden3">
                    <ion-button (click)="borrarDeGaleria()">
                      <ion-icon name="trash-outline"></ion-icon>
                    </ion-button>
                  </div>
+                </div>
              </ion-slide>
            </ion-slides>
          </div>
@ -79,12 +81,34 @@
          </ion-button>
      </ion-row>

+      <ion-row>
+        <div *ngIf="eventos.length>0" class="eventos">
+          <ion-list>
+              <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
+              <div class="evento">
+                <div class="eventoHeader">
+                {{evento.nombre}} · 
+                <ion-icon name="calendar-outline"></ion-icon>
+                {{evento.fecha}} · 
+                <ion-icon name="cash-outline"></ion-icon>
+                {{evento.precio1}},{{evento.precio2}}
+                <ion-button (click)="editarEvento(evento);$event.stopPropagation();"><ion-icon name="pencil-outline"></ion-icon></ion-button>
+                </div>
+                <div class="eventoDesc">
+                {{evento.descripcion}}
+                </div>
+              </div>
+              </ion-item>
+          </ion-list>
+        </div>
+      </ion-row>
+    </ion-grid>  
    </div>

  



-  </ion-grid>
+

 </ion-content>
--- a/src/app/perfil-discoteca/perfil-discoteca.page.scss
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.scss
@ -0,0 +1,78 @@
+:root {--ion-background-color: #494949;
+    --ion-background-color-rgb: 73,73,73;
+    
+    --ion-text-color: #eeeeee;
+    --ion-text-color-rgb: 238,238,238;
+  }
+    
+    *{
+      padding: 5px;
+      display: block;
+      margin: auto;
+    }
+    
+    .fotoPerfil{
+        text-align: end;
+        max-width: 800px;
+        max-height: auto;
+        margin: auto;
+    }
+    
+    .textoPie{
+      position: relative;
+      bottom: 40px;
+      right: 20px;
+      float: right;
+    }
+    
+    .addFoto{
+      position: relative;
+      float: left;
+    }
+    
+    .datosDisplay{
+    
+      float: left;
+      position: relative;
+      margin: auto;
+        
+    }
+    
+    .datosLabel{
+        color: grey;
+    }
+    
+    .galeria{
+      
+        display: block;
+        max-width: 300px;
+        max-height: auto;
+        margin: auto;
+    }
+    
+    .botonesHidden{
+        display: none;
+    }
+    
+    .botonesVisible{
+      display: none;
+    }
+
+    .eventos{
+      display:block;
+    }
+
+    .evento:hover{
+      background-color: rgb(97, 97, 97);
+    }
+    .eventoHeader{
+      font-weight: bold;
+    }
+
+    .eventoDesc{
+      color: white;
+    }
+    
+    ion-slides {
+      height: 200px;
+    }
--- a/src/app/perfil-discoteca/perfil-discoteca.page.ts
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.ts
@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { NodeCompatibleEventEmitter } from 'rxjs/internal/observable/fromEvent';
-import { Tab1Service } from '../tab1/tab1.service'
-import { Discoteca } from '../discoteca'
-import { IonSlides} from '@ionic/angular';
+import { Tab1Service } from '../tab1/tab1.service';
+import { IonSlides, ModalController} from '@ionic/angular';
 import { AlertController } from '@ionic/angular';
 import { ViewChild } from '@angular/core';
 import { Evento } from '../evento';
 import { Router } from '@angular/router';
+import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
+import { GaleriamodalPage } from '../galeriamodal/galeriamodal.page';
+import { stringify } from '@angular/compiler/src/util';

@Component({
  selector: 'app-perfil-discoteca',
@ -25,12 +26,16 @@ export class PerfilDiscotecaPage implements OnInit {
  editDisabled: string;
  editEnabled: string;
  galeriaFotos: string[];
-  galeriaFake: string[];
  currentIndex: number;
  eventos: Evento[];
  alertCtrl: AlertController;
+  sliderOpts = {
+      slidesPerView: 1.5,
+      centeredSlides: true,
+      spaceBetween: 20,
+  };

-  constructor(private tab1Service: Tab1Service, private router: Router) {
+  constructor(private tab1Service: Tab1Service, private router: Router, private modalController: ModalController) {

  }

@ -45,9 +50,9 @@ export class PerfilDiscotecaPage implements OnInit {
    this.getEventos();
    this.editDisabled="true";
    this.editEnabled="false";
-    this.fotoSrc = '../assets/barraca.jpg';
+    this.fotoSrc = '../assets/img/barraca.jpg';
    this.fotoLoaded = this.fotoSrc;
-    this.galeriaFotos = [];
+    this.galeriaFotos = this.tab1Service.galeria;

  }

@ -73,11 +78,11 @@ export class PerfilDiscotecaPage implements OnInit {
  }

  addGaleria(){
-     this.galeriaFotos.push(this.someURL); 
+    this.tab1Service.galeria.push(this.someURL);
+    this.galeriaFotos = this.tab1Service.galeria;
    this.slides.update();


-
  }

  loadImageFromDevice(event): void{
@ -160,7 +165,28 @@ export class PerfilDiscotecaPage implements OnInit {
 } 

  addEvento() {
-  this.router.navigate(['prompt-evento']);
+    this.tab1Service.editarEvento=false;
+    this.router.navigate(['/tabs/tab1/prompt-evento']);
+}
+
+  mostrarEvento(evento: Evento){
+    this.tab1Service.eventoIndex = this.eventos.indexOf(evento);
+    this.router.navigate(['/tabs/tab1/view-evento']);
+}
+
+  editarEvento(evento: Evento){
+    this.tab1Service.eventoIndex = this.eventos.indexOf(evento);
+    this.tab1Service.editarEvento = true;
+    this.router.navigate(['/tabs/tab1/prompt-evento']);
+}
+
+  openPreview(foto: string){
+      this.modalController.create({
+        component: GaleriamodalPage,
+        componentProps: {
+          foto: foto
+        }
+      }).then(modal=>modal.present());
  }
 }

--- a/src/app/prompt-evento/prompt-evento-routing.module.ts
+++ b/src/app/prompt-evento/prompt-evento-routing.module.ts
@ -7,7 +7,9 @@ const routes: Routes = [
  {
    path: '',
    component: PromptEventoPage
-  }
+  },
+
+  
 ];

@NgModule({
--- a/src/app/prompt-evento/prompt-evento.page.html
+++ b/src/app/prompt-evento/prompt-evento.page.html
@ -5,6 +5,57 @@
 </ion-header>

 <ion-content>
+  <form [formGroup]="eventoForm" (ngSubmit)="onSubmit()">
+
+  <ion-item>
+  <label>
+    Nombre del evento: 
+    <input type="text" id="nombre" formControlName = "nombre">
+  </label>
+  <span
+    *ngIf="nombre.errors.required && (nombre.touched||submitted)">
+    Tu evento necesita un nombre
+  </span>
+  </ion-item>
+
+  <ion-item>
+    <label>
+      Fecha:
+      <ion-datetime displayFormat="DD/MM, HH:mm"placeholder="Elegir Fecha" formControlName="fecha"></ion-datetime>
+    </label>
+    <span
+      *ngIf="fecha.errors.required && submitted">
+      Tu evento necesita una fecha
+    </span>
+  </ion-item>
+
+
+  <ion-item>
+    <label>
+      Precio:
+      <input type="number" formControlName = "precio1"><label>, </label><input type="number" formControlName = "precio2">
+    </label>
+    <span
+    *ngIf="precio1.errors.required && (precio1.touched||submitted)">
+    Tu evento necesita un precio (puede ser 0)
+  </span>
+  </ion-item>
+
+  <ion-item>
+    <label>
+      Descripción: 
+      <textarea formControlName = "descripcion" rows="10"></textarea>
+    </label>
+    <span
+    *ngIf="descripcion.errors.required && (descripcion.touched||submitted)">
+    ¡Dale una descripción a tu evento!
+  </span>
+  </ion-item>
+
+  <button type="submit">GUARDAR</button>
+  </form>
+
+

  
 </ion-content>
--- a/src/app/prompt-evento/prompt-evento.page.scss
+++ b/src/app/prompt-evento/prompt-evento.page.scss
@ -0,0 +1,33 @@
+*{
+    --ion-text-color: #fbffc4;
+    padding: 15px;
+    letter-spacing: 2px;
+
+}
+
+ion-item{
+    text-align: center;
+    color: wheat,
+}
+
+input{
+    display: inline-block;
+    text-align: left;
+    color: black;
+}
+
+label{
+    display: inline-block;
+    text-align: left;
+    color: wheat,
+}
+
+textarea{
+    color: black;
+}
+
+span{
+    color: red;
+    font-style: italic;
+}
+
--- a/src/app/prompt-evento/prompt-evento.page.ts
+++ b/src/app/prompt-evento/prompt-evento.page.ts
@ -1,4 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Tab1Service } from '../tab1/tab1.service';
+import { Evento } from '../evento';
+import { Router } from '@angular/router';

@Component({
  selector: 'app-prompt-evento',
@ -7,9 +11,79 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PromptEventoPage implements OnInit{

-  constructor() { }
+  submitted = false;
+  eventoForm = new FormGroup({
+      nombre: new FormControl('', Validators.required),
+      fecha: new FormControl('', Validators.required),
+      precio1: new FormControl('', Validators.required),
+      precio2: new FormControl('', Validators.required),
+      descripcion: new FormControl('', Validators.required),
+  });
+
+  eventos: Evento[];
+
+  constructor(private tab1Service: Tab1Service, private router: Router) {
+
+   }
  
   ngOnInit(){
+    if (this.tab1Service.editarEvento==true){
+      this.eventoForm = this.tab1Service.eventoForms[this.tab1Service.eventoIndex];
    }
+  }
+  onSubmit(){
+    this.submitted = true;
+    if (this.eventoForm.valid){
+      let evento = new Evento();
+      this.asignarEvento(evento);
+      this.router.navigate(['/tabs']);
+    }
+  }
+  asignarEvento(evento: Evento){
+    evento.setNombre(this.eventoForm.get('nombre').value);
+    evento.setDesc(this.eventoForm.get('descripcion').value);
+    evento.setFecha(this.eventoForm.get('fecha').value);
+    evento.setPrecio1(this.eventoForm.get('precio1').value);
+    evento.setPrecio2(this.eventoForm.get('precio2').value);
+    //evento.setDia(evento.getFecha()); el datetime de Ion devuelve un String, no se puede 
+    //evento.setHora(evento.getFecha()); transformar en dia y hora
+    if (!this.tab1Service.eventos){
+      this.tab1Service.initEventos();}
+    if(!this.tab1Service.eventoForms){
+      this.tab1Service.initEventoForms();}
+    if(this.tab1Service.editarEvento==true){
+      this.tab1Service.eventos[this.tab1Service.eventoIndex] = evento;
+      this.tab1Service.eventoForms[this.tab1Service.eventoIndex] = this.eventoForm;
+    }
+    else{
+      this.tab1Service.eventos.push(evento);
+      this.tab1Service.eventoForms.push(this.eventoForm);}
+    
+  }
+
+  get nombre(){
+    return this.eventoForm.get('nombre');
+  }
+
+  get fecha(){
+    return this.eventoForm.get('fecha');
+  }
+
+  get hora(){
+    return this.eventoForm.get('hora');
+  }
+
+  get precio1() {
+    return this.eventoForm.get('precio1');
+  }
+
+  get precio2() {
+    return this.eventoForm.get('precio2');
+  }
+
+  get descripcion(){
+    return this.eventoForm.get('descripcion');
+  }
+  

 }
--- a/src/app/tab1/tab1-routing.module.ts
+++ b/src/app/tab1/tab1-routing.module.ts
@ -1,13 +1,38 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { Tab1Page } from './tab1.page';
+import { PerfilDiscotecaPage } from '../perfil-discoteca/perfil-discoteca.page'
+import { PromptEventoPage } from '../prompt-evento/prompt-evento.page'
+import { ViewEventoPage } from '../view-evento/view-evento.page'

 const routes: Routes = [
+
+
+        {
+          path: 'perfil-discoteca',
+          component: PerfilDiscotecaPage
+        },
+
        {
          path: '',
-    component: Tab1Page,
+          redirectTo: 'perfil-discoteca',
+          pathMatch: 'full,'
        },
            
+        {
+          path: 'prompt-evento',
+          component: PromptEventoPage
+        },
+
+        {
+          path: 'view-evento',
+          component: ViewEventoPage
+        }
+
+
+  
+
+

 ];

--- a/src/app/tab1/tab1.module.ts
+++ b/src/app/tab1/tab1.module.ts
@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Tab1Page } from './tab1.page';
+import { PerfilDiscotecaPageModule} from '../perfil-discoteca/perfil-discoteca.module'
 import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';

 import { Tab1PageRoutingModule } from './tab1-routing.module';
@ -13,7 +14,8 @@ import { Tab1PageRoutingModule } from './tab1-routing.module';
    CommonModule,
    FormsModule,
    ExploreContainerComponentModule,
-    Tab1PageRoutingModule
+    Tab1PageRoutingModule,
+
  ],
  declarations: [Tab1Page]
 })
--- a/src/app/tab1/tab1.page.html
+++ b/src/app/tab1/tab1.page.html
@ -1,92 +0,0 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <ion-title>
-      Mi Perfil
-    </ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content [fullscreen]="true">
-  <ion-header collapse="condense">
-    <ion-toolbar>
-      <ion-title class="titulo" size="large">Mi Perfil</ion-title>
-    </ion-toolbar>
-  </ion-header>
-
-  <ion-grid>
-    <div class='fotoPerfil'>
-      <ion-row>
-        <ion-col>
-
-          <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
-          <div class="textoPie">{{nombre}}</div>
-
-          <div class="addFoto">
-            <ion-button [disabled]='editDisabled'>
-              <ion-icon name="image" slot="icon-only"></ion-icon>
-              <input type="file" (change)="loadImageFromDevice($event);cargarImagen()" id="file-input-perfil" accept="image/png, image/jpeg">
-            </ion-button>
-          </div>
-
-          <div>
-            <ion-button (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
-              <ion-icon name="create"></ion-icon>
-            </ion-button>
-            <div id="botonesHidden1" class="botonesHidden">
-              <ion-button (click)="saveEdit()" label="guardar" [disabled]='editDisabled'>
-              <ion-icon name="save"></ion-icon>
-            </ion-button>
-            <ion-button (click)="cancelEdit()" [disabled]='editDisabled'>
-              Cancelar
-            </ion-button></div>
-          </div>
-          
-
-
-        </ion-col>
-      </ion-row>
-    
-
-      <ion-row>
-        <ion-col>
-          <div id="cajaDatos" class='datosDisplay'>
-            <div class="datosLabel">Teléfono: </div>
-            <div [contentEditable]='editEnabled'>{{telefono}}</div>
-            <div class="datosLabel">Localización: </div>
-            <div [contentEditable]='editEnabled'>{{localizacion}}</div>
-          </div>
-        </ion-col>
-        <ion-col>
-          <div class="galeria">
-            <input type="file" (change)="loadImageFromDevice($event)" id="file-input-galeria" accept="image/png, image/jpeg">
-            <ion-slides (ionDrag)="onSlideChanged()">
-              <ion-slide *ngFor="let foto of galeriaFotos">
-                <div class="fotoGaleria"><img src="{{foto}}">
-                <ion-button (click)="borrarDeGaleria()">
-                  <ion-icon name="trash-outline"></ion-icon>
-                </ion-button>
-              </div>
-              </ion-slide>
-            </ion-slides>
-          </div>
-        </ion-col>
-      </ion-row>
-      
-      
-      <ion-row>
-          <ion-button (click)="addEvento()">
-            <ion-icon name="add-circle-outline">
-            </ion-icon>
-            Añadir evento
-          </ion-button>
-      </ion-row>
-      
-    </div>
-
-  
-
-
-
-  </ion-grid>
-
-</ion-content>
--- a/src/app/tab1/tab1.page.ts
+++ b/src/app/tab1/tab1.page.ts
@ -2,12 +2,13 @@ import { Component, OnInit } from '@angular/core';
 import { NodeCompatibleEventEmitter } from 'rxjs/internal/observable/fromEvent';
 import { Tab1Service } from './tab1.service'
 import { Discoteca } from '../discoteca'
+import { PerfilDiscotecaPage } from '../perfil-discoteca/perfil-discoteca.page'
 import { IonSlides} from '@ionic/angular';
 import { AlertController } from '@ionic/angular';
 import { ViewChild } from '@angular/core';
 import { Evento } from '../evento';
 import { Router } from '@angular/router';
-import { PerfilDiscotecaPageModule } from '../perfil-discoteca/perfil-discoteca.module';
+import { from } from 'rxjs';

@Component({
  selector: 'app-tab1',
@ -17,153 +18,18 @@ import { PerfilDiscotecaPageModule } from '../perfil-discoteca/perfil-discoteca.


 export class Tab1Page implements OnInit {
-  @ViewChild('IonSlides') slides: IonSlides;
-  nombre: string;
-  telefono: number;
-  localizacion: string;
-  fotoSrc: string;
-  fotoLoaded: string;
-  someURL: string;
-  editDisabled: string;
-  editEnabled: string;
-  galeriaFotos: string[];
-  galeriaFake: string[];
-  currentIndex: number;
-  eventos: Evento[];
-  alertCtrl: AlertController;
+ 

  constructor(private tab1Service: Tab1Service, private router: Router) {

  }

  ngOnInit(){
-    this.initValues();
-  }
-
-  initValues(): void{
-    this.getNombre();
-    this.getTelefono();
-    this.getLocalizacion();
-    this.getEventos();
-    this.editDisabled="true";
-    this.editEnabled="false";
-    this.fotoSrc = '../assets/barraca.jpg';
-    this.fotoLoaded = this.fotoSrc;
-    this.galeriaFotos = [];

  }


-  getNombre(): void{
-    this.nombre = this.tab1Service.getNombre();
-  }
-
-  getTelefono(): void{
-    this.telefono = this.tab1Service.getTelefono();
-  }
-
-  getLocalizacion(): void{
-    this.localizacion = this.tab1Service.getLocalizacion();
-  }
-
-  getEventos(): void{
-    this.eventos = this.tab1Service.getEventos();
-  }
-
-  cargarImagen(){
-      this.fotoSrc = this.someURL;
-  }
-
-  addGaleria(){
-     this.galeriaFotos.push(this.someURL); 
-     this.slides.update();
-
-
  
 }

-  loadImageFromDevice(event): void{
-
-    const file = event.target.files[0];
-
-    let blobURL: string;
-  
-    const reader = new FileReader();
-  
-    reader.readAsDataURL(file);
-  
-    reader.onload = () => {
-
-      let blob: Blob = new Blob([new Uint8Array((reader.result as ArrayBuffer))]);
-      let blobURL = URL.createObjectURL(blob); 
-      this.someURL = reader.result as string;
-      if (event.target.id=="file-input-perfil")
-        this.cargarImagen();
-      else if (event.target.id=="file-input-galeria")
-        this.addGaleria();
-        
-    };
-  
-
-  };
-
-
-  enableEdit(){
-    this.editDisabled="false";
-    this.editEnabled="true";
-    let cajaDatos = document.getElementById("cajaDatos");
-    cajaDatos.style.background="white";
-    cajaDatos.style.color="black";
-    let botones = document.getElementById("botonesHidden1");
-    botones.style.display = "block";
-    botones = document.getElementById("botonesHidden2");
-    botones.style.display = "block";
-
- 
-
-  }
-
-  disableEdit(){
-    this.editDisabled="true";
-    this.editEnabled="false";
-    let cajaDatos = document.getElementById("cajaDatos");
-    cajaDatos.style.background="inherit";
-    cajaDatos.style.color="inherit";
-    let botones = document.getElementById("botonesHidden1");
-    botones.style.display = "none";
-    botones = document.getElementById("botonesHidden2");
-    botones.style.display = "none";
-
-
-  }
-
-  saveEdit(){
-    this.fotoLoaded = this.fotoSrc;
-    this.disableEdit();
-    
-  }
-
-  cancelEdit(){
-    if(this.fotoLoaded)
-      this.fotoSrc = this.fotoLoaded;
-    this.disableEdit();}
-
-  borrarDeGaleria(){
-    this.galeriaFotos.splice(this.currentIndex, 1);
-
-  }
-
-  onSlideChanged() {
-    this.slides.getActiveIndex().then(index =>{
-        this.currentIndex = index;}
-    );
-    
-    this.slides.update();
-} 
-
-addEvento() {
-  this.router.navigate(['prompt-evento']);
-}
-}
-

--- a/src/app/tab1/tab1.service.ts
+++ b/src/app/tab1/tab1.service.ts
@ -2,8 +2,9 @@ import { Injectable, OnInit } from '@angular/core';
 import { stringify } from 'querystring';
 import { Tab1Page } from './tab1.page'
 import { Discoteca } from '../discoteca'
-import { Galeria } from '../galeria';
 import { Evento } from '../evento';
+import { FormControl, FormGroup } from '@angular/forms';
+import { NumericValueAccessor } from '@ionic/angular';


@Injectable({
@ -12,8 +13,11 @@ import { Evento } from '../evento';
 export class Tab1Service implements OnInit{

  discoteca: Discoteca;
-  galeria: Galeria;
+  galeria: string[];
  eventos: Evento[];
+  eventoForms: FormGroup[];
+  eventoIndex: number;
+  editarEvento: boolean;

  constructor() { 
    
@ -28,8 +32,9 @@ export class Tab1Service implements OnInit{
    this.discoteca.setNombre('Barraca');
    this.discoteca.setTelefono(666666666);
    this.discoteca.setLocalizacion('Calle del Barquillo');
-    this.galeria = new Galeria();
-    this.galeria.setDiscoteca(this.discoteca.getNombre());
+    this.galeria = [];
+    this.initEventos();
+    this.editarEvento = false;
  }

  getNombre(): string{
@ -48,7 +53,19 @@ export class Tab1Service implements OnInit{
  }

  getEventos(): Evento[]{
-    return this.discoteca.getEventos();
+    return this.eventos;
+  }
+
+  initEventos(): void{
+    this.eventos = [];
+  }
+
+  initEventoForms(): void{
+    this.eventoForms = [];
+  }
+
+  getEventobyIndex(eventoIndex: number){
+    return this.eventos[eventoIndex];
  }

 }
--- a/src/app/tabs/tabs-routing.module.ts
+++ b/src/app/tabs/tabs-routing.module.ts
@ -4,12 +4,12 @@ import { TabsPage } from './tabs.page';

 const routes: Routes = [
  {
-    path: 'tabs',
+    path: '',
    component: TabsPage,
    children: [
      {
        path: 'tab1',
-        loadChildren: () => import('../tab1/tab1.module').then(m => m.Tab1PageModule)
+        loadChildren: () => import('../tab1/tab1.module').then(m => m.Tab1PageModule),
      },
      {
        path: 'tab2',
@ -21,14 +21,14 @@ const routes: Routes = [
      },
      {
        path: '',
-        redirectTo: '/tabs/tab1',
+        redirectTo: 'tab1',
        pathMatch: 'full'
-      }
+      },
    ]
  },
  {
    path: '',
-    redirectTo: '/tabs/tab1',
+    redirectTo: 'tabs',
    pathMatch: 'full'
  }
 ];
--- a/src/app/view-evento/view-evento-routing.module.ts
+++ b/src/app/view-evento/view-evento-routing.module.ts
@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ViewEventoPage } from './view-evento.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewEventoPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewEventoPageRoutingModule {}
--- a/src/app/view-evento/view-evento.module.ts
+++ b/src/app/view-evento/view-evento.module.ts
@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventoPageRoutingModule } from './view-evento-routing.module';
+
+import { ViewEventoPage } from './view-evento.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ViewEventoPageRoutingModule
+  ],
+  declarations: [ViewEventoPage]
+})
+export class ViewEventoPageModule {}
--- a/src/app/view-evento/view-evento.page.html
+++ b/src/app/view-evento/view-evento.page.html
@ -0,0 +1,26 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>ViewEvento</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-grid>
+      <div class="evento">
+        <ion-row>
+          <div class="eventoHeader">
+          {{evento.nombre}} · 
+          <ion-icon name="calendar-outline"></ion-icon>
+          {{evento.fecha}} · 
+          <ion-icon name="cash-outline"></ion-icon>
+          {{evento.precio1}},{{evento.precio2}}
+          </div>
+        </ion-row>
+        <ion-row>
+          <div class="eventoDesc">
+          {{evento.descripcion}}
+          </div>
+        </ion-row>
+      </div>
+  </ion-grid>
+</ion-content>
--- a/src/app/view-evento/view-evento.page.scss
+++ b/src/app/view-evento/view-evento.page.scss
@ -0,0 +1,17 @@
+.eventoHeader{
+    font-weight: bold;
+  }
+
+  .eventoDesc{
+    color: white;
+    margin-top: 20px;
+  }
+
+.evento{
+    display: block;
+    max-width: 800px;
+    max-height: auto;
+    margin: auto;
+    text-align: justify;
+    
+}
--- a/src/app/view-evento/view-evento.page.spec.ts
+++ b/src/app/view-evento/view-evento.page.spec.ts
@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventoPage } from './view-evento.page';
+
+describe('ViewEventoPage', () => {
+  let component: ViewEventoPage;
+  let fixture: ComponentFixture<ViewEventoPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewEventoPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewEventoPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/view-evento/view-evento.page.ts
+++ b/src/app/view-evento/view-evento.page.ts
@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { Evento } from '../evento';
+import { Tab1Service } from '../tab1/tab1.service';
+
+@Component({
+  selector: 'app-view-evento',
+  templateUrl: './view-evento.page.html',
+  styleUrls: ['./view-evento.page.scss'],
+})
+export class ViewEventoPage implements OnInit {
+
+  evento: Evento;
+
+  constructor(private tab1Service: Tab1Service) { }
+
+  ngOnInit() {
+    this.evento = this.tab1Service.getEventobyIndex(this.tab1Service.eventoIndex);
+  }
+
+}
--- a/src/assets/img/barraca.jpg
+++ b/src/assets/img/barraca.jpg
Author	SHA1	Message	Date
onsaliyo	b086fd9eb2	Merge pull request 'master' (#2 ) from master into BackEnd Reviewed-on: #2	2021-02-19 13:21:41 +01:00
onsaliyo	ba2c101aa6	Merge pull request 'FrontEndDev' (#1 ) from FrontEndDev into master Reviewed-on: #1	2021-02-19 13:17:30 +01:00
onsaliyo	65658f5aa3	cambios en el aspecto. Validators en el formulario de evento.	2021-02-19 13:06:52 +01:00
onsaliyo	dca38179bb	mejorado el look del evento form	2021-02-10 15:45:25 +01:00
onsaliyo	3c9a0c416f	permite ver fotos de la galería en grande	2021-02-09 17:48:07 +01:00
onsaliyo	594332fd87	Permite añadir eventos a la discoteca y navegar a una página de cada evento	2021-02-02 16:42:38 +01:00
onsaliyo	af852bff37	Permite añadir eventos a la p	2021-02-02 12:02:37 +01:00
onsaliyo	e8b52ec48d	Arreglado el routing desde discoteca hasta prompt evento	2021-01-27 13:38:08 +01:00
onsaliyo	91e2261246	Routing estructurado. Discoteca se muestra sobre tab1 y es un child route. Pero solo se carga después de refrescar.	2021-01-27 13:34:17 +01:00