Merge branch 'front' into 'develop'

From front into develop See merge request s03-final/s03p31a303!284 Former-commit-id: 9e04ed7c134285de93fc023e0fd2851aecf09eac [formerly ebf7d17418b7a7a9ed09aab517cdff977258e46c] [formerly cd1878bd4dc15c2c9d03062b69990a21c4c194c7 [formerly 521bf581ad2501ee1a148c698a8382f8dca396d4]] Former-commit-id: 9edc2381b01f46af2680e01ac54f93e3c95a9dc8 [formerly 45ad2fd10021a91f1714adeaa6346e89d4cca9ac] Former-commit-id: 9b4993ce4b26aa1f88c9be90e28e475dee242617
soo-ni · Nov 24, 2020 · 13ba751 · 13ba751
2 parents 626d331 + 8887514
commit 13ba751
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 521 deletions.
diff --git a/frontend/RunWithMe/public/index.html b/frontend/RunWithMe/public/index.html
@@ -72,8 +72,7 @@
   <body class="text-left">
     <noscript>
       <strong>
-        We're sorry but gull-vue doesn't work properly without JavaScript
-        enabled. Please enable it to continue.</strong>
+        잠시 후 다시 시도해주세요. </strong>
     </noscript>
 
 

diff --git a/frontend/RunWithMe/src/store/modules/chat.js b/frontend/RunWithMe/src/store/modules/chat.js
@@ -5,6 +5,7 @@ import SockJS from 'sockjs-client';
 import store from "@/store/modules/groupchat.js";
 
 const state = {
+  visibleModal:false,
   currentUser: [],
   contactList: [],
   recentUsers: [],
@@ -25,6 +26,7 @@ const state = {
 
 
 const getters = {
+  getVisibleModal:state => state.visibleModal,
   getContactLists: state => state.contactList,
   getCurrentUser: state => state.currentUser,
   getRecentUser: state => state.recentUsers,
@@ -51,6 +53,9 @@ const actions = {
 };
 
 const mutations = {
+  mutateVisibleModal(state,visibleModal){
+    state.visibleModal = visibleModal
+  },
   updateSelectedUser: (state, id) => {
   },
   selectUserLists:(state) => {

diff --git a/frontend/RunWithMe/src/utils/http-common.js b/frontend/RunWithMe/src/utils/http-common.js
@@ -2,8 +2,8 @@ import axios from "axios";
 
 // axios 객체 생성
 export default axios.create({
-	baseURL: "https://k3a303.p.ssafy.io:8443/",
-  // baseURL: "http://localhost:8080/",
+	// baseURL: "https://k3a303.p.ssafy.io:8443/",
+  baseURL: "http://localhost:8080/",
 
   // baseURL: "https://878b31284fc1.ngrok.io",
     headers: {