Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
subugoe
emo
TIDO
Commits
5c5d6dff
Commit
5c5d6dff
authored
Jul 20, 2021
by
dindigala
Browse files
refactor: addressing review comments and renaming
parent
41e9596e
Pipeline
#213928
passed with stages
in 5 minutes and 13 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/App.vue
View file @
5c5d6dff
...
...
@@ -21,13 +21,13 @@
<q-page-container
class=
"root"
>
<router-view
:annotations=
"annotations"
:annotation-loaded=
"annotationLoaded"
:collection=
"collection"
:config=
"config"
:contenttypes=
"contentTypes"
:contenturls=
"contentUrls"
:fontsize=
"fontsize"
:imageurl=
"imageurl"
:isloading=
"isLoading"
:item=
"item"
:labels=
"config.labels"
:manifests=
"manifests"
...
...
@@ -54,7 +54,6 @@ export default {
data
()
{
return
{
annotations
:
[],
annotationLoaded
:
false
,
collection
:
{},
collectiontitle
:
''
,
config
:
{},
...
...
@@ -63,6 +62,7 @@ export default {
fontsize
:
16
,
imageurl
:
''
,
isCollection
:
false
,
isLoading
:
false
,
item
:
{},
itemurl
:
''
,
itemurls
:
[],
...
...
@@ -143,7 +143,7 @@ export default {
*/
async
getAnnotations
(
url
)
{
this
.
annotations
=
[];
this
.
annotation
Load
ed
=
false
;
this
.
is
Load
ing
=
false
;
try
{
const
annotations
=
await
this
.
request
(
url
);
...
...
@@ -163,7 +163,7 @@ export default {
}
catch
(
err
)
{
this
.
annotations
=
[];
}
finally
{
this
.
annotation
Load
ed
=
true
;
this
.
is
Load
ing
=
true
;
}
},
/**
...
...
src/components/annotations/annotations.vue
View file @
5c5d6dff
...
...
@@ -19,13 +19,13 @@
<AnnotationToggles
/>
<Loading
Progress
v-if=
"!
annotationLoaded
|| isProcessing"
:loading
progress=
"!annotationLoaded
|| isProcessing"
<Loading
v-if=
"!
isloading
|| isProcessing"
:loading
=
"!isloading
|| isProcessing"
/>
<AnnotationList
v-else-if=
"currentAnnotations.length &&
annotationLoaded
&& !isProcessing"
v-else-if=
"currentAnnotations.length &&
isloading
&& !isProcessing"
class=
"custom-font"
:configured-annotations=
"currentAnnotations"
:get-icon=
"getIcon"
...
...
@@ -34,7 +34,7 @@
/>
<div
v-else-if=
"
annotationLoaded &&
!currentAnnotations.length && !isProcessing"
v-else-if=
"!currentAnnotations.length &&
isloading &&
!isProcessing"
class=
"q-pa-sm"
>
<Notification
...
...
@@ -62,7 +62,7 @@ import AnnotationToggles from '@/components/annotations/toggles.vue';
import
AnnotationList
from
'
@/components/annotations/list.vue
'
;
import
AnnotationOptions
from
'
@/components/annotations/options.vue
'
;
import
Loading
Progress
from
'
@/components/loading.vue
'
;
import
Loading
from
'
@/components/loading.vue
'
;
import
Notification
from
'
@/components/notification.vue
'
;
export
default
{
...
...
@@ -71,7 +71,7 @@ export default {
AnnotationToggles
,
AnnotationList
,
AnnotationOptions
,
Loading
Progress
,
Loading
,
Notification
,
},
mixins
:
[
Annotation
],
...
...
@@ -80,7 +80,7 @@ export default {
type
:
Array
,
default
:
()
=>
[],
},
annotationLoaded
:
{
isloading
:
{
type
:
Boolean
,
default
:
false
,
},
...
...
@@ -157,7 +157,7 @@ export default {
this
.
configuredAnnotations
=
[];
const
interval
=
setInterval
(()
=>
{
if
(
this
.
annotationLoaded
)
{
if
(
this
.
isloading
)
{
this
.
configuredAnnotations
=
this
.
filterAnnotationTypes
();
const
firstTab
=
this
.
annotationTabs
.
find
((
x
)
=>
x
.
type
.
length
)?.
key
||
''
;
...
...
src/components/loading.vue
View file @
5c5d6dff
<
template
>
<q-inner-loading
:showing=
"loading
progress
"
:showing=
"loading"
>
<q-spinner
size=
"3em"
...
...
@@ -12,12 +12,9 @@
<
script
>
export
default
{
name
:
'
Loading
Progress
'
,
name
:
'
Loading
'
,
props
:
{
loadingprogress
:
{
type
:
Boolean
,
},
textcontentprogress
:
{
loading
:
{
type
:
Boolean
,
},
},
...
...
src/views/mainview.vue
View file @
5c5d6dff
...
...
@@ -85,10 +85,6 @@ export default {
type
:
Array
,
default
:
()
=>
[],
},
annotationLoaded
:
{
type
:
Boolean
,
default
:
false
,
},
collection
:
{
type
:
Object
,
default
:
()
=>
{},
...
...
@@ -113,6 +109,10 @@ export default {
type
:
String
,
default
:
()
=>
''
,
},
isloading
:
{
type
:
Boolean
,
default
:
false
,
},
item
:
{
type
:
Object
,
default
:
()
=>
{},
...
...
@@ -121,9 +121,6 @@ export default {
type
:
Object
,
default
:
()
=>
{},
},
loadingprogress
:
{
type
:
Boolean
,
},
manifests
:
{
type
:
Array
,
default
:
()
=>
[],
...
...
dindigala
@manikanth.dindigala
mentioned in merge request
!199 (closed)
·
Jul 20, 2021
mentioned in merge request
!199 (closed)
mentioned in merge request !199
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment