Merge pull request #86 from OpenDTU-App/52-implement-inverter-info

Author: CommanderRedYT

.eslintrc.json

@@ -3,6 +3,13 @@
     "node": true,
     "react-native/react-native": true
   },
+  "overrides": [
+    {
+      // Test files only
+      "files": ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"],
+      "extends": ["plugin:testing-library/react"]
+    }
+  ],
   "extends": [
     "eslint:recommended",
     "plugin:import/recommended",
@@ -34,11 +41,16 @@
     "react-native",
     "react-hooks",
     "prettier",
-    "import"
+    "import",
+    "simple-import-sort"
   ],
   "rules": {
     "import/no-named-as-default-member": "off",
     "import/no-named-as-default": "off",
+    "import/first": "error",
+    "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
+    "import/newline-after-import": "error",
+    "import/no-duplicates": "error",
     "import/extensions": [
       "error",
       "never",
@@ -72,7 +84,6 @@
         "disallowTypeAnnotations": true
       }
     ],
-    "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
     "no-console": 0,
     "indent": "off",
     "quotes": [
@@ -108,21 +119,24 @@
         "bracketSpacing": true,
         "arrowParens": "avoid",
         "bracketSameLine": false,
-        "endOfLine": "lf",
-        "importOrder": [
-          "^react",
-          "^react-native$",
-          "^@/slices",
-          "^@/types",
-          "^@/components",
-          "^@/hooks",
-          "^@/utils",
-          "^@/assets",
-          "^[./]",
-          "^@/"
-        ],
-        "importOrderSeparation": true
+        "endOfLine": "lf"
       }
-    ]
+    ],
+    "simple-import-sort/imports": ["error", {
+        "groups": [
+          ["^react"],
+          ["^react-native$"],
+          ["^\\w"],
+          ["^@/slices"],
+          ["^@/types"],
+          ["^@/components"],
+          ["^@/hooks"],
+          ["^@/utils"],
+          ["^@/assets"],
+          ["^@/"],
+          ["^[./]"]
+        ]
+    }],
+    "simple-import-sort/exports": "error"
   }
 }

.githooks/pre-commit

@@ -1,20 +1,27 @@
 #!/bin/bash
-# Get latest git tag
-latest_tag=$(git describe --tags --abbrev=0)
-latest_tag_without_v=${latest_tag#"v"}
-version_from_tag=$(echo "$latest_tag_without_v" | grep -P '^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
+# This script is ./pre-commit
+# Execute all scripts in ./pre-commit.d in order (0-foo before 10-bar)
 
-# Get the version from package.json
-version=$(jq -r '.version' package.json)
+# Get the directory of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+error=0
 
-echo "Latest tag: $latest_tag_without_v"
-echo "Version from tag: $version_from_tag"
-echo "Version from package.json: $version"
+echo "Running pre-commit hooks in $DIR/pre-commit.d"
 
-# Check if the version from the tag and package.json are the same
-if [ "$version" != "$version_from_tag" ]; then
-  echo "Version in package.json and tag are not the same"
-  exit 1
-fi
+# Run all scripts in ./pre-commit.d
+for script in $DIR/pre-commit.d/*; do
+  if [ -x $script ]; then
+    echo "> Running $script"
+    $script
+    err=$?
+    if [ $err -ne 0 ]; then
+      echo "Error in $script: $err"
+      if [ $error -eq 0 ]; then
+        error=$err
+      fi
+    fi
+    printf "\n"
+  fi
+done
 
-echo "Version in package.json and tag are the same"
+exit $error

.githooks/pre-commit.d/check-for-unresolved-conflicts

@@ -0,0 +1,14 @@
+#!/bin/bash
+conflicts=$(git diff --cached --name-only -G"<<<<<|=====|>>>>>")
+
+if [[ -n "$conflicts" ]]; then
+    echo "Unresolved merge conflicts in these files:"
+
+    for conflict in $conflicts; do
+        echo "$conflict"
+    done;
+
+    exit 1;
+fi
+
+exit 0

.githooks/pre-commit.d/check-if-packagejson-matches-tag

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Get latest git tag
+latest_tag=$(git describe --tags --abbrev=0)
+latest_tag_without_v=${latest_tag#"v"}
+version_from_tag=$(echo "$latest_tag_without_v" | grep -P '^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
+
+# Get the version from package.json
+version=$(jq -r '.version' package.json)
+
+echo "Latest tag: $latest_tag_without_v"
+echo "Version from tag: $version_from_tag"
+echo "Version from package.json: $version"
+
+# Check if the version from the tag and package.json are the same
+if [ "$version" != "$version_from_tag" ]; then
+  echo "Version in package.json and tag are not the same"
+  exit 1
+fi
+
+echo "Version in package.json and tag are the same"

.github/workflows/testing.yml

@@ -2,6 +2,8 @@ name: Continuous Integration
 
 on:
   push:
+    branches:
+      - main
   pull_request:
     branches: [ '*' ]
 

.yarn/patches/node-git-hooks-npm-1.0.7-618e27eb9b.patch

@@ -0,0 +1,13 @@
+diff --git a/install-git-hooks.js b/install-git-hooks.js
+index 62723526d054b2da4ec7fa418f9125bdc59c14be..a21d9dde0b0d78cb327787fabc6ac40b1aeaa871 100644
+--- a/install-git-hooks.js
++++ b/install-git-hooks.js
+@@ -54,7 +54,7 @@ function copyDir(src, dest) {
+ };
+ 
+ function copy(src, dest) {
+-  fs.copyFileSync(src, dest);
++  fs.cpSync(src, dest);
+ };
+ 
+ module.exports = installGitHooks;

__mocks__/@react-native-clipboard/clipboard.js

@@ -0,0 +1,11 @@
+/**
+ * @format
+ */
+/* eslint-env jest */
+
+jest.mock('@react-native-clipboard/clipboard', () => {
+  return {
+    addListener: jest.fn(),
+    removeAllListeners: jest.fn(),
+  };
+});

__tests__/App.test.tsx

@@ -1,16 +1,13 @@
 /**
  * @format
  */
-// Note: import explicitly to use the types shipped with jest.
-import { it } from '@jest/globals';
-
-import React from 'react';
-import 'react-native';
-// Note: test renderer must be required after react-native.
-import renderer from 'react-test-renderer';
+/* eslint-env jest */
 
 import App from '@/App';
 
+import { it } from '@jest/globals';
+import { render } from '@testing-library/react-native';
+
 it('renders correctly', () => {
-  renderer.create(<App />);
+  render(<App />);
 });

android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">opendtu-react-native</string>
+    <string name="app_name">OpenDTU</string>
 </resources>

app.json

@@ -1,4 +1,3 @@
 {
-  "name": "opendtu-react-native",
-  "displayName": "opendtu-react-native"
+  "name": "opendtu-react-native"
 }