Changed login input to password styled input. Patch v2.1.1

malee31 · Apr 11, 2022 · baa803d · baa803d
1 parent 48c5dd0
commit baa803d
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 70 deletions.
diff --git a/app.json b/app.json
@@ -1,56 +1,56 @@
 {
-  "expo": {
-    "name": "CardinalHours App",
-    "slug": "ReactNative-CardinalBoticsApp",
-    "icon": "./assets/icon.png",
-    "version": "2.1.0",
-    "privacy": "unlisted",
-    "orientation": "portrait",
-    "description": "Team4159 CardinalBotics Sign-In App",
-    "primaryColor": "#7D1120",
-    "backgroundColor": "#FFFFFF",
-    "splash": {
-      "image": "./assets/favicon.png",
-      "resizeMode": "contain",
-      "backgroundColor": "#7D1120",
-      "userInterfaceStyle": "automatic"
-    },
-    "notification": {
-      "icon": "./assets/icon.png",
-      "color": "#000000",
-      "iosDisplayInForeground": false,
-      "androidCollapsedTitle": "collapse"
-    },
-    "updates": {
-      "fallbackToCacheTimeout": 0
-    },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
-    "platforms": [
-      "ios",
-      "android",
-      "web"
-    ],
-    "android": {
-      "package": "com.team4159.cardinalboticsapp",
-      "versionCode": 2
-    },
-    "androidStatusBar": {
-      "barStyle": "dark-content",
-      "hidden": true,
-      "translucent": true
-    },
-    "androidNavigationBar": {
-      "barStyle": "dark-content"
-    },
-    "ios": {
-      "bundleIdentifier": "com.team4159.cardinalboticsapp",
-      "supportsTablet": true,
-      "buildNumber": "2.1.0"
-    },
-    "web": {
-      "favicon": "./assets/favicon.png"
-    }
-  }
+	"expo": {
+		"name": "CardinalHours App",
+		"slug": "ReactNative-CardinalBoticsApp",
+		"icon": "./assets/icon.png",
+		"version": "2.1.1",
+		"privacy": "unlisted",
+		"orientation": "portrait",
+		"description": "Team4159 CardinalBotics Sign-In App",
+		"primaryColor": "#7D1120",
+		"backgroundColor": "#FFFFFF",
+		"splash": {
+			"image": "./assets/favicon.png",
+			"resizeMode": "contain",
+			"backgroundColor": "#7D1120",
+			"userInterfaceStyle": "automatic"
+		},
+		"notification": {
+			"icon": "./assets/icon.png",
+			"color": "#000000",
+			"iosDisplayInForeground": false,
+			"androidCollapsedTitle": "collapse"
+		},
+		"updates": {
+			"fallbackToCacheTimeout": 0
+		},
+		"assetBundlePatterns": [
+			"**/*"
+		],
+		"platforms": [
+			"ios",
+			"android",
+			"web"
+		],
+		"android": {
+			"package": "com.team4159.cardinalboticsapp",
+			"versionCode": 2
+		},
+		"androidStatusBar": {
+			"barStyle": "dark-content",
+			"hidden": true,
+			"translucent": true
+		},
+		"androidNavigationBar": {
+			"barStyle": "dark-content"
+		},
+		"ios": {
+			"bundleIdentifier": "com.team4159.cardinalboticsapp",
+			"supportsTablet": true,
+			"buildNumber": "2.1.1"
+		},
+		"web": {
+			"favicon": "./assets/favicon.png"
+		}
+	}
 }
diff --git a/components/pages/Forms.js b/components/pages/Forms.js
@@ -6,6 +6,9 @@ import useModal from "../parts/ContextProviders/ModalProvider";
 import Screen from "../parts/StyledParts/ScreenWrapper";
 
 const formStyles = StyleSheet.create({
+	list: {
+		width: "100%"
+	},
 	button: {
 		width: "100%",
 		minHeight: 45,
@@ -14,9 +17,11 @@ const formStyles = StyleSheet.create({
 		alignItems: "flex-start",
 		paddingHorizontal: "4%",
 		marginVertical: 4
-	}, text: {
+	},
+	text: {
 		flex: 1, width: "30%", fontSize: 16, paddingHorizontal: 5, justifyContent: "center", alignContent: "center"
-	}, title: {
+	},
+	title: {
 		textAlign: 'center', alignSelf: 'center', width: "100%", fontSize: 30, color: colors.primary, marginTop: '5%'
 	}
 });
@@ -46,6 +51,7 @@ export default function Forms({ navigation }) {
 
 	if(data) {
 		component = <FlatList
+			style={formStyles.list}
 			data={data}
 			keyExtractor={item => item[1] + ": " + item[2]}
 			renderItem={entry => {
@@ -70,7 +76,9 @@ export default function Forms({ navigation }) {
 		/>;
 	}
 
-	return (<Screen navigation={navigation}>
-		{component}
-	</Screen>);
+	return (
+		<Screen navigation={navigation}>
+			{component}
+		</Screen>
+	);
 }
diff --git a/components/pages/Leaderboard.js b/components/pages/Leaderboard.js
@@ -5,14 +5,17 @@ import Screen from "../parts/StyledParts/ScreenWrapper";
 import React, { useEffect, useState } from "react";
 import { colors } from "../../config.json";
 
-const { memberListStyles } = StyleSheet.create({
-	memberListStyles: {
+const leaderboardStyles = StyleSheet.create({
+	list: {
+		width: "100%"
+	},
+	member: {
 		flexDirection: "column",
 		width: "100%",
 		backgroundColor: colors.gray,
 		borderRadius: 10,
 		padding: 5,
-		marginVertical: "1%"
+		marginVertical: 5
 	},
 });
 
@@ -36,13 +39,14 @@ export default function Leaderboard({ navigation }) {
 
 	if(leaderboardData) {
 		content = <FlatList
+			style={leaderboardStyles.list}
 			scrollEventThrottle={16}
 			data={leaderboardData}
 			keyExtractor={item => item.id.toString()}
 			renderItem={entry => {
 				entry = entry.item;
 				return (
-					<View style={memberListStyles}>
+					<View style={leaderboardStyles.member}>
 						<Text
 							style={{
 								color: entry.signedIn ? "green" : "black",

diff --git a/components/pages/Login.js b/components/pages/Login.js
@@ -22,7 +22,6 @@ const loginStyles = StyleSheet.create({
 		alignItems: "center",
 		justifyContent: "center",
 		alignSelf: "center",
-		justifySelf: "center",
 		padding: 10
 	},
 	loginButtonText: {
@@ -51,6 +50,7 @@ export default function Login({ navigation }) {
 				label="Login"
 				value={passwordInput}
 				style={loginStyles.loginInput}
+				secureTextEntry={true}
 				onChange={newText => setPasswordInput(newText.nativeEvent.text)}
 				onSubmitEditing={handleLogin}
 			/>

diff --git a/components/pages/Resources.js b/components/pages/Resources.js
@@ -1,10 +1,15 @@
-import { ActivityIndicator, FlatList } from 'react-native';
+import { ActivityIndicator, FlatList, StyleSheet } from 'react-native';
 import LinkButton from "../parts/StyledParts/LinkButton.js";
 import { colors, urls } from "../../config.json";
 import React, { useEffect, useState } from "react";
 import useModal from "../parts/ContextProviders/ModalProvider";
 import Screen from "../parts/StyledParts/ScreenWrapper";
 
+const { listStyle } = StyleSheet.create({
+	listStyle: {
+		width: "100%"
+	}
+});
 
 export default function Resources({ navigation }) {
 	const [data, setData] = useState([]);
@@ -21,6 +26,7 @@ export default function Resources({ navigation }) {
 
 	if(data) {
 		component = <FlatList
+			style={listStyle}
 			data={data}
 			keyExtractor={item => item[0] + ": " + item[1]}
 			renderItem={(entry) => {

diff --git a/config.json b/config.json
@@ -2,8 +2,7 @@
 	"urls": {
 		"resources": "https://sheets.googleapis.com/v4/spreadsheets/1fQyQXJPiFwXKT7wJ8wmJgTolLwxxiOe2PE3xpNQR9Wc/values/Resources!A2:C?key=AIzaSyB2ynMpXWG49Fk-rS0cBZdytUH9GK96NzU",
 		"training": "https://sheets.googleapis.com/v4/spreadsheets/1fQyQXJPiFwXKT7wJ8wmJgTolLwxxiOe2PE3xpNQR9Wc/values/Training%20Links!A2:C?key=AIzaSyB2ynMpXWG49Fk-rS0cBZdytUH9GK96NzU",
-		"sheet": "https://sheets.googleapis.com/v4/spreadsheets/1po_TE36FA-I7J2Y-Biw5snWdfSm_Cx055KVi1c43G7Y/values/App%20Assembly!A1:E?key=AIzaSyB2ynMpXWG49Fk-rS0cBZdytUH9GK96NzU",
-		"calendar": "https://www.googleapis.com/calendar/v3/calendars/nicholas.do%40team4159.org/events?key=AIzaSyDRSH4Trb-AdjEdzA06J7WOFLbyhOqnq-M&timeZone=UTC&timeMin=2020-08-16T00:00:00Z&orderBy=startTime&singleEvents=True"
+		"sheet": "https://sheets.googleapis.com/v4/spreadsheets/1po_TE36FA-I7J2Y-Biw5snWdfSm_Cx055KVi1c43G7Y/values/App%20Assembly!A1:E?key=AIzaSyB2ynMpXWG49Fk-rS0cBZdytUH9GK96NzU"
 	},
 	"serverEndpointBaseURLs": {
 		"getData": "https://hours.team4159.org/users/getusers",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CardinalBoticsApp",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "node_modules/expo/AppEntry.js",
   "homepage": "/ReactNativeCardinalBoticsApp",
   "scripts": {