Browse Source

refactor: add loader in project load

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/852/head
Pranav C 3 years ago
parent
commit
98b999af1f
  1. 4
      packages/nc-gui/package.json
  2. 86
      packages/nc-gui/pages/projects/index.vue

4
packages/nc-gui/package.json

@ -3,12 +3,12 @@
"version": "0.11.35", "version": "0.11.35",
"scripts": { "scripts": {
"dev": "EE=true nuxt", "dev": "EE=true nuxt",
"build": "nuxt build", "build": "EE=true nuxt build",
"lint": "eslint . --ext .js,.vue --fix --quiet", "lint": "eslint . --ext .js,.vue --fix --quiet",
"start": "EE=true nuxt start", "start": "EE=true nuxt start",
"generate": "nuxt generate", "generate": "nuxt generate",
"build:copy": "EE=true npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh ./dist/ ../nc-lib-gui/lib/dist/", "build:copy": "EE=true npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh ./dist/ ../nc-lib-gui/lib/dist/",
"build:copy:jsdeliver": "EE=true npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh ./dist/ ../nc-lib-gui/lib/dist/ ; npm publish ../nc-lib-gui" "build:copy:jsdeliver": "npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh ./dist/ ../nc-lib-gui/lib/dist/ ; npm publish ../nc-lib-gui"
}, },
"dependencies": { "dependencies": {
"@mdi/font": "^5.9.55", "@mdi/font": "^5.9.55",

86
packages/nc-gui/pages/projects/index.vue

@ -286,43 +286,50 @@
> >
<td data-v-step="2"> <td data-v-step="2">
<div class="d-flex align-center"> <div class="d-flex align-center">
<v-icon <v-progress-circular
x-small v-if="props.item.loading"
class="mr-2" class="mr-2"
:color=" size="15"
!props.item.allowed ? 'blue' :( indeterminate
props.item.status === 'started' />
? 'green' <template v-else>
: props.item.status === 'stopped' <v-icon
? 'orange' x-small
: 'orange' class="mr-2"
) :color="
" !props.item.allowed ? 'blue' :(
> props.item.status === 'started'
mdi-moon-full ? 'green'
</v-icon> : props.item.status === 'stopped'
<!-- Accessible via GraphQL APIs / Accessible via REST APIs --> ? 'orange'
<x-icon : 'orange'
small )
:tooltip=" "
props.item.projectType === 'graphql' >
? $t('projects.project_api_type_tooltip_graphql') mdi-moon-full
: $t('projects.project_api_type_tooltip_rest') </v-icon>
" <!-- Accessible via GraphQL APIs / Accessible via REST APIs -->
icon.class="mr-2" <x-icon
:color=" small
props.item.projectType === 'graphql' :tooltip="
? 'pink' props.item.projectType === 'graphql'
: 'green' ? $t('projects.project_api_type_tooltip_graphql')
" : $t('projects.project_api_type_tooltip_rest')
> "
{{ icon.class="mr-2"
props.item.projectType === 'graphql' :color="
? 'mdi-graphql' props.item.projectType === 'graphql'
: 'mdi-code-json' ? 'pink'
}} : 'green'
</x-icon> "
>
{{
props.item.projectType === 'graphql'
? 'mdi-graphql'
: 'mdi-code-json'
}}
</x-icon>
</template>
<v-tooltip bottom> <v-tooltip bottom>
<template #activator="{on}"> <template #activator="{on}">
<div <div
@ -1091,7 +1098,7 @@ export default {
} }
this.loaded = true this.loaded = true
}, },
projectRouteHandler(project) { async projectRouteHandler(project) {
if (!project.allowed) { if (!project.allowed) {
this.$toast.info(`Contact following owner email to get project access : ${project.owner}`).goAway(5000) this.$toast.info(`Contact following owner email to get project access : ${project.owner}`).goAway(5000)
return return
@ -1105,11 +1112,12 @@ export default {
.goAway(5000) .goAway(5000)
return return
} }
this.$set(project, 'loading', true)
if (!this.deleteBtnClicked) { if (!this.deleteBtnClicked) {
this.$router.push({ await this.$router.push({
path: `/nc/${project.id}` path: `/nc/${project.id}`
}) })
// this.$set(project, 'loading', false)
} }
}, },
async projectEdit(project) { async projectEdit(project) {

Loading…
Cancel
Save