jobdone-shared-files 0.0.1-beta.74 → 0.0.1-beta.75
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 +5 -15
- package/README.md +2 -2
- package/package.json +1 -1
|
@@ -57,9 +57,9 @@
|
|
|
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(' + userInfo.picture + ');'"></div>
|
|
60
|
+
<div class="thumbnail-content thumbnail-32 rounded-circle me-1" :style="'background-image: url(' + (userInfo.picture != null ? userInfo.picture : '/dist/images/avatar-default.svg') + ');'"></div>
|
|
61
61
|
<span class="text-user-name text-overflow">{{userInfo.displayName}}</span>
|
|
62
|
-
<small class="ms-1">
|
|
62
|
+
<small class="d-flex ms-1">
|
|
63
63
|
(<span class="text-user-name text-overflow">{{userInfo.lastName}} {{userInfo.firstName}}</span>)
|
|
64
64
|
</small>
|
|
65
65
|
</a>
|
|
@@ -136,8 +136,8 @@
|
|
|
136
136
|
type: String,
|
|
137
137
|
required: true
|
|
138
138
|
},
|
|
139
|
-
|
|
140
|
-
type:
|
|
139
|
+
userInfo: {
|
|
140
|
+
type: Object,
|
|
141
141
|
required: true
|
|
142
142
|
},
|
|
143
143
|
logOutLink: {
|
|
@@ -175,13 +175,6 @@
|
|
|
175
175
|
selfIsApp: false
|
|
176
176
|
});
|
|
177
177
|
|
|
178
|
-
const userInfo = ref({
|
|
179
|
-
displayName: '',
|
|
180
|
-
lastName: '',
|
|
181
|
-
firstName: '',
|
|
182
|
-
picture: ''
|
|
183
|
-
});
|
|
184
|
-
|
|
185
178
|
const finalRootDomain = ref(props.rootDomain);
|
|
186
179
|
|
|
187
180
|
|
|
@@ -193,12 +186,10 @@
|
|
|
193
186
|
|
|
194
187
|
const data = await Promise.all([
|
|
195
188
|
axios.get(props.apiProjectInfo),
|
|
196
|
-
axios.get(props.apiProjectApps)
|
|
197
|
-
axios.get(props.apiCurrentUser)
|
|
189
|
+
axios.get(props.apiProjectApps)
|
|
198
190
|
]);
|
|
199
191
|
Object.assign(projectInfo.value, data[0].data);
|
|
200
192
|
Object.assign(navLinkObj.value, data[1].data);
|
|
201
|
-
Object.assign(userInfo.value, data[2].data);
|
|
202
193
|
|
|
203
194
|
let navbarElements = document.getElementsByClassName('navbar-content');
|
|
204
195
|
Array.from(navbarElements).forEach(function(item){
|
|
@@ -220,7 +211,6 @@
|
|
|
220
211
|
formatDate,
|
|
221
212
|
projectInfo,
|
|
222
213
|
navLinkObj,
|
|
223
|
-
userInfo,
|
|
224
214
|
finalRootDomain,
|
|
225
215
|
}
|
|
226
216
|
}
|
package/README.md
CHANGED
|
@@ -57,8 +57,8 @@
|
|
|
57
57
|
| project-id | project id | 是 |
|
|
58
58
|
| api-project-apps | 取得 project module & menu | 是 |
|
|
59
59
|
| api-project-info | 取得 project 資訊 | 是 |
|
|
60
|
-
|
|
|
61
|
-
| log-out-link
|
|
60
|
+
| user-info | 傳入 user 的當前名稱資訊 object，包含：displayName、lastName、firstName、picture | 是 |
|
|
61
|
+
| log-out-link | 登出連結 | 是 |
|
|
62
62
|
|
|
63
63
|
|
|
64
64
|
----
|