live version

encryption_public_key.cer

@@ -0,0 +1,11 @@
+-----BEGIN PUBLIC KEY-----
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsXkzFk29X2yup2o2FaCC
+J9QHMcalVBG/cshQTSQoU3bM1+v+A9735uVTOmBXTIS7xKJ/nCWL5rq/0Fq71Myk
+2P2gFy0GPwl+WJLMm5fb9GNlLsyn/eWIHwD8XH31O6XQPZz3xM9EZskp29WfwNpe
+5OA8vLWRASJ4bRG9f8+/igIlZ6KTSyx9UJmX3PYOcP9EGjX7NUIJJ6oH5y4mt+XA
+Jf/If3Mj9RTIkZrZ4l7lAyB7tB65P/qrPKkm+duQRv7eZI09fgyZDSfg+We9CZ+X
+trpexgp0nWFBQfSWagI5/CikkJTRI9hO/b9fWzLwPmaqB8negqCfGfGSq889BhHj
+o6yVm+GE3c1cIFlaTKJlHG4q2mlkxggWaXSceo8Fro1DJ/ImsgiXV+S1wRi7qzV+
+muRTgdYoXmGxbfdHUWdfVDrAXlCPQu83IGOm3x4B+tkkmD0s0zZ1sSQLE7kxsdKK
+4D1Vvn2bsMALrQBS0IOBMxKZ8KmhXnRJXGT+y3mUnbGPAgMBAAE=
+-----END PUBLIC KEY-----

encryption_public_key.pem

@@ -0,0 +1,11 @@
+-----BEGIN PUBLIC KEY-----
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsXkzFk29X2yup2o2FaCC
+J9QHMcalVBG/cshQTSQoU3bM1+v+A9735uVTOmBXTIS7xKJ/nCWL5rq/0Fq71Myk
+2P2gFy0GPwl+WJLMm5fb9GNlLsyn/eWIHwD8XH31O6XQPZz3xM9EZskp29WfwNpe
+5OA8vLWRASJ4bRG9f8+/igIlZ6KTSyx9UJmX3PYOcP9EGjX7NUIJJ6oH5y4mt+XA
+Jf/If3Mj9RTIkZrZ4l7lAyB7tB65P/qrPKkm+duQRv7eZI09fgyZDSfg+We9CZ+X
+trpexgp0nWFBQfSWagI5/CikkJTRI9hO/b9fWzLwPmaqB8negqCfGfGSq889BhHj
+o6yVm+GE3c1cIFlaTKJlHG4q2mlkxggWaXSceo8Fro1DJ/ImsgiXV+S1wRi7qzV+
+muRTgdYoXmGxbfdHUWdfVDrAXlCPQu83IGOm3x4B+tkkmD0s0zZ1sSQLE7kxsdKK
+4D1Vvn2bsMALrQBS0IOBMxKZ8KmhXnRJXGT+y3mUnbGPAgMBAAE=
+-----END PUBLIC KEY-----

google-services.json

@@ -0,0 +1,70 @@
+{
+  "project_info": {
+    "project_number": "214019008700",
+    "project_id": "tmtlive-557ac",
+    "storage_bucket": "tmtlive-557ac.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:214019008700:android:3bf8cbb4e812fdf9c088b9",
+        "android_client_info": {
+          "package_name": "net.simplico.tmtlive"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "214019008700-62hfn39h1k01nmt038v6g126j4bvsf18.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "net.simplico.tmtlive",
+            "certificate_hash": "b83cf800b46961f5311d9438872d34ea544dcb53"
+          }
+        },
+        {
+          "client_id": "214019008700-96jleh7b9rautj8l9rv3jdcri04e6c75.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "net.simplico.tmtlive",
+            "certificate_hash": "be6da5e1f06456f6ab5bf89094568f4b67dc2a8a"
+          }
+        },
+        {
+          "client_id": "214019008700-l8i681i0rr5p6burfakaa62ruhh2kp66.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "net.simplico.tmtlive",
+            "certificate_hash": "34a1080575bbb1801481f773ce549d7d9538ab53"
+          }
+        },
+        {
+          "client_id": "214019008700-7d2rl1u56edjj1s8lk9fvk9934ook9r3.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDjUZhCBH_8PrLs9grBlQmZZTy3b9F3jcs"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "214019008700-7d2rl1u56edjj1s8lk9fvk9934ook9r3.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "214019008700-gp7946dkoaa2icbdghii3lrpp88cb1qf.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "net.simplico.tmtlive"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

src/views/CourseDetailPage.vue

@@ -82,10 +82,7 @@ onIonViewWillEnter(async () => {
   };
 </script>
 
-<style>
-ion-title {
-  font-size:1.5rem;
-}
+<style scoped>
 #readmore {
   display:block;
   width:100%;

src/views/CourseMatDetailPage.vue

@@ -6,7 +6,8 @@
           <ion-buttons slot="start">
             <ion-back-button></ion-back-button>
           </ion-buttons>
-          <ion-title>Material Detail</ion-title>
+          <!--
+          <ion-title>Material Detail</ion-title> -->
       </ion-toolbar>
     </ion-header>
     <ion-content class='ion-text-wrap'>

src/views/PostDetailPage.vue

@@ -9,23 +9,23 @@
           <ion-title v-if="obj">{{ obj.name }}</ion-title>
       </ion-toolbar>
     </ion-header>
-    <ion-content :fullscreen="true">
-      <ion-header collapse="condense">
-        <ion-toolbar>
-          <ion-title size="large" v-if="obj">{{ obj.name }}</ion-title>
-        </ion-toolbar>
-      </ion-header>
+    <ion-content>
+      <h1   v-if="obj">{{ obj.name }}</h1>
+      <div v-html="obj.embed_html" v-if="obj"></div>
       <div v-html="render_body" class='ion-padding'></div>
-
        <ion-fab slot="fixed" vertical="bottom" horizontal="end">
-      <ion-fab-button>
+      <ion-fab-button v-if="obj">
         <ion-icon :icon="shareSocial" @click="socShare"></ion-icon>
       </ion-fab-button>
     </ion-fab>
     </ion-content>
   </ion-page>
 </template>
-
+<style scoped>
+  h1 {
+    color: var(--ion-color-primary);
+  }
+</style>
 <script setup lang="ts">
 
 import { marked } from 'marked';
@@ -67,11 +67,13 @@ onIonViewWillEnter(async () => {
 })
 const socShare = async () => {
   console.log('share social')
-  await Share.share({
-    title: 'See cool stuff',
-    text: 'Really awesome thing you need to see right meow',
-    url: 'http://ionicframework.com/',
-    dialogTitle: 'Share with buddies',
-  });
+  if( obj ) {
+    await Share.share({
+      title: obj.value.name,
+      text: obj.value.description,
+      url: 'https://www.tigermuaythai.live/posts_detail/'+obj.value.id,
+      dialogTitle: 'TigerMuayThai.live',
+    });
+  }
 }
 </script>

src/views/ProfilePage.vue

@@ -57,19 +57,19 @@
         <ion-grid>
           <h3 class='ion-text-center'>Login With</h3>
           <ion-row class='ion-justify-content-center'>
-            <ion-col size=4>
+            <ion-col size=12>
               <ion-button @click='fbLogin' expand='full'>
                 <ion-icon slot="start" :icon="logoFacebook"></ion-icon>
 
                 Facebook</ion-button>
             </ion-col>
-            <ion-col size=4>
+            <ion-col size=12>
               <ion-button @click='ggLoginClick' expand='full'>
 
                 <ion-icon slot="start" :icon="logoGoogle"></ion-icon>
                 Google</ion-button>
             </ion-col>
-            <ion-col size=4>
+            <ion-col size=12 v-if="isPlatform('ios')">
               <ion-button @click='onAppleLogin' expand='full'>
                 <ion-icon slot="start" :icon="logoApple"></ion-icon>
                 Apple</ion-button>
@@ -82,7 +82,7 @@
 </template>
 
 <script setup lang="ts">
-import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonButton, onIonViewWillEnter, IonRow, IonCol, IonGrid, IonToggle, IonLabel, IonChip, IonIcon, IonSelect, IonSelectOption, IonList, IonListHeader, IonItem, IonText, IonImg } from '@ionic/vue';
+import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonButton, onIonViewWillEnter, IonRow, IonCol, IonGrid, IonToggle, IonLabel, IonChip, IonIcon, IonSelect, IonSelectOption, IonList, IonListHeader, IonItem, IonText, IonImg, isPlatform } from '@ionic/vue';
 import ExploreContainer from '@/components/ExploreContainer.vue';
 import LoginForm from '@/components/LoginForm.vue';
 import { defineComponent, onMounted } from 'vue';
@@ -179,7 +179,7 @@ const ggLoginClick = async () => {
       await setUserToken(d.key)
       myprofile.value  = await getPref()
       refIsLogin.value = true
-      
+      location.reload();
     }catch(error) {
       console.log(error);
       formError.value = error.response.data.non_field_errors.join("\n");
@@ -203,6 +203,7 @@ const fbLogin = async () => {
       await getProfile()
       // Login successful.
       refIsLogin.value = true
+      location.reload();
     }catch(error) {
       formError.value = error.response.data.non_field_errors.join("\n");
     }
@@ -243,6 +244,8 @@ onIonViewWillEnter(async () => {
   refIsLogin.value = await isLogin()
   if( refIsLogin.value == true ) {
     myprofile.value  = await getPref()
+    noti.liveNoti = myprofile.value.live_noti;
+    noti.newsNoti = myprofile.value.news_noti;
   }
 
 })
@@ -338,6 +341,7 @@ const onAppleLogin = async () => {
       //await getProfile()
       // Login successful.
       refIsLogin.value = true
+      location.reload(); 
     }catch(error) {
       console.log(error);
       formError.value = error.response.data.non_field_errors.join("\n");

src/views/Tab1Page.vue

@@ -72,7 +72,7 @@ import SearchEngine from '@/components/SearchEngine.vue'
 import { CapacitorHttp } from '@capacitor/core';
 import { ref } from 'vue';
 import { TOKEN, getProducts, setToken, getObject, getToken, getTrainers, listMats, storeAPNToken,
-getTodayProgs, getLive, getPosts, initAPI, clearPref, isLogin} from '@/composable/settings';
+getTodayProgs, getLive, getPosts, initAPI, clearPref, isLogin, getPref } from '@/composable/settings';
 //import VueCoreVideoPlayer from 'vue-core-video-player'
 import { vueVimeoPlayer } from 'vue-vimeo-player'
 
@@ -114,6 +114,7 @@ const options = {
       width: 640,
       loop: true
   };
+let myprofile = null;
  //const video = ref(null)
 
   //const player = new Player(video, options);
@@ -126,6 +127,10 @@ const modules =  [Autoplay, Keyboard, Pagination, Scrollbar, Zoom]
     if( v == false ) {
     ;
       //ionRouter.navigate('/tabs/tab4', 'forward', 'replace');
+    }else {
+    
+      myprofile = await getPref()
+      console.log("my profile ", myprofile);
     }
     //console.log("video " ,video)
     //console.log("video id", video.value.id)
@@ -161,10 +166,10 @@ const modules =  [Autoplay, Keyboard, Pagination, Scrollbar, Zoom]
     })
     console.log(" trainers => ", trainers)
 
-    GoogleAuth.initialize();
-    registerNotifications()
+    //GoogleAuth.initialize();
     addListeners()
-
+    registerNotifications()
+    
     getTodayProgs().then( (data) => {
       todays.value = data
     })
@@ -199,12 +204,6 @@ const addListeners = async () => {
   await PushNotifications.addListener('registration', token => {
     console.info('Registration token: ', token.value);
     storeAPNToken(token.value)
-    
-    FCM.subscribeTo({ topic: "TMT" })
-    .then((r) => {
-      console.log("subsribe to topic ", r)
-    })
-    .catch((err) => console.log(err));
   });
 
   await PushNotifications.addListener('registrationError', err => {
@@ -231,6 +230,34 @@ const registerNotifications = async () => {
     throw new Error('User denied permissions!');
   }
 
+    if( myprofile ) {
+      if( myprofile.live_noti == true ) {
+        FCM.subscribeTo({ topic: "LIVE" })
+        .then((r) => {
+          console.log("subsribe to topic ", r)
+        })
+        .catch((err) => console.log(err));
+      }else {
+        FCM.unsubscribeFrom({ topic: "LIVE" })
+        .then((r) => {
+          console.log("unsubsribe to topic ", r)
+        })
+        .catch((err) => console.log(err));
+      }
+      if( myprofile.news_noti == true ) {
+        FCM.subscribeTo({ topic: "NEWS" })
+        .then((r) => {
+          console.log("subsribe to topic ", r)
+        })
+        .catch((err) => console.log(err));
+      }else {
+        FCM.unsubscribeFrom({ topic: "NEWS" })
+        .then((r) => {
+          console.log("unsubsribe to topic ", r)
+        })
+        .catch((err) => console.log(err));
+      }
+    }
   await PushNotifications.register();
 }