github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #1726 from nocodb/add-api-docs-link 

Add api documentation link in project dashboard
pull/1728/head
աɨռɢӄաօռɢ 3 years ago committed by GitHub
parent
3c7bacdd2e 038b92d83c
commit
782a6b2de0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 90 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      packages/nc-gui/components/ProjectTreeView.vue
  2. 115
      packages/nc-gui/components/project/spreadsheet/components/extras.vue
  3. 3
      packages/nc-gui/mixins/device.js
  4. 2
      packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts

42
packages/nc-gui/components/ProjectTreeView.vue
Unescape View File

@ -580,7 +580,7 @@
<template v-if="_isUIAllowed('settings')"> <template v-if="_isUIAllowed('settings')">
<v-divider /> <v-divider />
<div class="py-3 pl-5 pr-3 d-flex align-center"> <div class="pt-3 pl-5 pr-3 d-flex align-center pb-2">
<settings-modal> <settings-modal>
<template #default="{click}"> <template #default="{click}">
<div v-t="['project-settings']" class="caption pointer nc-team-settings" @click="click"> <div v-t="['project-settings']" class="caption pointer nc-team-settings" @click="click">
@ -593,6 +593,17 @@
</settings-modal> </settings-modal>
</div> </div>
</template> </template>
<div
v-t="['api-docs']"
class="caption pointer nc-docs pb-3 pl-5 pr-3 pt-2 d-flex align-center"
@click="openLink('https://apis.nocodb.com')"
>
<v-icon small class="mr-2">
mdi-api
</v-icon>
API Docs
</div>
<v-divider /> <v-divider />
<extras class="pl-1 " /> <extras class="pl-1 " />
</div> </div>
@ -610,7 +621,6 @@
@create="mtdViewCreate($event)" @create="mtdViewCreate($event)"
/> />
<textDlgSubmitCancel <textDlgSubmitCancel
v-if="dialogRenameTable.dialogShow" v-if="dialogRenameTable.dialogShow"
:rules="[validateTableName, validateUniqueAlias]" :rules="[validateTableName, validateUniqueAlias]"
@ -663,7 +673,7 @@
<script> <script>
/* eslint-disable */ /* eslint-disable */
import { mapMutations, mapGetters, mapActions } from 'vuex' import {mapMutations, mapGetters, mapActions} from 'vuex'
import rightClickOptions from '../helpers/rightClickOptions' import rightClickOptions from '../helpers/rightClickOptions'
import rightClickOptionsSub from '../helpers/rightClickOptionsSub' import rightClickOptionsSub from '../helpers/rightClickOptionsSub'
@ -671,11 +681,11 @@ import icons from '../helpers/treeViewIcons'
import textDlgSubmitCancel from './utils/dlgTextSubmitCancel' import textDlgSubmitCancel from './utils/dlgTextSubmitCancel'
import dlgLabelSubmitCancel from './utils/dlgLabelSubmitCancel' import dlgLabelSubmitCancel from './utils/dlgLabelSubmitCancel'
import { copyTextToClipboard } from '../helpers/xutils' import {copyTextToClipboard} from '../helpers/xutils'
import DlgTableCreate from '@/components/utils/dlgTableCreate' import DlgTableCreate from '@/components/utils/dlgTableCreate'
import DlgViewCreate from '@/components/utils/dlgViewCreate' import DlgViewCreate from '@/components/utils/dlgViewCreate'
import SponsorMini from '@/components/sponsorMini' import SponsorMini from '@/components/sponsorMini'
import { validateTableName } from '~/helpers' import {validateTableName} from '~/helpers'
import ExcelImport from '~/components/import/excelImport' import ExcelImport from '~/components/import/excelImport'
import draggable from 'vuedraggable' import draggable from 'vuedraggable'
@ -717,7 +727,7 @@ export default {
viewer: 'mdi-eye-outline', viewer: 'mdi-eye-outline',
commenter: 'mdi-comment-account-outline', commenter: 'mdi-comment-account-outline',
}, },
rolesList: [{ title: 'editor' }, { title: 'commenter' }, { title: 'viewer' }], rolesList: [{title: 'editor'}, {title: 'commenter'}, {title: 'viewer'}],
showSqlClient: false, showSqlClient: false,
nestedMenu: {}, nestedMenu: {},
overShieldIcon: false, overShieldIcon: false,
@ -745,7 +755,7 @@ export default {
x: 0, x: 0,
y: 0, y: 0,
menuItem: null, menuItem: null,
menu: [{ title: 'Execute' }], menu: [{title: 'Execute'}],
icons, icons,
tree: [], tree: [],
active: [], active: [],
@ -912,7 +922,7 @@ export default {
name: 'App Store', name: 'App Store',
key: `appStore` key: `appStore`
} }
item._nodes = { env: '_noco' } item._nodes = {env: '_noco'}
item._nodes.type = 'appStore' item._nodes.type = 'appStore'
this.$store.dispatch('tabs/ActAddTab', item) this.$store.dispatch('tabs/ActAddTab', item)
} }
@ -950,7 +960,7 @@ export default {
name: `${this.$t('title.team&auth')} `, name: `${this.$t('title.team&auth')} `,
key: `roles` key: `roles`
} }
item._nodes = { env: '_noco' } item._nodes = {env: '_noco'}
item._nodes.type = 'roles' item._nodes.type = 'roles'
this.$store.dispatch('tabs/ActAddTab', item) this.$store.dispatch('tabs/ActAddTab', item)
} }
@ -964,7 +974,7 @@ export default {
name: `${this.$t('title.metaMgmt')}`, name: `${this.$t('title.metaMgmt')}`,
key: `disableOrEnableModel` key: `disableOrEnableModel`
} }
item._nodes = { env: '_noco' } item._nodes = {env: '_noco'}
item._nodes.type = 'disableOrEnableModel' item._nodes.type = 'disableOrEnableModel'
this.$store.dispatch('tabs/ActAddTab', item) this.$store.dispatch('tabs/ActAddTab', item)
} }
@ -1101,7 +1111,7 @@ export default {
} }
if (item._nodes.type === 'table') { if (item._nodes.type === 'table') {
let tableIndex = +item._nodes.key.split('.').pop() let tableIndex = +item._nodes.key.split('.').pop()
if (!(await this.$store.dispatch('windows/ActCheckMaxTable', { tableIndex }))) { if (!(await this.$store.dispatch('windows/ActCheckMaxTable', {tableIndex}))) {
return return
} }
} }
@ -1175,9 +1185,9 @@ export default {
if (!this.isTreeView) { if (!this.isTreeView) {
if (this.$route.query.type) { if (this.$route.query.type) {
const node = this.listViewArr.find(n => n.type === `${this.$route.query.type}Dir`) const node = this.listViewArr.find(n => n.type === `${this.$route.query.type}Dir`)
await this.addTab({ ...(node || this.listViewArr[0]) }, false, true) await this.addTab({...(node || this.listViewArr[0])}, false, true)
} else { } else {
await this.addTab({ ...this.listViewArr[0] }, false, true) await this.addTab({...this.listViewArr[0]}, false, true)
} }
} }
} catch (error) { } catch (error) {
@ -1344,7 +1354,7 @@ export default {
dbAlias: item._nodes.dbAlias, dbAlias: item._nodes.dbAlias,
}, },
func, func,
{ tn: item.name }, {tn: item.name},
]) ])
if (result && result.data) { if (result && result.data) {
copyTextToClipboard(result.data, 'selection') copyTextToClipboard(result.data, 'selection')
@ -1352,7 +1362,7 @@ export default {
copyTextToClipboard('Example String', 'selection') copyTextToClipboard('Example String', 'selection')
} }
let sqlClientNode = { ...item._nodes } let sqlClientNode = {...item._nodes}
let newItem = { let newItem = {
_nodes: sqlClientNode, _nodes: sqlClientNode,
} }
@ -1652,7 +1662,7 @@ export default {
dbAlias: item._nodes.dbAlias, dbAlias: item._nodes.dbAlias,
}, },
'viewRead', 'viewRead',
{ view_name: item._nodes.view_name }, {view_name: item._nodes.view_name},
]) ])
await this.$store.dispatch('sqlMgr/ActSqlOpPlus', [ await this.$store.dispatch('sqlMgr/ActSqlOpPlus', [

115
packages/nc-gui/components/project/spreadsheet/components/extras.vue
Unescape View File

@ -19,6 +19,7 @@
<v-list <v-list
width="100%" width="100%"
class=" class="
py-0
flex-shrink-1 flex-shrink-1
text-left text-left
elevation-0 elevation-0
@ -29,65 +30,86 @@
:class="{ active: true }" :class="{ active: true }"
dense dense
> >
<v-list-item dense href="https://discord.gg/5RgZmkW" target="_blank"> <v-list-item>
<!-- Join Discord --> <div class="d-flex justify-space-between d-100 pr-2">
<v-icon v-t="['community:discord']" class="mr-1" size="22" :color="textColors[0]" @click="open('https://discord.gg/5RgZmkW')">
mdi-discord
</v-icon>
<v-icon v-t="['community:discourse']" class="mr-1 discourse" size="22" :color="textColors[0]" @click="open('https://community.nocodb.com/')">
mdi-discourse
</v-icon>
<v-icon v-t="['community:discord']" class="mr-1" size="22" color="#ff4600" @click="open('https://www.reddit.com/r/NocoDB/')">
mdi-reddit
</v-icon>
<v-icon v-t="['community:twitter']" class="mr-1" size="22" :color="textColors[1]" @click="open('https://twitter.com/NocoDB')">
mdi-twitter
</v-icon>
<v-icon v-t="['community:book-demo']" class="mr-1" size="22" :color="textColors[3]" @click="open('https://calendly.com/nocodb-meeting')">
mdi-calendar-month
</v-icon>
</div>
</v-list-item>
<!-- <v-list-item dense href="https://discord.gg/5RgZmkW" target="_blank">
&lt;!&ndash; Join Discord &ndash;&gt;
<v-list-item-title> <v-list-item-title>
<v-icon class="mr-1" small :color="textColors[0]"> <v-icon class="mr-1" small :color="textColors[0]">
mdi-discord mdi-discord
</v-icon> </v-icon>
<span class="caption" :title="$t('labels.community.joinDiscord')" v-t="['community:discord']">{{ <span v-t="['community:discord']" class="caption" :title="$t('labels.community.joinDiscord')">{{
$t('labels.community.joinDiscord') $t('labels.community.joinDiscord')
}}</span> }}</span>
</v-list-item-title> </v-list-item-title>
</v-list-item> </v-list-item>
<!-- Join Community --> &lt;!&ndash; Join Community &ndash;&gt;
<v-list-item dense href="https://community.nocodb.com/" target="_blank"> <v-list-item dense href="https://community.nocodb.com/" target="_blank">
<v-list-item-title> <v-list-item-title>
<v-icon class="mr-1 discourse" small :color="textColors[0]"> <v-icon class="mr-1 discourse" small :color="textColors[0]">
mdi-discourse mdi-discourse
</v-icon> </v-icon>
<span class="caption" :title="$t('labels.community.joinCommunity')" v-t="['community:discourse']">{{ <span v-t="['community:discourse']" class="caption" :title="$t('labels.community.joinCommunity')">{{
$t('labels.community.joinCommunity') $t('labels.community.joinCommunity')
}}</span> }}</span>
</v-list-item-title> </v-list-item-title>
</v-list-item> </v-list-item>
<v-divider />
<v-list-item dense href="https://twitter.com/NocoDB" target="_blank"> <v-list-item dense href="https://twitter.com/NocoDB" target="_blank">
<!-- Join Reddit --> &lt;!&ndash; Join Reddit &ndash;&gt;
<v-list-item-title> <v-list-item-title>
<v-icon class="mr-1" small color="#ff4600"> <v-icon class="mr-1" small color="#ff4600">
mdi-reddit mdi-reddit
</v-icon> </v-icon>
<span class="caption" :title="$t('labels.community.joinReddit')" v-t="['community:reddit']">{{ <span class="caption" :title="$t('labels.community.joinReddit')" v-t="['community:reddit']">{{
$t('labels.community.joinReddit') $t('labels.community.joinReddit')
}}</span> }}</span>
</v-list-item-title> </v-list-item-title>
</v-list-item> </v-list-item>
<v-list-item <v-list-item
dense dense
target="_blank" target="_blank"
href="https://calendly.com/nocodb-meeting" href="https://calendly.com/nocodb-meeting"
> >
<!-- Follow NocoDB --> &lt;!&ndash; Follow NocoDB &ndash;&gt;
<v-list-item-title> <v-list-item-title>
<v-icon class="mr-1" small :color="textColors[1]"> <v-icon class="mr-1" small :color="textColors[1]">
mdi-twitter mdi-twitter
</v-icon> </v-icon>
<span class="caption" title="$t('labels.community.followNocodb')" v-t="['community:twitter']"> {{ <span class="caption" title="$t('labels.community.followNocodb')" v-t="['community:twitter']"> {{
$t('labels.community.followNocodb') $t('labels.community.followNocodb')
}}</span> }}</span>
</v-list-item-title> </v-list-item-title>
</v-list-item> </v-list-item>-->
<v-list-item dense href="https://www.reddit.com/r/NocoDB/" target="_blank"> <!-- <v-list-item dense href="https://www.reddit.com/r/NocoDB/" target="_blank">
<!-- Book a Free DEMO --> &lt;!&ndash; Book a Free DEMO &ndash;&gt;
<v-list-item-title> <v-list-item-title>
<v-icon class="mr-1" small :color="textColors[3]"> <v-icon class="mr-1" small :color="textColors[3]">
mdi-calendar-month mdi-calendar-month
</v-icon> </v-icon>
<span class="caption" :title="$t('labels.community.bookDemo')" v-t="['community:book-demo']">{{ <span v-t="['community:book-demo']" class="caption" :title="$t('labels.community.bookDemo')">{{
$t('labels.community.bookDemo') $t('labels.community.bookDemo')
}}</span> }}</span>
</v-list-item-title> </v-list-item-title>
</v-list-item> </v-list-item>-->
</v-list> </v-list>
</div> </div>
</template> </template>
@ -96,7 +118,6 @@
<script> <script>
import ShareIcons from '../../../share-icons' import ShareIcons from '../../../share-icons'
import SponsorMini from '~/components/sponsorMini'
import colors from '~/mixins/colors' import colors from '~/mixins/colors'
export default { export default {
@ -106,8 +127,7 @@ export default {
data: () => ({ data: () => ({
showCommunity: true showCommunity: true
}), }),
computed: { computed: {},
},
mounted() { mounted() {
setInterval(() => { setInterval(() => {
this.showCommunity = !this.showCommunity this.showCommunity = !this.showCommunity
@ -138,8 +158,8 @@ export default {
} }
.v-icon.discourse { .v-icon.discourse {
height: 16px; height: 22px;
width: 16px; width: 22px;
background-image: url('~/assets/img/discourse-icon.png'); background-image: url('~/assets/img/discourse-icon.png');
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -150,19 +170,4 @@ export default {
content: ""; content: "";
} }
//
//@keyframes anim {
// 0%, 100% {
// opacity: .2;
// transform: scale(.5);
// }
// 50% {
// opacity: 1;
// transform: scale(1);
// }
//}
//
//.vue-icon {
// animation: anim 2s infinite;
//}
</style> </style>

3
packages/nc-gui/mixins/device.js
Unescape View File

@ -126,6 +126,9 @@ export default {
msg = e.response.data.msg || 'Some internal error occurred' msg = e.response.data.msg || 'Some internal error occurred'
} }
return msg || 'Some error occurred' return msg || 'Some error occurred'
},
open(url, target = '_blank') {
window.open(url, target)
} }
} }
} }

2
packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts
Unescape View File

@ -105,7 +105,7 @@ export default class NcUpgrader {
evt_type: 'appMigration:failed', evt_type: 'appMigration:failed',
from: oldVersion, from: oldVersion,
to: process.env.NC_VERSION, to: process.env.NC_VERSION,
msg: e.msg msg: e.message
}); });
} }
} }

Write Preview
Loading…
Cancel
Save