Merge remote-tracking branch 'origin/gyDB' into rkyoung

81d004bc · Choi Ga Young · 3ffd2474 · ef8f183e · 81d004bc · 81d004bc
Commit 81d004bc authored Aug 02, 2021 by Choi Ga Young
--- a/Analy.js
+++ b/Analy.js
 import React, { useState, useEffect } from 'react';
-import { View, Text, StyleSheet, Dimensions } from 'react-native';
+import ChartM from './ChartM';
-import {
+import ChartY from './ChartY';
-  LineChart,
+import chartApi from './db/chartData.api';
-  BarChart,
+import ButtonsForm from './components/ButtonsForm';
-  PieChart,
+import { View, Dimensions } from 'react-native';
-  ProgressChart,
-  ContributionGraph,
-  StackedBarChart
-} from "react-native-chart-kit";
 const screenWidth = Dimensions.get("window").width;
-const screenHeight = Dimensions.get("window").height;
-const data1 = [
+const Analy = () => {
-  {
+  const date = new Date();
-    name: "Seoul",
+  const [year, setYear] = useState(date.getFullYear());
-    population: 21500000,
+  const [month, setMonth] = useState(date.getMonth());
-    color: "rgba(131, 167, 234, 1)",
+  const [resDataM, setResDataM] = useState([]);
-    legendFontColor: "#7F7F7F",
+  const [resDataY, setResDataY] = useState([]);
-    legendFontSize: 15
+  const [selectedIndex, setSelectedIndex] = useState(0);
-  },
-  {
+  const getDataM = async () => {
-    name: "Toronto",
+    try {
-    population: 2800000,
+      const resdata = await chartApi.outMoney({ year: year, month: month })
-    color: "#d8bfd8",
+      console.log('db res M', resdata)
-    legendFontColor: "#7F7F7F",
+      return resdata
-    legendFontSize: 15
+    } catch (error) {
-  },
+      console.log('error in getDataM', error)
-  {
+    }
-    name: "Beijing",
-    population: 1276120,
-    color: "#87ceeb",
-    legendFontColor: "#7F7F7F",
-    legendFontSize: 15
-  },
-  {
-    name: "New York",
-    population: 8538000,
-    color: "#fff5ee",
-    legendFontColor: "#7F7F7F",
-    legendFontSize: 15
-  },
-  {
-    name: "Moscow",
-    population: 11920000,
-    color: "#b0c4de",
-    legendFontColor: "#7F7F7F",
-    legendFontSize: 15
  }
-];
+  const getDataY = async () => {
-const data2 = {
+    try {
-  labels: ["Jan", "Feb", "Mar", "April", "May", "June"],
+      const resdata = await chartApi.yearMoney({ year: year })
-  datasets: [
+      console.log('db res Y', resdata)
-    {
+      setResDataY(resdata)
-      data: [20, 45, 28, 80, 99, 43]
+    } catch (error) {
+      console.log('error in getDataY', error)
    }
-  ]
+  }
-};
-const Analy = () => {
+  const calPercentage = async () => {
-  const chartConfig = {
+    const resPrice = await getDataM()
-    backgroundGradientFrom: "#abbcd6", //좌측 색
+    //console.log('어떻게 생겼니', resPrice)
-    backgroundGradientFromOpacity: 0.5, 
+    let totalP = 0;
-    backgroundGradientTo: "#E6DDC5", // 우측 색
-    backgroundGradientToOpacity: 0.2,
-    backgroundColor: "#ffffff", // 어디에 적용된건지 잘 모르겠음
-    color: (opacity = 1) => `rgba(0, 93, 232, ${opacity})`, // data의 색상 계산할 때 사용하는 함수
-    //color: (opacity = 1) => `rgba(255, 255, 255, ${opacity})`,
-    strokeWidth: 2, // optional, default 3
-    barPercentage: 0.5, // 그래프 width
-    useShadowColorFromDataset: false,// optional, default is false
-    //fillShadowGradient: 'blue',
-    fillShadowGradientOpacity: 1, // 좀 더 진하게만 할 뿐 단색 설정은 못하는 것 같음
-  };
+    for (let i = 0; i < resPrice.length; i++) {
-  const [state, SetState] = useState([]);
+      totalP = totalP + resPrice[i].total;
+    }
+    for (let j = 0; j < resPrice.length; j++) {
+      resPrice[j].percentage = Math.round((resPrice[j].total / totalP) * 100);
+    }
+    setResDataM(resPrice)
+  }
+  useEffect(() => {
+    getDataY()
+    calPercentage()
+  }, [])
+  useEffect(() => {
+    setResDataM([])
+    calPercentage()
+  }, [month])
+  useEffect(() => {
+    getDataY()
+  }, [year])
  return (
-    <View>
+    <>
-      <Text style={style.Font}>여기는 분석 페이지/ 차트 테스트</Text>
+      <View>
-      <PieChart
+        <ButtonsForm
-        data={data1}
+          onPress={(index) => setSelectedIndex(index)}
-        width={screenWidth}
+          selectedIndex={selectedIndex}
-        height={screenHeight / 3} //그래프의 높이가 커지기만
+          group={["월간", "연간"]} />
-        chartConfig={chartConfig}
+      </View>
-        accessor={"population"}
+      <View>
-        backgroundColor={"#ffffff"}
+        {
-        // paddingLeft={"15"}
+          selectedIndex === 0 ? <ChartM resDataM={resDataM} year={year} setYear={setYear} month={month} setMonth={setMonth} /> : <ChartY resDataY={resDataY} year={year} setYear={setYear} />
-        // center={[10, 50]}
+        }
-        absolute
+      </View>
-      />
+    </>
-      <BarChart 
-        //style={graphStyle}
-        data={data2}
-        width={screenWidth}
-        height={screenHeight / 3}
-        //yAxisLabel="$"
-        chartConfig={chartConfig}
-      //verticalLabelRotation={30}
-      />
-    </View>
  )
 }
-const style = StyleSheet.create({
-  Font: {
-    fontSize: 24
-  }
-});
 export default Analy;
\ No newline at end of file
--- a/ChartM.js
+++ b/ChartM.js
+import React, { useState, useEffect } from 'react';
+import { FlatList, View, Text, StyleSheet, Dimensions } from 'react-native';
+import { Button } from 'react-native-elements';
+import Ionicons from 'react-native-vector-icons/Ionicons';
+import { PieChart } from "react-native-chart-kit";
+const screenWidth = Dimensions.get("window").width;
+const screenHeight = Dimensions.get("window").height;
+const ChartItem = ({ item }) => {
+  return (
+    <>
+      <View style={{
+        flexDirection: "row", padding: "5%", borderColor: '#d3d3d3', //light grey
+        borderWidth: 1, borderTopWidth: 0,
+      }}>
+        <Text style={[style.itemText, style.Font]}>{item.name}</Text>
+        <Text style={[style.itemText, style.Font]}>{item.total}</Text>
+        <Text style={[style.itemText, style.Font]}>{item.percentage}%</Text>
+        <Text></Text>
+      </View>
+    </>
+  );
+};
+const ChartM = ({
+  resDataM,
+  year,
+  setYear,
+  month,
+  setMonth
+}) => {
+  const chartConfig = {
+    backgroundGradientFrom: "#abbcd6", //좌측 색
+    backgroundGradientFromOpacity: 0.5,
+    backgroundGradientTo: "#E6DDC5", // 우측 색
+    backgroundGradientToOpacity: 0.2,
+    backgroundColor: "#ffffff", // 어디에 적용된건지 잘 모르겠음
+    color: (opacity = 1) => `rgba(0, 93, 232, ${opacity})`, // data의 색상 계산할 때 사용하는 함수
+    //color: (opacity = 1) => `rgba(255, 255, 255, ${opacity})`,
+    strokeWidth: 2, // optional, default 3
+    barPercentage: 0.5, // 그래프 width
+    useShadowColorFromDataset: false,// optional, default is false
+    //fillShadowGradient: 'blue',
+    fillShadowGradientOpacity: 1, // 좀 더 진하게만 할 뿐 단색 설정은 못하는 것 같음
+  };
+  const renderChart = ({ item }) => {
+    return (
+      <ChartItem item={item} />
+    )
+  }
+  const prevBtn = () => {
+    if (month < 1) {
+      setYear(year - 1)
+      setMonth(11)
+    } else {
+      setMonth(month - 1)
+    }
+  };
+  const nextBtn = () => {
+    if (month > 10) {
+      setYear(year + 1)
+      setMonth(0)
+    } else {
+      setMonth(month + 1)
+    }
+  }
+  console.log('sdfaslfsakflf', resDataM)
+  return (
+    <>
+      <View style={{ flexDirection: 'row' }}>
+        <Button icon={
+          <Ionicons name='chevron-back-sharp' onPress={prevBtn} size={15} color='black' />
+        } type='clear' />
+        <Text>{year}.{month + 1}</Text>
+        <Button icon={
+          <Ionicons name='chevron-forward-sharp' onPress={nextBtn} size={15} color='black' />
+        } type='clear' />
+      </View>
+      <View>
+        {
+          resDataM.length != 0 ?
+            < PieChart
+              data={resDataM}
+              width={screenWidth}
+              height={screenHeight / 3} //그래프의 높이가 커지기만
+              chartConfig={chartConfig}
+              accessor={"total"}
+              backgroundColor={"#ffffff"}
+              absolute
+            /> : <Text style={{ fontSize: 30, textAlign: "center" }}> 지출 내역이 없습니다.</Text>
+        }
+        <FlatList
+          style={{ backgroundColor: "#FFFFFF" }}
+          data={resDataM}
+          renderItem={renderChart}
+          keyExtractor={item => item.color}
+        />
+      </View>
+    </>
+  )
+}
+const style = StyleSheet.create({
+  Font: {
+    fontSize: 20
+  },
+  itemText: {
+    paddingRight: "10%"
+  }
+});
+export default ChartM;
\ No newline at end of file
--- a/ChartY.js
+++ b/ChartY.js
+import React from 'react';
+import { View, Text, StyleSheet, Dimensions } from 'react-native';
+import { BarChart } from "react-native-chart-kit";
+import { Button } from 'react-native-elements';
+import Ionicons from 'react-native-vector-icons/Ionicons';
+const screenWidth = Dimensions.get("window").width;
+const screenHeight = Dimensions.get("window").height;
+const ChartY = ({ resDataY, year, setYear }) => {
+  const chartConfig = {
+    backgroundGradientFrom: "#ffffff", //좌측 색
+    backgroundGradientFromOpacity: 1,
+    backgroundGradientTo: "#ffffff", // 우측 색
+    backgroundGradientToOpacity: 1,
+    color: (opacity = 1) => `rgba(48, 48, 48, ${opacity})`,
+    strokeWidth: 2, // optional, default 3
+    barPercentage: 0.5, // 그래프 width
+    useShadowColorFromDataset: false,// optional, default is false
+    fillShadowGradientOpacity: 1, // 좀 더 진하게만 할 뿐 단색 설정은 못하는 것 같음
+  };
+  const prevBtn = () => {
+    setYear(year - 1)
+  };
+  const nextBtn = () => {
+    setYear(year + 1)
+  }
+  console.log('잠만확인', resDataY.temp1[0].datasets[0].data, '|', resDataY.temp2[0].datasets[0].data)
+  let totalYI = (resDataY.temp1[0].datasets[0].data).reduce((acc, curr) => acc + curr, 0);
+  let totalYO = (resDataY.temp2[0].datasets[0].data).reduce((acc, curr) => acc + curr, 0);
+  console.log('합산 확인', totalYI, '|', totalYO)
+  return (
+    <>
+      <View style={{ flexDirection: 'row' }}>
+        <Button icon={
+          <Ionicons name='chevron-back-sharp' onPress={prevBtn} size={15} color='black' />
+        } type='clear' />
+        <Text>{year}년</Text>
+        <Button icon={
+          <Ionicons name='chevron-forward-sharp' onPress={nextBtn} size={15} color='black' />
+        } type='clear' />
+      </View>
+      <View>
+        <Text style={style.Font}>수입:  {totalYI}원</Text>
+        <BarChart
+          style={{ marginBottom: "2%", marginTop: "2%" }}
+          data={resDataY.temp1[0]}
+          width={screenWidth}
+          height={screenHeight / 3}
+          chartConfig={{ ...chartConfig, fillShadowGradient: '#1E90FF' }}
+          fromZero={true}
+        />
+        <Text style={style.Font}>지출:  {totalYO}원 </Text>
+        <BarChart
+          style={{ marginTop: "2%" }}
+          data={resDataY.temp2[0]}
+          width={screenWidth}
+          height={screenHeight / 3}
+          chartConfig={{ ...chartConfig, fillShadowGradient: '#DC143C' }}
+          fromZero={true}
+        />
+      </View>
+    </>
+  )
+}
+const style = StyleSheet.create({
+  Font: {
+    textAlign: "center",
+    fontSize: 20,
+    fontFamily: 'Jua-Regular'
+  },
+});
+export default ChartY;
\ No newline at end of file
--- a/DetailInfo.js
+++ b/DetailInfo.js
-import React from 'react';
+import React, { useEffect, useState } from 'react';
-import { View, Text, StyleSheet } from 'react-native';
+import { SafeAreaView, View, Text, StyleSheet, FlatList } from 'react-native';
+import calApi from './db/calendarInfo.api';
+const DetailItem = ({ item }) => {
+  return (
+    <>
+      <View style={{
+        flexDirection: "row", padding: "5%", borderColor: '#d3d3d3', //light grey
+        borderWidth: 1, borderTopWidth: 0,
+      }}>
+        <Text style={item.type === 1 ? style.inputColor : style.outputColor}>{item.category}</Text>
+        <Text style={[style.itemText, style.Font]}>{item.contents}</Text>
+        <Text style={[style.itemText, style.Font]}>{item.price}원</Text>
+      </View>
+    </>
+  );
+};
 const DetailInfo = ({ route }) => {
  console.log('route', route.params)
  console.log('---------------------------')
+  const [resData, setResData] = useState([])
+  const getDetailData = async () => {
+    try {
+      const resdata = await calApi.detailData({ findDate: route.params })
+      console.log('resdata', resdata)
+      setResData(resdata)
+    } catch (error) {
+      console.log('error in getDetailData', error)
+    }
+  }
+  const renderDetail = ({ item }) => {
+    return (
+      <DetailItem item={item} />
+    )
+  }
+  useEffect(() => {
+    getDetailData()
+  }, [])
  return (
    <>
-      <View style={{ padding: '10%' }}>
+      <SafeAreaView>
-        <Text style={style.Font}>수입</Text>
+        {
-        <Text style={{ color: '#1E90FF' }}>{route.params?.input}</Text>
+          resData.length != 0 ? <FlatList
-        <Text>수입 내역들을 보여줄 예정입니다.</Text>
+            data={resData}
-      </View>
+            renderItem={renderDetail}
-      <View style={{ padding: '10%' }}>
+            keyExtractor={item => item.id}
-        <Text style={style.Font}>지출</Text>
+          /> : <View>
-        <Text style={{ color: '#DC143C' }}>{route.params?.output}</Text>
+            <Text style={{textAlign:"center", fontSize:20}}>내역이 없습니다.</Text>
-        <Text>지출 내역들을 보여줄 예정입니다.</Text>
+          </View>
-      </View>
+        }
-    </>
+      </SafeAreaView>
+    </>
  )
 }
 const style = StyleSheet.create({
  Font: {
-    fontSize: 24
+    fontSize: 20,
+    color: '#424242'
+  },
+  inputColor: {
+    color: '#1E90FF'
+  },
+  outputColor: {
+    color: '#dc143c'
+  },
+  itemText: {
+    paddingRight: "10%",
+    paddingLeft: "20%",
+    // alignItems:"center"
  }
 });

--- a/Monthly.js
+++ b/Monthly.js
-import React, { useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import Calendar from './components/Calendar';
 import calApi from './db/calendarInfo.api';
 const Montly = ({ navigation }) => {
+  const date = new Date();
+  const [year, setYear] = useState(date.getFullYear());
+  const [month, setMonth] = useState(date.getMonth());
+  const todayM = date.getMonth();
+  const todayY = date.getFullYear();
+  const [totalM, setTotalM] = useState([]);
  const getData = async () => {
    try {
-      const totalM = await calApi.getFullData()
+      const resDBdata = await calApi.getFullData({ year: year, month: month })
      console.log('db res', totalM)
+      setTotalM(resDBdata)
    } catch (error) {
      console.log('error in getData', error)
    }
  }
  useEffect(() => {
    getData()
-  }, [])
+  }, [month])
  return (
-    <Calendar navigation={navigation} MData={totalM} />
+    <Calendar navigation={navigation} MData={totalM} year={year} setYear={setYear} month={month} setMonth={setMonth} todayM={todayM} todayY={todayY} />
  )
 }

--- a/android/app/src/main/assets/fonts/Jua-Regular.ttf
+++ b/android/app/src/main/assets/fonts/Jua-Regular.ttf
--- a/components/ButtonsForm.js
+++ b/components/ButtonsForm.js
@@ -3,16 +3,17 @@ import { ButtonGroup } from 'react-native-elements';
 import { StyleSheet, Text } from 'react-native';
 const ButtonsForm = (props) => {
+    const components = [];
-    const component1 = () => <Text>{props.group[0]}</Text>
+    for (let i = 0; i < props.group.length ; i++) {
-    const component2 = () => <Text>{props.group[1]}</Text>
+        components[i] = { element: () => <Text>{props.group[i]}</Text> }
-    const component3 = () => <Text>{props.group[2]}</Text>
+    }
    return (
        <ButtonGroup
            onPress={props.onPress}
            selectedIndex={props.selectedIndex}
-            buttons={[{ element: component1 }, { element: component2 }, { element: component3 }]}
+            buttons={components}
            containerStyle={style.container}
            selectedButtonStyle={style.selectedButton}
            selectedTextStyle={style.selectedText}
@@ -20,6 +21,7 @@ const ButtonsForm = (props) => {
    );
 };
 const style = StyleSheet.create({
    container: {
        height: 50,

--- a/components/Calendar.js
+++ b/components/Calendar.js
@@ -38,12 +38,18 @@ const INIT_Data = [
  },
 ];
-function Calendar({ navigation, MData }) {
+function Calendar({
+  navigation,
+  MData,
+  year,
+  setYear,
+  month,
+  setMonth,
+  todayM,
+  todayY,
+}) {
+  //console.log('MData', MData)
  const date = new Date();
-  const [year, setYear] = useState(date.getFullYear());
-  const [month, setMonth] = useState(date.getMonth());
-  const todayM = date.getMonth();
-  const todayY = date.getFullYear();
  const [flatListHeight, setFlatListHeight] = useState(400)
  const prevLast = new Date(year, month, 0); //이전 달의 마지막 날
@@ -83,7 +89,6 @@ function Calendar({ navigation, MData }) {
    }
  }
-  //console.log('Dates', Dates)
  let istoday = false;
  const renderDate = ({ item }) => {
@@ -98,8 +103,9 @@ function Calendar({ navigation, MData }) {
    if (!(item.date.getMonth() === month)) {
      color = '#a9a9a9'
    }
    return (
-      <DateItem dateitem={item} textColor={{ color }} onPress={() => navigation.navigate('DetailInfo', item.date)} flatListHeight={flatListHeight / (Dates.length / 7)} />
+      <DateItem dateitem={item} textColor={{ color }} onPress={() => navigation.navigate('DetailInfo', String(item.date.toJSON()).split(/T/)[0])} flatListHeight={flatListHeight / (Dates.length / 7)} />
    )
  }
  const prevBtn = () => {

--- a/db/calendarInfo.api.js
+++ b/db/calendarInfo.api.js
@@ -4,55 +4,70 @@ import getDb from './moneyDB'
 DEBUG(true);
 enablePromise(true);
-const getFullData = async () => {
+const getFullData = async ({ year, month }) => {
+  const thisFirst = new Date(year, month, 1); //이번 달의 첫째 날
+  const thisLast = new Date(year, month + 1, 0); //이번 달의 마지막 날
  const db = await getDb();
  return new Promise((res, rej) => {
    db.transaction(async (tx) => {
      console.log('월간 데이터');
-      const [txn, results] = await tx.executeSql('SELECT * FROM money WHERE date BETWEEN "2021-07-01" AND "2021-07-31"');
+      const [txn, results] = await tx.executeSql(`SELECT date, type_id, sum(price) as total from money where date BETWEEN "${String(thisFirst.toJSON()).split(/T/)[0]}" and "${String(thisLast.toJSON()).split(/T/)[0]}" group by date, type_id`);
      const temp = [];
-      for (let i = 0; i < results.rows.length; i++) {
+      console.log('lelel', results.rows.length)
-        console.log('item check', results.rows.item(i));
+      if (results.rows.length != 0) {
-        if (results.rows.item(i).type == '수입') {
+        if (results.rows.item(0).type_id === 1) {
-          temp.push({ date: results.rows.item(i).date, type: { 'input': results.rows.item(i).price } })
+          temp.push({ date: results.rows.item(0).date, type: { 'input': results.rows.item(0).total } })
        }
-        if (results.rows.item(i).type == '지출') {
+        if (results.rows.item(0).type_id === 2) {
-          temp.push({ date: results.rows.item(i).date, type: { 'output': results.rows.item(i).price } })
+          temp.push({ date: results.rows.item(0).date, type: { 'output': results.rows.item(0).total } })
        }
      }
-      console.log('temp1', temp)
-      temp.sort(function (a, b) {
+      for (let i = 1; i < results.rows.length; i++) {
-        return a.date < b.date ? -1 : a.date > b.date ? 1 : 0;
+        if (results.rows.item(i).date === results.rows.item(i - 1).date) {
-      })
+          temp.pop()
-      const temp2 = [temp[0]]
+          let { 1: input, 2: output } = {
-      for (let i = 1; i < temp.length; i++) {
+            [results.rows.item(i).type_id]: results.rows.item(i).total,
-        if (temp[i].date === temp[i-1].date) {
+            [results.rows.item(i - 1).type_id]: results.rows.item(i - 1).total,
-          let lastObj = temp2.pop()
-          let newObj = lastObj.type
-          for (const key in temp[i].type) {
-            let data = 0
-            if (newObj.hasOwnProperty(key)) {
-              console.log('둘이 더할거임', temp[i].date, newObj[key], ' + ', temp[i].type[key], data)
-              data = newObj[key] + temp[i].type[key]
-              newObj[key] = data
-            } else {
-              newObj[key] = temp[i].type[key]
-            }
-            console.log('TETETET', temp[i].date, newObj)
          }
-          temp2.push({ date: temp[i].date, type: newObj})
+          temp.push({ date: results.rows.item(i).date, type: { 'input': input, 'output': output } })
        } else {
-          temp2.push(temp[i])
+          if (results.rows.item(i).type_id === 1) {
+            temp.push({ date: results.rows.item(i).date, type: { 'input': results.rows.item(i).total } })
+          }
+          if (results.rows.item(i).type_id === 2) {
+            temp.push({ date: results.rows.item(i).date, type: { 'output': results.rows.item(i).total } })
+          }
        }
      }
-      console.log('temp2', temp2)
+      console.log('결과 확인', temp)
-      res(temp2); 
+      res(temp)
+    })
+  })
+}
+const detailData = async ({ findDate }) => {
+  console.log('findData', findDate)
+  const db = await getDb();
+  return new Promise((res, rej) => {
+    db.transaction(async (tx) => {
+      console.log('월간 세부 데이터');
+      const [txn, results] = await tx.executeSql(`SELECT money.type_id, category_name, contents, price FROM money inner JOIN categories on money.category_id = categories.category_id WHERE date="${findDate}"`);
+      const temp = [];
+      for (let i = 0; i < results.rows.length; i++) {
+        console.log('item check', results.rows.item(i));
+        temp.push({ id: i, category: results.rows.item(i).category_name, contents: results.rows.item(i).contents, price: results.rows.item(i).price, type: results.rows.item(i).type_id })
+      }
+      //console.log('temp', temp)
+      res(temp);
    })
  })
 }
 const calApi = {
-  getFullData
+  getFullData,
+  detailData
 }
 export default calApi;
\ No newline at end of file
--- a/db/chartData.api.js
+++ b/db/chartData.api.js
+import { DEBUG, enablePromise } from 'react-native-sqlite-storage';
+import getDb from './moneyDB'
+DEBUG(true);
+enablePromise(true);
+const colorArr = [
+  "#f06c77", "#ffa07a", "#fafad2", "#e3fad2", "#b0c4de",
+  "#49618f", "#dda0dd", "#ff4d6a", "#fcc24c", "#fffacd",
+  "#8fbc8f", "#82a6e9", "#2b4069", "#db7093", "#fa8072",
+  "#98fb98", "#d6badb"
+]
+const outMoney = async ({ year, month }) => {
+  const thisFirst = new Date(year, month, 1); //이번 달의 첫째 날
+  const thisLast = new Date(year, month + 1, 0); //이번 달의 마지막 날
+  const db = await getDb();
+  return new Promise((res, rej) => {
+    db.transaction(async (tx) => {
+      console.log('차트 페이지');
+      const [txn, results] = await tx.executeSql(`SELECT category_id, category_name, sum(price) as total from (SELECT money.type_id, price, money.category_id, category_name FROM money inner JOIN categories on money.category_id = categories.category_id where date BETWEEN "${String(thisFirst.toJSON()).split(/T/)[0]}" and "${String(thisLast.toJSON()).split(/T/)[0]}") WHERE type_id=2 group by category_id`);
+      const temp = [];
+      for (let i = 0; i < results.rows.length; i++) {
+        console.log('chart', results.rows.item(i))
+        temp.push({
+          name: results.rows.item(i).category_name,
+          total: results.rows.item(i).total,
+          color: colorArr[i], legendFontColor: "#7F7F7F",
+          legendFontSize: 15
+        })
+        console.log('chart temp', temp)
+        res(temp)
+      }
+    })
+  })
+}
+const yearMoney = async ({ year }) => {
+  const yearFirst = new Date(year, 0, 1); //1월 1일
+  const yearLast = new Date(year, 12, 0); //12월 31일
+  const db = await getDb();
+  console.log('year', yearFirst, '|', yearLast)
+  return new Promise((res, rej) => {
+    db.transaction(async (tx) => {
+      console.log('차트페이지 연간')
+      const [txn, results] = await tx.executeSql(`SELECT strftime('%m',date) as month, type_id, sum(price) as total from money where strftime('%Y', date)= "${year}" GROUP by strftime('%m', date), type_id `);
+      const temp1 = [];
+      const temp2 = [];
+      let temparr1 = new Array(12).fill(0)
+      let temparr2 = new Array(12).fill(0)
+      for (let i = 0; i < results.rows.length; i++) {
+        console.log('year res check', results.rows.item(i))
+        if (results.rows.item(i).type_id === 1) {
+          let idx = Number(results.rows.item(i).month)
+          temparr1[idx - 1] = results.rows.item(i).total
+        } else if (results.rows.item(i).type_id === 2) {
+          let idx = Number(results.rows.item(i).month)
+          temparr2[idx - 1] = results.rows.item(i).total
+        }
+      }
+      temp1.push({
+        labels: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
+        datasets: [{
+          data: temparr1
+        }]
+      })
+      temp2.push({
+        labels: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
+        datasets: [{
+          data: temparr2
+        }]
+      })
+      res({ temp1, temp2 })
+    })
+  })
+}
+const chartApi = {
+  outMoney,
+  yearMoney
+}
+export default chartApi;
\ No newline at end of file
--- a/react-native.config.js
+++ b/react-native.config.js
+module.exports = {
+  project: {
+    ios: {},
+    android: {}, // grouped into "project"
+  },
+  assets: ["./assets/fonts/"], // stays the same
+};
\ No newline at end of file