diff --git a/app.json b/app.json
index b1c689c..855f2f4 100644
--- a/app.json
+++ b/app.json
@@ -32,7 +32,7 @@
]
},
"splash": {
- "image": "./assets/RomeSplash.png",
+ "image": "./assets/RomeOnlineIcon.png",
"backgroundColor": "#efefef"
},
"notification": {
@@ -42,9 +42,7 @@
"fallbackToCacheTimeout": 0,
"url": "https://u.expo.dev/df105e21-a07f-4425-af10-2200a7704a48"
},
- "assetBundlePatterns": [
- "**/*"
- ],
+ "assetBundlePatterns": ["**/*"],
"web": {
"favicon": "./assets/RomeIcon.png",
"config": {
diff --git a/assets/RomeOnlineIcon.png b/assets/RomeOnlineIcon.png
new file mode 100644
index 0000000..c48b5e9
Binary files /dev/null and b/assets/RomeOnlineIcon.png differ
diff --git a/components/screen-employee-sign-in/screen-employee-sign-in.component.jsx b/components/screen-employee-sign-in/screen-employee-sign-in.component.jsx
index 4f29785..40efadc 100644
--- a/components/screen-employee-sign-in/screen-employee-sign-in.component.jsx
+++ b/components/screen-employee-sign-in/screen-employee-sign-in.component.jsx
@@ -18,7 +18,7 @@ import ErrorDisplay from "../error-display/error-display.component";
const mapStateToProps = createStructuredSelector({
currentEmployee: selectCurrentEmployee,
signingIn: selectSigningIn,
- signingError: selectSignInError,
+ signinError: selectSignInError,
});
const mapDispatchToProps = (dispatch) => ({
@@ -27,7 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
});
export function EmployeeSignIn({
- signingError,
+ signinError,
signingIn,
employeeSignInStart,
}) {
@@ -46,40 +46,45 @@ export function EmployeeSignIn({
onSubmit={formSubmit}
>
{({ handleChange, handleBlur, handleSubmit, values }) => {
-const signingErrorMsg = signingError ? () : null;
- return(
-
-
-
- {signingErrorMsg}
-
-
- )
-}}
+ return (
+
+
+
+
+ {signinError ? (
+
+ ) : null}
+
+ );
+ }}
@@ -91,10 +96,12 @@ const localStyles = StyleSheet.create({
display: "flex",
flex: 1,
},
+ item: {
+ marginTop: 12,
+ marginBottom: 12,
+ },
signInContainer: {
flex: 1,
- },
- input: {
margin: 12,
},
});
diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx
index 8b97379..266a0d6 100644
--- a/components/screen-main/screen-main.component.jsx
+++ b/components/screen-main/screen-main.component.jsx
@@ -1,18 +1,20 @@
-import React, { useEffect, useRef } from "react";
+import { Ionicons } from "@expo/vector-icons";
+import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
+import { NavigationContainer } from "@react-navigation/native";
+import { createNativeStackNavigator } from "@react-navigation/native-stack";
import i18n from "i18next";
import moment from "moment";
+import React, { useEffect, useRef } from "react";
import { AppState } from "react-native";
import { Button } from "react-native-paper";
-import { Ionicons } from "@expo/vector-icons";
-import { NavigationContainer } from "@react-navigation/native";
-import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
-import { createNativeStackNavigator } from "@react-navigation/native-stack";
import { logImEXEvent } from "../../firebase/firebase.analytics";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { setCameraJob, setCameraJobId } from "../../redux/app/app.actions";
+import { employeeSignOut } from "../../redux/employee/employee.actions";
+import { selectCurrentEmployee } from "../../redux/employee/employee.selectors";
import {
checkUserSession,
emailSignInStart,
@@ -22,8 +24,6 @@ import {
selectBodyshop,
selectCurrentUser,
} from "../../redux/user/user.selectors";
-import { employeeSignOut } from "../../redux/employee/employee.actions";
-import { selectCurrentEmployee } from "../../redux/employee/employee.selectors";
import ScreenJobDetail from "../screen-job-detail/screen-job-detail.component";
import ScreenJobList from "../screen-job-list/screen-job-list.component";
@@ -32,12 +32,11 @@ import ScreenSettingsComponent from "../screen-settings/screen-settings.componen
import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
import ScreenSplash from "../screen-splash/screen-splash.component";
+import SignOutButton from "../Buttons/employee-sign-out-button.component";
import EmployeeSignIn from "../screen-employee-sign-in/screen-employee-sign-in.component";
import ScreenTimeTicketBrowser from "../screen-time-ticket-browser/screen-time-ticket-browser.component";
-import SignOutButton from "../Buttons/employee-sign-out-button.component";
-import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component";
-import ScreenTimeTicketCreate from "../time-ticket/screen-time-ticket-create.component";
import ScreenTimeTicketClockoffComponent from "../time-ticket/screen-time-ticket-clockoff.component";
+import ScreenTimeTicketCreate from "../time-ticket/screen-time-ticket-create.component";
const ActiveJobStack = createNativeStackNavigator();
const MoreStack = createNativeStackNavigator();
@@ -160,6 +159,8 @@ const TimeTicketBrowserStackNavigator = connect(
name="TimeTicketBrowser"
options={{
title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"),
+ // eslint-disable-next-line react/display-name
+ headerRight: () => ,
}}
component={ScreenTimeTicketBrowser}
/>
diff --git a/components/screen-settings/screen-settings.component.jsx b/components/screen-settings/screen-settings.component.jsx
index 8696345..07bafd6 100644
--- a/components/screen-settings/screen-settings.component.jsx
+++ b/components/screen-settings/screen-settings.component.jsx
@@ -21,7 +21,7 @@ export default function ScreenSettingsComponent() {
>
{t("settings.labels.version", {
- number: `${Constants.manifest.version}-${Constants.manifest.extra.expover}`,
+ number: `${Constants.expoConfig.version}-${Constants.expoConfig.extra.expover}`,
})}
diff --git a/components/screen-sign-in/screen-sign-in.component.jsx b/components/screen-sign-in/screen-sign-in.component.jsx
index f2ca1b2..c0ee82d 100644
--- a/components/screen-sign-in/screen-sign-in.component.jsx
+++ b/components/screen-sign-in/screen-sign-in.component.jsx
@@ -5,7 +5,7 @@ import { Image, StyleSheet, Text, View } from "react-native";
import { Button, TextInput, Title } from "react-native-paper";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
-import Logo from "../../assets/logo192.png";
+import Logo from "../../assets/RomeOnlineIcon.png";
import { emailSignInStart } from "../../redux/user/user.actions";
import {
selectCurrentUser,
diff --git a/components/screen-splash/screen-splash.component.jsx b/components/screen-splash/screen-splash.component.jsx
index 0f138d0..67a5981 100644
--- a/components/screen-splash/screen-splash.component.jsx
+++ b/components/screen-splash/screen-splash.component.jsx
@@ -2,7 +2,7 @@ import React from "react";
import { useTranslation } from "react-i18next";
import { ActivityIndicator, Image, StyleSheet, View } from "react-native";
import { Title, Subheading, Divider } from "react-native-paper";
-import Logo from "../../assets/logo192.png";
+import Logo from "../../assets/RomeOnlineIcon.png";
import SignOutButton from "../sign-out-button/sign-out-button.component";
export default function ScreenSplash({ noAccess }) {
diff --git a/components/screen-time-ticket-browser/screen-time-ticket-browser.component.jsx b/components/screen-time-ticket-browser/screen-time-ticket-browser.component.jsx
index b3ba682..dafa6f2 100644
--- a/components/screen-time-ticket-browser/screen-time-ticket-browser.component.jsx
+++ b/components/screen-time-ticket-browser/screen-time-ticket-browser.component.jsx
@@ -1,18 +1,10 @@
-import React, { useCallback, useState, useRef } from "react";
import moment from "moment";
-import {
- View,
- Text,
- StyleSheet,
- ScrollView,
- RefreshControl,
- FlatList,
-} from "react-native";
+import React, { useCallback, useState } from "react";
+import { FlatList, RefreshControl, StyleSheet, Text, View } from "react-native";
import {
ActivityIndicator,
Button,
Card,
- Headline,
Subheading,
} from "react-native-paper";
import styles from "../styles";
@@ -24,37 +16,37 @@ import { createStructuredSelector } from "reselect";
import { employeeGetRatesStart } from "../../redux/employee/employee.actions";
import {
selectCurrentEmployee,
- selectRates,
- selectGettingRates,
- selectSignInError,
selectEmployeeFullName,
+ selectGettingRates,
+ selectRates,
+ selectSignInError,
} from "../../redux/employee/employee.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import CostCenterSelect from "../Selects/select-cost-center";
-import ErrorDisplay from "../error-display/error-display.component";
+import { useMutation, useQuery } from "@apollo/client";
+import {
+ INSERT_NEW_TIME_TICKET,
+ QUERY_ACTIVE_TIME_TICKETS,
+} from "../../graphql/timetickets.queries";
import {
selectCurrentTimeTicketJob,
selectCurrentTimeTicketJobId,
} from "../../redux/timetickets/timetickets.selectors";
-import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
-import { useMutation, useQuery } from "@apollo/client";
-import { QUERY_ACTIVE_TIME_TICKETS } from "../../graphql/timetickets.queries";
+import CostCenterSelect from "../Selects/select-cost-center";
+import ErrorDisplay from "../error-display/error-display.component";
// import EmployeeClockedInList from "../time-ticket-lists/employee-clockedin-list.component";
import { useTranslation } from "react-i18next";
import ClockedinListItem from "../time-ticket-items/clockedin-list-item.component";
-import SignOutButton from "../Buttons/employee-sign-out-button.component";
-import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component";
-import KeyboardAvoidingComponent from "../keyboards/KeyboardAvoidingComponent";
-import JobSearchAndSelectModal from "../Modals/JobSearchAndSelectModal";
import { useNavigation } from "@react-navigation/native";
+import JobSearchAndSelectModal from "../Modals/JobSearchAndSelectModal";
+import KeyboardAvoidingComponent from "../keyboards/KeyboardAvoidingComponent";
const mapStateToProps = createStructuredSelector({
currentEmployee: selectCurrentEmployee,
loaderGettingRates: selectGettingRates,
- signingError: selectSignInError,
+ signinError: selectSignInError,
currentBodyshop: selectBodyshop,
currentRatesNCostCenters: selectRates,
currentSelectedTimeTicketJobId: selectCurrentTimeTicketJobId,
@@ -68,14 +60,9 @@ const mapDispatchToProps = (dispatch) => ({
});
export function ScreenTimeTicketBrowser({
- loaderGettingRates,
currentEmployee,
- employeeGetRatesStart,
- signingError,
currentBodyshop,
currentRatesNCostCenters,
- currentSelectedTimeTicketJob,
- currentSelectedTimeTicketJobId,
currentEmployeeFullName,
}) {
const { t } = useTranslation();
@@ -198,7 +185,6 @@ export function ScreenTimeTicketBrowser({
}
/>
{currentEmployeeFullName && (
@@ -226,9 +212,7 @@ export function ScreenTimeTicketBrowser({
icon="plus"
style={{ margin: 8 }}
>
-
- {t("timeticketbrowser.actions.ticket")}
-
+ {t("timeticketbrowser.actions.ticket")}
{/*