김서영 / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
bluejoyq
780c8fe7 2 parents 4e6dc209 1c167be0

Merge branch '2018102169/searchGuide-design' into 'master' 

2018102169/search guide design

merge conflict 해결중

See merge request !10
Inline Side-by-side
Showing 15 changed files with 41 additions and 24 deletions
...@@ -13,6 +13,8 @@ npm-debug.* ...@@ -13,6 +13,8 @@ npm-debug.*
13 *.orig.* 13 *.orig.*
14 web-build/ 14 web-build/
15 web-report/ 15 web-report/
16 +*/.expo/*
17 +*/.expo-shared/*
16 18
17 # macOS 19 # macOS
18 .DS_Store 20 .DS_Store
...\ No newline at end of file ...\ No newline at end of file
......
1 { 1 {
2 - "hostType": "lan", 2 + "hostType": "tunnel",
3 "lanType": "ip", 3 "lanType": "ip",
4 "dev": true, 4 "dev": true,
5 "minify": false, 5 "minify": false,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 "privacy": "public", 5 "privacy": "public",
6 "sdkVersion": "35.0.0", 6 "sdkVersion": "35.0.0",
7 "androidStatusBar": { 7 "androidStatusBar": {
8 - "backgroundColor": "#226557" 8 + "backgroundColor": "#06182d"
9 }, 9 },
10 "platforms": [ 10 "platforms": [
11 "ios", 11 "ios",
......
...@@ -5,7 +5,7 @@ import {createMaterialTopTabNavigator} from 'react-navigation-tabs'; ...@@ -5,7 +5,7 @@ import {createMaterialTopTabNavigator} from 'react-navigation-tabs';
5 import Home from '../Home/Home'; 5 import Home from '../Home/Home';
6 import Rate from '../Rate/Rate'; 6 import Rate from '../Rate/Rate';
7 7
8 - 8 +
9 const AppTabNavigator = createMaterialTopTabNavigator ( 9 const AppTabNavigator = createMaterialTopTabNavigator (
10 { 10 {
11 Home: Home, 11 Home: Home,
......
...@@ -3,7 +3,7 @@ import { View,Text, StyleSheet, Button,Alert } from 'react-native'; ...@@ -3,7 +3,7 @@ import { View,Text, StyleSheet, Button,Alert } from 'react-native';
3 import Icon from 'react-native-vector-icons/FontAwesome'; 3 import Icon from 'react-native-vector-icons/FontAwesome';
4 import Swiper from 'react-native-swiper'; 4 import Swiper from 'react-native-swiper';
5 import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN} from 'react-native-dotenv'; 5 import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN} from 'react-native-dotenv';
6 - 6 +
7 const FirstSlide = () => ( 7 const FirstSlide = () => (
8 <View style={styles.slide1} > 8 <View style={styles.slide1} >
9 <Icon name='search' style={styles.icon} size={50} /> 9 <Icon name='search' style={styles.icon} size={50} />
...@@ -46,8 +46,8 @@ export default PromptSearch = () => { ...@@ -46,8 +46,8 @@ export default PromptSearch = () => {
46 showsButtons={true} 46 showsButtons={true}
47 loop={false} height={400} 47 loop={false} height={400}
48 activeDotColor={LIGHT_MAIN} 48 activeDotColor={LIGHT_MAIN}
49 - nextButton={<Text style={{color:'#3BAD87', fontSize:60}}>›</Text>} 49 + nextButton={<Text style={{color:'#002857', fontSize:60}}>›</Text>}
50 - prevButton={<Text style={{color:'#3BAD87', fontSize:60}}>‹</Text>} 50 + prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>}
51 > 51 >
52 <FirstSlide /> 52 <FirstSlide />
53 <SecondSlide /> 53 <SecondSlide />
......
...@@ -45,7 +45,7 @@ export default RateBar = (props) => { ...@@ -45,7 +45,7 @@ export default RateBar = (props) => {
45 }]} 45 }]}
46 style={{height:50, width:'90%'}} 46 style={{height:50, width:'90%'}}
47 keys={['keyword','korean','rest']} 47 keys={['keyword','korean','rest']}
48 - colors={['#ffaa5a','#2cc3c2','#ffffff']} 48 + colors={['#f98a1a','#14a986','#ffffff']}
49 showGrid={ false } 49 showGrid={ false }
50 horizontal={ true } 50 horizontal={ true }
51 contentInset={ { top: 10 } } 51 contentInset={ { top: 10 } }
...@@ -76,13 +76,13 @@ const styles = StyleSheet.create({ ...@@ -76,13 +76,13 @@ const styles = StyleSheet.create({
76 right:0, 76 right:0,
77 }, 77 },
78 colorA:{ 78 colorA:{
79 - backgroundColor:'#ffaa5a', 79 + backgroundColor:'#f98a1a',
80 height: 7, 80 height: 7,
81 width: 7, 81 width: 7,
82 marginRight: 5, 82 marginRight: 5,
83 }, 83 },
84 colorB:{ 84 colorB:{
85 - backgroundColor:'#2cc3c2', 85 + backgroundColor:'#14a986',
86 height: 7, 86 height: 7,
87 width: 7, 87 width: 7,
88 marginRight: 5, 88 marginRight: 5,
...@@ -105,7 +105,8 @@ const styles = StyleSheet.create({ ...@@ -105,7 +105,8 @@ const styles = StyleSheet.create({
105 alignItems: 'center', 105 alignItems: 'center',
106 justifyContent: 'center', 106 justifyContent: 'center',
107 elevation: 2, 107 elevation: 2,
108 - marginTop: 10 108 + marginTop: 10,
109 + borderRadius: 5
109 }, 110 },
110 Text:{ 111 Text:{
111 fontSize: 25, 112 fontSize: 25,
......
...@@ -23,11 +23,11 @@ const RateLine = ({load,pastRecords }) => { ...@@ -23,11 +23,11 @@ const RateLine = ({load,pastRecords }) => {
23 {pastRecords.map((past,index)=> ( 23 {pastRecords.map((past,index)=> (
24 <View key={index} style={styles.past}> 24 <View key={index} style={styles.past}>
25 <Text style={styles.score}>{past.score}</Text> 25 <Text style={styles.score}>{past.score}</Text>
26 - <Text style={styles.date}>{past.date.substring(5,7)+'월 '+past.date.substring(8,10)+'일'}</Text> 26 + <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
27 </View> 27 </View>
28 ))} 28 ))}
29 </View> 29 </View>
30 - <Text>최근 점수 추세</Text> 30 + <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text>
31 </> 31 </>
32 : <PromptSearchRate /> 32 : <PromptSearchRate />
33 } 33 }
...@@ -47,27 +47,34 @@ const styles = StyleSheet.create({ ...@@ -47,27 +47,34 @@ const styles = StyleSheet.create({
47 elevation: 2, 47 elevation: 2,
48 marginTop: 10, 48 marginTop: 10,
49 marginBottom: 10, 49 marginBottom: 10,
50 + borderRadius: 5
50 }, 51 },
51 info:{ 52 info:{
52 - fontSize:25, 53 + fontSize:23,
53 fontWeight:'bold', 54 fontWeight:'bold',
54 - marginBottom: 5 55 + marginBottom: 5,
55 }, 56 },
56 score:{ 57 score:{
57 - fontSize:20 58 + fontSize:20,
59 + color:"#002857"
58 }, 60 },
59 scoreContainer:{ 61 scoreContainer:{
60 flexDirection:'row', 62 flexDirection:'row',
61 justifyContent: 'space-around', 63 justifyContent: 'space-around',
62 width:'100%' 64 width:'100%'
63 }, 65 },
64 - data:{ 66 + day:{
65 - fontSize:13, 67 + fontSize: 10,
66 textAlign:'center', 68 textAlign:'center',
69 + marginBottom:5
67 }, 70 },
68 past:{ 71 past:{
69 alignItems:'center', 72 alignItems:'center',
70 marginBottom:5 73 marginBottom:5
74 + },
75 + message:{
76 + margin: 5,
77 + color:"#6e8fb4"
71 } 78 }
72 }); 79 });
73 80
......
...@@ -40,7 +40,8 @@ const RateMessage = ({keywordText, score }) => { ...@@ -40,7 +40,8 @@ const RateMessage = ({keywordText, score }) => {
40 alignItems: 'center', 40 alignItems: 'center',
41 justifyContent: 'center', 41 justifyContent: 'center',
42 elevation: 2, 42 elevation: 2,
43 - marginTop: 10 43 + marginTop: 10,
44 + borderRadius: 5
44 }, 45 },
45 Text:{ 46 Text:{
46 fontSize: 25, 47 fontSize: 25,
......
...@@ -48,7 +48,8 @@ const RateSentence = ({originalText, fixedText, keywordText }) => { ...@@ -48,7 +48,8 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
48 alignItems: 'center', 48 alignItems: 'center',
49 justifyContent: 'center', 49 justifyContent: 'center',
50 elevation: 2, 50 elevation: 2,
51 - marginTop: 10 51 + marginTop: 10,
52 + borderRadius: 5
52 }, 53 },
53 Text:{ 54 Text:{
54 fontSize: 25, 55 fontSize: 25,
......
1 import React from 'react'; 1 import React from 'react';
2 -import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN} from 'react-native-dotenv'; 2 +import { DARK_MAIN,LIGHT_MAIN, WHITE_MAIN, BUTTON} from 'react-native-dotenv';
3 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper'; 3 import { Avatar, Button, Card, Title, Paragraph, Text } from 'react-native-paper';
4 import {Linking, Image, StyleSheet } from 'react-native'; 4 import {Linking, Image, StyleSheet } from 'react-native';
5 - 5 +
6 const SearchIcon = (props) => { 6 const SearchIcon = (props) => {
7 switch(props.site){ 7 switch(props.site){
8 case 'naver.com': 8 case 'naver.com':
...@@ -20,7 +20,7 @@ const SearchIcon = (props) => { ...@@ -20,7 +20,7 @@ const SearchIcon = (props) => {
20 default: 20 default:
21 return(<Image source={require('../../assets/img/etc-logo.png')} style={styles.image}/>) 21 return(<Image source={require('../../assets/img/etc-logo.png')} style={styles.image}/>)
22 } 22 }
23 -} 23 +}
24 24
25 25
26 26
...@@ -33,7 +33,7 @@ const SearchCard = (props) => ( ...@@ -33,7 +33,7 @@ const SearchCard = (props) => (
33 </Card.Content> 33 </Card.Content>
34 <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}> 34 <Card.Actions style={{flexDirection:'row', justifyContent:'space-between'}}>
35 <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic'}}>정확도 : {props.metric}%</Text> 35 <Text style={{marginTop:7, marginLeft: 10,fontStyle:'italic'}}>정확도 : {props.metric}%</Text>
36 - <Button mode='contained' color= {LIGHT_MAIN} labelStyle={{color:WHITE_MAIN}} onPress={()=>{Linking.openURL(props.url)}}> 36 + <Button mode='contained' color= {BUTTON} labelStyle={{color:WHITE_MAIN}} onPress={()=>{Linking.openURL(props.url)}}>
37 자세히보기 37 자세히보기
38 </Button> 38 </Button>
39 </Card.Actions> 39 </Card.Actions>
......
...@@ -39,5 +39,10 @@ ...@@ -39,5 +39,10 @@
39 "babel-preset-expo": "^7.1.0", 39 "babel-preset-expo": "^7.1.0",
40 "react-native-dotenv": "^0.2.0" 40 "react-native-dotenv": "^0.2.0"
41 }, 41 },
42 - "private": true 42 + "private": true,
43 + "rnpm": {
44 + "assets": [
45 + "./assets/fonts/"
46 + ]
47 + }
43 } 48 }
......