From 8d3a99fde4b13cabf565734a29f0ed0f2e35ab71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 22 Aug 2023 10:32:40 +0200 Subject: [PATCH 01/33] lint source + fix error on app closing tag --- .editorconfig | 21 + .idea/.gitignore | 3 + .idea/com-app.iml | 9 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + ComApp/.prettierrc.js | 2 +- ComApp/package-lock.json | 16 - ComApp/src/App.js | 588 +++-- .../src/App/Controllers/InstallController.js | 107 +- ComApp/src/App/Controllers/LoginController.js | 36 +- ComApp/src/App/Controllers/SyncController.js | 364 ++- ComApp/src/App/Lib/Helpers.js | 105 +- ComApp/src/App/Models/Contact.js | 1 - ComApp/src/App/Models/Directory.js | 23 +- ComApp/src/App/Models/Document.js | 130 +- ComApp/src/App/Models/SendBrochure.js | 3 +- ComApp/src/App/Models/Setting.js | 9 +- ComApp/src/App/Models/User.js | 1 - ComApp/src/App/Store/Actions/actionType.js | 18 +- ComApp/src/App/Store/Actions/contacts.js | 49 +- ComApp/src/App/Store/Actions/directories.js | 16 +- ComApp/src/App/Store/Actions/documents.js | 16 +- ComApp/src/App/Store/Actions/locales.js | 18 +- ComApp/src/App/Store/Actions/users.js | 12 +- ComApp/src/App/Store/ConfigureStore.js | 28 +- ComApp/src/App/Store/Reducers/AppReducer.js | 258 ++- ComApp/src/App/Store/Reducers/contacts.js | 51 +- ComApp/src/App/Store/Reducers/directories.js | 46 +- ComApp/src/App/Store/Reducers/documents.js | 28 +- ComApp/src/App/Store/Reducers/locales.js | 78 +- ComApp/src/App/Store/Reducers/users.js | 26 +- ComApp/src/App/Views/ContactDetailsScreen.js | 1784 ++++++++------- ComApp/src/App/Views/ContactScreen.js | 1189 +++++----- ComApp/src/App/Views/DirectoriesScreen.js | 131 +- ComApp/src/App/Views/HomeScreen.js | 222 +- ComApp/src/App/Views/InstallScreen.js | 347 +-- ComApp/src/App/Views/LoginScreen.js | 271 ++- ComApp/src/App/Views/MySpaceScreen.js | 52 +- ComApp/src/App/Views/OnlyVideosScreen.js | 124 +- ComApp/src/App/Views/PDFScreen.js | 54 +- ComApp/src/App/Views/SearchScreen.js | 173 +- ComApp/src/App/Views/SyncScreen.js | 714 +++--- ComApp/src/App/Views/VideoScreen.js | 84 +- ComApp/src/Database.js | 60 +- ComApp/src/I18n.js | 34 +- ComApp/src/Navigation.js | 10 +- ComApp/src/Resources/CommonStyles.js | 10 +- .../Resources/Styles/ContactDetailsStyle.js | 76 +- ComApp/src/Resources/Styles/ContactStyle.js | 140 +- .../src/Resources/Styles/DirectoriesStyle.js | 62 +- ComApp/src/Resources/Styles/HomeStyle.js | 68 +- ComApp/src/Resources/Styles/InstallStyle.js | 28 +- ComApp/src/Resources/Styles/LoginStyle.js | 40 +- ComApp/src/Resources/Styles/MySpaceStyle.js | 10 +- .../src/Resources/Styles/NavigationStyle.js | 62 +- .../src/Resources/Styles/OnlyVideosStyle.js | 56 +- ComApp/src/Resources/Styles/PDFStyle.js | 38 +- ComApp/src/Resources/Styles/SearchStyle.js | 56 +- ComApp/src/Resources/Styles/SyncStyle.js | 18 +- ComApp/src/Views/ContactDetails.js | 2023 ++++++++++------- ComApp/src/Views/ContactDetails_MC.js | 2017 +++++++++------- ComApp/src/Views/ContactDetails_RHD.js | 1990 ++++++++-------- ComApp/yarn.lock | 1125 +++++---- 63 files changed, 8329 insertions(+), 6815 deletions(-) create mode 100644 .editorconfig create mode 100644 .idea/.gitignore create mode 100644 .idea/com-app.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..13fb9eb --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.{yml,yaml}] +indent_size = 2 + +[*.{vue,js}] +indent_size = 2 + +[docker-compose.yml] +indent_size = 4 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/com-app.iml b/.idea/com-app.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/com-app.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..72b73b8 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ComApp/.prettierrc.js b/ComApp/.prettierrc.js index 2b54074..2ae7b38 100644 --- a/ComApp/.prettierrc.js +++ b/ComApp/.prettierrc.js @@ -1,7 +1,7 @@ module.exports = { arrowParens: 'avoid', bracketSameLine: true, - bracketSpacing: false, + bracketSpacing: true, singleQuote: true, trailingComma: 'all', }; diff --git a/ComApp/package-lock.json b/ComApp/package-lock.json index faa8f68..e465283 100644 --- a/ComApp/package-lock.json +++ b/ComApp/package-lock.json @@ -14436,8 +14436,6 @@ }, "node_modules/npm/node_modules/debug/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "inBundle": true, "license": "MIT" }, @@ -15237,8 +15235,6 @@ }, "node_modules/npm/node_modules/node-gyp/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "inBundle": true, "license": "ISC", "dependencies": { @@ -15741,8 +15737,6 @@ }, "node_modules/npm/node_modules/rimraf/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "inBundle": true, "license": "ISC", "dependencies": { @@ -15818,8 +15812,6 @@ }, "node_modules/npm/node_modules/semver/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -31283,8 +31275,6 @@ "dependencies": { "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "bundled": true } } @@ -31852,8 +31842,6 @@ }, "glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "bundled": true, "requires": { "fs.realpath": "^1.0.0", @@ -32195,8 +32183,6 @@ }, "glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "bundled": true, "requires": { "fs.realpath": "^1.0.0", @@ -32240,8 +32226,6 @@ "dependencies": { "lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "bundled": true, "requires": { "yallist": "^4.0.0" diff --git a/ComApp/src/App.js b/ComApp/src/App.js index 7fb263d..7fc7bb3 100644 --- a/ComApp/src/App.js +++ b/ComApp/src/App.js @@ -1,49 +1,58 @@ import React from 'react'; // Sentry -import * as Sentry from "@sentry/react-native"; +import * as Sentry from '@sentry/react-native'; // Redux import { Provider } from 'react-redux'; -import { store } from './App/Store/ConfigureStore'; import { initDocuments } from './App/Store/Actions/documents'; +import { store } from './App/Store/ConfigureStore'; // Deps -import 'react-native-gesture-handler'; import { NavigationContainer } from '@react-navigation/native'; import { createNativeStackNavigator } from '@react-navigation/native-stack'; -import { navigationRef, navigate } from './Navigation'; -import { TouchableOpacity, View, Image, Text, TextInput, Alert, DrawerLayoutAndroid, Button } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome5'; -import FlashMessage, { showMessage } from 'react-native-flash-message'; import * as SplashScreen from 'expo-splash-screen'; +import { + Alert, + Button, + DrawerLayoutAndroid, + Image, + Text, + TextInput, + TouchableOpacity, + View, +} from 'react-native'; +import FlashMessage, { showMessage } from 'react-native-flash-message'; +import 'react-native-gesture-handler'; +import Icon from 'react-native-vector-icons/FontAwesome5'; +import { navigate, navigationRef } from './Navigation'; // Application infos import * as Application from 'expo-application'; // i18n -import i18n from "./I18n"; +import i18n from './I18n'; // FileSytem import * as FileSystem from 'expo-file-system'; // Views +import ContactDetailsScreen from './App/Views/ContactDetailsScreen'; +import ContactScreen from './App/Views/ContactScreen'; +import DirectoriesScreen from './App/Views/DirectoriesScreen'; +import HomeScreen from './App/Views/HomeScreen'; import InstallScreen from './App/Views/InstallScreen'; import LoginScreen from './App/Views/LoginScreen'; -import SyncScreen from './App/Views/SyncScreen'; -import HomeScreen from './App/Views/HomeScreen'; -import DirectoriesScreen from './App/Views/DirectoriesScreen'; -import PDFScreen from './App/Views/PDFScreen'; -import VideoScreen from './App/Views/VideoScreen'; -import OnlyVideosScreen from './App/Views/OnlyVideosScreen'; -import ContactScreen from './App/Views/ContactScreen'; -import ContactDetailsScreen from './App/Views/ContactDetailsScreen'; -import SearchScreen from "./App/Views/SearchScreen"; import MySpaceScreen from './App/Views/MySpaceScreen'; +import OnlyVideosScreen from './App/Views/OnlyVideosScreen'; +import PDFScreen from './App/Views/PDFScreen'; +import SearchScreen from './App/Views/SearchScreen'; +import SyncScreen from './App/Views/SyncScreen'; +import VideoScreen from './App/Views/VideoScreen'; // Style import styles from './Resources/Styles/NavigationStyle'; // Controllers import SyncController from './App/Controllers/SyncController'; Sentry.init({ - dsn: "https://ab87e8d840324f41873c95b06903b0bf@o4504314935640064.ingest.sentry.io/4504441255886848", + dsn: 'https://ab87e8d840324f41873c95b06903b0bf@o4504314935640064.ingest.sentry.io/4504441255886848', }); -Sentry.setContext("app", { - boUrl: SyncController.getUrlBo() +Sentry.setContext('app', { + boUrl: SyncController.getUrlBo(), }); SplashScreen.preventAutoHideAsync(); //Keep @@ -61,7 +70,7 @@ class App extends React.Component { searchTxt: '', sendEmail: '', mainColor: '', - drawerRef: React.createRef() + drawerRef: React.createRef(), }; componentDidMount() { @@ -69,7 +78,7 @@ class App extends React.Component { this.setState({ isSetup: store.getState().app.isSetup, isLogged: store.getState().app.logged, - mainColor: store.getState().app.mainColor + mainColor: store.getState().app.mainColor, }); } @@ -77,9 +86,9 @@ class App extends React.Component { this.setState({ isSetup: store.getState().app.isSetup, isLogged: store.getState().app.logged, - mainColor: store.getState().app.mainColor + mainColor: store.getState().app.mainColor, }); // to force re-rendering - console.log("state changed") + console.log('state changed'); } navigationView = () => ( @@ -89,16 +98,23 @@ class App extends React.Component { onPress={() => { this.state.drawerRef.current.closeDrawer(); store.dispatch({ type: 'EDIT_LOCALE' }); - store.dispatch(initDocuments(store.getState().locale.locale, store.getState().directories.global)) + store.dispatch( + initDocuments( + store.getState().locale.locale, + store.getState().directories.global, + ), + ); }} style={styles.drawer.btn}> - {i18n.t('global.change_lang')} + + {i18n.t('global.change_lang')} + { this.state.drawerRef.current.closeDrawer(); - navigate('SyncScreen') + navigate('SyncScreen'); }} style={styles.drawer.btn}> @@ -115,7 +131,9 @@ class App extends React.Component { - Version : {Application.nativeApplicationVersion} + + Version : {Application.nativeApplicationVersion} +