Merge pull request abalone0204#7 from abalone0204/feature/other-provider

Feature/other provider

chromeExtension/manifest.json

@@ -23,7 +23,8 @@
   "content_scripts": [{
     "matches": [
       "https://www.104.com.tw/job/*",
-      "http://www.104.com.tw/job/*"
+      "http://www.104.com.tw/job/*",
+      "http://www.1111.com.tw/job-bank/job-description*"
     ],
     "js": ["./dist/content-bundle.js"]
   }]

front-end/app/API/createJob.js

@@ -5,14 +5,14 @@ import {
 
 import config from '../../../config.json'
 
-export default function createJob({company_name, job_name, e04_job_no}) {
+export default function createJob({company_name, job_name, e04_job_no, eeee_job_no}) {
     const {backend} = config
     const options = {
         headers: {
             "Content-Type": "application/json"
         },
         method: 'POST',
-        body: JSON.stringify({company_name, job_name, e04_job_no}),
+        body: JSON.stringify({company_name, job_name, e04_job_no, eeee_job_no}),
         mode: 'cors'
     }
     return fetch(`${backend}/jobs`, options)

front-end/app/API/fetchJob.js

@@ -8,7 +8,8 @@ import config from '../../../config.json'
 export default function fetchJob({
     company_name,
     job_name,
-    e04_job_no
+    e04_job_no,
+    eeee_job_no
 }) {
     const {
         backend
@@ -19,7 +20,7 @@ export default function fetchJob({
         mode: 'cors'
     }
 
-    const url = `${backend}/jobs?company_name=${company_name}&job_name=${job_name}&e04_job_no=${e04_job_no}`
+    const url = `${backend}/jobs?company_name=${company_name}&job_name=${job_name}&e04_job_no=${e04_job_no}&eeee_job_no=${eeee_job_no}`
     return fetch(url, options)
         .then(checkStatus)
         .then(parseJSON)

front-end/app/actions/createJob.js

@@ -6,14 +6,22 @@ export const SUCCESS_CREATE_JOB = 'SUCCESS_CREATE_JOB'
 export function requestCreateJob({
     company_name,
     job_name,
-    e04_job_no
+    e04_job_no="null",
+    eeee_job_no="null"
 }) {
+    console.log('requestCreateJob:::',{
+    company_name,
+    job_name,
+    e04_job_no,
+    eeee_job_no
+});
     return {
         type: REQUEST_CREATE_JOB,
         params: {
             company_name,
             job_name,
-            e04_job_no
+            e04_job_no,
+            eeee_job_no
         }
     }
 }

front-end/app/actions/fetchJob.js

@@ -3,10 +3,10 @@ export const FAIL_TO_FETCH_JOB = 'FAIL_TO_FETCH_JOB'
 export const SUCCESS_FETCH_JOB = 'SUCCESS_FETCH_JOB'
 
 
-export function requestFetchJob({company_name, job_name, e04_job_no}) {
+export function requestFetchJob({company_name, job_name, e04_job_no="null", eeee_job_no="null"}) {
     return {
         type: REQUEST_FETCH_JOB,
-        query: {company_name, job_name, e04_job_no}
+        query: {company_name, job_name, e04_job_no, eeee_job_no}
     }
 }
 

front-end/app/components/StatusBlock/index.js

@@ -9,7 +9,7 @@ class StatusBlock extends React.Component {
             comments
         } = this.props
 
-        if (comments.data.length !== 0) {
+
             let statNumbers = {
                 good: 0,
                 bad: 0,
@@ -45,7 +45,6 @@ class StatusBlock extends React.Component {
                 </div>
             </div>
             )
-        }
 
 
     }

front-end/app/containers/App.js

@@ -53,21 +53,17 @@ class App extends React.Component {
 
     componentWillMount() {
         const {
-            dispatch
+            dispatch, user
         } = this.props
 
         chrome.storage.sync.get('access_token', (item) => {
-            console.log('item ==>', item);
             if (!!item['access_token']) {
                 dispatch(requestLogin(item['access_token']))
-            } else {
-                console.log('access token not found');
             }
         })
 
         chrome.storage.sync.get('anonymous', (item) => {
             if (item['anonymous'] !== undefined) {
-                console.log('item ==>', item['anonymous']);
                 if (user.anonymous !== item['anonymous']) {
                     dispatch(changeUserIdentity())
                 }    

front-end/app/providers/104.js

@@ -1,11 +1,14 @@
 const get_job_name = () => document.querySelector('#job h1')
     .firstChild
     .textContent.trim()
+
 const get_company_name = () => document.querySelector('#job .company a')
     .firstChild
     .textContent.trim()
+
 const get_e04_job_no = () => location.search.match(/\?jobno=([^\&]+)/)[1]
 
+
 const provider = {
     get_job_name,
     get_company_name,

front-end/app/providers/1111.js

@@ -0,0 +1,11 @@
+const get_job_name = () => document.querySelector('#commonTop h1').innerText.trim()
+const get_company_name = () => document.querySelector('#commonTop .navbar a').innerText.trim()
+const get_eeee_job_no = () => location.search.match(/\?eNo=([0-9]+)/)[1] 
+
+const provider = {
+    get_job_name,
+    get_company_name,
+    get_eeee_job_no
+}
+
+export default provider

front-end/app/providers/index.js

@@ -1,7 +1,9 @@
 import p104 from './104.js'
+import p1111 from './1111.js'
 
 const rootProvider = {
-    ["104"]: p104
+    ["104"]: p104,
+    ["1111"]: p1111
 }
 
 export function getProviderName() {
@@ -13,9 +15,11 @@ export function getProviderName() {
 
 export function getJobQuery(provider) {
     const jobQuery = {}
+
     Object.keys(provider).forEach(key => {
         jobQuery[key.substring(4)] = provider[key]()
     })
+
     return jobQuery
 }
 

front-end/popup.js

@@ -1,9 +1,22 @@
+
 class Popup extends React.Component {
     render() {
         return (
-            <div>
-                <h2>Popup</h2>
-                <a href="" onClick={()=>chrome.tabs.create({'url': "/options.html" } )}>選項</a>
+            <div style={{width: '360px', fontSize: '18px', padding: '15px'}}>
+                <h3>Clairvoyance</h3>
+                <div>
+                    <a href="" onClick={()=>chrome.tabs.create({'url': "/options.html" } )}><h4>設置與說明書</h4></a>
+                </div>
+                <div>
+                    <h4>關於 Clairvoyance</h4>
+                    <div>
+                        臉書專頁：<a href="https://www.facebook.com/Clairvoyance-%E6%B1%82%E8%81%B7%E5%A4%A9%E7%9C%BC%E9%80%9A-1084564708284768" target="_blank">Clairvoyance - 求職天眼通</a>
+                    </div>
+                    <div>
+                        Source code: <a href="https://github.com/abalone0204/Clairvoyance" target="_blank">Clairvoyance</a>
+                    </div>
+                </div>
+
             </div>
         )
     }

tests/front-end/actions/createJob.spec.js

@@ -23,7 +23,8 @@ describe('Actions/ Create job', () => {
             params: {
                 company_name,
                 job_name,
-                e04_job_no
+                e04_job_no,
+                eeee_job_no: "null"
             }
         }
         const actual = requestCreateJob({

tests/front-end/actions/fetchJob.spec.js

@@ -23,7 +23,8 @@ describe('Actions/ Fetch job', () => {
             query: {
                 company_name,
                 job_name,
-                e04_job_no
+                e04_job_no,
+                eeee_job_no: "null"
             }
         }
         const actual = requestFetchJob({