From 027d80870670d079dcb078c6d778f52a08d50caf Mon Sep 17 00:00:00 2001
From: Override-6 <maximebatista18@gmail.com>
Date: Sun, 4 Dec 2022 18:18:15 +0100
Subject: [PATCH] increment counter improvements, application now builds for
 release and debug on android/browser and web platforms

---
 README.md              |  5 ++++
 config.xml             |  4 +++
 package-lock.json      | 28 ++++++++++----------
 package.json           |  9 ++++---
 www/counter/index.html |  1 +
 www/index.html         | 60 +++++++++---------------------------------
 6 files changed, 42 insertions(+), 65 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..dab8290
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# Application Basket
+Ce repository utilise Cordova pour build sur electron / android et web.
+
+## contribuer
+Dans le code ou dans la documentation, merci d'ecrire en anglais si possible
diff --git a/config.xml b/config.xml
index db4b7dc..27fa3b0 100644
--- a/config.xml
+++ b/config.xml
@@ -8,4 +8,8 @@
     <content src="index.html" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
+    <platform name="android">
+        <preference name="Scheme" value="http" />
+    </platform>
+
 </widget>
diff --git a/package-lock.json b/package-lock.json
index 32d5380..ee63aa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "devDependencies": {
-        "cordova-android": "^10.1.2",
+        "cordova-android": "^11.0.0",
         "cordova-browser": "^6.0.0",
         "cordova-electron": "^3.1.0"
       }
@@ -1248,25 +1248,25 @@
       "dev": true
     },
     "node_modules/cordova-android": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
-      "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz",
+      "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==",
       "dev": true,
       "dependencies": {
         "android-versions": "^1.7.0",
         "cordova-common": "^4.0.2",
         "execa": "^5.1.1",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^10.0.0",
+        "fast-glob": "^3.2.11",
+        "fs-extra": "^10.1.0",
         "is-path-inside": "^3.0.3",
         "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
       }
     },
     "node_modules/cordova-browser": {
@@ -5807,20 +5807,20 @@
       "dev": true
     },
     "cordova-android": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
-      "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz",
+      "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==",
       "dev": true,
       "requires": {
         "android-versions": "^1.7.0",
         "cordova-common": "^4.0.2",
         "execa": "^5.1.1",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^10.0.0",
+        "fast-glob": "^3.2.11",
+        "fs-extra": "^10.1.0",
         "is-path-inside": "^3.0.3",
         "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "untildify": "^4.0.0",
         "which": "^2.0.2"
       }
diff --git a/package.json b/package.json
index d96bec7..b6a97b8 100644
--- a/package.json
+++ b/package.json
@@ -13,15 +13,16 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "cordova-android": "^10.1.2",
+    "cordova-android": "^11.0.0",
     "cordova-browser": "^6.0.0",
     "cordova-electron": "^3.1.0"
   },
   "cordova": {
     "platforms": [
-      "android",
       "electron",
-      "browser"
-    ]
+      "browser",
+      "android"
+    ],
+    "plugins": {}
   }
 }
\ No newline at end of file
diff --git a/www/counter/index.html b/www/counter/index.html
index c532488..416e58b 100644
--- a/www/counter/index.html
+++ b/www/counter/index.html
@@ -11,6 +11,7 @@
     <label>Compteur : </label>
     <label id="counter">{0}</label>
     <button id="increment" onclick="makeIncrement()">Incrémenter</button>
+    <button id="reload" onclick="window.location.reload()">recharger la page</button>
 </div>
 
 <script src="/cordova.js"></script>
diff --git a/www/index.html b/www/index.html
index 716987c..2a08da5 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,50 +1,16 @@
 <!DOCTYPE html>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <script src="index.js"></script>
+    <title>hello</title>
+</head>
+<body onload="">
 
-    http://www.apache.org/licenses/LICENSE-2.0
+<div id="page">
+    <button onclick="window.location.href = 'counter/index.html'">aller au compteur</button>
+</div>
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-     KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<html>
-    <head>
-        <meta charset="utf-8">
-        <!--
-        Customize this policy to fit your own app's needs. For more guidance, please refer to the docs:
-            https://cordova.apache.org/docs/en/latest/
-        Some notes:
-            * https://ssl.gstatic.com is required only on Android and is needed for TalkBack to function properly
-            * Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
-                * Enable inline JS: add 'unsafe-inline' to default-src
-        -->
-        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
-        <meta name="format-detection" content="telephone=no">
-        <meta name="msapplication-tap-highlight" content="no">
-        <meta name="viewport" content="initial-scale=1, width=device-width, viewport-fit=cover">
-        <meta name="color-scheme" content="light dark">
-        <link rel="stylesheet" href="css/index.css">
-        <title>Hello World</title>
-    </head>
-    <body>
-        <div class="app">
-            <h1>Apache Cordova</h1>
-            <div id="deviceready" class="blink">
-                <p class="event listening">Connecting to Device</p>
-                <p class="event received">Device is Ready</p>
-            </div>
-        </div>
-        <script src="cordova.js"></script>
-        <script src="js/index.js"></script>
-    </body>
-</html>
+<script src="/cordova.js"></script>
+</body>
+</html>
\ No newline at end of file