mg-library 1.0.512 → 1.0.514

package/blocks.js

@@ -74,29 +74,6 @@ export function MGWelcome(props) {
         );
     }
 
-    /*     return (
-            <View style={mgFunctionsLib.getBasicStyleSheet().availableArea}>
-                <FlatList
-                    data={props.notices}
-                    keyExtractor={item => item.idNotice.toString()}
-                    renderItem={({ item }) => (
-                        <Card header={cardHeader(item)} style={{ marginBottom: 10, marginHorizontal: 10 }}>
-                            {item.imageUrl != undefined &&
-                                <View style={{ flexGrow: 1, alignItems: 'center', marginBottom: 10 }}>
-                                    <Image source={{ uri: item.imageUrl }} style={{ width: '50%', height: '50%' }} />
-                                </View>
-                            }
-                            <Text>
-                                <Text style={{ marginBottom: 10 }}>{item.content}</Text>
-                            </Text>
-                        </Card>
-                    )}
-                    ListHeaderComponent={listHeaderComponent}
-                    ListFooterComponent={listFooterComponent}
-                />
-            </View>
-        ) */
-
     return (
         <View style={mgFunctionsLib.getBasicStyleSheet().availableArea}>
             <FlatList
@@ -122,6 +99,66 @@ export function MGWelcome(props) {
 
 }
 
+export function MGBenefits(props) {
+
+    let subTitle = mgFunctionsLib.i18nString('benefits', props.language);
+
+    if (props.subTitle != undefined)
+        subTitle = props.subTitle;
+
+    let listHeaderComponent = (
+        <View>
+            <MGSessionHeader module={subTitle} person={props.person} theme={props.theme} />
+            <MGDivider />
+            {props.beforeBenefits != undefined &&
+                <>
+                    {props.beforeBenefits}
+                    <MGDivider />
+                </>
+            }
+        </View>
+    );
+
+    function cardHeader(item) {
+        return (
+            <>
+                <View style={{ flex: 1, flexDirection: 'column', marginVertical: 10, marginHorizontal: 10 }}>
+                    {item.isImportant &&
+                        <MaterialCommunityIcons style={{ flex: 1 }} name='alert-circle-outline' color={props.theme['color-primary-500']} size={30} />
+                    }
+                    <Text style={{ flex: 1 }} category='h6'>{item.description}</Text>
+                </View>
+            </>
+        );
+    };
+
+    let listFooterComponent = (<View></View>);
+
+    return (
+        <View style={mgFunctionsLib.getBasicStyleSheet().availableArea}>
+            <FlatList
+                data={props.benefits}
+                keyExtractor={item => item.idNotice.toString()}
+                renderItem={({ item }) => (
+                    <Card header={cardHeader(item)} style={{ marginBottom: 10, marginHorizontal: 10 }}>
+                        {item.imageUrl != undefined &&
+                            <View style={{ flexGrow: 1, alignItems: 'center', marginBottom: 10 }}>
+                                <Image source={{ uri: item.imageUrl }} style={{ width: '70%', resizeMode: 'contain', height: undefined, aspectRatio: 1 }} />
+                            </View>
+                        }
+                        <Text>
+                            <Text style={{ marginBottom: 10 }}>{item.content}</Text>
+                        </Text>
+                    </Card>
+                )}
+                ListHeaderComponent={listHeaderComponent}
+                ListFooterComponent={listFooterComponent}
+            />
+        </View>
+    )
+
+}
+
 export function MGLogin(props) {
 
     const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);

package/i18n/english.js

@@ -40,6 +40,7 @@ export const strings = {
     yes: 'Yes',
     no: 'No',
     notices: 'Notices',
+    benefits: 'Benefits',
     dashboard: 'Control Panel',
     period: 'Period',
     amount: 'Importe',

package/i18n/spanish.js

@@ -40,6 +40,7 @@ export const strings = {
     yes: 'Si',
     no: 'No',
     notices: 'Noticias',
+    benefits: 'Beneficios en Comercios Adheridos',
     dashboard: 'Tablero de Control',
     period: 'Período',
     amount: 'Importe',

package/login.js

@@ -2,36 +2,6 @@ import * as mgFunctionsLib from './functions.js';
 import * as mgConstantsLib from './constants.js';
 import axios from 'axios';
 
-/* export function onPressLogin(dispatch, actions, app, apiUrl, language, data) {
-    try {
-        if (validateForm(data, language)) {
-            let requestData = {
-                app: app,
-                userName: data.userName.toLowerCase(),
-                password: data.password,
-                language: mgConstantsLib.LANGUAGE_SPANISH
-            }
-            dispatch(actions.apiRequest());
-            axios.post(apiUrl + '/Login', requestData, mgFunctionsLib.getRequestHeader())
-                .then(response => {
-                    let appSession = response.data;
-                    dispatch(actions.login(appSession));
-                    mgFunctionsLib.writeToLocalStorage(mgConstantsLib.ACCESS_TOKEN, appSession.accessToken);
-                    dispatch(actions.apiSuccess());
-                })
-                .catch(error => {
-                    dispatch(actions.apiError());
-                    let msg = '';
-                    if(error.message!=undefined)
-                        msg = ' |>| ' + error.message;
-                    mgFunctionsLib.showToastError(mgFunctionsLib.i18nMessage('credentialsInvalid', language) + msg);
-                })
-        }
-    } catch (error) {
-        mgFunctionsLib.showToastError(error);
-    }
-} */
-
 export function onPressLogin(dispatch, actions, app, apiUrl, language, data) {
     try {
         if (validateForm(data, language)) {
@@ -51,20 +21,9 @@ export function onPressLogin(dispatch, actions, app, apiUrl, language, data) {
                 })
                 .catch(error => {
                     dispatch(actions.apiError());
-
-                   console.log('ERROR');
-                   console.log('---');
-                   console.log(apiUrl + '/Login');
-                   console.log('---');                   
-                   console.log(requestData);
-                   console.log('---');                   
-                   console.log(mgFunctionsLib.getRequestHeader());
-                   console.log('---');                   
-                   console.log(error.response.data);
-
                     let msg = '';
                     if(error.message!=undefined)
-                        msg = ' |>| ' + error.message;
+                        msg = ' |>| ' + error.message + ' |>| ' + error.response.data;
                     mgFunctionsLib.showToastError(mgFunctionsLib.i18nMessage('credentialsInvalid', language) + msg);
                 })
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mg-library",
-    "version": "1.0.512",
+    "version": "1.0.514",
     "description": "",
     "main": "index.js",
     "scripts": {