Merge pull request #543 from bounswe/feature/MB-stock-details

Feature/mb stock details
bounswe · Dec 16, 2024 · 261818f · 261818f
2 parents 2c8691d + f4e2f25
commit 261818f
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 14 deletions.
diff --git a/mobile/src/pages/Markets.js b/mobile/src/pages/Markets.js
@@ -124,17 +124,23 @@ const Markets = ({ navigation }) => {
 
   const renderStockItem = ({ item }) => (
     <TouchableOpacity
-      style={styles.stockCard}
-      onPress={() => navigation.navigate('StockDetails', { id: item.id })}
-    >
-      <View>
-        <Text style={styles.stockCode}>{item.symbol || 'N/A'}</Text>
-        <Text style={styles.stockName}>{item.name || 'No Name'}</Text>
-      </View>
-      <Text style={styles.stockPrice}>
-        {parseFloat(item.price || 0).toFixed(2)} {item.currency?.code || ''}
-      </Text>
-    </TouchableOpacity>
+  style={styles.stockCard}
+  onPress={() => navigation.navigate('StockDetails', { id: item.id })}
+>
+  <View style={styles.stockTextContainer}>
+    <Text style={styles.stockCode}>{item.symbol || 'N/A'}</Text>
+    <Text numberOfLines={1} ellipsizeMode="tail" style={styles.stockName}>
+      {item.name || 'No Name'}
+    </Text>
+  </View>
+  <View>
+    <Text style={styles.stockPrice}>
+      {parseFloat(item.price || 0).toFixed(2)}{' '}
+      {item.currency === 2 ? 'TRY' : item.currency === 3 ? 'USD' : 'N/A'}
+    </Text>
+  </View>
+</TouchableOpacity>
+
   );
 
   if (loading) {
@@ -216,6 +222,22 @@ const styles = StyleSheet.create({
   searchLoader: {
     marginBottom: 10,
   },
+  stockTextContainer: {
+    flex: 1, // Ensures the name and code take up available space
+    marginRight: 10, // Adds spacing between the name and the price
+  },
+  stockName: {
+    fontSize: 14,
+    color: '#333333',
+    marginTop: 5, // Adds spacing between the code and name
+  },
+  stockPrice: {
+    fontSize: 16,
+    fontWeight: '600',
+    color: '#4CAF50',
+    textAlign: 'right', // Aligns the price text to the right
+  },
+
   loaderContainer: {
     flex: 1,
     justifyContent: 'center',
@@ -243,7 +265,7 @@ const styles = StyleSheet.create({
   stockName: {
     fontSize: 14,
     color: '#333333',
-    marginTop: 4,
+    paddingTop: 20,
   },
   stockPrice: {
     fontSize: 16,

diff --git a/mobile/src/pages/PortfolioDetails.js b/mobile/src/pages/PortfolioDetails.js
@@ -28,6 +28,7 @@ const PortfolioDetails = ({ route, navigation }) => {
   const [selectedStock, setSelectedStock] = useState(null);
   const [searchLoading, setSearchLoading] = useState(false);
 
+
   const predefinedColors = ['#1E90FF', '#FFD700', '#8A2BE2', '#FF8C00', '#00CED1'];
 
   const generateColor = () => {
@@ -384,7 +385,7 @@ const PortfolioDetails = ({ route, navigation }) => {
 
           <TextInput
             style={styles.input}
-            placeholder="Price Bought (TRY)"
+            placeholder={`Price Bought (${selectedStock?.currency === 2 ? 'TRY' : selectedStock?.currency === 3 ? 'USD' : ''})`}
             keyboardType="numeric"
             placeholderTextColor="#000"
             value={priceBought}

diff --git a/mobile/src/pages/StockDetails.js b/mobile/src/pages/StockDetails.js
@@ -1,10 +1,14 @@
 import React, { useState, useEffect } from 'react';
-import { View, Text, StyleSheet, ActivityIndicator, ScrollView, Alert } from 'react-native';
+import { View, Dimensions, Text, StyleSheet, ActivityIndicator, ScrollView, Alert } from 'react-native';
+import { LineChart } from 'react-native-chart-kit';
 
 const StockDetails = ({ route }) => {
   const { id } = route.params; // Get the stock ID from navigation params
   const [stockDetails, setStockDetails] = useState(null);
   const [loading, setLoading] = useState(true);
+  const [stockData, setStockData] = useState([]);
+  const [stockDates, setStockDates] = useState([]);
+  const [graphLoading, setGraphLoading] = useState(false);
 
   const fetchStockDetails = async () => {
     const url = `http://159.223.28.163:30002/stocks/${id}/`;
@@ -33,9 +37,47 @@ const StockDetails = ({ route }) => {
       setLoading(false);
     }
   };
+  // Fetch historical stock data
+  const fetchStockData = async () => {
+    setGraphLoading(true);
+    try {
+      const response = await fetch(
+        `http://159.223.28.163:30002/stocks/${id}/get_historical_data/`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: 'Basic ZnVya2Fuc2Vua2FsOkxvc29sdmlkYWRvcy41NQ==',
+          },
+          body: JSON.stringify({
+            period: '1mo', // Default time range
+            interval: '1d', // Default interval
+          }),
+        }
+      );
+
+      const data = await response.json();
+      if (data.Close && data.Date) {
+        setStockData(data.Close); // Set closing prices
+        setStockDates(
+          data.Date.map((date) =>
+            new Date(date).toLocaleDateString('en-US', { month: 'short', day: 'numeric' })
+          )
+        );
+      } else {
+        console.error('Unexpected response structure:', data);
+      }
+    } catch (error) {
+      console.error('Error fetching stock data:', error);
+      Alert.alert('Error', 'Unable to fetch historical stock data.');
+    } finally {
+      setGraphLoading(false);
+    }
+  };
 
   useEffect(() => {
     fetchStockDetails();
+    fetchStockData();
   }, [id]);
 
   if (loading) {
@@ -91,6 +133,47 @@ const StockDetails = ({ route }) => {
         </Text>
         <Text style={styles.subDetail}>Current Price</Text>
       </View>
+      {/* Historical Stock Data Graph */}
+      <View style={[styles.section, styles.graphSection]}>
+      <Text style={styles.sectionTitle}>Stock Price History</Text>
+        {graphLoading ? (
+        <ActivityIndicator size="large" color="#007AFF" />
+        ) : stockData.length > 0 && stockDates.length > 0 ? (
+        <View style={styles.graphContainer}>
+        <LineChart
+        data={{
+          labels: stockDates,
+          datasets: [{ data: stockData }],
+        }}
+        width={Dimensions.get('window').width - 50} // Adjust width with padding
+        height={300}
+        yAxisLabel= {`${currencyCode}`}
+        verticalLabelRotation={60}
+        chartConfig={{
+          backgroundColor: '#fff',
+          backgroundGradientFrom: '#fff',
+          backgroundGradientTo: '#fff',
+          decimalPlaces: 2,
+          color: (opacity = 1) => `rgba(0, 123, 255, ${opacity})`,
+          labelColor: (opacity = 1) => `rgba(0, 0, 0, ${opacity})`,
+          style: {
+            borderRadius: 16,
+          },
+          propsForDots: {
+            r: '4',
+            strokeWidth: '2',
+            stroke: '#007AFF',
+          },
+        }}
+        bezier
+        style={styles.chart}
+      />
+    </View>
+  ) : (
+    <Text style={styles.noDataText}>No historical stock data available.</Text>
+  )}
+</View>
+
 
       {/* Stock Highlights */}
       <View style={styles.section}>
@@ -159,6 +242,26 @@ const styles = StyleSheet.create({
     color: 'red',
     textAlign: 'center',
   },
+  chart: {
+    marginVertical: 8,
+    borderRadius: 16,
+  },
+  graphSection: {
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  graphContainer: {
+    alignSelf: 'center', // Center the graph horizontally
+    paddingHorizontal: 8, // Add padding for the graph container
+    marginTop: 10,
+  },
+  noDataText: {
+    textAlign: 'center',
+    fontSize: 16,
+    color: '#555',
+    marginTop: 10,
+  },
+
   container: {
     padding: 16,
     backgroundColor: '#f4f4f4',