Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scorelab/elly
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.3-alpha
Choose a base ref
...
head repository: scorelab/elly
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 24, 2019

  1. Copy the full SHA
    0f96f0b View commit details
  2. Create rdm

    sourabhnegi43 authored Dec 24, 2019
    Copy the full SHA
    d0413a1 View commit details
  3. Elly App Logo

    Please accept my pull
    sourabhnegi43 authored Dec 24, 2019
    Copy the full SHA
    2d36a13 View commit details
  4. Copy the full SHA
    841ff66 View commit details
  5. Delete ELE LOGO.svg

    Rajulmahto21 authored Dec 24, 2019
    Copy the full SHA
    271ea2b View commit details
  6. Add files via upload

    Rajulmahto21 authored Dec 24, 2019
    Copy the full SHA
    adfabd5 View commit details
  7. Added the previous logo files.

    I have added the previous logo files as told by the GCI mentors.
    Rajulmahto21 authored Dec 24, 2019
    Copy the full SHA
    0f1561a View commit details
  8. elly logo

    google code-in elly logo
    Chamudu authored Dec 24, 2019
    Copy the full SHA
    5a3c460 View commit details
  9. Copy the full SHA
    b2a25d5 View commit details
  10. Copy the full SHA
    5983927 View commit details
  11. removed chached files

    AsithaIndrajith committed Dec 24, 2019
    Copy the full SHA
    4bbd761 View commit details

Commits on Dec 25, 2019

  1. Add files via upload

    dhssherylng authored Dec 25, 2019
    Copy the full SHA
    f739b45 View commit details
  2. Copy the full SHA
    01e9f86 View commit details
  3. Svg for Elly app

    Added Avg for elly KIndly accept the pull
    sourabhnegi43 authored Dec 25, 2019
    Copy the full SHA
    5f314db View commit details
  4. Add files via upload

    dhssherylng authored Dec 25, 2019
    Copy the full SHA
    d4df733 View commit details
  5. Create hoshi

    dhssherylng authored Dec 25, 2019
    Copy the full SHA
    8200605 View commit details
  6. Add files via upload

    dhssherylng authored Dec 25, 2019
    Copy the full SHA
    b6fdfd2 View commit details
  7. Delete hoshi

    dhssherylng authored Dec 25, 2019
    Copy the full SHA
    975c67f View commit details
  8. Create README.md

    kunalbhatia18 authored Dec 25, 2019
    Copy the full SHA
    44c9199 View commit details
  9. Add files via upload

    kunalbhatia18 authored Dec 25, 2019
    Copy the full SHA
    355eb2a View commit details
  10. Merge pull request #14 from Chamudu/master

    elly logo
    AsithaIndrajith authored Dec 25, 2019
    Copy the full SHA
    b01f35b View commit details
  11. Merge pull request #13 from scorelab/asi

    added neccessary files for firebase hosting
    AsithaIndrajith authored Dec 25, 2019
    Copy the full SHA
    4389b5e View commit details
  12. Merge pull request #8 from Rajulmahto21/master

    added folder with svg and png  files of the logo
    AsithaIndrajith authored Dec 25, 2019
    Copy the full SHA
    2a9dc9b View commit details
  13. Copy the full SHA
    730efa5 View commit details

Commits on Dec 26, 2019

  1. Copy the full SHA
    886cf88 View commit details
  2. Add files via upload

    kunalbhatia18 authored Dec 26, 2019
    Copy the full SHA
    b6b6e7f View commit details

Commits on Dec 27, 2019

  1. Copy the full SHA
    7780063 View commit details
  2. Merge pull request #1 from shreevardhan97/shreevardhan97-patch-1

    creating folder for gci logo
    shreevardhan97 authored Dec 27, 2019
    Copy the full SHA
    735f707 View commit details
  3. Copy the full SHA
    098a167 View commit details
  4. Merge pull request #2 from shreevardhan97/revert-1-shreevardhan97-pat…

    …ch-1
    
    Revert "creating folder for gci logo"
    shreevardhan97 authored Dec 27, 2019
    Copy the full SHA
    e869b5e View commit details
  5. Copy the full SHA
    23f0a91 View commit details
  6. Merge pull request #3 from shreevardhan97/shreevardhan97-patch-1

    Added all the logo files
    shreevardhan97 authored Dec 27, 2019
    Copy the full SHA
    4b33e8c View commit details
  7. commit message

    SamHunts committed Dec 27, 2019
    Copy the full SHA
    c8d02ad View commit details
  8. Merge pull request #20 from SamHunts/master

    Elly logo by samvrant
    AsithaIndrajith authored Dec 27, 2019
    Copy the full SHA
    9187360 View commit details
  9. Merge pull request #19 from shreevardhan97/master

    Added logo for the mobile app
    AsithaIndrajith authored Dec 27, 2019
    Copy the full SHA
    6bacee0 View commit details
  10. Merge pull request #18 from kunalbhatia18/logos-for-mobile

    Logos for Mobile App
    AsithaIndrajith authored Dec 27, 2019
    Copy the full SHA
    619fe8f View commit details
  11. Merge pull request #17 from MysticalGamer17/patch-1

     Elly logo ---Mystical_Gamer17
    AsithaIndrajith authored Dec 27, 2019
    Copy the full SHA
    dd806de View commit details
  12. Merge pull request #11 from sourabhnegi43/sourabhnegi43-patch-1

    Sourabhnegi43 patch 1
    AsithaIndrajith authored Dec 27, 2019
    Copy the full SHA
    2c18000 View commit details
  13. Added my logo for Elly

    vivekkj123 authored Dec 27, 2019
    Copy the full SHA
    408d9a7 View commit details
  14. Delete Elly App.svg

    vivekkj123 authored Dec 27, 2019
    Copy the full SHA
    0a29b9a View commit details
  15. Delete Elly app.png

    vivekkj123 authored Dec 27, 2019
    Copy the full SHA
    a386a7d View commit details
  16. Add files via upload

    vivekkj123 authored Dec 27, 2019
    Copy the full SHA
    58a285f View commit details

Commits on Dec 28, 2019

  1. Merge pull request #1 from vivekkj123/vivekkj

    I added my logo for Elly app
    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    7101a1f View commit details
  2. Delete Elly App.svg

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    59eea8e View commit details
  3. Delete Elly app.png

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    c10ae05 View commit details
  4. ADDED CREATED LOGO

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    0358c13 View commit details
  5. Delete ELLY.png

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    3abff5c View commit details
  6. Delete ELLY.svg

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    a70130c View commit details
  7. ADDED LOGO BY VIVEKKJ

    vivekkj123 authored Dec 28, 2019
    Copy the full SHA
    38d3a71 View commit details
  8. Create readme.md

    yaswanth5806 authored Dec 28, 2019
    Copy the full SHA
    369e5d0 View commit details
Showing 346 changed files with 40,093 additions and 8,136 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
WebApp/.firebase*
WebApp/node_modules
WebApp/.pnp
WebApp/.pnp.js
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"editor.formatOnSave": true
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
24 changes: 0 additions & 24 deletions CONTIBUTION.md

This file was deleted.

104 changes: 57 additions & 47 deletions MobileApp/App.js
Original file line number Diff line number Diff line change
@@ -6,74 +6,74 @@
* @flow
*/
import React from 'react';
import {View} from 'react-native'
import { createAppContainer, createSwitchNavigator } from 'react-navigation';
import { createStackNavigator } from "react-navigation-stack";
import { createMaterialBottomTabNavigator } from 'react-navigation-material-bottom-tabs';
import {View} from 'react-native';
import {createAppContainer, createSwitchNavigator} from 'react-navigation';
import {createStackNavigator} from 'react-navigation-stack';
import {createMaterialBottomTabNavigator} from 'react-navigation-material-bottom-tabs';
// import { createBottomTabNavigator } from "react-navigation-tabs";
// import { createDrawerNavigator } from "react-navigation-drawer";

//Screens
import LoginScreen from './src/screens/LoginScreen/LoginScreen'
import CameraViewScreen from './src/screens/CameraViewScreen/CameraViewScreen'
import LandingScreen from './src/screens/LandingScreen/LandingScreen'
import FormScreen from './src/screens/FormScreen/FormScreen'
import FeedScreen from './src/screens/FeedScreen/FeedScreen'
import ProfileScreen from './src/screens/ProfileScreen/ProfileScreen'
import SearchScreen from './src/screens/SearchScreen/SearchScreen'
import DiscoverScreen from './src/screens/DiscoverScreen/DiscoverScreen'
import ShowPhotoScreen from './src/screens/ShowPhotoScreen/ShowPhotoScreen'
import ShowDetailedPhotoScreen from './src/screens/ShowDetailedPhotoScreen/ShowDetailedPhotoScreen'
import showLocationScreen from './src/screens/ShowLocationScreen/ShowLocationScreen'
import AboutScreen from './src/screens/AboutScreen/AboutScreen'
import EmailAuthSignInScreen from './src/screens/EmailAuthScreen/EmailAuthSignInScreen'
import EmailAuthSignUpScreen from './src/screens/EmailAuthScreen/EmailAuthSignUpScreen'
import LoginScreen from './src/screens/LoginScreen/LoginScreen';
import CameraViewScreen from './src/screens/CameraViewScreen/CameraViewScreen';
import LandingScreen from './src/screens/LandingScreen/LandingScreen';
import FormScreen from './src/screens/FormScreen/FormScreen';
import FeedScreen from './src/screens/FeedScreen/FeedScreen';
import ProfileScreen from './src/screens/ProfileScreen/ProfileScreen';
import SearchScreen from './src/screens/SearchScreen/SearchScreen';
import DiscoverScreen from './src/screens/DiscoverScreen/DiscoverScreen';
import ShowPhotoScreen from './src/screens/ShowPhotoScreen/ShowPhotoScreen';
import ShowDetailedPhotoScreen from './src/screens/ShowDetailedPhotoScreen/ShowDetailedPhotoScreen';
import showLocationScreen from './src/screens/ShowLocationScreen/ShowLocationScreen';
import AboutScreen from './src/screens/AboutScreen/AboutScreen';
import EmailAuthSignInScreen from './src/screens/EmailAuthScreen/EmailAuthSignInScreen';
import EmailAuthSignUpScreen from './src/screens/EmailAuthScreen/EmailAuthSignUpScreen';

import {Avatar} from 'react-native-paper'
import {Avatar} from 'react-native-paper';

//SignIn stack
const AuthStack = createStackNavigator({
SignIn: LoginScreen,
Email: EmailAuthSignInScreen,
EmailSignUp: EmailAuthSignUpScreen

},
{
mode: 'modal',
headerMode: 'none',
}
const AuthStack = createStackNavigator(
{
SignIn: LoginScreen,
Email: EmailAuthSignInScreen,
EmailSignUp: EmailAuthSignUpScreen,
},
{
mode: 'modal',
headerMode: 'none',
},
);

//Home stack
const FeedStack = createStackNavigator({
FeedScreen: FeedScreen,
showDetailedPhoto: ShowDetailedPhotoScreen ,
showDetailedPhoto: ShowDetailedPhotoScreen,
showLocationScreen: showLocationScreen,
});

const CameraStack = createStackNavigator({
CameraViewScreen: CameraViewScreen,
FormScreenStack: FormScreen,
showPhoto: ShowPhotoScreen,
showPhoto: ShowPhotoScreen,
});

const DiscoverStack = createStackNavigator({
Discover: DiscoverScreen,
showDetailedPhoto: ShowDetailedPhotoScreen,
showLocationScreen: showLocationScreen
showLocationScreen: showLocationScreen,
});

const SearchStack = createStackNavigator({
Search: SearchScreen,
Search: SearchScreen,
showDetailedPhoto: ShowDetailedPhotoScreen,
showLocationScreen: showLocationScreen
showLocationScreen: showLocationScreen,
});

const ProfileStack = createStackNavigator({
ProfileScreen: ProfileScreen,
showDetailedPhoto: ShowDetailedPhotoScreen,
showLocationScreen: showLocationScreen,
AboutScreen: AboutScreen
AboutScreen: AboutScreen,
});

//Bottom navigator
@@ -82,44 +82,54 @@ const MainTabs = createMaterialBottomTabNavigator({
screen: FeedStack,
navigationOptions: {
tabBarLabel: [],
tabBarIcon: ({ tintColor }) => (
<View style={{flex:1,justifyContent: 'center', alignItems: 'center'}}><Avatar.Icon size={50} color='white' icon="home-variant" /></View>
tabBarIcon: ({tintColor}) => (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Avatar.Icon size={50} icon="home-variant" />
</View>
),
},
},
SearchStack: {
screen: SearchStack,
navigationOptions: {
tabBarLabel: [],
tabBarIcon: ({ tintColor }) => (
<View style={{flex:1, justifyContent: 'center', alignItems: 'center'}}><Avatar.Icon size={50} color='white' icon="image-search" /></View>
tabBarIcon: ({tintColor}) => (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Avatar.Icon size={50} icon="image-search" />
</View>
),
},
},
PhotoLandingScreen: {
screen: CameraStack,
navigationOptions: {
tabBarLabel: [],
tabBarIcon: ({ tintColor }) => (
<View style={{flex:1, justifyContent: 'center', alignItems: 'center'}}><Avatar.Icon size={50} color='white' icon="camera-iris" /></View>
tabBarIcon: ({tintColor}) => (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Avatar.Icon size={50} icon="camera-iris" />
</View>
),
},
},
Discover: {
screen: DiscoverStack,
navigationOptions: {
tabBarLabel: [],
tabBarIcon: ({ tintColor }) => (
<View style={{flex:1, justifyContent: 'center', alignItems: 'center'}}><Avatar.Icon size={50} color='white' icon="google-maps" /></View>
tabBarIcon: ({tintColor}) => (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Avatar.Icon size={50} icon="google-maps" />
</View>
),
},
},
Profile: {
screen: ProfileStack,
navigationOptions: {
tabBarLabel: [],
tabBarIcon: ({ tintColor }) => (
<View style={{flex:1, justifyContent: 'center', alignItems: 'center'}}><Avatar.Icon size={50} color='white' icon="account-box" /></View>
tabBarIcon: ({tintColor}) => (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Avatar.Icon size={50} icon="account-box" />
</View>
),
},
},
@@ -132,7 +142,7 @@ const AppModalStack = createStackNavigator(
{
mode: 'modal',
headerMode: 'none',
}
},
);

const App = createSwitchNavigator({
@@ -147,4 +157,4 @@ const App = createSwitchNavigator({
},
});

export default createAppContainer(App);
export default createAppContainer(App);
3 changes: 2 additions & 1 deletion MobileApp/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ android {
applicationId "com.elly"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 4
versionCode 6
multiDexEnabled true
versionName "1.0"
missingDimensionStrategy 'react-native-camera', 'general'
@@ -194,6 +194,7 @@ android {
}

dependencies {
implementation project(':react-native-image-resizer')
implementation project(':react-native-fbsdk')
implementation project(':react-native-maps')
implementation project(':@react-native-firebase_storage')
8 changes: 8 additions & 0 deletions MobileApp/android/app/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
android.useAndroidX=true
android.enableJetifier=true
facebookSdkVersion=5.11.0

MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore
MYAPP_UPLOAD_KEY_ALIAS=my-key-alias
MYAPP_UPLOAD_STORE_PASSWORD=1995_Asitha
MYAPP_UPLOAD_KEY_PASSWORD=1995_Asitha
6 changes: 4 additions & 2 deletions MobileApp/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.elly"
android:versionCode="4"
android:versionCode="6"
>

<uses-permission android:name="android.permission.INTERNET" />
@@ -24,7 +24,9 @@
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import com.facebook.reactnative.androidsdk.FBSDKPackage;
import com.airbnb.android.react.maps.MapsPackage;
import io.invertase.firebase.storage.ReactNativeFirebaseStoragePackage;
@@ -39,6 +40,7 @@ protected List<ReactPackage> getPackages() {

// Packages that cannot be autolinked yet can be added manually here, for example:
//packages.add(new MainReactPackage(),
// new ImageResizerPackage(),
// new FBSDKPackage(),
// new FBSDKPackage(),
// new MapsPackage(),
Binary file modified MobileApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MobileApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MobileApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion MobileApp/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Elly</string>
<string name="app_name">Ele-Watch</string>
<string name="facebook_app_id">515087955882398</string>
<string name="fb_login_protocol_scheme">fb515087955882398</string>
</resources>
2 changes: 1 addition & 1 deletion MobileApp/android/build.gradle
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
buildscript {
ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 16
minSdkVersion = 21
compileSdkVersion = 28
targetSdkVersion = 28
supportLibVersion = "27.1.1"
2 changes: 2 additions & 0 deletions MobileApp/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'Elly'
include ':react-native-image-resizer'
project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/android')
include ':react-native-fbsdk'
project(':react-native-fbsdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fbsdk/android')
include ':react-native-fbsdk'
27 changes: 17 additions & 10 deletions MobileApp/index.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,11 @@
import * as React from 'react';
import {AppRegistry, StatusBar} from 'react-native';
import App from './App';
import {configureFonts, DefaultTheme, Provider as PaperProvider } from 'react-native-paper';
import {
configureFonts,
DefaultTheme,
Provider as PaperProvider,
} from 'react-native-paper';
import {name as appName} from './app.json';

const fontConfig = {
@@ -33,19 +37,22 @@ const theme = {
roundness: 15,
colors: {
...DefaultTheme.colors,
primary: '#0b6623',
accent: '#f1c40f',
primary: 'white',
accent: 'black',
},
fonts: configureFonts(fontConfig),
};

export default function Main() {
return (
<PaperProvider theme={theme}>
{/* <StatusBar backgroundColor="#228B22" barStyle="light-content" /> */}
<App />
</PaperProvider>
);
}
return (
<PaperProvider theme={theme}>
<StatusBar
// backgroundColor="#004c21"
barStyle="light-content"
/>
<App />
</PaperProvider>
);
}

AppRegistry.registerComponent(appName, () => Main);
2 changes: 2 additions & 0 deletions MobileApp/ios/Podfile
Original file line number Diff line number Diff line change
@@ -70,6 +70,8 @@ target 'Elly' do

pod 'react-native-fbsdk', :path => '../node_modules/react-native-fbsdk'

pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'

target 'EllyTests' do
inherit! :search_paths
# Pods for testing
1 change: 1 addition & 0 deletions MobileApp/package.json
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
"react-native-camera": "3.8.0",
"react-native-fbsdk": "1.1.1",
"react-native-gesture-handler": "1.5.0",
"react-native-image-resizer": "1.2.0",
"react-native-maps": "0.26.1",
"react-native-paper": "3.0.0",
"react-native-reanimated": "1.3.2",
Loading