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
commit
782a6b2de0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      packages/nc-gui/components/ProjectTreeView.vue
  2. 69
      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

14
packages/nc-gui/components/ProjectTreeView.vue

@ -580,7 +580,7 @@
<template v-if="_isUIAllowed('settings')">
<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>
<template #default="{click}">
<div v-t="['project-settings']" class="caption pointer nc-team-settings" @click="click">
@ -593,6 +593,17 @@
</settings-modal>
</div>
</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 />
<extras class="pl-1 " />
</div>
@ -610,7 +621,6 @@
@create="mtdViewCreate($event)"
/>
<textDlgSubmitCancel
v-if="dialogRenameTable.dialogShow"
:rules="[validateTableName, validateUniqueAlias]"

69
packages/nc-gui/components/project/spreadsheet/components/extras.vue

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

3
packages/nc-gui/mixins/device.js

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

2
packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts

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

Loading…
Cancel
Save