From e196197a7cd79db332df58fe55824491acf13fba Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 14:46:10 +0200
Subject: [PATCH 1/8] implement vueex

---
 README.md                          |  2 -
 client/package-lock.json           |  5 +++
 client/package.json                |  3 +-
 client/src/api/index.js            | 20 ++++++++++
 client/src/components/chainetv.vue | 45 ++++-----------------
 client/src/main.js                 |  2 +
 client/src/store/index.js          | 64 ++++++++++++++++++++++++++++++
 7 files changed, 101 insertions(+), 40 deletions(-)
 delete mode 100644 README.md
 create mode 100644 client/src/api/index.js
 create mode 100644 client/src/store/index.js

diff --git a/README.md b/README.md
deleted file mode 100644
index 6787402..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# chainetv_web
-
diff --git a/client/package-lock.json b/client/package-lock.json
index c0af77b..e3e8eae 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -11773,6 +11773,11 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuex": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.0.tgz",
+      "integrity": "sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg=="
+    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
diff --git a/client/package.json b/client/package.json
index cd64562..5dd9825 100644
--- a/client/package.json
+++ b/client/package.json
@@ -14,7 +14,8 @@
     "axios": "^0.18.0",
     "bulma": "^0.7.4",
     "vue": "^2.5.2",
-    "vue-router": "^3.0.1"
+    "vue-router": "^3.0.1",
+    "vuex": "^3.1.0"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
diff --git a/client/src/api/index.js b/client/src/api/index.js
new file mode 100644
index 0000000..1793707
--- /dev/null
+++ b/client/src/api/index.js
@@ -0,0 +1,20 @@
+import axios from "axios";
+
+const API_PATH=`${process.env.ROOT_API}/api/v1`;
+
+export function  fetchchaine(num){
+
+    return axios.get(`${API_PATH}/chaine/${num}`)
+}
+
+export function fetchemission(num){
+
+    return  axios.get(`${API_PATH}/chaine/${num}/emission`)
+
+}
+
+export function putparsechaine(){
+    
+    return axios.put(`${API_PATH}/chaine/`);
+
+}
\ No newline at end of file
diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 37ded3e..72c2b57 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -29,8 +29,8 @@
       </div>
       <div class="section">
         <div class="container">
-          <ul class v-if="arrayresultchaines">
-            <li class="box" v-for="result in arrayresultchaines" v-bind:key="result.chaine">
+          <ul class v-if="this.$store.state.arrayresultchaines">
+            <li class="box" v-for="result in this.$store.state.arrayresultchaines" v-bind:key="result.chaine">
               <h3 class="title is-5">{{result.chaine}} : {{result.name}}</h3>
               <ul v-if="(result.emission!='can\'t find channel' && result.emission)">
                 <li>
@@ -74,63 +74,34 @@
 </template>
 
 <script>
-import axios from "axios";
+import {putparsechaine} from "../api";
 
 export default {
   name: "chainetv",
   data() {
     return {
-      arrayresultchaines: [],
       chaine: ""
     };
   },
   methods: {
-    getchaine(num) {
-      let path = process.env.ROOT_API + "/api/v1/chaine/";
-      axios
-        .get(path + num)
-        .then(res => {
-          if (res.status === 200) {
-            axios
-              .get(path + num + "/emission")
-              .then(res_emission => {
-                this.arrayresultchaines.push({
-                  chaine: num,
-                  name: res.data,
-                  emission: res_emission.data
-                });
-                console.log(this.arrayresultchaines);
-              })
-              .catch(error => {
-                this.arrayresultchaines.push({ chaine: num, name: res.data });
-              });
-          } else if (res.status === 204) {
-            this.arrayresultchaines.push({ chaine: num, name: "inconnue" });
-          }
-        })
-        .catch(error => {
-          // eslint-disable-next-line
-          console.error(error);
-        });
-    },
+
     checkchaine() {
       if (this.chaine === "") {
         alert("rentrer un numéro");
         return;
       }
-      this.arrayresultchaines = [];
+      this.$store.state.arrayresultchaines = [];
       const arraychaine = [...new Set(this.chaine.split(" "))];
 
       arraychaine.forEach(element => {
         if (element != "") {
-          this.getchaine(element);
+          this.$store.dispatch('getchaine',{num:element});
         }
       });
     },
     parsechaine() {
-      const path = process.env.ROOT_API + "/api/v1/chaine/";
-      axios
-        .put(path)
+    
+      return putparsechaine()
         .then(res => {
           if (res.data == "OK") {
             alert("update database OK");
diff --git a/client/src/main.js b/client/src/main.js
index d08884c..a3c43f4 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -3,6 +3,7 @@
 import Vue from 'vue';
 import App from './App';
 import router from './router';
+import store from './store'
 import './../node_modules/bulma/css/bulma.css'
 Vue.config.productionTip = false;
 
@@ -10,6 +11,7 @@ Vue.config.productionTip = false;
 new Vue({
   el: '#app',
   router,
+  store,
   components: { App },
   template: '<App/>',
 });
diff --git a/client/src/store/index.js b/client/src/store/index.js
new file mode 100644
index 0000000..91c76a9
--- /dev/null
+++ b/client/src/store/index.js
@@ -0,0 +1,64 @@
+// src/store/index.js
+
+import Vue from 'vue'  
+import Vuex from 'vuex'
+import axios from "axios";
+import { fetchchaine, fetchemission } from '../api';
+Vue.use(Vuex)
+const state = {  
+  // single source of data
+  arrayresultchaines: [],
+}
+const API_PATH=`${process.env.ROOT_API}/api/v1`;
+const actions = {  
+  // asynchronous operations
+  getchaine(context,{num}) {
+    
+    return fetchchaine(num)
+      .then( res => {
+        if (res.status === 200){
+          context.dispatch('getemission',{chaine:num,name:res.data})
+        }else{
+          context.commit('push_chaine',{chaine:num,name:res.data})
+        }
+     })
+      .catch(error => {
+        // eslint-disable-next-line
+        console.error(error);
+      });
+    },
+  getemission(context,{chaine,name}){
+    return fetchemission (chaine)
+      .then(res_emission => {
+        context.commit('push_chaine',{chaine:chaine,name:name,emission:res_emission.data})
+      })
+      .catch(error => {
+        console.error(error);
+      });
+  },
+
+}
+
+const mutations = {  
+  // isolated data mutations
+  push_chaine(state,payload){
+    if(!payload.name){
+      state.arrayresultchaines.push({ chaine: payload.chaine, name: "inconnue" });
+    }else{
+      state.arrayresultchaines.push({chaine: payload.chaine,name: payload.name,emission: payload.emission});
+    }
+  }
+}
+
+const getters = {  
+  // reusable data accessors
+}
+
+const store = new Vuex.Store({  
+  state,
+  actions,
+  mutations,
+  getters
+})
+
+export default store  
\ No newline at end of file
-- 
2.45.2


From d85afa8b49b57b15430b6fdd48570a5d769e4055 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 15:22:10 +0200
Subject: [PATCH 2/8] remove axios import

---
 client/src/store/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/store/index.js b/client/src/store/index.js
index 91c76a9..1b8c855 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -2,7 +2,6 @@
 
 import Vue from 'vue'  
 import Vuex from 'vuex'
-import axios from "axios";
 import { fetchchaine, fetchemission } from '../api';
 Vue.use(Vuex)
 const state = {  
-- 
2.45.2


From 4d5290c8ed8a2721d519a6b92dc7090661973a33 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 16:23:24 +0200
Subject: [PATCH 3/8] change project structure

---
 .gitignore          |  2 +-
 backend/__init__.py |  0
 backend/api.py      | 35 +++++++++++++++++++++++++++++
 backend/app.py      | 19 ++++++++++++++++
 backend/config.py   |  3 +++
 backend/run.py      | 54 +++------------------------------------------
 6 files changed, 61 insertions(+), 52 deletions(-)
 create mode 100644 backend/__init__.py
 create mode 100644 backend/api.py
 create mode 100644 backend/app.py
 create mode 100644 backend/config.py

diff --git a/.gitignore b/.gitignore
index ac77d92..947795f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-__*
+__pycache__
 env
 venv
 dist
\ No newline at end of file
diff --git a/backend/__init__.py b/backend/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/api.py b/backend/api.py
new file mode 100644
index 0000000..2fae157
--- /dev/null
+++ b/backend/api.py
@@ -0,0 +1,35 @@
+from flask import Blueprint, jsonify, request,make_response,redirect,url_for,render_template
+from Jsonfile import JSONfile
+import emission
+data= JSONfile("chaine.json")
+api = Blueprint("api", __name__)
+
+
+
+@api.route('/ping', methods=['GET'])
+def ping_pong():
+    return jsonify('pong!')
+
+@api.route('/chaine/<num>', methods=['GET'])
+def get_chaine(num):
+    chaine=data.get_chaine(num)
+    if (chaine == "numero de chaine inconnue"):
+        return make_response("",204)
+    else:
+        return jsonify(chaine)
+
+@api.route('/chaine/', methods=['put'])
+def update_list():
+        status=data.parsechaine()
+        if(status=='ok'):
+            return jsonify("OK")
+        else:
+            return make_response('Error during Chaine Update',500)
+
+@api.route('/chaine/<num>/emission', methods=['GET'])
+def get_emmission(num):
+    chaine=data.get_chaine(num)
+    if (chaine == "numero de chaine inconnue"):
+        return make_response("",204)
+    else:    
+        return jsonify(emission.parse_emmission(chaine))
diff --git a/backend/app.py b/backend/app.py
new file mode 100644
index 0000000..1a10cf0
--- /dev/null
+++ b/backend/app.py
@@ -0,0 +1,19 @@
+from flask import Flask,render_template
+from flask_cors import CORS
+from api import api
+#from ReverseProxied import ReverseProxied
+def create_app(app_name=__name__):
+    app=Flask(__name__, static_folder= "./dist/static",template_folder="./dist")
+    app.config.from_object('config.BaseConfig')
+    #app.wsgi_app = ReverseProxied(app.wsgi_app)
+    CORS(app)
+    app.register_blueprint(api, url_prefix="/api/v1")
+    @app.route('/<path:path>')
+    def index(path):
+        return render_template('index.html')
+    return app
+
+
+##@app.errorhandler(404)
+##def ma_page_404(error):
+##        return redirect("https://www.ducamps.win/404/404.html", 307)
diff --git a/backend/config.py b/backend/config.py
new file mode 100644
index 0000000..24dea4c
--- /dev/null
+++ b/backend/config.py
@@ -0,0 +1,3 @@
+class BaseConfig(object):  
+    DEBUG = True
+    SECRET_KEY = 'mysecretkeyg'
\ No newline at end of file
diff --git a/backend/run.py b/backend/run.py
index 8df6d4a..3b426ae 100644
--- a/backend/run.py
+++ b/backend/run.py
@@ -1,52 +1,4 @@
-from flask import Flask,request,make_response,redirect,url_for,render_template,jsonify
-from flask_cors import CORS
-from Jsonfile import JSONfile
-#from ReverseProxied import ReverseProxied
-import emission
-data= JSONfile("chaine.json")
-app=Flask(__name__,static_folder = "./dist/static",template_folder="./dist")
-#app.wsgi_app = ReverseProxied(app.wsgi_app)
-CORS(app)
-
-@app.route('/', defaults={'path': ''})
-@app.route('/<path:path>')
-def index(path):
-    return render_template('index.html')
-
-@app.route('/api/v1/ping', methods=['GET'])
-def ping_pong():
-    return jsonify('pong!')
-
-@app.route('/api/v1/chaine/<num>', methods=['GET'])
-def get_chaine(num):
-    chaine=data.get_chaine(num)
-    if (chaine == "numero de chaine inconnue"):
-        return make_response("",204)
-    else:
-        return jsonify(chaine)
-
-@app.route('/api/v1/chaine/', methods=['put'])
-def update_list():
-        status=data.parsechaine()
-        if(status=='ok'):
-            return jsonify("OK")
-        else:
-            return make_response('Error during Chaine Update',500)
-
-@app.route('/api/v1/chaine/<num>/emission', methods=['GET'])
-def get_emmission(num):
-    chaine=data.get_chaine(num)
-    if (chaine == "numero de chaine inconnue"):
-        return make_response("",204)
-    else:    
-        return jsonify(emission.parse_emmission(chaine))
-
-##@app.errorhandler(404)
-##def ma_page_404(error):
-##        return redirect("https://www.ducamps.win/404/404.html", 307)
-
-
-
-
 if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+    from app import create_app
+    app= create_app()
+    app.run()
\ No newline at end of file
-- 
2.45.2


From dc61708d462da4ae48c9f607fb1da31d999bdf22 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 16:36:29 +0200
Subject: [PATCH 4/8] revu structure projet python

---
 backend/{ => chainetv}/Jsonfile.py       | 0
 backend/{ => chainetv}/ReverseProxied.py | 0
 backend/chainetv/__init__.py             | 0
 backend/{ => chainetv}/api.py            | 9 ++++-----
 backend/{ => chainetv}/app.py            | 5 +++--
 backend/{ => chainetv}/chaine.json       | 0
 backend/{ => chainetv}/config.py         | 0
 backend/{ => chainetv}/emission.py       | 0
 backend/run.py                           | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename backend/{ => chainetv}/Jsonfile.py (100%)
 rename backend/{ => chainetv}/ReverseProxied.py (100%)
 create mode 100644 backend/chainetv/__init__.py
 rename backend/{ => chainetv}/api.py (93%)
 rename backend/{ => chainetv}/app.py (86%)
 rename backend/{ => chainetv}/chaine.json (100%)
 rename backend/{ => chainetv}/config.py (100%)
 rename backend/{ => chainetv}/emission.py (100%)

diff --git a/backend/Jsonfile.py b/backend/chainetv/Jsonfile.py
similarity index 100%
rename from backend/Jsonfile.py
rename to backend/chainetv/Jsonfile.py
diff --git a/backend/ReverseProxied.py b/backend/chainetv/ReverseProxied.py
similarity index 100%
rename from backend/ReverseProxied.py
rename to backend/chainetv/ReverseProxied.py
diff --git a/backend/chainetv/__init__.py b/backend/chainetv/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/api.py b/backend/chainetv/api.py
similarity index 93%
rename from backend/api.py
rename to backend/chainetv/api.py
index 2fae157..8383852 100644
--- a/backend/api.py
+++ b/backend/chainetv/api.py
@@ -1,11 +1,10 @@
 from flask import Blueprint, jsonify, request,make_response,redirect,url_for,render_template
-from Jsonfile import JSONfile
-import emission
+from chainetv.Jsonfile import JSONfile
+from chainetv import emission
 data= JSONfile("chaine.json")
+
+
 api = Blueprint("api", __name__)
-
-
-
 @api.route('/ping', methods=['GET'])
 def ping_pong():
     return jsonify('pong!')
diff --git a/backend/app.py b/backend/chainetv/app.py
similarity index 86%
rename from backend/app.py
rename to backend/chainetv/app.py
index 1a10cf0..ecf4a2c 100644
--- a/backend/app.py
+++ b/backend/chainetv/app.py
@@ -1,12 +1,13 @@
 from flask import Flask,render_template
 from flask_cors import CORS
-from api import api
+
 #from ReverseProxied import ReverseProxied
 def create_app(app_name=__name__):
     app=Flask(__name__, static_folder= "./dist/static",template_folder="./dist")
-    app.config.from_object('config.BaseConfig')
+    app.config.from_object('chainetv.config.BaseConfig')
     #app.wsgi_app = ReverseProxied(app.wsgi_app)
     CORS(app)
+    from chainetv.api import api
     app.register_blueprint(api, url_prefix="/api/v1")
     @app.route('/<path:path>')
     def index(path):
diff --git a/backend/chaine.json b/backend/chainetv/chaine.json
similarity index 100%
rename from backend/chaine.json
rename to backend/chainetv/chaine.json
diff --git a/backend/config.py b/backend/chainetv/config.py
similarity index 100%
rename from backend/config.py
rename to backend/chainetv/config.py
diff --git a/backend/emission.py b/backend/chainetv/emission.py
similarity index 100%
rename from backend/emission.py
rename to backend/chainetv/emission.py
diff --git a/backend/run.py b/backend/run.py
index 3b426ae..b7a98cb 100644
--- a/backend/run.py
+++ b/backend/run.py
@@ -1,4 +1,4 @@
 if __name__ == '__main__':
-    from app import create_app
+    from chainetv.app import create_app
     app= create_app()
     app.run()
\ No newline at end of file
-- 
2.45.2


From 8fc67cccceea76f3a26bf6c5255f4e4ec4a3a3e8 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 16:55:30 +0200
Subject: [PATCH 5/8] fix error gunicorn

---
 backend/run.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/run.py b/backend/run.py
index b7a98cb..eda0270 100644
--- a/backend/run.py
+++ b/backend/run.py
@@ -1,4 +1,5 @@
+
+from chainetv.app import create_app
+app= create_app()
 if __name__ == '__main__':
-    from chainetv.app import create_app
-    app= create_app()
     app.run()
\ No newline at end of file
-- 
2.45.2


From 686ec235829aee05675a43513101deb66cc6712b Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 17:03:09 +0200
Subject: [PATCH 6/8] correct path dist

---
 backend/chainetv/app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/chainetv/app.py b/backend/chainetv/app.py
index ecf4a2c..4825ca8 100644
--- a/backend/chainetv/app.py
+++ b/backend/chainetv/app.py
@@ -3,12 +3,13 @@ from flask_cors import CORS
 
 #from ReverseProxied import ReverseProxied
 def create_app(app_name=__name__):
-    app=Flask(__name__, static_folder= "./dist/static",template_folder="./dist")
+    app=Flask(__name__, static_folder= "../dist/static",template_folder="../dist")
     app.config.from_object('chainetv.config.BaseConfig')
     #app.wsgi_app = ReverseProxied(app.wsgi_app)
     CORS(app)
     from chainetv.api import api
     app.register_blueprint(api, url_prefix="/api/v1")
+    @app.route('/')
     @app.route('/<path:path>')
     def index(path):
         return render_template('index.html')
-- 
2.45.2


From 9bf2b5a97df4059c27c5d96272322e48a3e52827 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 17:05:00 +0200
Subject: [PATCH 7/8] correct path dist

---
 backend/chainetv/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/chainetv/app.py b/backend/chainetv/app.py
index 4825ca8..f4a46e6 100644
--- a/backend/chainetv/app.py
+++ b/backend/chainetv/app.py
@@ -11,7 +11,7 @@ def create_app(app_name=__name__):
     app.register_blueprint(api, url_prefix="/api/v1")
     @app.route('/')
     @app.route('/<path:path>')
-    def index(path):
+    def index(path="/"):
         return render_template('index.html')
     return app
 
-- 
2.45.2


From 2256435c3f00f36e6cc75bc281562b247954b996 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 29 Apr 2019 17:24:02 +0200
Subject: [PATCH 8/8] fix issue when no synopsys div

---
 backend/chainetv/emission.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/chainetv/emission.py b/backend/chainetv/emission.py
index fd14d9d..8068e78 100644
--- a/backend/chainetv/emission.py
+++ b/backend/chainetv/emission.py
@@ -24,14 +24,22 @@ def parse_emmission(strsearch):
     html = response.read()
     parse=BeautifulSoup(html,"html.parser")
     divcasting=parse.select_one(".descriptif")
-    casting=divcasting.find_all(href=re.compile("biographie"))
-    count=0
-    for actor in casting:
-        casting[count]=actor.text
-        count+=1
+    if (divcasting):
+        casting=divcasting.find_all(href=re.compile("biographie"))
+        count=0
+        for actor in casting:
+            casting[count]=actor.text
+            count+=1
+    else:
+        casting= None
     divsynopsis=parse.select_one(".episode-synopsis")
-    img=divsynopsis.find_next('img')['data-src']
-    synopsis=divsynopsis.select_one(".d-b").text
+    if (divsynopsis):
+        img=divsynopsis.find_next('img')['data-src']
+        synopsis=divsynopsis.select_one(".d-b").text
+    else:
+        img=None
+        synopsis=""
+        
     return {'title':link['title'],'href':href,'casting':casting,'synopsis':remove_first_space(synopsis),'img':img}
 
 
-- 
2.45.2