Refined codes for the merge

cms/config/database.js

 const path = require('path');
 
-// module.exports = ({ env }) => ({
-//   connection: {
-//     client: 'postgres',
-//     connection: {
-//       host: env('DATABASE_HOST', '127.0.0.1'),
-//       port: env.int('DATABASE_PORT', 5432),
-//       database: env('DATABASE_NAME', 'ddcode'),
-//       user: env('DATABASE_USERNAME', 'strapi'),
-//       password: env('DATABASE_PASSWORD', 'strapi'),
-//       schema: env('DATABASE_SCHEMA', 'public'), // Not required
-//     },
-//     debug: false,
-//   },
-// });
-
-// Uncomment for using SQLite instead of postgres
 module.exports = ({ env }) => ({
   connection: {
-    client: 'sqlite',
+    client: 'postgres',
     connection: {
-      filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+      host: env('DATABASE_HOST', '127.0.0.1'),
+      port: env.int('DATABASE_PORT', 5432),
+      database: env('DATABASE_NAME', 'ddcode'),
+      user: env('DATABASE_USERNAME', 'strapi'),
+      password: env('DATABASE_PASSWORD', 'strapi'),
+      schema: env('DATABASE_SCHEMA', 'public'), // Not required
     },
-    useNullAsDefault: true,
+    debug: false,
   },
 });
+
+// Uncomment for using SQLite instead of postgres
+// module.exports = ({ env }) => ({
+//   connection: {
+//     client: 'sqlite',
+//     connection: {
+//       filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+//     },
+//     useNullAsDefault: true,
+//   },
+// });

web/src/components/CMS/fetchProfile.vue

@@ -15,7 +15,6 @@ export default {
     return {
       loading: true,
       response: '',
-      
       isDev: process.env.NODE_ENV === 'development'
     }
   },
@@ -25,7 +24,7 @@ export default {
     },
   },
   methods: {
-    async getItems() {
+    getItems() {
       const vm = this;
 
       // console.log(host)
@@ -33,7 +32,6 @@ export default {
       if(vm.isDev) {
         host = require('../js/const').devApiHost;
       }
-
       // console.log(vm.isExperimental)
 
       let url = `${host}/api/users/me`;
@@ -58,43 +56,12 @@ export default {
         .then((response) => {
           // /* eslint-disable no-console */
           //console.log(response);
-          
 
           setTimeout(() => {
             vm.loading = false;
-            vm.response = response;
-            }, 10);
+            vm.response = response
+          }, 10);
         });
-      //   const response= await fetch(url, {
-      //   method: 'GET',
-      //   mode: 'cors',
-      //   cache: 'no-cache',
-      //   headers: {
-      //     Authorization: `Bearer ${jwt}`
-      //   }
-      // })
-      // const responseData= await response.json()
-      // vm.loading = false;
-      // vm.response = responseData;
-            
-      // let getRoleUrl= `${host}/api/users-permissions/roles/${vm.response.id}`
-      // console.log("getRole url", getRoleUrl);
-
-      // const responseRole= await fetch(getRoleUrl, {
-      //   method: 'GET',
-      //   mode: 'cors',
-      //   cache: 'no-cache',
-      //   headers: {
-      //     Authorization: `Bearer ${jwt}`
-      //   }
-      // })
-      // const responseRoleData= await responseRole.json();
-      
-      // console.log("role is", vm.response);
-      // const roleName= responseRoleData.role.name;
-      // vm.response = {...vm.response, role: roleName }
-      
-      
     }
   },
   mounted() {

web/src/components/CMS/fetchUpdateItems.vue

@@ -45,8 +45,6 @@ export default {
         encodeValuesOnly: true,
       });
 
-    
-
       let url = `${host}/api/update-items?${query}`;
 
       const jwt = vm.jwt;

web/src/components/js/const.js

 
 export const host = '/api';
 // export const devHost = 'http://localhost:5001';
-export const devHost = 'https://dev.ddcode.org/api';
+export const devHost = '/api';
 
 export const apiHost = 'http://localhost:1337'
 export const devApiHost = 'http://localhost:1337'

web/src/views/Login.vue

@@ -60,7 +60,7 @@ export default {
         });
 
         const { jwt, user } = res.data
-        console.log(user)
+        // console.log(user)
         window.localStorage.setItem('jwt', jwt)
         window.localStorage.setItem('userData', JSON.stringify(user))
 

web/src/views/Profile.vue

@@ -120,8 +120,7 @@ export default {
       return this.$store.getters['User/userData']
     },
     getRole: function(){
-      let role = this.$store.getters['User/userRole']
-      return role
+      return this.$store.getters['User/userRole']
     }
   },
   methods: {