Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontend codacy errors #63

Merged
merged 10 commits into from
Nov 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion frontend/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@ module.exports = {
],
rules: {
"react/prop-types": ["error", { "ignore": ["navigation"] }],
"no-underscore-dangle": [2, { "allow": ["_id"] }]
"no-underscore-dangle": [2, { "allow": ["_id"] }],
"react/sort-comp": [1, {
order: [
"static-variables",
"instance-variables",
"constructor",
"static-methods",
"lifecycle",
"everything-else",
"render",
]
}]
},
};


Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.jobtogo;

import android.app.Application;
import android.util.Log;

import com.facebook.react.PackageList;
import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.ReactApplication;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;

import java.util.List;
Expand Down
5 changes: 5 additions & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"react-native-firebase": "^5.5.6",
"react-native-gesture-handler": "^1.4.1",
"react-native-google-signin": "^2.1.0",
"react-native-logger": "^1.0.3",
"react-native-reanimated": "^1.3.0",
"react-native-swipe-gestures": "^1.0.4",
"react-navigation": "^4.0.10",
Expand Down
48 changes: 12 additions & 36 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import { Platform } from 'react-native';
import { Platform, Alert } from 'react-native';
import { createAppContainer, createSwitchNavigator } from 'react-navigation';
import { createStackNavigator } from 'react-navigation-stack';
import { createDrawerNavigator } from 'react-navigation-drawer';
import firebase from 'react-native-firebase';
import { logger } from 'react-native-logger';

import SignIn from './screens/SignIn';
import SignUp from './screens/SignUp';
Expand All @@ -14,33 +15,33 @@ import EditSkills from './screens/EditSkills';

import { appStyles } from './styles';


const styles = appStyles;
export default class App extends React.Component {
async componentDidMount() {
if (Platform.OS === 'android') {
try {
await firebase.messaging().requestPermission();
const fcmToken = await firebase.messaging().getToken();
if (fcmToken) {
console.log('FCM Token: ', fcmToken);
logger.log('FCM Token: ', fcmToken);
global.firebaseToken = fcmToken;
const enabled = await firebase.messaging().hasPermission();
if (enabled) {
console.log(`FCM messaging has permission:${enabled}`);
logger.log(`FCM messaging has permission:${enabled}`);
} else {
try {
await firebase.messaging().requestPermission();
console.log('FCM permission granted');
logger.log('FCM permission granted');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to me that react-native-logger is perhaps not the best logger to use if you cannot even distinguish between different log levels (i.e. debug, info, warn, error, etc). May want to try out js-logger, like used in the backend.

I've set stuff up so that it also prints out which module the log comes from, which is very useful.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#64

} catch (error) {
console.log('FCM Permission Error', error);
logger.log('FCM Permission Error', error);
}
}
this.createNotificationListeners();
} else {
console.log('FCM Token not available');
logger.log('FCM Token not available');
}
} catch (e) {
console.log('Error initializing FCM', e);
logger.log('Error initializing FCM', e);
}
}
}
Expand All @@ -51,10 +52,10 @@ export default class App extends React.Component {
}

showAlert = (title, body) => {
alert(
Alert.alert(
wchang22 marked this conversation as resolved.
Show resolved Hide resolved
title, body,
[
{ text: 'OK', onPress: () => console.log('OK Pressed') },
{ text: 'OK', onPress: () => logger.log('OK Pressed') },
],
{ cancelable: false },
);
Expand All @@ -68,37 +69,12 @@ export default class App extends React.Component {
const { title, body } = notification;
this.showAlert(title, body);
});

/*
* If your app is in background, you can listen for when a notification
* is clicked / tapped / opened as follows:
* */
this.notificationOpenedListener = firebase.notifications()
wchang22 marked this conversation as resolved.
Show resolved Hide resolved
.onNotificationOpened((notificationOpen) => {
const { title, body } = notificationOpen.notification;
});

/*
* If your app is closed, you can check if it was opened by a notification
* being clicked / tapped / opened as follows:
* */
const notificationOpen = await firebase.notifications().getInitialNotification();
if (notificationOpen) {
const { title, body } = notificationOpen.notification;
}
/*
* Triggered for data only payload in foreground
* */
this.messageListener = firebase.messaging().onMessage((message) => {
// process data message
console.log(JSON.stringify(message));
});
}

render() {
return (
<AppContainer
styles={appStyles.containerStyle}
styles={styles.container}
/>
);
}
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/Button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ import React from 'react';
import { Text, TouchableOpacity, ViewPropTypes } from 'react-native';
import PropTypes from 'prop-types';

import { buttonStyles } from '../styles';
import { buttonStyles, containerStyles } from '../styles';


const styles = buttonStyles;
const styles = { ...containerStyles, ...buttonStyles };
const Button = ({
style, backgroundColor, textColor, title, enable, onPress,
}) => (
<TouchableOpacity
style={[{
opacity: enable ? 1 : 0.3,
backgroundColor,
}, styles.containerStyle, style]}
}, styles.alignJustifyCenter, styles.container, style]}
disabled={!enable}
onPress={onPress}
>
<Text style={[{ color: textColor }, styles.textStyle]}>
<Text style={[{ color: textColor }, styles.text]}>
{title}
</Text>
</TouchableOpacity>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/ImageButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import React from 'react';
import { TouchableOpacity, Image } from 'react-native';
import PropTypes from 'prop-types';

import { imageButtonStyles } from '../styles';
import { containerStyles } from '../styles';


const styles = imageButtonStyles;
const styles = containerStyles;
const ImageButton = ({ source, onPress }) => (
<TouchableOpacity
style={[styles.containerStyle]}
style={[styles.alignJustifyCenter]}
onPress={onPress}
>
<Image
Expand Down
41 changes: 20 additions & 21 deletions frontend/src/components/JobDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import PropTypes from 'prop-types';

import ImageButton from './ImageButton';
import images from '../constants/images';
import { jobDetailsStyles } from '../styles';

import { containerStyles, jobDetailsStyles } from '../styles';

const styles = { ...containerStyles, ...jobDetailsStyles };
class JobDetails extends Component {
constructor(props) {
super(props);
Expand All @@ -23,67 +23,66 @@ class JobDetails extends Component {
}

render() {
const styles = jobDetailsStyles;
const { modalVisible } = this.state;
const {
company, title, location, description,
} = this.props;
return (
<View style={[styles.containerStyle]}>
<View style={[styles.container]}>
<Modal
animationType="slide"
transparent={false}
visible={modalVisible}
>
<View style={[styles.modalContainerStyle]}>
<View style={[styles.modalContainer]}>
<ImageButton
source={images.iconChevronDown}
onPress={() => {
this.setModalVisible(false);
}}
/>
<Text style={[styles.headerStyle]}>{company}</Text>
<View style={[styles.subHeaderContainerStyle]}>
<Text style={[styles.header]}>{company}</Text>
<View style={[styles.subHeaderContainer]}>
<Image
source={images.iconJob}
styles={[styles.iconStyle]}
styles={[styles.icon]}
/>
<Text style={[styles.subHeaderStyle]}>{title}</Text>
<Text style={[styles.subHeader]}>{title}</Text>
</View>
<View style={[styles.subHeaderContainerStyle]}>
<View style={[styles.subHeaderContainer]}>
<Image
source={images.iconLocation}
styles={[styles.iconStyle]}
styles={[styles.icon]}
/>
<Text style={[styles.subHeaderStyle]}>{location}</Text>
<Text style={[styles.subHeader]}>{location}</Text>
</View>
<ScrollView style={[styles.scrollStyle]}>
<ScrollView style={[styles.scroll]}>
<Text>{description}</Text>
</ScrollView>
</View>
</Modal>

<View style={[styles.textContainerStyle]}>
<View style={[styles.textContainer]}>
<ImageButton
source={images.iconChevronUp}
onPress={() => {
this.setModalVisible(true);
}}
/>
<Text style={[styles.headerStyle]}>{company}</Text>
<View style={[styles.subHeaderContainerStyle]}>
<Text style={[styles.header]}>{company}</Text>
<View style={[styles.subHeaderContainer]}>
<Image
source={images.iconJob}
styles={[styles.iconStyle]}
styles={[styles.icon]}
/>
<Text style={[styles.subHeaderStyle]}>{title}</Text>
<Text style={[styles.subHeader]}>{title}</Text>
</View>
<View style={[styles.subHeaderContainerStyle]}>
<View style={[styles.subHeaderContainer]}>
<Image
source={images.iconLocation}
styles={[styles.iconStyle]}
styles={[styles.icon]}
/>
<Text style={[styles.subHeaderStyle]}>{location}</Text>
<Text style={[styles.subHeader]}>{location}</Text>
</View>
</View>
</View>
Expand Down
11 changes: 7 additions & 4 deletions frontend/src/components/JobImage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import { Text, ImageBackground } from 'react-native';
import PropTypes from 'prop-types';

import images from '../constants/images';
import { jobImageStyles } from '../styles';
import { containerStyles, displayStyles, jobImageStyles } from '../styles';


const styles = jobImageStyles;
const styles = { ...containerStyles, ...displayStyles, ...jobImageStyles };
const JobImage = ({ company }) => (
<ImageBackground source={images.tempBg1} style={[styles.containerStyle]}>
<Text style={[styles.textStyle]}>{company}</Text>
<ImageBackground
source={images.jobBackground}
style={[styles.flexRowContainer, styles.container]}
>
<Text style={[styles.lightText, styles.text]}>{company}</Text>
</ImageBackground>
);

Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/Loader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { Image, View } from 'react-native';

import images from '../constants/images';

import { loaderStyles } from '../styles';
import { containerStyles, displayStyles, loaderStyles } from '../styles';


const styles = loaderStyles;
const styles = { ...containerStyles, ...displayStyles, ...loaderStyles };
const Loader = () => (
<View style={[styles.containerStyle]}>
<View style={[styles.flexRowContainer, styles.accentBackground]}>
<Image
source={images.iconLogo}
style={[styles.imageStyle]}
style={[styles.image]}
/>
</View>
);
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/MainHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ import PropTypes from 'prop-types';

import ImageButton from './ImageButton';
import images from '../constants/images';
import { mainHeaderStyles } from '../styles';
import { containerStyles, mainHeaderStyles } from '../styles';

const styles = mainHeaderStyles;

const styles = { ...containerStyles, ...mainHeaderStyles };
const MainHeader = ({ onPressMenu, onPressSend }) => (
<View style={[styles.containerStyle]}>
<View style={[styles.flexRowContainer, styles.container]}>
<ImageButton
source={images.iconMenu}
onPress={onPressMenu}
/>
<Image source={images.logoLight} style={[styles.logoStyle]} />
<Image source={images.logoLight} style={[styles.logo]} />
<ImageButton
source={images.iconSend}
onPress={onPressSend}
Expand Down
Loading