Skip to content

Commit 469a29e

Browse files
prakhyatoxprakhyatox
committed
fixing profile view page
1 parent 0d97940 commit 469a29e

File tree

9 files changed

+63
-51
lines changed

9 files changed

+63
-51
lines changed

‎src/components/Users/Profiles/Private/EditsTable.vue

+11-7
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,15 @@
5959
</template>
6060
<v-list>
6161
<v-list-item @click="previewRecord(item.fairsharingRecord.id)">
62-
<v-avatar><v-icon>fas fa-eye</v-icon></v-avatar>
62+
<template #prepend>
63+
<v-icon>fas fa-eye</v-icon>
64+
</template>
6365
<v-list-item-title> Preview record </v-list-item-title>
6466
</v-list-item>
6567
<v-list-item @click="goToRecord(item.fairsharingRecord.id)">
66-
<v-avatar><v-icon>fas fa-newspaper</v-icon></v-avatar>
68+
<template #prepend>
69+
<v-icon>fas fa-newspaper</v-icon>
70+
</template>
6771
<v-list-item-title> Go to record </v-list-item-title>
6872
</v-list-item>
6973
</v-list>
@@ -133,11 +137,11 @@ export default {
133137
...mapState('users', ['user']),
134138
headers() {
135139
let headers = [
136-
{text: 'Record', value: 'fairsharingRecord.name', align: 'center'},
137-
{text: 'Event', value: 'editEvent', align: 'center'},
138-
{text: 'Type', value: 'editType', align: 'center'},
139-
{text: 'Date', value: 'createdAt', align: 'center'},
140-
{text: 'Actions', value: 'actions', align: 'center', sortable: 'false'}
140+
{title: 'Record', value: 'fairsharingRecord.name', align: 'center'},
141+
{title: 'Event', value: 'editEvent', align: 'center'},
142+
{title: 'Type', value: 'editType', align: 'center'},
143+
{title: 'Date', value: 'createdAt', align: 'center'},
144+
{title: 'Actions', value: 'actions', align: 'center', sortable: 'false'}
141145
];
142146
return headers;
143147
},

‎src/components/Users/Profiles/Private/RecordsTable.vue

+9-3
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,24 @@
5050
</template>
5151
<v-list>
5252
<v-list-item @click="previewRecord(item.id)">
53-
<v-avatar><v-icon>fas fa-eye</v-icon></v-avatar>
53+
<template #prepend>
54+
<v-icon>fas fa-eye</v-icon>
55+
</template>
5456
<v-list-item-title> Preview record </v-list-item-title>
5557
</v-list-item>
5658
<v-list-item @click="goToRecord(item.id)">
57-
<v-avatar><v-icon>fas fa-newspaper</v-icon></v-avatar>
59+
<template #prepend>
60+
<v-icon>fas fa-newspaper</v-icon>
61+
</template>
5862
<v-list-item-title> Go to record </v-list-item-title>
5963
</v-list-item>
6064
<v-list-item
6165
v-if="(source !== 'maintenanceRequests' && source !== 'watchedRecords') || (source === 'watchedRecords' && user().is_curator)"
6266
@click="goToEdit(item.id)"
6367
>
64-
<v-avatar><v-icon>fas fa-pen</v-icon></v-avatar>
68+
<template #prepend>
69+
<v-icon>fas fa-pen</v-icon>
70+
</template>
6571
<v-list-item-title> Edit record </v-list-item-title>
6672
</v-list-item>
6773
</v-list>

‎src/components/Users/Profiles/Private/StatusPills.vue

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
>
77
<div
88
class="led d-inline-block"
9-
:class="{'green': status === 'approved', 'red': status === 'rejected', 'orange': status === 'pending', 'small': small}"
9+
:class="{'bg-green': status === 'approved', 'bg-red': status === 'rejected', 'bg-orange': status === 'pending', 'small': small}"
1010
/>
1111
<b
1212
v-if="!small"
1313
class="ml-2"
14-
:class="{'green--text': status === 'approved', 'red--text': status === 'rejected', 'orange--text': status === 'pending'}"
14+
:class="{'text-green': status === 'approved', 'text-red': status === 'rejected', 'text-orange': status === 'pending'}"
1515
>{{ status.toUpperCase() }}</b>
1616
</div>
1717

@@ -21,9 +21,9 @@
2121
>
2222
<div
2323
class="led mr-0"
24-
:class="{'green': recommended, 'grey': !recommended, 'small': small}"
24+
:class="{'bg-green': recommended, 'bg-grey': !recommended, 'small': small}"
2525
/>
26-
<b :class="recommended ? 'green--text' : 'grey--text'">
26+
<b :class="recommended ? 'text-green' : 'text-grey'">
2727
<span v-if="recommended">Yes</span>
2828
<span v-else>No</span>
2929
</b>
@@ -36,20 +36,20 @@
3636
<div
3737
class="led d-inline-block mr-0"
3838
:class="{
39-
'green': recordStatus === 'ready',
40-
'red': recordStatus === 'deprecated',
41-
'orange': recordStatus === 'in_development',
42-
'grey': recordStatus === 'uncertain',
39+
'bg-green': recordStatus === 'ready',
40+
'bg-red': recordStatus === 'deprecated',
41+
'bg-orange': recordStatus === 'in_development',
42+
'bg-grey': recordStatus === 'uncertain',
4343
'small': small
4444
}"
4545
/>
4646
<b
4747
v-if="!small"
4848
:class="{
49-
'green--text': recordStatus === 'ready',
50-
'red--text': recordStatus === 'deprecated',
51-
'orange--text': recordStatus === 'in_development',
52-
'grey--text': recordStatus === 'uncertain',
49+
'text-green': recordStatus === 'ready',
50+
'text-red': recordStatus === 'deprecated',
51+
'text-orange': recordStatus === 'in_development',
52+
'text-grey': recordStatus === 'uncertain',
5353
}"
5454
class="text-center"
5555
>
@@ -63,18 +63,18 @@
6363
>
6464
<div
6565
class="led d-inline-block"
66-
:class="{'green': approved, 'red': !approved, 'small': small}"
66+
:class="{'bg-green': approved, 'bg-red': !approved, 'small': small}"
6767
/>
6868
<div v-if="!small">
6969
<b
7070
v-if="approved"
71-
class="ml-2 green--text"
71+
class="ml-2 text-green"
7272
>
7373
APPROVED
7474
</b>
7575
<b
7676
v-if="!approved"
77-
class="ml-2 red--text"
77+
class="ml-2 text-red"
7878
>
7979
NOT APPROVED
8080
</b>
@@ -86,15 +86,15 @@
8686
<script>
8787
import stringUtils from "@/utils/stringUtils";
8888
export default {
89-
name: "StatusPills",
90-
mixins: [stringUtils],
91-
props: {
92-
status: {type: String, default: null},
93-
approved: {type: Boolean, default: null},
94-
small: {type: Boolean, default: false},
95-
recommended: {type: Boolean, default: null},
96-
recordStatus: {type: String, default: null}
97-
}
89+
name: "StatusPills",
90+
mixins: [stringUtils],
91+
props: {
92+
status: {type: String, default: null},
93+
approved: {type: Boolean, default: null},
94+
small: {type: Boolean, default: false},
95+
recommended: {type: Boolean, default: null},
96+
recordStatus: {type: String, default: null}
97+
}
9898
}
9999
</script>
100100

‎src/components/Users/Profiles/Private/ViewAwards.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ export default {
3131
computed: {
3232
headers() {
3333
let headers = [
34-
{text: 'Role', value: 'role', align: 'center'},
35-
{text: 'Start Date', value: 'start_date', align: 'center'},
36-
{text: 'End Date', value: 'end_date', align: 'center'},
34+
{title: 'Role', value: 'role', align: 'center'},
35+
{title: 'Start Date', value: 'start_date', align: 'center'},
36+
{title: 'End Date', value: 'end_date', align: 'center'},
3737
];
3838
return headers;
3939
},

‎src/components/Users/Profiles/Private/ViewOrganisations.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
{{ objToList(item.organisationTypes) }}
3030
</template>
3131

32-
<template slot="no-data">
32+
<template #no-data>
3333
<div>
3434
You are not a member of any organisations.
3535
</div>
@@ -50,9 +50,9 @@ export default {
5050
...mapState('users', ['user']),
5151
headers() {
5252
let headers = [
53-
{text: 'Name', value: 'name', align: 'center'},
54-
{text: 'Types', value: 'organisationTypes', align: 'center'},
55-
{text: 'Homepage', value: 'homepage', align: 'center'},
53+
{title: 'Name', value: 'name', align: 'center'},
54+
{title: 'Types', value: 'organisationTypes', align: 'center'},
55+
{title: 'Homepage', value: 'homepage', align: 'center'},
5656
];
5757
return headers;
5858
},

‎src/components/Users/Profiles/Private/ViewSavedSearchesTable.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ export default {
183183
...mapGetters("users", ["getUserRecords"]),
184184
headers() {
185185
let headers = [
186-
{ text: "Creator", value: "creator", align: "center", sortable: false },
187-
{ text: "Date", value: "date", align: "center", sortable: false },
188-
{ text: "Name", value: "name", align: "center", sortable: false },
189-
{ text: "Comments", value: "comments", align: "center", sortable: false },
190-
{ text: "Record", value: "record", align: "center", sortable: false },
191-
{ text: "Organisation", value: "organisation", align: "center", sortable: false },
186+
{ title: "Creator", value: "creator", align: "center", sortable: false },
187+
{ title: "Date", value: "date", align: "center", sortable: false },
188+
{ title: "Name", value: "name", align: "center", sortable: false },
189+
{ title: "Comments", value: "comments", align: "center", sortable: false },
190+
{ title: "Record", value: "record", align: "center", sortable: false },
191+
{ title: "Organisation", value: "organisation", align: "center", sortable: false },
192192
];
193193
if (this.user().isLoggedIn) {
194194
headers.push({ text: "Actions", value: "actions", align: "center", sortable: false },)

‎src/components/Users/UserProfileMenu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
icon
1212
v-bind="props"
1313
>
14-
<v-icon>
14+
<v-icon class="text-white">
1515
fa fa-bars
1616
</v-icon>
1717
</v-btn>

‎src/plugins/theme.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ const fairSharingTheme = {
3636
bg_database_record_card: "#f9f9f9",
3737
bg_policy_record_card: "#f9f9f9",
3838
bg_collection_record_card: "#f0f5f9",
39-
4039
dark_gray: "#727272",
40+
orcid_green: "#a6ce39",
4141

4242
//lighten colors
4343
subject_color_lighten_2: "#FFB458",

‎src/views/Users/User.vue

+4-2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@
114114
rel="external"
115115
target="_blank"
116116
variant="elevated"
117+
color="orcid_green"
118+
style="color:white !important"
117119
>
118120
View ORCID profile
119121
</v-btn>
@@ -135,7 +137,7 @@
135137
</v-card>
136138
</v-col>
137139

138-
<v-col cols="12" xl="4" lg="6" md="6" sm="12" xs="12" class="pt-0">
140+
<v-col cols="12" xl="4" lg="6" md="12" sm="12" xs="12" class="pt-0">
139141
<v-card height="100%" class="d-flex flex-column rounded-0">
140142
<v-card-title class="bg-primary text-white py-3">
141143
Record Edits
@@ -225,7 +227,7 @@
225227
class="bg-primary text-white py-3 flex-column align-start"
226228
>
227229
<span>Saved Searches</span>
228-
<v-card-subtitle class="pa-0">
230+
<v-card-subtitle class="pa-0 opacity-100" style="white-space: normal">
229231
Clicking on the name of a saved search will take you to its
230232
search results. From the results page, if you are logged in
231233
you may further refine the search and/or save the search

0 commit comments

Comments
 (0)