Skip to content

Commit

Permalink
Merge pull request #28 from dooptha/develop
Browse files Browse the repository at this point in the history
Update project to v1.0.1
  • Loading branch information
roman-sereda authored Sep 12, 2019
2 parents a27feb4 + 5cec631 commit b6d0b62
Show file tree
Hide file tree
Showing 60 changed files with 1,486 additions and 961 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ buck-out/
*.jsbundle

# CocoaPods
/ios/Pods/
ios/Pods/
ios/Podfile.lock

# Project config override
config/override.js
Expand Down
28 changes: 18 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
# NUWM Frontend
## NUWM Frontend

<img align="right" width="120" height="120" src="https://raw.githubusercontent.com/dooptha/nuwm-frontend/develop/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png">

This is open source React Native application designed for students by students of the [NATIONAL UNIVERSITY OF WATER AND ENVIRONMENTAL ENGINEERING](http://en.nuwm.edu.ua/).

[![Build Status](https://travis-ci.com/dooptha/nuwm-frontend.svg?branch=develop)](https://travis-ci.com/dooptha/nuwm-frontend)
[![Maintainability](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/maintainability)](https://codeclimate.com/github/dooptha/nuwm-frontend/maintainability)
<a href="https://apps.apple.com/us/app/nuwee-timetable/id1478105131?mt=8">
<img height="55" src="https://raw.githubusercontent.com/Volorf/Badges/master/App%20Store/App%20Store%20Badge.png">
</a>
<a href='https://play.google.com/store/apps/details?id=com.nuwmapp&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
<img height="55" alt='Get it on Google Play' src='https://raw.githubusercontent.com/Volorf/Badges/master/Google%20Play/Google%20Play%20Badge.png'/>
</a>

[![Build Status](https://travis-ci.com/dooptha/nuwm-frontend.svg?branch=develop)](https://travis-ci.com/dooptha/nuwm-frontend)
[![Maintainability](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/maintainability)](https://codeclimate.com/github/dooptha/nuwm-frontend/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/test_coverage)](https://codeclimate.com/github/dooptha/nuwm-frontend/test_coverage)
[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)

## Dependencies
#### Dependencies
* Node.js _(v11.14.0)_ and NPM _(v6.7.0)_
* XCode _(v10.3)_

### Build
#### Build

###### IOS

Expand All @@ -28,7 +38,7 @@ To build production version use this [instruction.](https://facebook.github.io/r
$ cd android && ./gradlew bundleRelease -PkeyPassword=<password> -PstorePassword=<password>
```

### Configuration
#### Configuration

You can configure app by using configuration files in `/config` directory.
In development environment `production.js` will be overwritten by `development.js`.
Expand All @@ -45,7 +55,7 @@ In production environment `override.js` and `development.js` will be ignored.
If you have any error related to `override.js`, restarting metro bundler, or creating `override.js` file (if you haven't done this yet) can solve that error.


### Debugging
#### Debugging

RN have a lot of tools for development purposes, more info you can find [_here_](https://facebook.github.io/react-native/docs/debugging).

Expand Down Expand Up @@ -75,6 +85,4 @@ but for our backend you should forward additional port by default it's `:3000`
$ adb -s <device name from "adb devices"> reverse tcp:3000 tcp:3000
```

**IMPORTANT:** For connecting to a local server from Emulator device use `http://10.0.2.2:3000` <a href="https://developer.android.com/studio/run/emulator-networking" target="_blank">_(More info)_</a>

___
**IMPORTANT:** For connecting to a local server from Emulator device use `http://10.0.2.2:3000` <a href="https://developer.android.com/studio/run/emulator-networking" target="_blank">_(More info)_</a>
4 changes: 2 additions & 2 deletions config/development.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable */
import { Platform } from 'react-native';

const apiEndpoint = Platform.OS === 'ios' ? 'https://api.dooptha.com' : 'http://10.0.2.2:3000';
const socketIoEndpoint = Platform.OS === 'ios' ? 'https://api.dooptha.com/flood' : 'http://10.0.2.2:3000/flood';
const apiEndpoint = Platform.OS === 'ios' ? 'http://localhost:3000' : 'http://10.0.2.2:3000';
const socketIoEndpoint = Platform.OS === 'ios' ? 'http://localhost:3000/flood' : 'http://10.0.2.2:3000/flood';

export default {
API_ENDPOINT: apiEndpoint,
Expand Down
7 changes: 6 additions & 1 deletion config/production.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable */
export default {
VERSION: '1.0.0',
VERSION: '1.0.1',
API_ENDPOINT: 'https://api.dooptha.com',
SOCKET_IO_ENDPOINT: 'https://api.dooptha.com/flood',
INITIAL_ROUTE_NAME: 'Timetable', /* [Timetable, Conversations, Settings] */
Expand Down Expand Up @@ -29,4 +29,9 @@ export default {

MAXIMUM_CHARS_IN_MESSAGE: 500,
MAX_USERNAME_LENGTH: 30,

// 604800000 = every 7 days
UPDATE_AUTOCOMPLETE_GROUPS_TIMER: 604800000,
// 604800000 = every 7 days
UPDATE_AUTOCOMPLETE_TEACHERS_TIMER: 604800000,
};
Loading

0 comments on commit b6d0b62

Please sign in to comment.