jobdone-shared-files 0.0.1-beta.74 → 0.0.1-beta.76
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ProjectManagement/projectNavbar.vue +8 -21
- package/README.md +3 -2
- package/package.json +1 -1
|
@@ -57,11 +57,8 @@
|
|
|
57
57
|
<nav class="navbar-nav navbar-main navbar-line navbar-line-lg ms-auto">
|
|
58
58
|
<div class="nav-item navbar-line-item btn nav-link border-0 dropdown">
|
|
59
59
|
<a class="dropdown-link" :href="rootDomain + 'Profile'">
|
|
60
|
-
<div class="thumbnail-content thumbnail-32 rounded-circle me-1" :style="'background-image: url(' +
|
|
61
|
-
<span class="text-user-name text-overflow">{{
|
|
62
|
-
<small class="ms-1">
|
|
63
|
-
(<span class="text-user-name text-overflow">{{userInfo.lastName}} {{userInfo.firstName}}</span>)
|
|
64
|
-
</small>
|
|
60
|
+
<div class="thumbnail-content thumbnail-32 rounded-circle me-1" :style="'background-image: url(' + userPicture + ');'"></div>
|
|
61
|
+
<span class="text-user-name text-overflow">{{userId}}</span>
|
|
65
62
|
</a>
|
|
66
63
|
</div>
|
|
67
64
|
<div class="nav-item navbar-line-item btn nav-link border-0 dropdown">
|
|
@@ -136,7 +133,11 @@
|
|
|
136
133
|
type: String,
|
|
137
134
|
required: true
|
|
138
135
|
},
|
|
139
|
-
|
|
136
|
+
userId: {
|
|
137
|
+
type: String,
|
|
138
|
+
required: true
|
|
139
|
+
},
|
|
140
|
+
userPicture: {
|
|
140
141
|
type: String,
|
|
141
142
|
required: true
|
|
142
143
|
},
|
|
@@ -175,13 +176,6 @@
|
|
|
175
176
|
selfIsApp: false
|
|
176
177
|
});
|
|
177
178
|
|
|
178
|
-
const userInfo = ref({
|
|
179
|
-
displayName: '',
|
|
180
|
-
lastName: '',
|
|
181
|
-
firstName: '',
|
|
182
|
-
picture: ''
|
|
183
|
-
});
|
|
184
|
-
|
|
185
179
|
const finalRootDomain = ref(props.rootDomain);
|
|
186
180
|
|
|
187
181
|
|
|
@@ -193,12 +187,10 @@
|
|
|
193
187
|
|
|
194
188
|
const data = await Promise.all([
|
|
195
189
|
axios.get(props.apiProjectInfo),
|
|
196
|
-
axios.get(props.apiProjectApps)
|
|
197
|
-
axios.get(props.apiCurrentUser)
|
|
190
|
+
axios.get(props.apiProjectApps)
|
|
198
191
|
]);
|
|
199
192
|
Object.assign(projectInfo.value, data[0].data);
|
|
200
193
|
Object.assign(navLinkObj.value, data[1].data);
|
|
201
|
-
Object.assign(userInfo.value, data[2].data);
|
|
202
194
|
|
|
203
195
|
let navbarElements = document.getElementsByClassName('navbar-content');
|
|
204
196
|
Array.from(navbarElements).forEach(function(item){
|
|
@@ -220,7 +212,6 @@
|
|
|
220
212
|
formatDate,
|
|
221
213
|
projectInfo,
|
|
222
214
|
navLinkObj,
|
|
223
|
-
userInfo,
|
|
224
215
|
finalRootDomain,
|
|
225
216
|
}
|
|
226
217
|
}
|
|
@@ -273,8 +264,4 @@
|
|
|
273
264
|
padding-left: 5.25rem;
|
|
274
265
|
padding-right: 1rem;
|
|
275
266
|
}
|
|
276
|
-
|
|
277
|
-
.text-user-name{
|
|
278
|
-
max-width: 5.5rem;
|
|
279
|
-
}
|
|
280
267
|
</style>
|
package/README.md
CHANGED
|
@@ -57,8 +57,9 @@
|
|
|
57
57
|
| project-id | project id | 是 |
|
|
58
58
|
| api-project-apps | 取得 project module & menu | 是 |
|
|
59
59
|
| api-project-info | 取得 project 資訊 | 是 |
|
|
60
|
-
|
|
|
61
|
-
|
|
|
60
|
+
| user-id | 傳入 user 的帳號 id | 是 |
|
|
61
|
+
| user-picture | 傳入 user 的大頭貼 | 是 |
|
|
62
|
+
| log-out-link | 登出連結 | 是 |
|
|
62
63
|
|
|
63
64
|
|
|
64
65
|
----
|