Merge pull request #14 from misterpancn/feature-develop-buck

Feature develop buck

Author: misterpancn

README.md

@@ -30,16 +30,10 @@ npm run lint
 ```
 
 #### Config Setup
-```javascript
-const config = {
-  serviceAddress: 'localhost.com', // websocket service
-  websocketPort: 1234, // ws port
-  connectLimit: 10,
-  openssl: false,
-  apiVersion: 'prs.dingo.v1',
-  allMbPrefix: []
-}
-export default config
+```bash
+# setup config file
+cd src/renderer/store/config
+cp config.js.example config.js
 ```
 
 ---

build/icons/256x256.png

@@ -1,6 +1,6 @@
 {
   "name": "VueChat",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "[email protected]",
   "description": "An electron-vue project",
   "private": true,

build/icons/icon.icns

@@ -27,9 +27,9 @@ function createWindow () {
    * Initial window options
    */
   mainWindow = new BrowserWindow({
-    height: 350,
-    useContentSize: true,
-    width: 540,
+    height: config.windowSize.login.height,
+    // useContentSize: true,
+    width: config.windowSize.login.width,
     show: false
   })
 
@@ -43,13 +43,20 @@ function createWindow () {
   mainWindow.once('ready-to-show', () => {
     mainWindow.show()
   })
-  winModal = new BrowserWindow({ parent: mainWindow, modal: true, useContentSize: true, frame: false, show: false, alwaysOnTop: true })
+  winModal = new BrowserWindow({
+    parent: mainWindow,
+    modal: true,
+    useContentSize: true,
+    frame: false,
+    show: false,
+    alwaysOnTop: true
+  })
   winModal.loadURL(winModalURL)
   winModal.on('closed', () => {
     winModal = null
   })
   mainWindow.on('close', (e) => {
-    if (!exit) {
+    if (!exit && isShowExitNotify()) {
       e.preventDefault()
       dialog.showMessageBox(mainWindow, {
         type: 'warning',
@@ -67,6 +74,17 @@ function createWindow () {
       })
     }
   })
+  const { session } = require('electron')
+
+  session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
+    let c = {
+      responseHeaders: {
+        ...details.responseHeaders,
+        'Content-Security-Policy': config.contentSecurityPolicy ? config.contentSecurityPolicy : ['default-src \'self\' \'unsafe-inline\' \'unsafe-eval\' data:']
+      }
+    }
+    callback(c)
+  })
   handleUpdate()
 }
 
@@ -86,6 +104,7 @@ app.on('activate', () => {
 
 ipcMain.on('change-win-size', (e, args) => {
   mainWindow.setSize(args.width, args.height)
+  mainWindow.center()
 })
 ipcMain.on('show-win-notify', (e, args) => {
   if (!mainWindow.isFocused()) {
@@ -95,6 +114,7 @@ ipcMain.on('show-win-notify', (e, args) => {
 ipcMain.on('show-win-model', (e, args) => {
   winModal.setSize(args.width, args.height)
   winModal.show()
+  winModal.center()
   winModal.webContents.send('send-win-modal-img', args.src)
 })
 ipcMain.on('hide-win-modal', (e, args) => {
@@ -138,3 +158,14 @@ function handleUpdate () {
     autoUpdater.quitAndInstall()
   })
 }
+
+function isShowExitNotify () {
+  let size = mainWindow.getSize();
+  if (size[0] === config.windowSize.login.width && size[1] === config.windowSize.login.height) {
+    return false;
+  }
+  if (size[0] === config.windowSize.register.width && size[1] === config.windowSize.register.height) {
+    return false;
+  }
+  return true;
+}

build/icons/icon.ico

@@ -0,0 +1,106 @@
+<script>
+  import axios from '@/request'
+  export default {
+    data () {
+      return {
+        group: {}
+      }
+    },
+    computed: {
+      show: {
+        get: function () {
+          if (this.$store.getters.getGroupUserShow) {
+            this.$Spin.hide();
+            axios.getGroupMember(this.groupId).then((r) => {
+              this.group = r.data.data
+            })
+          }
+          return this.$store.getters.getGroupUserShow
+        },
+        set: function (val) {
+          this.$store.dispatch('setGroupUserShow', val)
+        }
+      },
+      groupId () {
+        return this.$store.getters.selectId
+      },
+      user () {
+        return this.$store.getters.getUser
+      }
+    },
+    methods: {
+      getUserInfo (uid) {
+        if (uid === this.user.userId) {
+          this.$Message.warning({
+            content: this.$t('notify.thisIsYou'),
+            duration: 3
+          });
+          return false;
+        }
+        this.$Spin.show()
+        this.$store.dispatch('setUserInfo', uid).then((r) => {
+          if (r.status === 200) {
+            this.$store.dispatch('upUserInfoShow', true)
+          }
+          this.$Spin.hide();
+        }).catch((e) => {
+          this.$Message.warning({
+            content: this.$t('notifyTitle.errorOccurred'),
+            duration: 3
+          });
+          this.$Spin.hide();
+        })
+      }
+    }
+  }
+</script>
+<template>
+    <Modal v-model="show" :mask-closable="false" :styles="{top: '50px'}" footer-hide>
+        <p slot="header" style="text-align: center;">{{ $t('chat.groupInformation') }}</p>
+        <div class="m-ui-content-group-user" v-if="group.group_id">
+            <div class="m-ui-gu-gi">
+                <Row class="m-ui-gu-row">
+                    <Col span="8">{{$t('chat.groupName')}}</Col><Col span="16">{{group.group_name}}</Col>
+                </Row>
+                <Row class="m-ui-gu-row">
+                    <Col span="8">{{$t('chat.chatId')}}</Col><Col span="16">{{group.group_number}}</Col>
+                </Row>
+                <Row class="m-ui-gu-row">
+                    <Col span="8">{{$t('chat.groupOwner')}}</Col><Col span="16">{{group.group_owner_name}}</Col>
+                </Row>
+                <Row class="m-ui-gu-row">
+                    <Col span="8">{{$t('chat.createTime')}}</Col><Col span="16">{{group.created_at}}</Col>
+                </Row>
+            </div>
+            <Divider orientation="left" size="small">{{$t('chat.groupMembers')}}</Divider>
+            <div class="m-ui-g-user" v-if="group.group_members" v-for="item in group.group_members" :key="item.group_user_id">
+                <img :src="item.photo" width="50" height="50" @click="getUserInfo(item.user_id)" style="cursor: pointer"><span>{{item.group_user_name}}</span>
+            </div>
+        </div>
+        <div class="m-ui-content-group-user" v-else><Spin fix></Spin></div>
+    </Modal>
+</template>
+<style lang="less">
+    .m-ui-content-group-user {
+        position: relative;
+        overflow-y: auto;
+        max-height: calc(100vh - 250px);
+        min-height: 150px;
+        .m-ui-g-user {
+            float: left;
+            width: 25%;
+            text-align: center;
+        }
+        .m-ui-gu-gi {
+            margin-bottom: 10px;
+            .m-ui-gu-row {
+                padding: 6px 0;
+            }
+        }
+        span {
+            vertical-align: middle;
+            text-align: center;
+            display: block;
+        }
+    }
+</style>

package.json

@@ -4,8 +4,7 @@
       components: { messageItem },
       data () {
         return {
-          message: null,
-          loading: false
+          message: null
         }
       },
       computed: {
@@ -49,10 +48,11 @@
             page: page
           }).then((res) => {
             this.message = res.data.data
-            console.log(res)
-            this.loading = true;
           }).catch((e) => {
-            this.loading = true;
+            this.$Message.warning({
+              content: this.$t('notifyTitle.errorOccurred'),
+              duration: 3
+            });
           })
         }
       }
@@ -61,31 +61,44 @@
 <template>
     <Modal v-model="show" :mask-closable="false" :styles="{top: '50px'}">
         <p slot="header" style="text-align: center;">{{ $t('chat.messageHistory') }}</p>
-        <div class="m-ui-content-message" v-if="message">
-            <Row v-for="item in message.data">
+        <div class="m-ui-content-message" v-if="message && message.data && message.data.length">
+            <Row v-for="item in message.data" :key="item.id">
                 <p>
                     <span style="margin-right: 10px;"><b>{{item.user_name}}</b></span>
                     <span style="color: darkturquoise"><Time :time="item.time * 1000" type="datetime" /></span>
                 </p>
                 <message-item v-bind:item="item"></message-item>
             </Row>
         </div>
+        <div v-else-if="message" class="m-ui-content-message"><p class="m-ui-p">{{$t('notify.noDataQueried')}}</p></div>
         <div v-else class="m-ui-content-message"><Spin fix></Spin></div>
         <div slot="footer" v-if="message">
-            <Page :total="message.total" :current="message.current_page" :page-size="parseInt(message.per_page)" @on-change="changePage" show-elevator />
+            <Page :total="message.total" :current="message.current_page" :page-size="parseInt(message.per_page)" @on-change="changePage" size="small" show-elevator show-total />
         </div>
-        <div v-else slot="footer"><Spin fix></Spin></div>
+        <div v-else slot="footer"></div>
     </Modal>
 </template>
 <style lang="less">
     .m-ui-content-message {
         position: relative;
         overflow: auto;
-        height: calc(100vh - 250px);
+        max-height: calc(100vh - 250px);
+        min-height: 100px;
         font-size: 12px;
         .m-mess-modal {
             background: none;
             width: 100% !important;
         }
+        .m-ui-p {
+            width:50%;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            -moz-transform: translate(-50%, -50%);
+            -ms-transform: translate(-50%, -50%);
+            -webkit-transform: translate(-50%, -50%);
+            transform: translate(-50%, -50%);
+            text-align: center;
+        }
     }
 </style>

src/main/index.js

@@ -27,7 +27,7 @@
       headers () {
         return {
           'Accept': 'application/' + config.apiVersion + '+json',
-          'Custom-Token': config.clientKey,
+          'Client-Key': config.clientKey,
           'Authorization': localStorage.getItem('tokenType') + ' ' + localStorage.getItem('token')
         }
       }

src/renderer/components/Chat/Modal/groupUser.vue

@@ -32,16 +32,37 @@
           saveLocal: true,
           page: 1
         }).then((res) => {
-          if (res.data.data && res.data.data.length === 0) {
+          if (res.data.data.data && res.data.data.data.length === 0) {
             this.$Message.warning({
               content: this.$t('notify.noDataQueried'),
               duration: 3
             });
           }
           this.loading = true;
         }).catch((e) => {
+          this.$Message.warning({
+            content: this.$t('notifyTitle.errorOccurred'),
+            duration: 3
+          });
           this.loading = true;
         })
+      },
+      getUserInfo (item) {
+        if (!item.self) {
+          this.$Spin.show();
+          this.$store.dispatch('setUserInfo', item.uid).then((r) => {
+            if (r.status === 200) {
+              this.$store.dispatch('upUserInfoShow', true)
+            }
+            this.$Spin.hide();
+          }).catch((e) => {
+            this.$Message.warning({
+              content: this.$t('notifyTitle.errorOccurred'),
+              duration: 3
+            });
+            this.$Spin.hide();
+          })
+        }
       }
     },
     directives: {