김서영 / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
김서영
9e7bf1e5 1 parent 952c6f95

conflict problem solved

Inline Side-by-side
Showing 3 changed files with 8 additions and 42 deletions
1 { 1 {
2 "devToolsPort": 19002, 2 "devToolsPort": 19002,
3 "expoServerPort": 19000, 3 "expoServerPort": 19000,
4 - "packagerPort": null, 4 + "packagerPort": 19001,
5 - "packagerPid": null, 5 + "packagerPid": 2240,
6 - "expoServerNgrokUrl": "https://7f-yzp.anonymous.searchguide.exp.direct", 6 + "expoServerNgrokUrl": "https://bm-jd7.anonymous.searchguide.exp.direct",
7 - "packagerNgrokUrl": "https://packager.7f-yzp.anonymous.searchguide.exp.direct", 7 + "packagerNgrokUrl": "https://packager.bm-jd7.anonymous.searchguide.exp.direct",
8 - "ngrokPid": 2900 8 + "ngrokPid": 21352
9 } 9 }
......
1 { 1 {
2 - "hostType": "tunnel", 2 + "hostType": "lan",
3 "lanType": "ip", 3 "lanType": "ip",
4 "dev": true, 4 "dev": true,
5 "minify": false, 5 "minify": false,
6 - "urlRandomness": "7f-yzp", 6 + "urlRandomness": "bm-jd7",
7 "https": false 7 "https": false
8 } 8 }
......
...@@ -15,40 +15,10 @@ export default RateBar = (props) => { ...@@ -15,40 +15,10 @@ export default RateBar = (props) => {
15 <View style={styles.container}> 15 <View style={styles.container}>
16 <Text style={styles.Text}>총 점수 : {props.score.full}점</Text> 16 <Text style={styles.Text}>총 점수 : {props.score.full}점</Text>
17 </View> 17 </View>
18 -<<<<<<< HEAD 18 +
19 <View style={styles.container}> 19 <View style={styles.container}>
20 <Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text> 20 <Text style={styles.message}>눌러서 각각의 점수를 알아보세요!</Text>
21 </View> 21 </View>
22 -=======
23 - <StackedBarChart
24 - data={ [{
25 - keyword: {
26 - value: props.score.key,
27 - svg: {
28 - onPressIn: () => {setClick(1)},
29 - onPressOut: ()=>{setClick(0)}
30 - },
31 - },
32 - korean: {
33 - value: props.score.fix,
34 - svg: {
35 - onPressIn: () => {setClick(2)},
36 - onPressOut: ()=>{setClick(0)}
37 - },
38 - },
39 - rest: {
40 - value: (100-(props.score.key+props.score.fix)),
41 - }
42 - }]}
43 - style={{height:50, width:'90%'}}
44 - keys={['keyword','korean','rest']}
45 - colors={['#f98a1a','#14a986','#ffffff']}
46 - showGrid={ false }
47 - horizontal={ true }
48 - contentInset={ { top: 10 } }
49 - valueAccessor={({ item, key }) => item[key].value}
50 - />
51 ->>>>>>> master
52 <View style={styles.infoContainer}> 22 <View style={styles.infoContainer}>
53 <HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText> 23 <HelperText type={'info'} visible={click==2} style={styles.helper}>맞춤법 : {props.score.fix}</HelperText>
54 <HelperText type={'info'} visible={click==1} style={styles.helper}>키워드 : {props.score.key}</HelperText> 24 <HelperText type={'info'} visible={click==1} style={styles.helper}>키워드 : {props.score.key}</HelperText>
...@@ -112,11 +82,7 @@ const styles = StyleSheet.create({ ...@@ -112,11 +82,7 @@ const styles = StyleSheet.create({
112 right:10, 82 right:10,
113 }, 83 },
114 colorA:{ 84 colorA:{
115 -<<<<<<< HEAD
116 backgroundColor:'#e85a71', 85 backgroundColor:'#e85a71',
117 -=======
118 - backgroundColor:'#f98a1a',
119 ->>>>>>> master
120 height: 7, 86 height: 7,
121 width: 7, 87 width: 7,
122 marginRight: 5, 88 marginRight: 5,
......