Skip to content

Commit

Permalink
Merge pull request #26 from victorbalssa/version/0.2.1
Browse files Browse the repository at this point in the history
version/0.2.1
  • Loading branch information
victorbalssa authored Aug 3, 2022
2 parents e6003f1 + d34c3b8 commit 40a1975
Show file tree
Hide file tree
Showing 35 changed files with 5,145 additions and 4,759 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
![size](https://img.shields.io/github/repo-size/victorbalssa/abacus?style=for-the-badge)
![licence](https://img.shields.io/github/license/victorbalssa/abacus?style=for-the-badge)
![stars](https://img.shields.io/github/stars/victorbalssa/abacus?style=for-the-badge)
[![sdk](https://img.shields.io/badge/SDK-45.0.0-blue?style=for-the-badge)](https://www.npmjs.com/package/expo)
[![sdk](https://img.shields.io/badge/SDK-46.0.0-blue?style=for-the-badge)](https://www.npmjs.com/package/expo)
[![sdk](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge)](http://makeapullrequest.com)

</sup>
Expand All @@ -36,7 +36,7 @@

### 📡 Technologies

- __Expo SDK 45__ Framework and a Platform for universal React applications. [docs.expo.io](https://docs.expo.io/)
- __Expo SDK 46__ Framework and a Platform for universal React applications. [docs.expo.io](https://docs.expo.io/)
- __Routing and navigation__ React Navigation V6. [https://reactnavigation.org/docs](https://reactnavigation.org/docs/getting-started)
- __Redux architecture__
- Rematch core [@rematch/core](https://github.com/rematch/rematch)
Expand Down
10 changes: 6 additions & 4 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"platforms": [
"ios"
],
"version": "0.1.0",
"version": "0.2.1",
"orientation": "portrait",
"icon": "./src/images/icon-abacus.png",
"splash": {
Expand All @@ -16,12 +16,14 @@
},
"updates": {
"enabled": true,
"checkAutomatically": "ON_LOAD",
"fallbackToCacheTimeout": 0
"checkAutomatically": "ON_ERROR_RECOVERY"
},
"ios": {
"buildNumber": "0.1.0",
"buildNumber": "0.2.1",
"bundleIdentifier": "abacus.ios.app",
"infoPlist": {
"NSFaceIDUsageDescription": "Abacus use Authentication with TouchId or FaceID"
},
"config": {
"usesNonExemptEncryption": false
}
Expand Down
7,447 changes: 3,830 additions & 3,617 deletions package-lock.json

Large diffs are not rendered by default.

60 changes: 31 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "abacus",
"homepage": "https://github.com/victorbalssa/abacus",
"version": "0.1.0",
"version": "0.2.1",
"private": true,
"jest": {
"preset": "jest-expo",
Expand All @@ -18,69 +18,71 @@
"dependencies": {
"@expo/vector-icons": "^13.0.0",
"@react-native-async-storage/async-storage": "~1.17.3",
"@react-native-community/datetimepicker": "6.1.2",
"@react-native-community/datetimepicker": "6.2.0",
"@react-navigation/bottom-tabs": "^6.2.0",
"@react-navigation/native": "^6.0.8",
"@react-navigation/native-stack": "^6.5.0",
"@react-navigation/stack": "^6.2.2",
"@rematch/core": "^2.2.0",
"@rematch/loading": "^2.1.2",
"@rematch/persist": "^2.1.2",
"axios": "^0.21.1",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.4.1",
"eslint": "^7.32.0",
"expo": "^45.0.0",
"expo-asset": "~8.5.0",
"expo-auth-session": "~3.6.1",
"expo-font": "~10.1.0",
"expo-haptics": "~11.2.0",
"expo-linear-gradient": "~11.3.0",
"expo-random": "~12.2.0",
"expo-secure-store": "~11.2.0",
"expo-splash-screen": "~0.15.1",
"expo-status-bar": "~1.3.0",
"expo-updates": "~0.13.3",
"expo-web-browser": "~10.2.1",
"expo": "^46.0.0",
"expo-asset": "~8.6.1",
"expo-auth-session": "~3.7.1",
"expo-font": "~10.2.0",
"expo-haptics": "~11.3.0",
"expo-linear-gradient": "~11.4.0",
"expo-random": "~12.3.0",
"expo-secure-store": "~11.3.0",
"expo-splash-screen": "~0.16.1",
"expo-status-bar": "~1.4.0",
"expo-updates": "~0.14.3",
"expo-web-browser": "~11.0.0",
"globally": "^0.0.0",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"native-base": "^3.3.7",
"prop-types": "^15.7.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react": "18.0.0",
"react-dom": "18.0.0",
"react-helmet": "^5.2.1",
"react-native": "0.68.2",
"react-native": "0.69.3",
"react-native-animated-splash-screen": "^2.0.5",
"react-native-gesture-handler": "~2.2.1",
"react-native-gesture-handler": "~2.5.0",
"react-native-modal": "^11.5.6",
"react-native-reanimated": "~2.8.0",
"react-native-safe-area-context": "4.2.4",
"react-native-screens": "~3.11.1",
"react-native-reanimated": "~2.9.1",
"react-native-safe-area-context": "4.3.1",
"react-native-screens": "~3.15.0",
"react-native-svg": "12.3.0",
"react-native-swipe-list-view": "^3.2.9",
"react-native-web": "0.17.7",
"react-native-web": "~0.18.7",
"react-redux": "^7.1.3",
"redux": "^4.1.2",
"redux-persist": "^6.0.0",
"sharp-cli": "^1.14.1",
"slash": "^3.0.0",
"victory-native": "^36.3.1"
"victory-native": "^36.3.1",
"expo-local-authentication": "~12.3.0"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@types/react": "~17.0.21",
"@types/react-native": "~0.67.6",
"@babel/core": "^7.18.6",
"@types/react": "~18.0.0",
"@types/react-native": "~0.69.1",
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
"babel-preset-expo": "~9.1.0",
"babel-preset-expo": "~9.2.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-jest": "^23.6.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.18.0",
"jest-expo": "^45.0.0",
"jest-expo": "^46.0.0",
"node-sass": "^7.0.0",
"react-scripts": "2.1.8",
"typescript": "~4.3.5"
"typescript": "^4.6.3"
}
}
1 change: 0 additions & 1 deletion src/containers/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const Chart = ({
toast.show({
placement: 'top',
title: 'Something went wrong',
status: 'error',
description: e.message,
});
}
Expand Down
11 changes: 8 additions & 3 deletions src/containers/Configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ import React from 'react';
import { connect } from 'react-redux';
import { CommonActions } from '@react-navigation/native';
import Layout from '../native/components/Configuration';
import {Dispatch} from "../store";
import { Dispatch } from '../store';

const mapStateToProps = (state) => ({
backendURL: state.configuration.backendURL,
faceId: state.configuration.faceId,
loading: state.loading.models.configuration,
});

const mapDispatchToProps = (dispatch: Dispatch) => ({
resetAllStorage: dispatch.configuration.resetAllStorage,
setFaceId: dispatch.configuration.setFaceId,
});

interface ConfigurationContainerType extends
ReturnType<typeof mapStateToProps>,
interface ConfigurationContainerType extends ReturnType<typeof mapStateToProps>,
ReturnType<typeof mapDispatchToProps> {
navigation: { dispatch: (action) => void },
loading: boolean,
Expand All @@ -26,6 +27,8 @@ const ConfigurationContainer = ({
navigation,
backendURL,
resetAllStorage,
faceId,
setFaceId,
}: ConfigurationContainerType) => {
const resetApp = async () => {
await resetAllStorage();
Expand All @@ -44,6 +47,8 @@ const ConfigurationContainer = ({
loading={loading}
backendURL={backendURL}
resetApp={resetApp}
faceId={faceId}
setFaceId={setFaceId}
/>
);
};
Expand Down
119 changes: 0 additions & 119 deletions src/containers/Create.tsx

This file was deleted.

5 changes: 2 additions & 3 deletions src/containers/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type HomeContainerType = {
earned: HomeDisplayType[],
getSummary: () => Promise<void>,
getDashboard: () => Promise<void>,
handleChangeRange: (value: object) => Promise<void>,
handleChangeRange: (value?: object) => Promise<void>,
};

const Home = ({
Expand All @@ -43,7 +43,7 @@ const Home = ({
const toast = useToast();

useEffect(() => {
(async () => handleChangeRange({ range: '3' }))();
(async () => handleChangeRange())();
}, []);

const fetchData = async () => {
Expand All @@ -53,7 +53,6 @@ const Home = ({
toast.show({
placement: 'top',
title: 'Something went wrong',
status: 'error',
description: e.message,
});
}
Expand Down
Loading

0 comments on commit 40a1975

Please sign in to comment.