update settings page and API config

- remove Expo version from settings - deprecate bare API key in config file
NJUCSE17 · Mar 2, 2019 · 0628db8 · 0628db8
1 parent 26b8f59
commit 0628db8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/app.json b/app.json
@@ -8,7 +8,7 @@
       "ios",
       "android"
     ],
-    "version": "0.2.0",
+    "version": "0.2.1",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "splash": {

diff --git a/components/SettingsView.js b/components/SettingsView.js
@@ -15,12 +15,10 @@ export default class SettingsView extends React.Component {
   }
 
   render() {
-    const { expoVersion, manifest } = Constants;
+    const { manifest } = Constants;
     const sections = [
       { data: [{ value: this.state.username }], title: 'Username (Student ID)' },
-      { data: [{ value: expoVersion }], title: 'Expo Version' },
-      { data: [{ value: manifest.sdkVersion }], title: 'SDK Version' },
-      { data: [{ value: manifest.version }], title: 'version' },
+      { data: [{ value: manifest.version }], title: 'Version' },
       { data: [{ value: (
         <Text 
           style={{ textDecorationLine: "underline" }} 

diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
@@ -64,7 +64,7 @@ export default class LoginScreen extends React.Component {
                     onChangeText={(password) => this.setState({password})} 
                   />
                 </Item>
-                <Button iconLeft full bordered 
+                <Button iconLeft full success
                   style={[styles.rounded, styles.auth_button]}
                   onPress={this._handleLogin.bind(this)}
                 >

diff --git a/services/api.js b/services/api.js
@@ -36,7 +36,7 @@ export const login = async (username, password) => {
   const params = {
     grant_type: 'password',
     client_id: Config.clientID,
-    client_secret: Config.clientSecret,
+    client_secret: atob(Config.clientSecret),
     username: username,
     password: password
   };