Skip to content

Commit b6d0b62

Browse files
authored
Merge pull request #28 from dooptha/develop
Update project to v1.0.1
2 parents a27feb4 + 5cec631 commit b6d0b62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1486
-961
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ buck-out/
6161
*.jsbundle
6262

6363
# CocoaPods
64-
/ios/Pods/
64+
ios/Pods/
65+
ios/Podfile.lock
6566

6667
# Project config override
6768
config/override.js

README.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
# NUWM Frontend
1+
## NUWM Frontend
2+
3+
<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">
4+
25
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/).
36

4-
[![Build Status](https://travis-ci.com/dooptha/nuwm-frontend.svg?branch=develop)](https://travis-ci.com/dooptha/nuwm-frontend)
5-
[![Maintainability](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/maintainability)](https://codeclimate.com/github/dooptha/nuwm-frontend/maintainability)
7+
<a href="https://apps.apple.com/us/app/nuwee-timetable/id1478105131?mt=8">
8+
<img height="55" src="https://raw.githubusercontent.com/Volorf/Badges/master/App%20Store/App%20Store%20Badge.png">
9+
</a>
10+
<a href='https://play.google.com/store/apps/details?id=com.nuwmapp&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
11+
<img height="55" alt='Get it on Google Play' src='https://raw.githubusercontent.com/Volorf/Badges/master/Google%20Play/Google%20Play%20Badge.png'/>
12+
</a>
13+
14+
[![Build Status](https://travis-ci.com/dooptha/nuwm-frontend.svg?branch=develop)](https://travis-ci.com/dooptha/nuwm-frontend)
15+
[![Maintainability](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/maintainability)](https://codeclimate.com/github/dooptha/nuwm-frontend/maintainability)
616
[![Test Coverage](https://api.codeclimate.com/v1/badges/470fde4b1b8945fba5f0/test_coverage)](https://codeclimate.com/github/dooptha/nuwm-frontend/test_coverage)
717
[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)
818

9-
## Dependencies
19+
#### Dependencies
1020
* Node.js _(v11.14.0)_ and NPM _(v6.7.0)_
1121
* XCode _(v10.3)_
1222

13-
### Build
23+
#### Build
1424

1525
###### IOS
1626

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

31-
### Configuration
41+
#### Configuration
3242

3343
You can configure app by using configuration files in `/config` directory.
3444
In development environment `production.js` will be overwritten by `development.js`.
@@ -45,7 +55,7 @@ In production environment `override.js` and `development.js` will be ignored.
4555
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.
4656

4757

48-
### Debugging
58+
#### Debugging
4959

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

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

78-
**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>
79-
80-
___
88+
**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>

config/development.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable */
22
import { Platform } from 'react-native';
33

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

77
export default {
88
API_ENDPOINT: apiEndpoint,

config/production.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable */
22
export default {
3-
VERSION: '1.0.0',
3+
VERSION: '1.0.1',
44
API_ENDPOINT: 'https://api.dooptha.com',
55
SOCKET_IO_ENDPOINT: 'https://api.dooptha.com/flood',
66
INITIAL_ROUTE_NAME: 'Timetable', /* [Timetable, Conversations, Settings] */
@@ -29,4 +29,9 @@ export default {
2929

3030
MAXIMUM_CHARS_IN_MESSAGE: 500,
3131
MAX_USERNAME_LENGTH: 30,
32+
33+
// 604800000 = every 7 days
34+
UPDATE_AUTOCOMPLETE_GROUPS_TIMER: 604800000,
35+
// 604800000 = every 7 days
36+
UPDATE_AUTOCOMPLETE_TEACHERS_TIMER: 604800000,
3237
};

0 commit comments

Comments
 (0)