Commit @8a51801753f744013a8e78280404be09c7c48c03

72769d0

8a51801

client/resources/css/common.css

--- client/resources/css/common.css

+++ client/resources/css/common.css


   align-items: center;
 }
 
+.flex-end{
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+
 .pad-10 {
   padding: 10px;
 }

   justify-content: flex-end;
   align-items: center;
 }
+.blue-border-bnt{
+  padding: 8px 15px;
+  color: #417dff;
+  border: 1px solid #417dff;
+  border-radius: 3px;
+  background-color: #fff;
+}
 
 .blue-btn {
   padding: 8px 15px;

72769d0

8a51801

client/views/layout/AdminHeader.vue

--- client/views/layout/AdminHeader.vue

+++ client/views/layout/AdminHeader.vue


 <template>
     <header>
-        <p class="navigate_bar">{{ userId }}</p>
+        <div class="flex-end">
+        <p class="admin-bar">{{ mngrId.mngr_id }} 님</p>
+            <button class="blue-border-bnt" v-show="mngrId.mngr_id != null">로그아웃</button>
+        </div>
+        
     </header>
 </template>
 

 import { useRoute } from 'vue-router';
 
 export default {
+    props:{
+        mngrId:{type: Object}
+   },
     data() {
         return {};
     },

     border-bottom: 1px solid #eee;
     grid-area: header;
     background: #fff;
+    padding: 10px 30px;
 }
 
-header p {
+header p.admin-bar {
     padding: 15px 30px;
     font-size: 1.5rem;
     font-weight: 900;
+
 }
 </style>

72769d0

8a51801

client/views/pages/App.vue

--- client/views/pages/App.vue

+++ client/views/pages/App.vue


 <template>
    <div v-if="isAdminPage" class="admin-wrap">
       <div :class="{ 'layout-wrap': true }">
-         <AdminHeader v-show="mngrInfo.mngr_id != null" :userId="loggedInUserId"></AdminHeader>
+         <AdminHeader v-show="mngrInfo.mngr_id != null" :mngrId="mngrInfo"></AdminHeader>
          <AdminMenu v-show="mngrInfo.mngr_id != null"></AdminMenu>
          <div :class="{ 'login-wrap': mngrInfo.mngr_id == null, 'main-wrap': mngrInfo.mngr_id != null }">
             <router-view @updateIsLogin="isLogin = $event" />

       updateIsLogin: function (boolean) {
          console.log("newValue : ", newValue);
          this.isLogin = boolean;
-         this.loggedInUserId = "test";
       },
       //로그인 사용자 조회
       loginUserSelectOne: function (callback) {

    height: 100%;
    display: grid;
    grid-template-columns: 200px minmax(1234px, 1fr);
-   grid-template-rows: 50px 1fr 33px;
+   grid-template-rows: auto 1fr 33px;
    grid-template-areas:
       "nav header "
       "nav  main  "

72769d0

8a51801

client/views/pages/admin/login/Login.vue

--- client/views/pages/admin/login/Login.vue

+++ client/views/pages/admin/login/Login.vue


 
                 data: vm.mngrLogin
             }).then(function (response) {
-                // console.log("login - response : ", response.data);
-                // console.log("headers",response.headers);
-                console.log("1 : ", response.headers);
-                const cookies = response.headers['Set-Cookie']
-                const cookies2 = response.headers['set-cookie']
-                console.log("2", cookies, "3", cookies2)
                 if (response.data == true) {
                     vm.$emit("updateIsLogin", true);
                     vm.$router.push({ path: '/adm.page', query: {} });

...	...	@@ -63,12 +63,6 @@
63	63
64	64	data: vm.mngrLogin
65	65	}).then(function (response) {
66		- // console.log("login - response : ", response.data);
67		- // console.log("headers",response.headers);
68		- console.log("1 : ", response.headers);
69		- const cookies = response.headers['Set-Cookie']
70		- const cookies2 = response.headers['set-cookie']
71		- console.log("2", cookies, "3", cookies2)
72	66	if (response.data == true) {
73	67	vm.$emit("updateIsLogin", true);
74	68	vm.$router.push({ path: '/adm.page', query: {} });

...	...	@@ -6,6 +6,12 @@
6	6	align-items: center;
7	7	}
8	8
	9	+.flex-end{
	10	+ display: flex;
	11	+ justify-content: flex-end;
	12	+ align-items: center;
	13	+}
	14	+
9	15	.pad-10 {
10	16	padding: 10px;
11	17	}
...	...	@@ -64,6 +70,13 @@
64	70	justify-content: flex-end;
65	71	align-items: center;
66	72	}
	73	+.blue-border-bnt{
	74	+ padding: 8px 15px;
	75	+ color: #417dff;
	76	+ border: 1px solid #417dff;
	77	+ border-radius: 3px;
	78	+ background-color: #fff;
	79	+}
67	80
68	81	.blue-btn {
69	82	padding: 8px 15px;

...	...	@@ -1,6 +1,10 @@
1	1	<template>
2	2	<header>
3		- <p class="navigate_bar">{{ userId }}</p>
	3	+ <div class="flex-end">
	4	+ <p class="admin-bar">{{ mngrId.mngr_id }} 님</p>
	5	+ <button class="blue-border-bnt" v-show="mngrId.mngr_id != null">로그아웃</button>
	6	+ </div>
	7	+
4	8	</header>
5	9	</template>
6	10
...	...	@@ -8,6 +12,9 @@
8	12	import { useRoute } from 'vue-router';
9	13
10	14	export default {
	15	+ props:{
	16	+ mngrId:{type: Object}
	17	+ },
11	18	data() {
12	19	return {};
13	20	},
...	...	@@ -27,11 +34,13 @@
27	34	border-bottom: 1px solid #eee;
28	35	grid-area: header;
29	36	background: #fff;
	37	+ padding: 10px 30px;
30	38	}
31	39
32		-header p {
	40	+header p.admin-bar {
33	41	padding: 15px 30px;
34	42	font-size: 1.5rem;
35	43	font-weight: 900;
	44	+
36	45	}
37	46	</style>

...	...	@@ -1,7 +1,7 @@
1	1	<template>
2	2	<div v-if="isAdminPage" class="admin-wrap">
3	3	<div :class="{ 'layout-wrap': true }">
4		- <AdminHeader v-show="mngrInfo.mngr_id != null" :userId="loggedInUserId"></AdminHeader>
	4	+ <AdminHeader v-show="mngrInfo.mngr_id != null" :mngrId="mngrInfo"></AdminHeader>
5	5	<AdminMenu v-show="mngrInfo.mngr_id != null"></AdminMenu>
6	6	<div :class="{ 'login-wrap': mngrInfo.mngr_id == null, 'main-wrap': mngrInfo.mngr_id != null }">
7	7	<router-view @updateIsLogin="isLogin = $event" />
...	...	@@ -50,7 +50,6 @@
50	50	updateIsLogin: function (boolean) {
51	51	console.log("newValue : ", newValue);
52	52	this.isLogin = boolean;
53		- this.loggedInUserId = "test";
54	53	},
55	54	//로그인 사용자 조회
56	55	loginUserSelectOne: function (callback) {
...	...	@@ -196,7 +195,7 @@
196	195	height: 100%;
197	196	display: grid;
198	197	grid-template-columns: 200px minmax(1234px, 1fr);
199		- grid-template-rows: 50px 1fr 33px;
	198	+ grid-template-rows: auto 1fr 33px;
200	199	grid-template-areas:
201	200	"nav header "
202	201	"nav main "

Delete comment