diff --git a/public/package.json b/public/package.json index f7872ce..c5b157b 100644 --- a/public/package.json +++ b/public/package.json @@ -16,9 +16,11 @@ "author": "Thuan Envity", "dependencies": { "axios": "^0.19.0", + "bootstrap": "^4.4.0", "core-js": "^3.3.2", "lodash": "^4.17.15", "moment": "^2.24.0", + "popper.js": "^1.16.0", "socket.io-client": "^2.3.0", "vue": "^2.6.10", "vue-router": "^3.1.3", @@ -31,6 +33,9 @@ "babel-eslint": "^10.0.3", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.0.0", + "jquery": "^3.4.1", + "node-sass": "^4.13.0", + "sass-loader": "^8.0.0", "vue-template-compiler": "^2.6.10" }, "eslintConfig": { diff --git a/public/src/App.vue b/public/src/App.vue index b2aca22..52de933 100644 --- a/public/src/App.vue +++ b/public/src/App.vue @@ -32,6 +32,7 @@ export default { // this.socket.on("disconnect", () => { // this.rooms = []; // }); + document.body.style.overflowY = "hidden"; }, methods: { connect() { @@ -52,4 +53,8 @@ export default { } }; - + diff --git a/public/src/assets/icon_group.png b/public/src/assets/icon_group.png new file mode 100644 index 0000000..4fb4930 Binary files /dev/null and b/public/src/assets/icon_group.png differ diff --git a/public/src/assets/icon_search.png b/public/src/assets/icon_search.png new file mode 100644 index 0000000..b1c328b Binary files /dev/null and b/public/src/assets/icon_search.png differ diff --git a/public/src/assets/icon_send.png b/public/src/assets/icon_send.png new file mode 100644 index 0000000..127e78a Binary files /dev/null and b/public/src/assets/icon_send.png differ diff --git a/public/src/assets/icon_user.png b/public/src/assets/icon_user.png new file mode 100644 index 0000000..9f328cb Binary files /dev/null and b/public/src/assets/icon_user.png differ diff --git a/public/src/components/HelloWorld.vue b/public/src/components/HelloWorld.vue deleted file mode 100644 index 879051a..0000000 --- a/public/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - {{ msg }} - - For a guide and recipes on how to configure / customize this project, - check out the - vue-cli documentation. - - Installed CLI Plugins - - babel - eslint - - Essential Links - - Core Docs - Forum - Community Chat - Twitter - News - - Ecosystem - - vue-router - vuex - vue-devtools - vue-loader - awesome-vue - - - - - - - - diff --git a/public/src/components/auth/Login.vue b/public/src/components/auth/Login.vue index 725aaef..b67015b 100644 --- a/public/src/components/auth/Login.vue +++ b/public/src/components/auth/Login.vue @@ -1,48 +1,40 @@ - - - Sign In - - - - - We are excited to - see you again! - - - - - Username - - - - - Password - - - Do you have an account? - - Register - - Login - - - + + + + + + + + + + + + Login + + + Don't have an account? + Sign up + here + + + + + diff --git a/public/src/components/auth/Register.vue b/public/src/components/auth/Register.vue index 61112bb..ab91978 100644 --- a/public/src/components/auth/Register.vue +++ b/public/src/components/auth/Register.vue @@ -1,43 +1,48 @@ - - - Register Here - - We hope will you enjoy our application! - - + + + + - We always welcome new Envity - - + - Username - + - Password - - Already have an account? - - Login + + - Register + Register + + Already have an account? + Sign in + - + @@ -52,6 +57,50 @@ export default { errors: [] }; }, - + }; + diff --git a/public/src/components/auth/user.jpg b/public/src/components/auth/user.jpg new file mode 100644 index 0000000..84a94ef Binary files /dev/null and b/public/src/components/auth/user.jpg differ diff --git a/public/src/components/icon/icon_group.png b/public/src/components/icon/icon_group.png new file mode 100644 index 0000000..4fb4930 Binary files /dev/null and b/public/src/components/icon/icon_group.png differ diff --git a/public/src/components/icon/icon_user.png b/public/src/components/icon/icon_user.png new file mode 100644 index 0000000..9f328cb Binary files /dev/null and b/public/src/components/icon/icon_user.png differ diff --git a/public/src/components/room/Conservation.vue b/public/src/components/room/Conservation.vue new file mode 100644 index 0000000..92aa700 --- /dev/null +++ b/public/src/components/room/Conservation.vue @@ -0,0 +1,95 @@ + + + + + {{ mess.content }} + + + + + + + \ No newline at end of file diff --git a/public/src/components/room/ListFriend.vue b/public/src/components/room/ListFriend.vue new file mode 100644 index 0000000..e1a5458 --- /dev/null +++ b/public/src/components/room/ListFriend.vue @@ -0,0 +1,151 @@ + + + + + + + + + {{ friend.user_name }} + + + + + + + + + + \ No newline at end of file diff --git a/public/src/components/room/ListRoom.vue b/public/src/components/room/ListRoom.vue index 607df30..10d4510 100644 --- a/public/src/components/room/ListRoom.vue +++ b/public/src/components/room/ListRoom.vue @@ -1,24 +1,20 @@ - - - Room List - - - - Total Rooms: {{ rooms.length }} - - - - {{room.name}} - - - - + + + + + + + {{ room.room_name }} + + + + + + diff --git a/public/src/main.js b/public/src/main.js index 0add49e..3760845 100644 --- a/public/src/main.js +++ b/public/src/main.js @@ -5,6 +5,11 @@ import axios from 'axios'; // import io from 'socket.io-client'; import setAuthToken from './utils/authToken'; import moment from 'moment'; +import 'bootstrap'; +import 'bootstrap/dist/css/bootstrap.min.css'; +import 'bootstrap/js/dist/modal' +import 'bootstrap/js/dist/tooltip' +import 'bootstrap/scss/bootstrap.scss' Vue.config.productionTip = false diff --git a/public/src/router.js b/public/src/router.js index c0fc978..6ab0168 100644 --- a/public/src/router.js +++ b/public/src/router.js @@ -7,6 +7,7 @@ import Vue from 'vue'; import Router from 'vue-router'; import Login from './components/auth/Login'; import Register from './components/auth/Register'; + Vue.use(Router); const router = new Router({ @@ -36,7 +37,7 @@ const router = new Router({ { path: '*', component: () => import('@/components/error/Error.vue') - } + }, ] }); diff --git a/public/src/views/Home.vue b/public/src/views/Home.vue index 59f15fd..21bc7f4 100644 --- a/public/src/views/Home.vue +++ b/public/src/views/Home.vue @@ -1,10 +1,184 @@ - - Home + + + + + + USER NAME + + + + + + + + + + + + + {{ tab }} + + + + + + + + + + + ROOM NAME + + + + + + + + + + + + + + + + + +
- For a guide and recipes on how to configure / customize this project, - check out the - vue-cli documentation. -
We hope will you enjoy our application!