mat view

capacitor.config.ts

@@ -11,6 +11,14 @@ const config: CapacitorConfig = {
     CapacitorHttp: {
       enabled: true
     },
+    GoogleAuth: {
+      scopes: ['profile', 'email'],
+      serverClientId: '214019008700-7d2rl1u56edjj1s8lk9fvk9934ook9r3.apps.googleusercontent.com',
+      forceCodeForRefreshToken: true,
+    },
+    PushNotifications: {
+      presentationOptions: ["badge", "sound", "alert"]
+    }
   }
 };
 

package-lock.json

@@ -10,6 +10,8 @@
       "dependencies": {
         "@capacitor-community/apple-sign-in": "^5.0.0",
         "@capacitor-community/facebook-login": "^5.0.3",
+        "@capacitor-community/fcm": "^5.0.2",
+        "@capacitor/android": "5.5.0",
         "@capacitor/app": "5.0.6",
         "@capacitor/core": "5.5.0",
         "@capacitor/haptics": "5.0.6",
@@ -1745,6 +1747,22 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/@capacitor-community/fcm": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@capacitor-community/fcm/-/fcm-5.0.2.tgz",
+      "integrity": "sha512-E3RjjI0Vm9RaAPzhrjacN5IdHV7KpTyNEzj4UnsHimwYU62YIs+mtcC4IDhzPvASuA3/XXj8ZOjWvQwN3osYxA==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/android": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.5.0.tgz",
+      "integrity": "sha512-ipJijb3M0FA6DvotS9zrbJ8p/mTEVg9EVtBmvUexogm8g5se1mc7i1gvOr3MQ/iTZ3PnNrRC/P7kHxa2R55iqg==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.5.0"
+      }
+    },
     "node_modules/@capacitor/app": {
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-5.0.6.tgz",

package.json

@@ -14,6 +14,8 @@
   "dependencies": {
     "@capacitor-community/apple-sign-in": "^5.0.0",
     "@capacitor-community/facebook-login": "^5.0.3",
+    "@capacitor-community/fcm": "^5.0.2",
+    "@capacitor/android": "5.5.0",
     "@capacitor/app": "5.0.6",
     "@capacitor/core": "5.5.0",
     "@capacitor/haptics": "5.0.6",

src/components/CourseMat.vue

@@ -41,6 +41,7 @@
     console.log("name === ", props.obj)
 
     const obj = props.obj
+
     if(await isLogin()) {
       pref = await getPref()
       console.debug(" pref = ", pref)

src/composable/settings.ts

@@ -8,9 +8,9 @@ import { Preferences } from '@capacitor/preferences';
 
 
 export const TOKEN = '173cb9e357a861abd91e8008fab9246e0cc116af'
-//export const BASE_URL = 'http://192.168.1.35:8020/'
-export const BASE_URL = 'http://localhost:8020/'
-//export const BASE_URL = 'https://www.tigermuaythai.live/'
+
+//export const BASE_URL = 'http://localhost:8020/'
+export const BASE_URL = 'https://www.tigermuaythai.live/'
 
 export const APPLE_CALLBACK = BASE_URL + "soc_accounts/apple/login/callback/";
 //const axios = setupCache(Axios); 
@@ -50,9 +50,9 @@ export const getToken = async () => {
     console.log("get token ", data)
     await Preferences.set({
       key: 'token', 
-      value: data.token
+      value: data.key
     })
-    return data.token
+    return data.key
   }else {
     return token.value
   }
@@ -64,16 +64,17 @@ export const initAPI = async () => {
   console.log("-- cookie ---")
   const cookieHeaders = r.headers['Set-Cookie'];
   console.log(cookieHeaders)
+  return r;
 }
 export const setUserToken = async(token) => {
   let data = await Preferences.set({
     key: 'user_token', 
     value: token
   })
-  let data2 = await Preferences.set({
-    key: 'token', 
-    value: token
-  })
+  //let data2 = await Preferences.set({
+    //key: 'token', 
+    //value: token
+  //})
   return data
 }
 export const getTrainers = async () => {
@@ -148,8 +149,8 @@ export const getMat = async(pk) => {
 }
 
 export const storeAPNToken = async (device_token) => {
-  
   const token = await Preferences.get({ key: 'token' });
+  console.log('storeAPNToken ', token, device_token) 
   console.log("token = ", token)
   const { data } = await axios.post(BASE_URL + "backend/api/device_tokens/",{token: device_token},
   {
@@ -316,7 +317,8 @@ export const logout = async() => {
 }
 export const clearPref = async() => {
 
-  const clear = await Preferences.clear()
+  //const clear = await Preferences.clear()
+  const clear = await Preferences.remove({key: 'user_token'})
   return clear
 }
 export const isLogin = async() => {
@@ -356,7 +358,7 @@ export const resetPassword = async (email) => {
 
 
 export const getPref = async () => {
-  const token = await Preferences.get({ key: 'token' });
+  const token = await Preferences.get({ key: 'user_token' });
   console.log("token = ", token)
   const { data } = await axios.get(BASE_URL + `backend/api/profiles/myprofile/`, {
     headers: { 
@@ -371,7 +373,7 @@ export const getPref = async () => {
   return data
 }
 export const likeCourse = async (cid) => {
-  const token = await Preferences.get({ key: 'token' });
+  const token = await Preferences.get({ key: 'user_token' });
   console.log("token = ", token)
   const { data } = await axios.get(BASE_URL + `backend/api/profiles/like_course/?cid=${cid}`, {
     headers: { 
@@ -382,7 +384,7 @@ export const likeCourse = async (cid) => {
   return data
 }
 export const likeMat = async (cid) => {
-  const token = await Preferences.get({ key: 'token' });
+  const token = await Preferences.get({ key: 'user_token' });
   console.log("token = ", token)
   const { data } = await axios.get(BASE_URL + `backend/api/profiles/like_mat/?cid=${cid}`, {
     headers: { 
@@ -395,7 +397,7 @@ export const likeMat = async (cid) => {
 
 
 export const updateNoti = async (noti) => {
-  const token = await Preferences.get({ key: 'token' });
+  const token = await Preferences.get({ key: 'user_token' });
   console.log("token = ", token)
   const { data } = await axios.post(BASE_URL + `backend/api/profiles/update_noti/`,
   {live_noti: noti.liveNoti, 'news_noti':noti.newsNoti},
@@ -410,7 +412,7 @@ export const updateNoti = async (noti) => {
 
 export const appleLogin = async(access_token) => {
 
-  const token = await Preferences.get({ key: 'token' });
+  const token = await Preferences.get({ key: 'user_token' });
   console.log("access_code = ", access_token)
   const { data } = await axios.post(BASE_URL + 'dj-rest-auth/apple/',{access_token: access_token.authorizationCode, id_token: access_token.identityToken}, {
     headers: {

src/views/CourseMatDetailPage.vue

@@ -46,7 +46,7 @@
 import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent,   IonNavLink,
     IonButton,
     IonButtons,
-    IonBackButton, onIonViewWillEnter, IonRow, IonGrid, IonCol, IonItem, IonList, IonAvatar, IonLabel, IonItemDivider,
+    IonBackButton, onIonViewWillEnter, onIonViewDidLeave, IonRow, IonGrid, IonCol, IonItem, IonList, IonAvatar, IonLabel, IonItemDivider,
     useIonRouter } from '@ionic/vue';
 
 import { Autoplay, Keyboard, Pagination, Scrollbar, Zoom } from 'swiper/modules';
@@ -88,6 +88,10 @@ onIonViewWillEnter(async () => {
   mats.value  = await listMats(mat.value.related_mats)
 
 })
+onIonViewDidLeave(async () => {
+  mat.value.embed = null; 
+})
+
 </script>
 
 <style scoped>

src/views/ProfilePage.vue

@@ -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 } 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 } from '@ionic/vue';
 import ExploreContainer from '@/components/ExploreContainer.vue';
 import LoginForm from '@/components/LoginForm.vue';
 import { defineComponent, onMounted } from 'vue';
@@ -162,7 +162,12 @@ const urlChange = (event) => {
 
 const ggLoginClick = async () => {
   console.log("ggLogin")
-  const response = await GoogleAuth.signIn();
+  let response = null;
+  try{
+    response = await GoogleAuth.signIn();
+  }catch(error) {
+    console.log("Error ", error);
+  }
   let t1 = response.authentication.accessToken;
   let t2 = response.authentication.idToken;
   let t3 = response.authentication.refreshToken;
@@ -297,7 +302,7 @@ const userLogin = async (data) => {
   }else {
     console.log("Success")
     await setUserToken(data.key)
-    
+    myprofile.value  = await getPref()
     // Login successful.
     refIsLogin.value = true
   }

src/views/Tab1Page.vue

@@ -79,6 +79,8 @@ import { vueVimeoPlayer } from 'vue-vimeo-player'
 import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth';
 
 import { PushNotifications } from '@capacitor/push-notifications';
+import { FCM } from "@capacitor-community/fcm";
+
 
 import Player from '@vimeo/player';
 
@@ -122,7 +124,8 @@ const modules =  [Autoplay, Keyboard, Pagination, Scrollbar, Zoom]
     let v = await isLogin()
     console.log("v === ", v)
     if( v == false ) {
-      ionRouter.navigate('/tabs/tab4', 'forward', 'replace');
+    ;
+      //ionRouter.navigate('/tabs/tab4', 'forward', 'replace');
     }
     //console.log("video " ,video)
     //console.log("video id", video.value.id)
@@ -196,6 +199,12 @@ 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 => {