edit store, crawler

@@ -6,7 +6,7 @@
 
 
 import {BASE_URL} from "@src/config/url";
 import {BASE_URL} from "@src/config/url";
 import {randomTransition} from "@src/components/pageTransition";
 import {randomTransition} from "@src/components/pageTransition";
-import {setState} from "@src/store/state";
+import {getState, setState} from "@src/store/state";
 
 
 export const addEvent = async (
 export const addEvent = async (
     e : Event,
     e : Event,
@@ -31,18 +31,21 @@ export const addEvent = async (
 
 
         if(insta_id){
         if(insta_id){
             try{
             try{
-                result = await (await fetch(BASE_URL + 'update?insta_id=' + insta_id)).json();
+                result = await (await fetch(BASE_URL + 'search?insta_id=' + insta_id)).json();
             } catch (e){
             } catch (e){
                 console.log(e);
                 console.log(e);
             } finally {
             } finally {
-                console.log(result);
+                console.log('res!',result);
                 result && $App && (()=>{
                 result && $App && (()=>{
-                    $App.innerHTML = App('main');
+                    randomTransition();
                     setState({
                     setState({
                         insta_id : insta_id,
                         insta_id : insta_id,
                         followers : result.followers,
                         followers : result.followers,
                         following : result.following
                         following : result.following
                     });
                     });
+                    setTimeout(()=>{
+                        $App.innerHTML = App('main');
+                    },1200)
                 })();
                 })();
             }
             }
         } else {
         } else {
@@ -62,8 +65,15 @@ export const addEvent = async (
             } finally {
             } finally {
                 console.log(result);
                 console.log(result);
                 result && $App && (()=>{
                 result && $App && (()=>{
-                    $App.innerHTML = App('main');
-                    setState({insta_id : insta_id});
+                    randomTransition();
+                    setState({
+                        insta_id : insta_id,
+                        followers : result.followers,
+                        following : result.following
+                    });
+                    setTimeout(()=>{
+                        $App.innerHTML = App('main');
+                    },1200)
                 })();
                 })();
             }
             }
         } else {
         } else {

@@ -24,7 +24,7 @@ const turnOnAndOff = (idx : number)=>{
                 $div.style.display = 'none';
                 $div.style.display = 'none';
                 $div.classList.toggle(pageTransitionClassList[idx]);
                 $div.classList.toggle(pageTransitionClassList[idx]);
             })()
             })()
-        },idx === 0 ? 1000 : 2400);
+        },idx === 0 ? 900 : 2300);
     })()
     })()
 }
 }
 
 

@@ -5,9 +5,7 @@
 **/
 **/
 
 
 import App from './App';
 import App from './App';
-import {BASE_URL} from './config/url';
-import {initialTrantition, randomTransition} from "./components/pageTransition";
-import {setState} from "./store/state";
+import {initialTrantition} from "./components/pageTransition";
 import './assets/style/PageTransition.scss';
 import './assets/style/PageTransition.scss';
 import {addEvent} from "@src/components/addEvent";
 import {addEvent} from "@src/components/addEvent";
 
 

@@ -15,13 +15,18 @@ const initialState = {
     insta_id : '',
     insta_id : '',
     followers : [''],
     followers : [''],
     following : [''],
     following : [''],
-};
+}
+let state: StateType = initialState;
 
 
-const state: StateType = initialState;
+export const setState = (newState: StateType): void => {
+    state = {
+        ...state,
+        ...newState
+    }
+};
 
 
-export const setState = (newState: StateType): StateType =>({
-    ...state,
-    ...newState
-});
+export const getState = () => {
+    return state
+}
 
 
 export default state;
 export default state;

 /**
 /**
  * @author : wonseog
  * @author : wonseog
  * @date : 2021/03/10
  * @date : 2021/03/10
- * @description : followers vs followings
+ * @description : followers vs following
 **/
 **/
 
 
 const Compare = () => {
 const Compare = () => {

@@ -13,6 +13,7 @@ const Intro = (): string =>{
             ${Title('인스타 조회하기').Large}
             ${Title('인스타 조회하기').Large}
             <input id="id-input" type="text" name="insta_id" />
             <input id="id-input" type="text" name="insta_id" />
             <button id="search-button">조회</button>
             <button id="search-button">조회</button>
+            <button id="update-button">업데이</button>
         </lable>
         </lable>
     </div>`
     </div>`
 }
 }

@@ -5,11 +5,20 @@
  *                업데이트하기
  *                업데이트하기
  *                다른 메뉴 보기
  *                다른 메뉴 보기
 **/
 **/
+import state from "@src/store";
+import {getState} from "@src/store/state";
 
 
 const Main = () => {
 const Main = () => {
+    let contents = `<div>${state.insta_id}</div>`
+
+    contents += getState().followers?.map(id => `<div>followers ${id}</div>`)
+
+    contents += getState().following?.map(id => `<div>following ${id}</div>`)
+
     return `
     return `
         <div class="main">
         <div class="main">
             its main
             its main
+            ${contents}
         </div>
         </div>
     `
     `
 }
 }

@@ -19,7 +19,7 @@ db = firebase.database()
 
 
 
 
 def id_encrypt(user_insta_id):
 def id_encrypt(user_insta_id):
-    return user_insta_id.replace('_', '1z1').replace('.', '2z2')
+    return user_insta_id.replace('_', '').replace('.', '')
 
 
 
 
 def update_data(user_insta_id, data):
 def update_data(user_insta_id, data):

 import time
 import time
 from selenium import webdriver
 from selenium import webdriver
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.chrome.options import Options
 from config.admin import ID, PW, LOCAL_PROJECT_PATH
 from config.admin import ID, PW, LOCAL_PROJECT_PATH
 from config.URLs import INSTAGRAM_URL
 from config.URLs import INSTAGRAM_URL
 from config.firebase import update_data
 from config.firebase import update_data
@@ -13,7 +14,7 @@ def check_people(driver, type):
         navigations[1].click()
         navigations[1].click()
     elif type == "following":
     elif type == "following":
         navigations[2].click()
         navigations[2].click()
-    time.sleep(1)
+    time.sleep(2)
 
 
     elem = driver.find_elements_by_css_selector('.Jv7Aj ._0imsa')
     elem = driver.find_elements_by_css_selector('.Jv7Aj ._0imsa')
     for obj in elem:
     for obj in elem:
@@ -24,6 +25,8 @@ def check_people(driver, type):
 
 
 def login(driver):
 def login(driver):
     elem = driver.find_elements_by_css_selector('._9GP1n .f0n8F ._2hvTZ')
     elem = driver.find_elements_by_css_selector('._9GP1n .f0n8F ._2hvTZ')
+    time.sleep(1)
+
     elem[0].send_keys(ID)
     elem[0].send_keys(ID)
     elem[1].send_keys(PW)
     elem[1].send_keys(PW)
 
 
@@ -39,30 +42,39 @@ def get_list(insta_id, driver):
     driver.find_element_by_css_selector('.WaOAr .wpO6b').click()
     driver.find_element_by_css_selector('.WaOAr .wpO6b').click()
     time.sleep(1)
     time.sleep(1)
 
 
-    # check followings
+    # check following
     following_list = check_people(driver, "following")
     following_list = check_people(driver, "following")
 
 
     # update at firebase
     # update at firebase
     data = {
     data = {
         "followers" : followers_list,
         "followers" : followers_list,
-        "followings" : following_list,
+        "following" : following_list,
         "insta_id" : insta_id
         "insta_id" : insta_id
     }
     }
     update_data(insta_id, data)
     update_data(insta_id, data)
 
 
+    return data
+
 
 
 def crawler_instagram(insta_id):
 def crawler_instagram(insta_id):
-    driver = webdriver.Chrome(executable_path=LOCAL_PROJECT_PATH + '/crawler/chromedriver')
+    options = Options()
+    # options.add_argument("--headless")
+    options.add_argument("window-size=1920,1080")
+    driver = webdriver.Chrome(chrome_options=options, executable_path=LOCAL_PROJECT_PATH + '/crawler/chromedriver')
     driver.get(url=INSTAGRAM_URL)
     driver.get(url=INSTAGRAM_URL)
     time.sleep(2)
     time.sleep(2)
 
 
+    print('hi')
     login(driver)
     login(driver)
+    print('by')
     time.sleep(2)
     time.sleep(2)
 
 
     url="%s/%s"%(INSTAGRAM_URL, insta_id)
     url="%s/%s"%(INSTAGRAM_URL, insta_id)
     driver.get(url=url)
     driver.get(url=url)
     time.sleep(2)
     time.sleep(2)
 
 
+    data = {};
+
     try:
     try:
         isPrivate = driver.find_element_by_class_name('rkEop').text
         isPrivate = driver.find_element_by_class_name('rkEop').text
     except Exception as e:
     except Exception as e:
@@ -73,10 +85,12 @@ def crawler_instagram(insta_id):
     if isPrivate:
     if isPrivate:
         print('private!!')
         print('private!!')
     else:
     else:
-        get_list(insta_id, driver)
+        data = get_list(insta_id, driver)
 
 
     driver.close()
     driver.close()
 
 
+    return data
+
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     print("-" * 60)
     print("-" * 60)

@@ -10,16 +10,12 @@ app = Flask(__name__, static_folder=os.path.abspath(my_path))
 
 
 
 
 def update(insta_id):
 def update(insta_id):
-    result = 'ok'
+    data = {}
     try:
     try:
-        crawler_instagram(insta_id)
+        data = crawler_instagram(insta_id)
     except Exception as e:
     except Exception as e:
         print(e)
         print(e)
-        result = 'fail'
 
 
-    data = {
-        "result" : result
-    }
     return jsonify(data)
     return jsonify(data)