Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated project #25

Merged
merged 52 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3f46241
Saving a status with new react version
lucak276 Aug 1, 2023
d49d540
Add Swiper.js but still blue screen
lucak276 Aug 1, 2023
89907b0
Update DevDependencies for node und react
lucak276 Aug 2, 2023
8633de1
App runs with some updated Dependencies
lucak276 Aug 2, 2023
acb0a3b
chore(dependencies): update react-router dep to the latest v5
lucak276 Aug 8, 2023
cad741b
chore(dependencies): update reduxjs.toolkit dep to the latest
lucak276 Aug 8, 2023
d1bdb64
fix: viewport meta element content should not contain 'maximum-scale'…
lucak276 Aug 8, 2023
cf7f8d2
chore(dependencies): update use-query-params dep to the new major v2
lucak276 Aug 8, 2023
15ef326
chore(dependencies): update @ionic/storage dep to the new major v4
lucak276 Aug 8, 2023
48244d6
chore(dependencies): update ionicons dep from v5 to the new major v7
lucak276 Aug 8, 2023
a2c3da2
chore(dependencies): update query-strings dep to the new major v8
lucak276 Aug 8, 2023
1e168fb
refactor: adding imports
lucak276 Aug 8, 2023
cf291cf
chore(dependencies): update ionic/cli to new major v7
lucak276 Aug 9, 2023
32fc048
chore(dependencies): commitlint from v12 to v17
lucak276 Aug 9, 2023
00864e5
chore(dependencies): semantic-release von v17 auf v21
lucak276 Aug 9, 2023
7861b50
chore(dependencies): semantic-release changelog exec und git update
lucak276 Aug 9, 2023
a37692e
chore(dependencies): eslint config and plugins update dep
lucak276 Aug 9, 2023
0ecfd4b
chore(dependencies): squoosh/cli update dep
lucak276 Aug 9, 2023
bc2c283
chore(dependencies): chalk from v4 to v5
lucak276 Aug 9, 2023
95fc7e8
chore(dependencies): stylelint from v13 to v15
lucak276 Aug 9, 2023
b5e0d26
chore(dependencies): prettier to v3, all stylelint
lucak276 Aug 9, 2023
17b5132
chore: updating the dep with bi linter config + linter von json zu js
lucak276 Aug 9, 2023
61283ec
style: speichern vom zwischenstand der css updates
lucak276 Aug 10, 2023
d0599a2
chore(dependencies): updating playwright, not sure if it still works,…
lucak276 Aug 10, 2023
7e61c2e
chore(dependencies): updating husky vom v6 to v8
lucak276 Aug 10, 2023
c94e573
refactor: pre-commit husky got changed that commits can be done
lucak276 Aug 10, 2023
edfbc4b
style: fix some stylelint errors, especially colors from eg 000000 to…
lucak276 Aug 10, 2023
4a465b2
style: fix rest of stylelint errors, 3 errors propertynovenderprefix …
lucak276 Aug 11, 2023
bba8a24
style: fix .selectable in index.css because no more needed
lucak276 Aug 11, 2023
1411855
refactor: changes in husky folder
lucak276 Aug 11, 2023
7ad0554
refactor: changes in husky folder
lucak276 Aug 11, 2023
d5636f9
chore(dependencies): updating lint-staged from v11 to v13
lucak276 Aug 11, 2023
9d83b8e
chore(dependencies): updating lint-staged from v11 to v13
lucak276 Aug 11, 2023
2a615fc
chore(dependencies): updating fuse.js minor version
lucak276 Aug 11, 2023
050671d
test: preperation for playwright
lucak276 Aug 14, 2023
b2b8b84
fix: update getdefaultmiddleware because it was deprecated
lucak276 Aug 14, 2023
9c26b37
chore(dependencies): updating all i18next to new versions, change tfu…
lucak276 Aug 14, 2023
f050b07
refactor: change imports on 18next
lucak276 Aug 14, 2023
c810bff
chore(dependencies): updating @types/node from v18 to v20
lucak276 Aug 15, 2023
33b1e26
chore(dependencies): updating lint staged from v13 to v14
lucak276 Aug 15, 2023
add9dc3
perf: migrating from squoosh to sharp image optimization
lucak276 Aug 15, 2023
9fc15f1
style: renaming file from squoosh.js to sharp.js
lucak276 Aug 15, 2023
89ff554
chore(dependencies): removing old, unused deps
lucak276 Aug 15, 2023
8e176e1
chore(dependencies): removing old, unused deps
lucak276 Aug 15, 2023
3b7f281
fix: update to swiper instead of ionslides
lucak276 Aug 15, 2023
8df81a2
fix: change swipeToClose in IonModal because no longer supported in c…
lucak276 Aug 15, 2023
34cf952
refactor: add .d.ts file to solve cannot find module error
lucak276 Aug 15, 2023
440dffd
feat: implemented pagination
lucak276 Aug 15, 2023
dc8d394
chore(deps): updating capacitor to v5 + replacing dist with build
lucak276 Aug 16, 2023
de6dcbb
style: image now centered, not in the Iphone notch anymore
lucak276 Sep 27, 2023
0473f7f
style: delete unused file
lucak276 Sep 27, 2023
bc52281
docs: update readme file with new node and npm version
lucak276 Sep 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module "*.png";
20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
env: {
browser: true,
es2022: true,
node: true,
worker: true,
},
extends: [
"@boehringer-ingelheim/eslint-config/base/strict",
"@boehringer-ingelheim/eslint-config/react",
"@boehringer-ingelheim/eslint-config/playwright",
// HINT: prettier must be the last extension to work
"plugin:prettier/recommended",
],
ignorePatterns: ["build", "dev-dist", "dist", "docker", "node_modules", "openshift", "public"],
plugins: [
// HINT: prettier must be the last plugin to work
"prettier",
],
};
12 changes: 0 additions & 12 deletions .eslintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/release-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: build-browser
path: build
path: dist
release:
name: Release
needs: build
Expand All @@ -67,7 +67,7 @@ jobs:
uses: actions/download-artifact@v2
with:
name: build-browser
path: build
path: dist
- name: Cache Node Modules
id: cache-node-modules
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: build-browser
path: build
path: dist
resources:
name: Generate Screenshots
needs: build
Expand All @@ -74,7 +74,7 @@ jobs:
uses: actions/download-artifact@v2
with:
name: build-browser
path: build
path: dist
- name: Install Dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: npm install
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public/assets/img/photo_*

# production
.gradle
/build
/dist

# resources
resources/android
Expand All @@ -37,3 +37,6 @@ resources/pwa
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/test-results/
/playwright-report/
/playwright/.cache/
6 changes: 3 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install commitlint --edit $1 || echo "Try \033[1;32mnpx git-cz --disable-emoji\033[0;37m to commit and be align with the conventions or use \033[1;32git commit -m \"yolo!\" --no-verify\033[0;37m to bypass the commit-msg hook."
npx --no -- commitlint --edit "$1" || { echo "Try \033[1;32mnpx git-cz --disable-emoji\033[0;37m to commit and be align with the conventions or use \033[1;33mgit commit -m \"yolo!\" --no-verify\033[0;37m to bypass the commit-msg hook."; exit 1; }
7 changes: 7 additions & 0 deletions .husky/post-checkout
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

set +e
# Install any missing dependencies since package.json changed, while only versions changes are ignored.
git diff-tree -r --ignore-matching-lines="version" --name-only --no-commit-id "$1" "$2" | grep --quiet package.json && npm ci
set -e
8 changes: 4 additions & 4 deletions .husky/post-merge
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# Install any missing dependencies since package.json changed
git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD | grep --quiet package.json && npm install
# Install any missing dependencies since package.json changed, while only versions changes are ignored.
git diff-tree -r --ignore-matching-lines="version" --name-only --no-commit-id ORIG_HEAD HEAD | grep --quiet package.json && npm ci
17 changes: 14 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install lint-staged
# The (feature) branch name is part of the helm release name and only supports a maximum number of characters.
# The number is unknown for the moment, since it's also depends on Project Id and Component Id.
# However, the recommendation is that the branch name should not be longer than 32 characters.
BRANCH_NAME_LENGTH=$(git branch --show-current | wc -m)
BRANCH_NAME_MAX_LENGTH=32
if [ $BRANCH_NAME_LENGTH -gt $BRANCH_NAME_MAX_LENGTH ]
then
echo "\033[1;31m✖ Branch name too long ($((BRANCH_NAME_LENGTH))), only $((BRANCH_NAME_MAX_LENGTH)) characters are allowed. Change with 'git branch -m \"new-name\"'\033[0m" && exit;
fi

npx --no lint-staged
# helm lint chart --strict
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps = true
9 changes: 9 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.history/
build/
dev-dist/
dist/
node_modules/
openshift/ods-deployments.json
package-lock.json
package.json
yarn.lock
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@boehringer-ingelheim/prettier-config");
16 changes: 0 additions & 16 deletions .prettierrc.json

This file was deleted.

17 changes: 17 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
extends: ["stylelint-config-standard", "stylelint-prettier/recommended"],
plugins: ["stylelint-order"],
ignoreFiles: ["./dist/**", "./ios/**"],
rules: {
/**
* Ionic uses colors with an opacity (alpha) in several components.
* In order for this to work, those properties must be provided in RGB format
* in a comma separated format without parentheses.
* see: https://ionicframework.com/docs/theming/advanced#the-alpha-problem
*/
"color-function-notation": "legacy",
"order/order": ["custom-properties", "declarations"],
"order/properties-alphabetical-order": true,

},
};
10 changes: 0 additions & 10 deletions .stylelintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

### Requirements

- NodeJS 14+
- NPM 6+
![Prerequisite Npm](https://img.shields.io/badge/npm-%3E%3D9-blue.svg?style=for-the-badge)
![Prerequisite Node](https://img.shields.io/badge/node-%3E%3D18-blue.svg?style=for-the-badge)
- Ionic

### Set Environment Variables
Expand Down
9 changes: 6 additions & 3 deletions capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@
"appName": "Goat Health",
"bundledWebRuntime": true,
"npmClient": "npm",
"webDir": "build",
"webDir": "dist",
"cordova": {},
"plugins": {
"SplashScreen": {
"launchShowDuration": 3000,
"launchAutoHide": true,
"backgroundColor": "#ffffffff",
"backgroundColor": "#fffff",
"androidSplashResourceName": "splash",
"androidScaleType": "CENTER_CROP",
"androidSpinnerStyle": "large",
"iosSpinnerStyle": "small",
"spinnerColor": "#999999",
"spinnerColor": "#999",
"showSpinner": false,
"splashFullScreen": true,
"splashImmersive": true
}
},
"server": {
"androidScheme": "https"
}
}
10 changes: 10 additions & 0 deletions capacitor.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { CapacitorConfig } from "@capacitor/cli";

const config: CapacitorConfig = {
"appId": "de.golms.mmh.goathealth",
"appName": "Goat Health",
"bundledWebRuntime": false,
"webDir": "dist",
};

export default config;
11 changes: 6 additions & 5 deletions public/index.html → index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

<meta
name="viewport"
content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
content="viewport-fit=cover, width=device-width, initial-scale=1.0"
/>
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />

<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="manifest" href="/manifest.json" />

<link
rel="shortcut icon"
type="image/png"
href="%PUBLIC_URL%/assets/icon/favicon.png"
href="/assets/icon/favicon.png"
/>

<!-- add to homescreen for ios -->
Expand All @@ -29,10 +29,10 @@
<!-- Open Graph Protocol -->
<meta property="og:title" content="Goat Health by Making More Health" />
<meta property="og:description" content="Taking good care of your goats." />
<meta property="og:url" content="%PUBLIC_URL%" />
<meta property="og:url" content="/" />
<meta
property="og:image:url"
content="%PUBLIC_URL%/assets/img/social-preview.png"
content="/assets/img/social-preview.png"
/>
<meta property="og:image:height" content="640" />
<meta property="og:image:width" content="1280" />
Expand All @@ -42,5 +42,6 @@

<body>
<div id="root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion ionic.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"integrations": {
"capacitor": {}
},
"type": "react"
"type": "react-vite"
}
3 changes: 2 additions & 1 deletion ios/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
App/build
App/Pods
App/Podfile.lock
App/App/public

# Cordova plugins for Capacitor
Expand Down Expand Up @@ -96,3 +95,5 @@ fastlane/test_output
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/


Loading