Browse Source

Changed prowiwash source to use updating json, edited readme

keplyx 2 years ago
parent
commit
c6e27c5d47
5 changed files with 11 additions and 7 deletions
  1. 6
    2
      README.md
  2. 1
    1
      app.json
  3. 1
    1
      components/BaseContainer.js
  4. 1
    1
      screens/HomeScreen.js
  5. 2
    2
      screens/ProxiwashScreen.js

+ 6
- 2
README.md View File

@@ -1,3 +1,7 @@
1
-# application-amicale
1
+# Application pour l'Amicale
2 2
 
3
-Application Android et IOS pour l'Amicale de l'INSA Toulouse
3
+Créée pendant l'été 2019, cette application compatible Android et iOS permet aux étudiants d'avoir un accès facile aux informations du campus :
4
+ - News de l'amicale
5
+ - État des machines à laver
6
+ - Stock du Proximo
7
+ -

+ 1
- 1
app.json View File

@@ -10,7 +10,7 @@
10 10
       "android",
11 11
       "web"
12 12
     ],
13
-    "version": "0.0.6",
13
+    "version": "0.0.7",
14 14
     "orientation": "portrait",
15 15
     "primaryColor": "#be1522",
16 16
     "icon": "./assets/android.icon.png",

+ 1
- 1
components/BaseContainer.js View File

@@ -25,7 +25,7 @@ type State = {
25 25
 export default class BaseContainer extends React.Component<Props, State> {
26 26
 
27 27
     static defaultProps = {
28
-        headerRightMenu: <Right/>
28
+        headerRightButton: <View/>
29 29
     };
30 30
 
31 31
 

+ 1
- 1
screens/HomeScreen.js View File

@@ -11,7 +11,7 @@ import ThemeManager from "../utils/ThemeManager";
11 11
 
12 12
 const ICON_AMICALE = require('../assets/amicale.png');
13 13
 const NAME_AMICALE = 'Amicale INSA Toulouse';
14
-const DATA_URL = "https://etud.insa-toulouse.fr/~vergnet/appli-amicale/facebook_data.json";
14
+const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~vergnet/appli-amicale/facebook_data.json";
15 15
 
16 16
 
17 17
 /**

+ 2
- 2
screens/ProxiwashScreen.js View File

@@ -12,7 +12,7 @@ import PlatformTouchable from "react-native-platform-touchable";
12 12
 import AsyncStorageManager from "../utils/AsyncStorageManager";
13 13
 import * as Expo from "expo";
14 14
 
15
-const DATA_URL = "https://etud.insa-toulouse.fr/~vergnet/appli-amicale/dataProxiwash.json";
15
+const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~vergnet/appli-amicale/washinsa/washinsa.json";
16 16
 
17 17
 let reminderNotifTime = 5;
18 18
 
@@ -42,7 +42,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
42 42
      * Creates machine state parameters using current theme and translations
43 43
      */
44 44
     constructor() {
45
-        super(DATA_URL, 1000 * 30); // Refresh every half minute
45
+        super(DATA_URL, 1000 * 60); // Refresh every minute
46 46
         let colors = ThemeManager.getCurrentThemeVariables();
47 47
         stateColors[MACHINE_STATES.TERMINE] = colors.proxiwashFinishedColor;
48 48
         stateColors[MACHINE_STATES.DISPONIBLE] = colors.proxiwashReadyColor;

Loading…
Cancel
Save