added github release support

.env.development

@@ -1,4 +1,4 @@
-#VUE_APP_BADHAN_API_BASE_URL=http://localhost:3000
-VUE_APP_BADHAN_API_BASE_URL=https://badhan-web-test.herokuapp.com
+VUE_APP_BADHAN_API_BASE_URL=http://localhost:3000
+#VUE_APP_BADHAN_API_BASE_URL=https://badhan-web-test.herokuapp.com
 VUE_APP_FRONTEND_BASE=http://localhost:8080/
 NODE_ENV=development

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.mmmbadhan"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 69
-        versionName "4.7.5"
+        versionCode 70
+        versionName "4.7.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -48,4 +48,4 @@ try {
     }
 } catch(Exception e) {
     logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
-}
+}

src/App.vue

@@ -28,6 +28,8 @@ import MessageBox from './components/MessageBox'
 import ConfirmationBox from './components/ConfirmationBox'
 import { myConsole } from './mixins/myConsole'
 
+import { isAppVersionBackdated } from './mixins/helpers'
+
 export default {
   name: 'app',
   data () {
@@ -52,7 +54,6 @@ export default {
     ...mapGetters('frontendSettings', ['getSettings'])
   },
   methods: {
-    ...mapActions('release', ['fetchtAppDetails']),
     ...mapActions('frontendSettings', ['fetchSettings']),
     ...mapMutations('confirmationBox', ['setConfirmationMessage']),
 
@@ -70,8 +71,7 @@ export default {
     async versionCheck () {
       await this.fetchSettings()
       const googlePlayAppVersion = this.getSettings.version
-
-      if (getIsNative() && googlePlayAppVersion !== await getLocalAppVersion()) {
+      if (getIsNative() && isAppVersionBackdated(await getLocalAppVersion(), googlePlayAppVersion)) {
         this.setConfirmationMessage({
           confirmationMessage: 'New version ' + googlePlayAppVersion + ' available. Please download the latest update.',
           confirmationAction: () => {

src/api/index.js

@@ -268,13 +268,7 @@ const handleGETSearchV3 = async (payload) => {
     return e.response
   }
 }
-const handleGETAppVersion = async () => {
-  try {
-    return await badhanAxios('/log/version')
-  } catch (e) {
-    return e.response
-  }
-}
+
 const handleGETStatistics = async () => {
   try {
     return await badhanAxios.get('/log/statistics')
@@ -428,7 +422,13 @@ const handleGETActiveDonors = async (payload) => {
     return e.response
   }
 }
-
+const handleGETAppVersions = async () => {
+  try {
+    return await badhanAxios.get('/log/version/v5')
+  } catch (e) {
+    return e.response
+  }
+}
 /// ///////////////////////FIREBASE API CALLS ////////////////////////
 const handleGETCredits = async () => {
   try {
@@ -444,6 +444,7 @@ const handleGETFrontendSettings = async () => {
     return e.response
   }
 }
+
 export {
   badhanAxios,
   firebaseAxios,
@@ -470,7 +471,6 @@ export {
   handlePOSTDonations,
   handleGETDonors,
   handleGETSearchV3,
-  handleGETAppVersion,
   handleGETStatistics,
   handleDELETELogs,
   handleGETVolunteersAll,
@@ -493,6 +493,7 @@ export {
   handlePOSTActiveDonors,
   handleDELETEActiveDonors,
   handleGETActiveDonors,
+  handleGETAppVersions,
 
   // firebase methods
   handleGETFrontendSettings

src/mixins/helpers.js

@@ -45,3 +45,11 @@ export const directCall = (phoneNumber) => {
 export const fixBackSlash = (text) => {
   return text.replaceAll('/', '/')
 }
+
+export const isAppVersionBackdated = (appVersion, remoteVersion) => {
+  const appVersionSegments = appVersion.split('.')
+  const remoteVersionSegments = remoteVersion.split('.')
+  const appVersionNumber = parseInt(appVersionSegments[0]) * 10000 + parseInt(appVersionSegments[1]) * 100 + parseInt(appVersionSegments[2])
+  const remoteVersionNumber = parseInt(remoteVersionSegments[0]) * 10000 + parseInt(remoteVersionSegments[1]) * 100 + parseInt(remoteVersionSegments[2])
+  return remoteVersionNumber > appVersionNumber
+}

src/store/store.js

@@ -9,7 +9,6 @@ import superadmin from './superadmin'
 import details from './details'
 import userDetails from './userDetails'
 import notification from './notification'
-import release from './release'
 import statistics from './statistics'
 import consoleStore from './consoleStore'
 import messageBox from './messageBox'
@@ -53,7 +52,6 @@ export const store = new Vuex.Store({
     details,
     userDetails,
     notification,
-    release,
     statistics,
     consoleStore,
     messageBox,

src/views/About.vue

@@ -4,10 +4,36 @@
     <transition-group name="slide-fade-down-snapout" mode="out-in">
       <Container :key="'versionLoaded'">
         <v-card-text>
-          <p><b>App Version on Google Play:</b> {{ getGooglePlayAppVersion }}</p>
-          <p><b>Local App Version:</b> {{ nativeAppVersion }}</p>
-          <p><b>Database:</b> {{ $getEnvironmentName() }}</p>
-          <p><b>Last Updated:</b> {{getBuildTime}}</p>
+          <v-simple-table>
+            <template v-slot:default>
+              <tbody>
+              <tr>
+                <td><b>App Version on Google Play: </b></td>
+                <td>{{ getGooglePlayAppVersion }}</td>
+              </tr>
+              <tr>
+                <td><b>Local App Version: </b></td>
+                <td>{{ nativeAppVersion }}</td>
+              </tr>
+              <tr>
+                <td><b>Github Release Version: </b></td>
+                <td><span v-if="versionLoaderFlag"><v-skeleton-loader type="text"></v-skeleton-loader></span><span v-else>{{githubVersion}}</span></td>
+              </tr>
+              <tr>
+                <td><b>Download from Github: </b></td>
+                <td><v-btn rounded :loading="versionLoaderFlag" x-small :href="githubLink" style="text-decoration: none"><v-icon left>mdi-download</v-icon>Download</v-btn></td>
+              </tr>
+              <tr>
+                <td><b>Database:</b></td>
+                <td>{{ $getEnvironmentName() }}</td>
+              </tr>
+              <tr>
+                <td><b>Last Updated:</b></td>
+                <td>{{getBuildTime}}</td>
+              </tr>
+              </tbody>
+            </template>
+          </v-simple-table>
         </v-card-text>
       </Container>
       <Container :key="'aboutPage'">
@@ -28,6 +54,7 @@ import readme from '../../README.md'
 import Container from '../components/Wrappers/Container'
 import { mapGetters } from 'vuex'
 import { getIsNative, getLocalAppVersion } from '../plugins/android_support'
+import { handleGETAppVersions } from '../api'
 
 export default {
   name: 'About',
@@ -52,13 +79,22 @@ export default {
   data () {
     return {
       text: readme,
-      nativeAppVersion: 'Web'
+      nativeAppVersion: 'Web',
+      versionLoaderFlag: false,
+      githubVersion: 'None',
+      githubLink: 'https://github.com'
     }
   },
   async mounted () {
     if (getIsNative()) {
       this.nativeAppVersion = await getLocalAppVersion()
     }
+    this.versionLoaderFlag = true
+    const appVersionResponse = await handleGETAppVersions()
+    this.versionLoaderFlag = false
+    if (appVersionResponse.status !== 200) return
+    this.githubVersion = appVersionResponse.data.githubReleaseVersion
+    this.githubLink = appVersionResponse.data.githubReleaseDownloadURL
   }
 }
 </script>

src/views/SignInCover.vue

@@ -30,9 +30,7 @@
                   >
                       Badhan
                     </span>
-                  <p class="subtitle-2">BUET Zone<br>
-
-                  </p>
+                  <p class="subtitle-2">BUET Zone</p>
                 </v-col>
                 <v-col class="text-center"
                        cols="12"