Merge branch 'master' into dev

.eslintrc.json

@@ -1,10 +1,17 @@
 {
     "extends": [
-        "airbnb"
+        "airbnb",
+        "prettier"
     ],
     "parser": "babel-eslint",
     "plugins": [
-        "simple-import-sort"
+        "simple-import-sort",
+        "import",
+        "module-resolver",
+        "react",
+        "react-native",
+        "prettier"
+
     ],
     "rules": {
         "no-use-before-define": "off",
@@ -15,10 +22,13 @@
         "react/no-access-state-in-setstate": "off",
         "simple-import-sort/imports": "error",
         "simple-import-sort/exports": "error",
-        "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "**/__test__/*.js" ]}]
-
-
-
+        "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "**/__test__/*.js" ]}],
+        "module-resolver/use-alias": 2
+    },
+     "settings": {
+        "import/resolver": {
+        "babel-module": {}
+        }
     },
     "env": {
         "jest": true,

.versionrc.js

@@ -1,31 +1,31 @@
 module.exports = {
   bumpFiles: [
     {
-      filename: 'package.json',
+      filename: "package.json",
     },
     {
-      filename: 'app.json',
-      updater: require.resolve('standard-version-expo'),
+      filename: "app.json",
+      updater: require.resolve("standard-version-expo"),
     },
     {
-      filename: 'app.json',
-      updater: require.resolve('standard-version-expo/android'),
+      filename: "app.json",
+      updater: require.resolve("standard-version-expo/android"),
     },
     {
-      filename: 'app.json',
-      updater: require.resolve('standard-version-expo/ios'),
-    }
+      filename: "app.json",
+      updater: require.resolve("standard-version-expo/ios"),
+    },
   ],
   types: [
-    { type: 'chore', section: 'Housekeeping Tasks', hidden: true },
-    { type: 'ci', section: 'Pipeline Changes' },
-    { type: 'docs', section: 'Documentation Changes' },
-    { type: 'feat', section: 'New Features' },
-    { type: 'fix', section: 'Bug fixes' },
-    { type: 'perf', hidden: true },
-    { type: 'refactor', section: 'Code Refactors' },
-    { type: 'release', hidden: true },
-    { type: 'style', hidden: true },
-    { type: 'test', hidden: true },
+    { type: "chore", section: "Housekeeping Tasks", hidden: true },
+    { type: "ci", section: "Pipeline Changes" },
+    { type: "docs", section: "Documentation Changes" },
+    { type: "feat", section: "New Features" },
+    { type: "fix", section: "Bug fixes" },
+    { type: "perf", hidden: true },
+    { type: "refactor", section: "Code Refactors" },
+    { type: "release", hidden: true },
+    { type: "style", hidden: true },
+    { type: "test", hidden: true },
   ],
-};
+};

App.js

@@ -1,16 +1,17 @@
 /* eslint-disable-file */
-import 'react-native-gesture-handler';
+import "react-native-gesture-handler";
 
-import { NavigationContainer } from '@react-navigation/native';
-import React from 'react';
-import { Provider as PaperProvider } from 'react-native-paper';
+import { AlertContextProvider } from "@context/alert.context";
+import { UserContextProvider } from "@context/auth.context";
+import { OfflineContextProvider } from "@context/offline.context";
+import MainNavigation from "@impacto-design-system/MainNavigation";
+import useCachedResources from "@modules/cached-resources/useCachedResources";
+import { theme } from "@modules/theme";
+import { NavigationContainer } from "@react-navigation/native";
+import React from "react";
+import { Provider as PaperProvider } from "react-native-paper";
 
-import MainNavigation from './components/MainNavigation';
-import { UserContextProvider } from './context/auth.context';
-import { OfflineContextProvider } from './context/offline.context';
-import useCachedResources from './modules/cached-resources/useCachedResources';
-import { theme } from './modules/theme';
-import { initialize } from './services/parse/auth';
+import { initialize } from "./services/parse/auth";
 
 initialize();
 
@@ -23,13 +24,14 @@ export default function App() {
   return (
     <NavigationContainer independent>
       <PaperProvider theme={theme}>
-        <UserContextProvider>
-          <OfflineContextProvider>
-            <MainNavigation />
-          </OfflineContextProvider>
-        </UserContextProvider>
+        <AlertContextProvider>
+          <UserContextProvider>
+            <OfflineContextProvider>
+              <MainNavigation />
+            </OfflineContextProvider>
+          </UserContextProvider>
+        </AlertContextProvider>
       </PaperProvider>
     </NavigationContainer>
-
   );
 }

App.unit.test.js

@@ -1,3 +1,3 @@
-test('get something to work', () => {
+test("get something to work", () => {
   expect(true).toBeTruthy();
 });

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [12.5.0](https://github.com/hopetambala/puente-reactnative-collect/compare/v12.4.2...v12.5.0) (2023-02-17)
+
+
+### New Features
+
+* HUGE REFACTOR of imports to consolidate for design system ([c8d9777](https://github.com/hopetambala/puente-reactnative-collect/commit/c8d9777e35aae23277ef90aab5803469965a1ea4))
+
+
+### Bug fixes
+
+* remove automatic login ([b8eb1ea](https://github.com/hopetambala/puente-reactnative-collect/commit/b8eb1ea728ab06beccec99573d2d4280e675efe5))
+
+### [12.4.3](https://github.com/hopetambala/puente-reactnative-collect/compare/v12.4.2...v12.4.3) (2023-02-17)
+
+
+### New Features
+
+* HUGE REFACTOR of imports to consolidate for design system ([c8d9777](https://github.com/hopetambala/puente-reactnative-collect/commit/c8d9777e35aae23277ef90aab5803469965a1ea4))
+
+
+### Bug fixes
+
+* remove automatic login ([b8eb1ea](https://github.com/hopetambala/puente-reactnative-collect/commit/b8eb1ea728ab06beccec99573d2d4280e675efe5))
+
 ### [12.4.2](https://github.com/hopetambala/puente-reactnative-collect/compare/v12.4.1...v12.4.2) (2022-10-20)
 
 

app.json

@@ -7,7 +7,7 @@
       "android",
       "web"
     ],
-    "version": "12.4.2",
+    "version": "12.5.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",
@@ -23,7 +23,7 @@
     ],
     "ios": {
       "supportsTablet": true,
-      "buildNumber": "12.4.2",
+      "buildNumber": "12.5.0",
       "infoPlist": {
         "NSLocationWhenInUseUsageDescription": "This app uses your location to geo-tag surveys accurately.",
         "NSCameraUsageDescription": "This app uses photos to identify residents more accurately.",
@@ -36,7 +36,7 @@
       "favicon": "./assets/images/favicon.png"
     },
     "android": {
-      "versionCode": 460120402,
+      "versionCode": 460120500,
       "permissions": [
         "ACCESS_COARSE_LOCATION",
         "ACCESS_FINE_LOCATION",

babel.config.js

@@ -1,12 +1,27 @@
 module.exports = function (api) {
   api.cache(true);
   return {
-    presets: ['babel-preset-expo'],
-    plugins: ['react-native-reanimated/plugin'],
+    presets: ["babel-preset-expo"],
+    plugins: [
+      "react-native-reanimated/plugin",
+      [
+        "module-resolver",
+        {
+          root: ["./"],
+          alias: {
+            "@impacto-design-system": "./impacto-design-system",
+            "@modules": "./modules",
+            "@assets": "./assets",
+            "@context": "./context",
+            "@app": ".",
+          },
+        },
+      ],
+    ],
     env: {
       production: {
-        plugins: ['react-native-paper/babel'],
+        plugins: ["react-native-paper/babel"],
       },
     },
   };
-};
+};