Merge branch 'main' of https://github.com/wieerwill/CocktailShaker-App into main

This reverts commit aaa7aeab81.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+robert.jeutter@gmx.de.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Readme-EN.md

@@ -8,8 +8,7 @@ All the cocktail recipes are for information only.
 No food bloggers, bartenders or programmers were harmed in the making of this project.
 
 ## Download
-- [Android Release APK](android/app/release/app-release.apk)
+Download the ready app from [releases](/releases) page
-- [Android Debug APK](android/app/build/outputs/apk/debug/app-debug.apk)
 
 ## Contribution
 - the (CocktailDB)[https://www.thecocktaildb.com/] API; you can add your own API Key

Readme.md

@@ -15,10 +15,26 @@ Die Autoren des Projekts warnen vor den Schäden, die Alkohol anrichtet, und üb
 Alle Cocktailrezepte dienen nur zur Information.
 Bei der Erstellung dieses Projekts wurden keine Food-Blogger, Barkeeper oder Programmierer geschädigt.
 
-## Download
+## Releases
-- [Android Release APK](android/app/release/app-release.apk)
+Übersicht aller [Releases](/releases). Downloade die App von dort.
-- [Android Debug APK](android/app/build/outputs/apk/debug/app-debug.apk)
 
+- Version 1.1
+  - Favourisieren aus Shake-Sicht möglich
+  - Logo auf Startseite
+  - kleine Verbesserungen und Bugfixes
+- Version 1.0
+  - grundlegende Funktionen implementiert
+  - editieren nicht möglich
+
+## Open Bugs, Issues & ToDos
+- Shake: Scroll-to-top funktioniert nicht
+- New Cocktail
+  - Zutat verschwindet bei hinzufügen einer neuen Reihe
+- Edit Cocktails
+  - Cocktail Zutat zeigen
+  - Speichern ermöglichen
+- API Key
+  - Key nicht gespeichert
 
 ## Quellen und Bibliotheken
 - die [CocktailDB](https://www.thecocktaildb.com/) API; der eigene API Schlüssel kann in der App gespeichert werden

android/app/src/main/assets/capacitor.config.json

@@ -1,13 +1,14 @@
 {
-  "appId": "io.ionic.starter",
+    "appId": "cocktail.shaker.app",
-  "appName": "cocktailShakerApp",
+    "appName": "cocktailShakerApp",
-  "bundledWebRuntime": false,
+    "bundledWebRuntime": false,
-  "npmClient": "yarn",
+    "npmClient": "yarn",
-  "webDir": "dist",
+    "webDir": "dist",
-  "plugins": {
+    "plugins": {
-    "SplashScreen": {
+        "SplashScreen": {
-      "launchShowDuration": 0
+            "launchShowDuration": 0
-    }
+        }
-  },
+    },
-  "cordova": {}
+    "cordova": {},
+    "linuxAndroidStudioPath": "/home/robert/Dokumente/Programme/android-studio/bin/studio.sh"
 }

ios/App/App/capacitor.config.json

@@ -1,13 +1,14 @@
 {
-  "appId": "io.ionic.starter",
+    "appId": "cocktail.shaker.app",
-  "appName": "cocktailShakerApp",
+    "appName": "cocktailShakerApp",
-  "bundledWebRuntime": false,
+    "bundledWebRuntime": false,
-  "npmClient": "yarn",
+    "npmClient": "yarn",
-  "webDir": "dist",
+    "webDir": "dist",
-  "plugins": {
+    "plugins": {
-    "SplashScreen": {
+        "SplashScreen": {
-      "launchShowDuration": 0
+            "launchShowDuration": 0
-    }
+        }
-  },
+    },
-  "cordova": {}
+    "cordova": {},
+    "linuxAndroidStudioPath": "/home/robert/Dokumente/Programme/android-studio/bin/studio.sh"
 }

package.json

@@ -9,7 +9,8 @@
         "build": "vue-cli-service build",
         "test:unit": "vue-cli-service test:unit",
         "test:e2e": "vue-cli-service test:e2e",
-        "lint": "vue-cli-service lint"
+        "lint": "vue-cli-service lint",
+        "resources": "cordova-res android && cordova-res ios && node ./resources/sync.js android && node ./resources/sync.js ios"
     },
     "dependencies": {
         "@capacitor/android": "2.4.7",
@@ -25,8 +26,10 @@
         "@vueuse/core": "^5.0.2",
         "axios": "^0.21.1",
         "cordova-plugin-x-socialsharing": "^6.0.3",
+        "cordova-res": "^0.15.3",
         "core-js": "^3.6.5",
         "es6-promise-plugin": "^4.2.2",
+        "fs": "^0.0.1-security",
         "register-service-worker": "^1.7.1",
         "vue": "^3.0.0-0",
         "vue-router": "^4.0.0-0"

public/index.html

@@ -12,12 +12,15 @@
     <meta name="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />
 
-    <link rel="shortcut icon" type="image/png" href="<%= BASE_URL %>img/favicon.ico" />
+    <link rel="shortcut icon" type="image/png" href="/img/favicon.ico" />
+    <link rel="favicon" type="image/png" href="/img/favicon.ico?" />
+    <link rel="icon" type="image/png" href="/img/icon.png?" />
+    <link rel="manifest" href="/manifest.json">
 
     <!-- add to homescreen for ios -->
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-title" content="Cocktail Shaker App" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="rgb(202, 0, 152)" />
 </head>
 
 <body>

public/manifest.json

@@ -1,27 +1,25 @@
 {
     "name": "cocktail-shaker",
     "short_name": "CS",
+    "description": "shake your way to a new cocktail",
     "theme_color": "#4DBA87",
     "icons": [{
             "src": "./img/favicon.ico",
             "sizes": "32x32",
-            "type": "image/png",
+            "type": "image/png"
-            "purpose": "maskable"
         },
         {
             "src": "./img/icon.png",
             "sizes": "32x32",
-            "type": "image/png",
+            "type": "image/png"
-            "purpose": "maskable"
         },
         {
             "src": "./img/splash.png",
             "sizes": "128x128",
-            "type": "image/png",
+            "type": "image/png"
-            "purpose": "maskable"
         }
     ],
-    "start_url": ".",
+    "start_url": "/",
     "display": "standalone",
-    "background_color": "#000000"
+    "background_color": "rgb(202, 0, 152)"
 }