From e5dad20d31e7d935cec5141fdb06a935f1b3de8c Mon Sep 17 00:00:00 2001 From: Duncan-Kiragu Date: Fri, 7 Oct 2022 22:39:26 +0300 Subject: [PATCH] made minor changes to screens for UI check --- App.js | 62 +- package-lock.json | 96 +- package.json | 1 + res/api.js | 7 + screens/Scales/NPSscale.js | 10 +- screens/Scales/OldVersions.js | 95 +- screens/auth/ForgotPassword.js | 202 +- screens/auth/SigninScreen.js | 8 +- screens/components/NpsSettings.js | 13 +- screens/components/Reports/ReportRadio.js | 32 +- screens/components/Reports/ReportTable.js | 125 +- screens/mainScreens/CommentScreen.js | 111 +- screens/mainScreens/ProfileScreen.js | 3 +- screens/mainScreens/ReportScreen.js | 38 +- yarn.lock | 12217 ++++++++++---------- 15 files changed, 6765 insertions(+), 6255 deletions(-) create mode 100644 res/api.js diff --git a/App.js b/App.js index 878f7a710..52ecb1a83 100644 --- a/App.js +++ b/App.js @@ -7,6 +7,9 @@ import { Image } from "react-native"; // AUTH import SigninScreen from "./screens/auth/SigninScreen"; import SignupScreen from "./screens/auth/SignupScreen"; +// import ForgotPasswordScreen from "./screens/auth/ForgotPassword"; + +import api from "./res/api"; // MAIN SCREENS import CommentScreen from "./screens/mainScreens/CommentScreen"; @@ -16,12 +19,64 @@ import ProfileScreen from "./screens/mainScreens/ProfileScreen"; import ReportScreen from "./screens/mainScreens/ReportScreen"; import ScaleScreen from "./screens/mainScreens/ScaleScreen"; import NPSScale from "./screens/Scales/NPSscale"; - +// NAVIGATION const AuthStack = createStackNavigator(); const Tab = createBottomTabNavigator(); const ScaleStack = createStackNavigator(); const ProfileStack = createStackNavigator(); +// AXIOS API CALL -AUTHENTICATION + +// function getCurrentUser() { +// console.log("getCurrentUser"); +// // return +// api +// .get("api/profile/") +// .then((res) => { +// console.log("current", res); +// }) +// .then((response) => { +// // return json; + +// AsyncStorage.setItem("client", JSON.stringify(response.data)); +// }) +// .catch(function (error) { +// console.log( +// "There has been a problem with your fetch operation: " + error.message +// ); +// // ADD THIS THROW error +// throw error; +// }); +// } + +// async function checkUserSignedIn() { +// // let context = this; +// try { +// let value = await AsyncStorage.getItem("user_token"); +// // console.log("user_token ",value); +// if (value !== null) { +// // do something +// setIsSigned(true); +// getCurrentUser(); +// } else { +// // do something else +// setIsSigned(false); +// } +// } catch (error) { +// // Error retrieving data +// console.log("checkUserSignedIn error", error); +// } +// } + +// useEffect(() => { +// checkUserSignedIn(); +// }, []); + +{ + /* {isSignedIn ? ( + <> */ +} + const ScaleStackScreen = () => ( ( component={SignupScreen} options={{ title: "DOWELL - SIGN UP" }} /> + {/* */} ); diff --git a/package-lock.json b/package-lock.json index d88ad6043..76fb79228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@react-navigation/native-stack": "^6.8.0", "@react-navigation/stack": "^6.3.1", "@ui-kitten/components": "^5.1.2", + "axios": "^1.1.0", "expo": "~46.0.9", "expo-status-bar": "~1.4.0", "react": "18.0.0", @@ -26,7 +27,7 @@ "react-native-gesture-handler": "^2.7.0", "react-native-paper": "^4.12.4", "react-native-phone-number-input": "^2.1.0", - "react-native-reanimated": "~2.9.1", + "react-native-reanimated": "^2.10.0", "react-native-recommendation": "^1.1.2", "react-native-safe-area-context": "^4.3.1", "react-native-screens": "~3.15.0", @@ -4973,6 +4974,29 @@ "node": ">= 4.5.0" } }, + "node_modules/axios": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.0.tgz", + "integrity": "sha512-hsJgcqz4JY7f+HZ4cWTrPZ6tZNCNFPTRx1MjRqu/hbpgpHdSCUpLVuplc+jE/h7dOvyANtw/ERA3HC2Rz/QoMg==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/babel-core": { "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", @@ -7193,6 +7217,25 @@ "node": ">=0.4.0" } }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/fontfaceobserver": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz", @@ -10635,6 +10678,11 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -11084,11 +11132,10 @@ } }, "node_modules/react-native-reanimated": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.9.1.tgz", - "integrity": "sha512-309SIhDBwY4F1n6e5Mr5D1uPZm2ESIcmZsGXHUu8hpKX4oIOlZj2MilTk+kHhi05LjChoJkcpfkstotCJmPRPg==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.10.0.tgz", + "integrity": "sha512-jKm3xz5nX7ABtHzzuuLmawP0pFWP77lXNdIC6AWOceBs23OHUaJ29p4prxr/7Sb588GwTbkPsYkDqVFaE3ezNQ==", "dependencies": { - "@babel/plugin-proposal-export-namespace-from": "^7.17.12", "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@types/invariant": "^2.2.35", @@ -17120,6 +17167,28 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, + "axios": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.0.tgz", + "integrity": "sha512-hsJgcqz4JY7f+HZ4cWTrPZ6tZNCNFPTRx1MjRqu/hbpgpHdSCUpLVuplc+jE/h7dOvyANtw/ERA3HC2Rz/QoMg==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, "babel-core": { "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", @@ -18858,6 +18927,11 @@ "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.121.0.tgz", "integrity": "sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==" }, + "follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, "fontfaceobserver": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz", @@ -21486,6 +21560,11 @@ } } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -21836,11 +21915,10 @@ } }, "react-native-reanimated": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.9.1.tgz", - "integrity": "sha512-309SIhDBwY4F1n6e5Mr5D1uPZm2ESIcmZsGXHUu8hpKX4oIOlZj2MilTk+kHhi05LjChoJkcpfkstotCJmPRPg==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.10.0.tgz", + "integrity": "sha512-jKm3xz5nX7ABtHzzuuLmawP0pFWP77lXNdIC6AWOceBs23OHUaJ29p4prxr/7Sb588GwTbkPsYkDqVFaE3ezNQ==", "requires": { - "@babel/plugin-proposal-export-namespace-from": "^7.17.12", "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@types/invariant": "^2.2.35", diff --git a/package.json b/package.json index 6a9d4a3f9..d9fd71bf8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@react-navigation/native-stack": "^6.8.0", "@react-navigation/stack": "^6.3.1", "@ui-kitten/components": "^5.1.2", + "axios": "^1.1.0", "expo": "~46.0.9", "expo-status-bar": "~1.4.0", "react": "18.0.0", diff --git a/res/api.js b/res/api.js new file mode 100644 index 000000000..6ed18b3f4 --- /dev/null +++ b/res/api.js @@ -0,0 +1,7 @@ +import axios from "axios"; + +const api = axios.create({ + baseURL: "https://100014.pythonanywhere.com/", +}); + +export default api; diff --git a/screens/Scales/NPSscale.js b/screens/Scales/NPSscale.js index fd54d09be..49b23ece8 100644 --- a/screens/Scales/NPSscale.js +++ b/screens/Scales/NPSscale.js @@ -60,12 +60,13 @@ export default function NPSScale() { margin: 10, padding: 10, bottom: 0, - alignItems: "center", + alignSelf: "center", + justifyContent: "space-between", }} // Remove this to disable reaction icon and text /> - - */} + {/* + > */} { - const [text, onChangeText] = React.useState("Search for old versions"); -// const [text2, onChangeButton] = React.useState("Save"); +const DATA = [ + { + id: "bd7acbea-c1b1-46c2-aed5-3ad53abb28ba", + title: "defaultScale", + }, + { + id: "3ac68afc-c605-48d3-a4f8-fbd91aa97f63", + title: "scaleAmbrose21", + }, + { + id: "58694a0f-3da1-471f-bd96-145571e29dh2", + title: "scale893dun", + }, + { + id: "58694a0f-3da1-471f-bd96-145571e29d4l", + title: "npsScalev4", + }, + { + id: "58694a0f-3da1-471f-bd96-145571e29d72", + title: "newScale213", + }, +]; +const Item = ({ title }) => ( + + {title} + +); + +const OldVersions = () => { + const renderItem = ({ item }) => ; return ( - - + item.id} /> - {/* */} - {/*