Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev onting #3

Merged
merged 4 commits into from
Aug 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion App.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function App() {

return (
<NavigationContainer>
{!logined ? <MainView /> : <LoginView onLogin={loginCheck} />}
{logined ? <MainView /> : <LoginView onLogin={loginCheck} />}
<StatusBar style="auto" />
</NavigationContainer>
);
Expand Down
12 changes: 11 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@
"**/*"
],
"ios": {
"supportsTablet": true
"supportsTablet": true,
"infoPlist": {
"NSAppTransportSecurity": {
"NSAllowsArbitraryLoads": true
}
}
},
"android": {
"permissions": [
"ACCESS_NETWORK_STATE"
]
},
"web": {
"favicon": "./assets/favicon.png"
Expand Down
Binary file removed assets/account.png
Binary file not shown.
Binary file removed assets/article.png
Binary file not shown.
Binary file removed assets/notification.png
Binary file not shown.
Binary file removed assets/organization.png
Binary file not shown.
67 changes: 36 additions & 31 deletions compo/loginview.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,46 @@
import AsyncStorage from '@react-native-community/async-storage';
import React from 'react';
import { StyleSheet, Text, View, TextInput, Button, TouchableHighlight, Alert } from 'react-native';
import hostaddr from '../config'
import {hostaddr} from '../config'
import * as SecureStore from 'expo-secure-store';


export default function LoginView(props) {
const [username, setUsername] = React.useState('');
const [password, setPassword] = React.useState('');

const login = () => {
props.onLogin();
fetch(hostaddr + '/login', {
method: 'POST',
credentials: 'same-origin',
body: JSON.stringify({
username: username,
password: password
}),
}).then(res => {
if(!res.ok){
Alert.alert(
'로그인 실패',
'아이디와 비밀번호를 확인해주세요',
[
{
text: '닫기',
style: 'cancle',
},
],
{cancelable: false},
);
}
else{
AsyncStorage.setItem('username', username);
}
return res.text();
}).then(text => console.log(text))
.catch((err) => {
const login = async() => {
// props.onLogin();/

try{
let loginHeaders = new Headers();
loginHeaders.append('Content-Type', 'application/json');
let res = await fetch(hostaddr + '/user/login', {
method: 'POST',
headers: loginHeaders,
body: JSON.stringify({
"username": username,
"password": password,
})
});
if(!res.ok){
Alert.alert(
'로그인 실패',
'아이디와 비밀번호를 확인해주세요',
[
{
text: '닫기',
style: 'cancle',
},
],
{cancelable: false},
);
}
else{
await AsyncStorage.setItem('username', username);
await SecureStore.setItemAsync("session", res.headers.get("Set-Cookie"))
}
}catch(err){
Alert.alert(
'로그인 실패',
String(err),
Expand All @@ -48,7 +53,7 @@ export default function LoginView(props) {
{cancelable: false},
);
console.log(err);
});
}
}

return (
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"@react-navigation/bottom-tabs": "^5.7.3",
"@react-navigation/native": "^5.7.2",
"expo": "~38.0.8",
"expo-secure-store": "~9.0.1",
"expo-status-bar": "^1.0.2",
"react": "~16.11.0",
"react-dom": "~16.11.0",
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2731,6 +2731,11 @@ expo-permissions@~9.0.1:
resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-9.0.1.tgz#dc10b58654bbe39bbbed5827369942b01b08055e"
integrity sha512-CosJgy8XQRN/OFG2JTQDcFxz3XTGi27coCMym/hVXWtQfk0z6PwdRG5IXHfLGuSckwIcgmirrwm2+Zc0X3MmNg==

expo-secure-store@~9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/expo-secure-store/-/expo-secure-store-9.0.1.tgz#e564a2d5392cd1ab883b9b6a7e261c1815d15788"
integrity sha512-+XgSZTelr57AyIJIGPcB/+QMrrm7wd8KFaF+TD8eJFwEN3B7s+tZyNoPH2JaJkAY0yh9FqcGG4kE3/YgK7GY3Q==

expo-splash-screen@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.3.1.tgz#4dd79d9d1ab8135281f7cc5889a68e3003223f37"
Expand Down