Skip to content

Commit

Permalink
updated fa-question-circle icon with fas fa-question-circle
Browse files Browse the repository at this point in the history
  • Loading branch information
prakhyatox committed Mar 5, 2025
1 parent 6932597 commit a77cedd
Show file tree
Hide file tree
Showing 28 changed files with 1,124 additions and 1,107 deletions.
29 changes: 13 additions & 16 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<template>
<v-app id="app">
<!-- <div-->
<!-- v-if="loading"-->
<!-- style="height:100vh; color: white"-->
<!-- >-->
<!-- loading-hidden-->
<!-- </div>-->
<!-- <div-->
<!-- v-if="loading"-->
<!-- style="height:100vh; color: white"-->
<!-- >-->
<!-- loading-hidden-->
<!-- </div>-->
<v-navigation-drawer
v-if="$vuetify.display.mdAndDown"
v-model="UIGeneralStatus.drawerVisibilityState"
left
width="70%"
location="left"
>
<NavigationDrawer />
</v-navigation-drawer>
<HeaderComp />
<v-alert
v-if="readOnlyMode"
class="mt-4 mx-4"
type="info"
>
The site currently only allows viewing of records and editing is disabled. We hope to restore normal service
as soon as possible. Please accept our apologies for any inconvenience
<v-alert v-if="readOnlyMode" class="mt-4 mx-4" type="info">
The site currently only allows viewing of records and editing is disabled.
We hope to restore normal service as soon as possible. Please accept our
apologies for any inconvenience
</v-alert>
<Jumbotron />
<PublicMessages />
Expand Down Expand Up @@ -69,7 +65,8 @@ export default {
min-height: 99vh;
}
html, body {
html,
body {
height: 100%;
}
</style>
78 changes: 40 additions & 38 deletions src/components/Editor/AdditionalInformation/EditAdditionalInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
v-model="formValid"
>
<v-card>
<v-card-title class="grey lighten-4 blue--text">
<v-card-title class="bg-grey-lighten-4 text-blue">
Edit Additional Information
</v-card-title>
<Alerts target="additionalInformation" />
Expand Down Expand Up @@ -37,26 +37,26 @@
<v-tooltip
v-if="getFields('array')[fieldName]['description']"
class="d-inline-block mr-2"
bottom
location="bottom"
>
<template #activator="{ on }">
<v-icon v-on="on">
fa-question-circle
<template #activator="{ props }">
<v-icon v-bind="props">
fas fa-question-circle
</v-icon>
</template>
{{ getFields('array')[fieldName]['description'] }}
</v-tooltip>
<b class="body-1 blue--text"> {{ cleanString(fieldName).toUpperCase() }} </b>
<b class="text-body-1 text-blue"> {{ cleanString(fieldName).toUpperCase() }} </b>

<v-tooltip
bottom
location="bottom"
class="d-inline-block mr-2"
>
<template #activator="{ on }">
<template #activator="{ props }">
<v-icon
small
class="blue--text white ml-2 iconReposition"
v-on="on"
size="small"
class="text-blue bg-white ml-2 iconReposition"
v-bind="props"
@click="createItem(fieldName,
allowedFields.definitions[field.items.$ref.replace('#/definitions/', '')].properties,
allowedFields.definitions[field.items.$ref.replace('#/definitions/', '')].required || []
Expand Down Expand Up @@ -85,7 +85,7 @@
>
<v-card
height="100%"
class="d-flex flex-column grey lighten-4"
class="d-flex flex-column bg-grey-lighten-4"
>
<v-card-text
style="flex-grow: 1;"
Expand All @@ -101,27 +101,27 @@
<v-card-actions>
<v-spacer />
<v-btn
class="success"
class="bg-success"
fab
x-small
size="x-small"
@click="showOverlay(itemIndex,
fieldName, item, allowedFields.definitions[field.items.$ref.replace('#/definitions/', '')].properties,
allowedFields.definitions[field.items.$ref.replace('#/definitions/', '')].required || []
)"
>
<v-icon
x-small
size="x-small"
>
fa-pen
</v-icon>
</v-btn>
<v-btn
class="error"
class="bg-error"
fab
x-small
size="x-small"
@click="removeItem(fieldName, itemIndex)"
>
<v-icon x-small>
<v-icon size="x-small">
fa-trash
</v-icon>
</v-btn>
Expand All @@ -145,23 +145,23 @@
xl="3"
>
<v-card
class="grey lighten-4"
class="bg-grey-lighten-4"
height="100%"
>
<v-card-title>
<v-tooltip
v-if="getFields('object')[fieldName]['description']"
bottom
location="bottom"
class="d-inline-block mr-2"
>
<template #activator="{ on }">
<v-icon v-on="on">
fa-question-circle
<template #activator="{ props }">
<v-icon v-bind="props">
fas fa-question-circle
</v-icon>
</template>
{{ getFields('object')[fieldName]['description'] }}
</v-tooltip>
<b class="body-1 blue--text"> {{ cleanString(fieldName).toUpperCase() }}: </b>
<b class="text-body-1 text-blue"> {{ cleanString(fieldName).toUpperCase() }}: </b>
</v-card-title>
<v-card-text>
<FieldInput
Expand All @@ -180,7 +180,7 @@
<v-row v-if="Object.keys(getFields('enum')).length > 0">
<!-- there are currently no fields with type: enum -->
<v-col cols="12">
<b class="body-1 blue--text"> BASE FIELDS: </b>
<b class="text-body-1 text-blue"> BASE FIELDS: </b>
</v-col>
<v-col
xs="12"
Expand Down Expand Up @@ -221,15 +221,15 @@
<v-card-actions>
<v-btn
:disabled="!formValid"
class="info"
class="bg-info"
:loading="saving"
@click="saveRecord(false)"
>
Save and continue
</v-btn>
<v-btn
:disabled="!formValid"
class="info"
class="bg-info"
:loading="saving"
@click="saveRecord(true)"
>
Expand All @@ -250,7 +250,7 @@
ref="editAdditionalInformationOverlay"
v-model="subFormValid"
>
<v-card-title class="green white--text">
<v-card-title class="bg-green text-white">
Edit {{ cleanString(overlay.fieldName) }} {{ overlay.id + 1 }}
</v-card-title>
<v-card-text class="pt-4">
Expand All @@ -261,12 +261,12 @@
>
<v-tooltip
v-if="overlay.template[fieldName].description"
bottom
location="bottom"
class="d-inline-block mr-2"
>
<template #activator="{ on }">
<v-icon v-on="on">
fa-question-circle
<template #activator="{ props }">
<v-icon v-bind="props">
fas fa-question-circle
</v-icon>
</template>
{{ overlay.template[fieldName].description }}
Expand All @@ -275,15 +275,15 @@
v-if="!field.enum"
v-model="overlay.fields[fieldName]"
:label="fieldName"
outlined
variant="outlined"
class="field"
:rules="rules(fieldName, overlay.required)"
/>
<v-autocomplete
v-else
v-model="overlay.fields[fieldName]"
:label="fieldName"
outlined
variant="outlined"
:items="field.enum"
class="field"
:rules="rules(fieldName, overlay.required)"
Expand All @@ -293,13 +293,13 @@
<v-card-actions>
<v-btn
:disabled="!subFormValid"
class="success"
class="bg-success"
@click="addItem()"
>
Submit item
</v-btn>
<v-btn
class="error"
class="bg-error"
@click="hideOverlay()"
>
Cancel
Expand Down Expand Up @@ -413,7 +413,8 @@ export default {
};
/* istanbul ignore next */
this.$nextTick(() => {
if(this.$refs['editAdditionalInformationOverlay']) this.$refs['editAdditionalInformationOverlay'].validate()}
if(this.$refs['editAdditionalInformationOverlay']) this.$refs['editAdditionalInformationOverlay'].validate()
}
);
},
hideOverlay(){
Expand All @@ -439,7 +440,8 @@ export default {
});
/* istanbul ignore next */
this.$nextTick(() => {
if(this.$refs['editAdditionalInformationOverlay']) this.$refs['editAdditionalInformationOverlay'].validate()}
if(this.$refs['editAdditionalInformationOverlay']) this.$refs['editAdditionalInformationOverlay'].validate()
}
);
},
addItem(){
Expand Down
Loading

0 comments on commit a77cedd

Please sign in to comment.