diff --git a/packages/nc-gui-v2/public/ants-leaf-cutter.jpeg b/packages/nc-gui-v2/assets/img/ants-leaf-cutter.jpeg
similarity index 100%
rename from packages/nc-gui-v2/public/ants-leaf-cutter.jpeg
rename to packages/nc-gui-v2/assets/img/ants-leaf-cutter.jpeg
diff --git a/packages/nc-gui-v2/public/social/email.png b/packages/nc-gui-v2/assets/img/social/email.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/email.png
rename to packages/nc-gui-v2/assets/img/social/email.png
diff --git a/packages/nc-gui-v2/public/social/facebook.png b/packages/nc-gui-v2/assets/img/social/facebook.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/facebook.png
rename to packages/nc-gui-v2/assets/img/social/facebook.png
diff --git a/packages/nc-gui-v2/public/social/google-plus.png b/packages/nc-gui-v2/assets/img/social/google-plus.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/google-plus.png
rename to packages/nc-gui-v2/assets/img/social/google-plus.png
diff --git a/packages/nc-gui-v2/public/social/googlemaps.png b/packages/nc-gui-v2/assets/img/social/googlemaps.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/googlemaps.png
rename to packages/nc-gui-v2/assets/img/social/googlemaps.png
diff --git a/packages/nc-gui-v2/public/social/gov.uk.png b/packages/nc-gui-v2/assets/img/social/gov.uk.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/gov.uk.png
rename to packages/nc-gui-v2/assets/img/social/gov.uk.png
diff --git a/packages/nc-gui-v2/public/social/instagram.png b/packages/nc-gui-v2/assets/img/social/instagram.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/instagram.png
rename to packages/nc-gui-v2/assets/img/social/instagram.png
diff --git a/packages/nc-gui-v2/public/social/linkedin.png b/packages/nc-gui-v2/assets/img/social/linkedin.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/linkedin.png
rename to packages/nc-gui-v2/assets/img/social/linkedin.png
diff --git a/packages/nc-gui-v2/public/social/medium.png b/packages/nc-gui-v2/assets/img/social/medium.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/medium.png
rename to packages/nc-gui-v2/assets/img/social/medium.png
diff --git a/packages/nc-gui-v2/public/social/onthemarket.png b/packages/nc-gui-v2/assets/img/social/onthemarket.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/onthemarket.png
rename to packages/nc-gui-v2/assets/img/social/onthemarket.png
diff --git a/packages/nc-gui-v2/public/social/pinterest.png b/packages/nc-gui-v2/assets/img/social/pinterest.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/pinterest.png
rename to packages/nc-gui-v2/assets/img/social/pinterest.png
diff --git a/packages/nc-gui-v2/public/social/png/douban.png b/packages/nc-gui-v2/assets/img/social/png/douban.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/douban.png
rename to packages/nc-gui-v2/assets/img/social/png/douban.png
diff --git a/packages/nc-gui-v2/public/social/png/facebook.png b/packages/nc-gui-v2/assets/img/social/png/facebook.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/facebook.png
rename to packages/nc-gui-v2/assets/img/social/png/facebook.png
diff --git a/packages/nc-gui-v2/public/social/png/gmail.png b/packages/nc-gui-v2/assets/img/social/png/gmail.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/gmail.png
rename to packages/nc-gui-v2/assets/img/social/png/gmail.png
diff --git a/packages/nc-gui-v2/public/social/png/google-plus.png b/packages/nc-gui-v2/assets/img/social/png/google-plus.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/google-plus.png
rename to packages/nc-gui-v2/assets/img/social/png/google-plus.png
diff --git a/packages/nc-gui-v2/public/social/png/line.png b/packages/nc-gui-v2/assets/img/social/png/line.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/line.png
rename to packages/nc-gui-v2/assets/img/social/png/line.png
diff --git a/packages/nc-gui-v2/public/social/png/linkedin.png b/packages/nc-gui-v2/assets/img/social/png/linkedin.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/linkedin.png
rename to packages/nc-gui-v2/assets/img/social/png/linkedin.png
diff --git a/packages/nc-gui-v2/public/social/png/medium.png b/packages/nc-gui-v2/assets/img/social/png/medium.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/medium.png
rename to packages/nc-gui-v2/assets/img/social/png/medium.png
diff --git a/packages/nc-gui-v2/public/social/png/odnoklassniki.png b/packages/nc-gui-v2/assets/img/social/png/odnoklassniki.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/odnoklassniki.png
rename to packages/nc-gui-v2/assets/img/social/png/odnoklassniki.png
diff --git a/packages/nc-gui-v2/public/social/png/renren.png b/packages/nc-gui-v2/assets/img/social/png/renren.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/renren.png
rename to packages/nc-gui-v2/assets/img/social/png/renren.png
diff --git a/packages/nc-gui-v2/public/social/png/skype.png b/packages/nc-gui-v2/assets/img/social/png/skype.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/skype.png
rename to packages/nc-gui-v2/assets/img/social/png/skype.png
diff --git a/packages/nc-gui-v2/public/social/png/telegram.png b/packages/nc-gui-v2/assets/img/social/png/telegram.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/telegram.png
rename to packages/nc-gui-v2/assets/img/social/png/telegram.png
diff --git a/packages/nc-gui-v2/public/social/png/twitter.png b/packages/nc-gui-v2/assets/img/social/png/twitter.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/twitter.png
rename to packages/nc-gui-v2/assets/img/social/png/twitter.png
diff --git a/packages/nc-gui-v2/public/social/png/viber.png b/packages/nc-gui-v2/assets/img/social/png/viber.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/viber.png
rename to packages/nc-gui-v2/assets/img/social/png/viber.png
diff --git a/packages/nc-gui-v2/public/social/png/vk.png b/packages/nc-gui-v2/assets/img/social/png/vk.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/vk.png
rename to packages/nc-gui-v2/assets/img/social/png/vk.png
diff --git a/packages/nc-gui-v2/public/social/png/wechat.png b/packages/nc-gui-v2/assets/img/social/png/wechat.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/wechat.png
rename to packages/nc-gui-v2/assets/img/social/png/wechat.png
diff --git a/packages/nc-gui-v2/public/social/png/weibo.png b/packages/nc-gui-v2/assets/img/social/png/weibo.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/weibo.png
rename to packages/nc-gui-v2/assets/img/social/png/weibo.png
diff --git a/packages/nc-gui-v2/public/social/png/whatsapp.png b/packages/nc-gui-v2/assets/img/social/png/whatsapp.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/whatsapp.png
rename to packages/nc-gui-v2/assets/img/social/png/whatsapp.png
diff --git a/packages/nc-gui-v2/public/social/png/wykop.jpg b/packages/nc-gui-v2/assets/img/social/png/wykop.jpg
similarity index 100%
rename from packages/nc-gui-v2/public/social/png/wykop.jpg
rename to packages/nc-gui-v2/assets/img/social/png/wykop.jpg
diff --git a/packages/nc-gui-v2/public/social/reddit.png b/packages/nc-gui-v2/assets/img/social/reddit.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/reddit.png
rename to packages/nc-gui-v2/assets/img/social/reddit.png
diff --git a/packages/nc-gui-v2/public/social/scribd.png b/packages/nc-gui-v2/assets/img/social/scribd.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/scribd.png
rename to packages/nc-gui-v2/assets/img/social/scribd.png
diff --git a/packages/nc-gui-v2/public/social/snapchat.png b/packages/nc-gui-v2/assets/img/social/snapchat.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/snapchat.png
rename to packages/nc-gui-v2/assets/img/social/snapchat.png
diff --git a/packages/nc-gui-v2/public/social/tumblr.png b/packages/nc-gui-v2/assets/img/social/tumblr.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/tumblr.png
rename to packages/nc-gui-v2/assets/img/social/tumblr.png
diff --git a/packages/nc-gui-v2/public/social/twitter.png b/packages/nc-gui-v2/assets/img/social/twitter.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/twitter.png
rename to packages/nc-gui-v2/assets/img/social/twitter.png
diff --git a/packages/nc-gui-v2/public/social/whatsapp.png b/packages/nc-gui-v2/assets/img/social/whatsapp.png
similarity index 100%
rename from packages/nc-gui-v2/public/social/whatsapp.png
rename to packages/nc-gui-v2/assets/img/social/whatsapp.png
diff --git a/packages/nc-gui-v2/public/social/zoopla.jpg b/packages/nc-gui-v2/assets/img/social/zoopla.jpg
similarity index 100%
rename from packages/nc-gui-v2/public/social/zoopla.jpg
rename to packages/nc-gui-v2/assets/img/social/zoopla.jpg
diff --git a/packages/nc-gui-v2/components/general/Share.vue b/packages/nc-gui-v2/components/general/Share.vue
index 7024daadd1..6ff28b21db 100644
--- a/packages/nc-gui-v2/components/general/Share.vue
+++ b/packages/nc-gui-v2/components/general/Share.vue
@@ -52,7 +52,7 @@ const openUrl = (url: string) => {
@click.prevent="openUrl(`https://twitter.com/intent/tweet?url=${shareUrl}&text=${encodedSummary}&hashtags=${hashTags}`)"
>
{
"
>
{
"
>
{
@click.prevent="openUrl(`https://www.reddit.com/submit?url=${shareUrl}&title=${encodedSummary}`)"
>
{
@click.prevent="openUrl(`https://pinterest.com/pin/create/button/?url=${shareUrl}&description==${encodedSummary}`)"
>
{
@click.prevent="openUrl(`https://api.whatsapp.com/send?text=${encodedSummary}%0D%0A${shareUrl}`)"
>
{
@click.prevent="openUrl(`https://telegram.me/share/url?url=${shareUrl}&text=${encodedSummary}`)"
>
{
@click.prevent="openUrl(`https://www.addtoany.com/add_to/wechat?linkurl=${shareUrl}&linkname=${encodedTitle}`)"
>
{
{
class="px-2"
>
{
@click.prevent="openUrl(`http://service.weibo.com/share/share.php?url=${shareUrl})&title=${encodedTitle}`)"
>
{
"
>
{
@click.prevent="openUrl(`http://www.douban.com/recommend/?url=${shareUrl}&title=${encodedTitle}`)"
>
{
"
>
{
@click.prevent="openUrl(`https://www.addtoany.com/add_to/wykop?linkurl=${shareUrl}&linkname=${encodedTitle}`)"
>
()
- 
+ 
diff --git a/packages/nc-gui-v2/nuxt.config.ts b/packages/nc-gui-v2/nuxt.config.ts
index 6155cf9098..34dd37dd1d 100644
--- a/packages/nc-gui-v2/nuxt.config.ts
+++ b/packages/nc-gui-v2/nuxt.config.ts
@@ -29,7 +29,7 @@ export default defineNuxtConfig({
{
rel: 'icon',
type: 'image/x-icon',
- href: './favicon-32.png',
+ href: './favicon.ico',
},
],
meta: [
diff --git a/packages/nc-gui-v2/public/favicon-32.png b/packages/nc-gui-v2/public/favicon.ico
similarity index 100%
rename from packages/nc-gui-v2/public/favicon-32.png
rename to packages/nc-gui-v2/public/favicon.ico
diff --git a/packages/nc-gui/nuxt.config.js b/packages/nc-gui/nuxt.config.js
index c1f56f67a3..f755b78e5b 100644
--- a/packages/nc-gui/nuxt.config.js
+++ b/packages/nc-gui/nuxt.config.js
@@ -1,24 +1,24 @@
-import MonacoEditorWebpackPlugin from 'monaco-editor-webpack-plugin'
+import MonacoEditorWebpackPlugin from 'monaco-editor-webpack-plugin';
// import HtmlWebpackPlugin from 'html-webpack-plugin';
-const fs = require('fs')
-const packageJson = JSON.parse(fs.readFileSync('../nc-lib-gui/package.json', 'utf8'))
+const fs = require('fs');
+const packageJson = JSON.parse(fs.readFileSync('../nc-lib-gui/package.json', 'utf8'));
export default {
/*
- ** Nuxt rendering mode
- ** See https://nuxtjs.org/api/configuration-mode
- */
+ ** Nuxt rendering mode
+ ** See https://nuxtjs.org/api/configuration-mode
+ */
mode: 'spa',
// ssr: false,
/*
- ** Nuxt target
- ** See https://nuxtjs.org/api/configuration-target
- */
+ ** Nuxt target
+ ** See https://nuxtjs.org/api/configuration-target
+ */
target: 'server',
/*
- ** Headers of the page
- ** See https://nuxtjs.org/api/configuration-head
- */
+ ** Headers of the page
+ ** See https://nuxtjs.org/api/configuration-head
+ */
head: {
titleTemplate: '',
title: 'NocoDB',
@@ -26,53 +26,53 @@ export default {
{ charset: 'utf-8' },
{
name: 'viewport',
- content: 'width=device-width, initial-scale=1'
+ content: 'width=device-width, initial-scale=1',
},
{
hid: 'description',
name: 'description',
- content: process.env.npm_package_description || ''
- }
+ content: process.env.npm_package_description || '',
+ },
],
link: [
{
rel: 'icon',
type: 'image/x-icon',
- href: './favicon-32.png'
- }
- ]
+ href: './favicon.ico',
+ },
+ ],
},
/*
- ** Global CSS
- */
+ ** Global CSS
+ */
/*
- ** Plugins to load before mounting the App
- ** https://nuxtjs.org/guide/plugins
- */
+ ** Plugins to load before mounting the App
+ ** https://nuxtjs.org/guide/plugins
+ */
plugins: [
{ src: '~plugins/api.js' },
'~/plugins/xutils.js',
{
src: '~plugins/localStorage.js',
- ssr: false
+ ssr: false,
},
{
src: '~plugins/confetti.js',
- ssr: false
+ ssr: false,
},
{
src: '~plugins/domPurify.js',
- ssr: false
+ ssr: false,
},
{
src: '~plugins/axiosInterceptor.js',
- ssr: false
+ ssr: false,
},
'@/plugins/veeValidate',
'@/plugins/vueTour',
{
src: '@/plugins/vueShortkey',
- ssr: false
+ ssr: false,
},
'@/plugins/vueClipboard',
'@/plugins/globalComponentLoader',
@@ -82,65 +82,63 @@ export default {
'~/plugins/i18n.js',
{
src: '~plugins/projectLoader.js',
- ssr: false
+ ssr: false,
},
{
src: '~/plugins/tele.js',
- ssr: false
- }
+ ssr: false,
+ },
],
/*
- ** Auto import components
- ** See https://nuxtjs.org/api/configuration-components
- */
+ ** Auto import components
+ ** See https://nuxtjs.org/api/configuration-components
+ */
// components: true,
/*
- ** Nuxt.js dev-modules
- */
- buildModules: [
- '@nuxtjs/vuetify'
- ],
+ ** Nuxt.js dev-modules
+ */
+ buildModules: ['@nuxtjs/vuetify'],
/*
- ** Nuxt.js modules
- */
+ ** Nuxt.js modules
+ */
modules: [
// Doc: https://axios.nuxtjs.org/usage
'@nuxtjs/axios',
'vue-github-buttons/nuxt',
- '@nuxtjs/toast'
+ '@nuxtjs/toast',
],
toast: {
- position: 'top-center'
+ position: 'top-center',
},
/*
- ** Axios module configuration
- ** See https://axios.nuxtjs.org/options
- */
+ ** Axios module configuration
+ ** See https://axios.nuxtjs.org/options
+ */
axios: {
- baseURL: process.env.NC_BACKEND_URL || (process.env.NODE_ENV === 'production' ? '..' : 'http://localhost:8080')
+ baseURL: process.env.NC_BACKEND_URL || (process.env.NODE_ENV === 'production' ? '..' : 'http://localhost:8080'),
},
/*
- ** vuetify module configuration
- ** https://github.com/nuxt-community/vuetify-module
- */
+ ** vuetify module configuration
+ ** https://github.com/nuxt-community/vuetify-module
+ */
router: {
mode: 'hash',
// base: '/xc/',
- middleware: ['auth']
+ middleware: ['auth'],
},
vuetify: {
defaultAssets: {
// font: false,
- icons: false
+ icons: false,
},
optionsPath: '@/config/vuetify.options.js',
treeShake: true,
- customVariables: ['./config/variables.scss']
+ customVariables: ['./config/variables.scss'],
},
/*
- ** Build configuration
- ** See https://nuxtjs.org/api/configuration-build/
- */
+ ** Build configuration
+ ** See https://nuxtjs.org/api/configuration-build/
+ */
build: {
parallel: true,
plugins: [
@@ -151,21 +149,18 @@ export default {
// e.g. Build full languages support with webpack 4.0 takes over 80 seconds
// Languages are loaded on demand at runtime
languages: ['sql', 'json', 'javascript'],
- features: ['!gotoSymbol']
- })
+ features: ['!gotoSymbol'],
+ }),
],
// publicPath: process.env.NODE_ENV === 'production' ? `https://cdn.jsdelivr.net/npm/nc-lib-gui@${version}/lib/dist/` : undefined,
publicPath: process.env.NODE_ENV === 'production' ? './_nuxt/' : undefined,
- extend(config, {
- isDev,
- isClient
- }) {
+ extend(config, { isDev, isClient }) {
if (isDev) {
- config.devtool = isClient ? 'source-map' : 'inline-source-map'
+ config.devtool = isClient ? 'source-map' : 'inline-source-map';
}
- config.externals = config.externals || {}
- config.externals['@microsoft/typescript-etw'] = 'FakeModule'
+ config.externals = config.externals || {};
+ config.externals['@microsoft/typescript-etw'] = 'FakeModule';
// config.plugins.push(new MonacoEditorWebpackPlugin({
// languages: ['javascript', 'typescript', 'json', 'mysql', 'sql', 'pgsql'],
@@ -204,12 +199,12 @@ export default {
if (process.env.targetEnv === 'DEV') {
// nightly build
// e.g. 0.84.2-20220220-1250
- packageJson.version = `${packageJson.version}-${process.env.targetVersion}`
- packageJson.name += '-daily'
+ packageJson.version = `${packageJson.version}-${process.env.targetVersion}`;
+ packageJson.name += '-daily';
} else {
- packageJson.version = process.env.targetVersion
+ packageJson.version = process.env.targetVersion;
}
- fs.writeFileSync('../nc-lib-gui/package.json', JSON.stringify(packageJson, 0, 2))
+ fs.writeFileSync('../nc-lib-gui/package.json', JSON.stringify(packageJson, 0, 2));
// config.output.publicPath = `https://cdn.jsdelivr.net/npm/nc-lib-gui@${version}/lib/dist/`;
// const htmlWebpack = config.plugins.find(w => w instanceof HtmlWebpackPlugin);
@@ -221,18 +216,17 @@ export default {
// };
}
if (!isDev) {
- config.output.publicPath = './_nuxt/'
+ config.output.publicPath = './_nuxt/';
}
-
- return config
- }
+ return config;
+ },
},
loading: {
color: '#13f4ef',
height: '0px',
continuous: true,
- duration: 3000
+ duration: 3000,
},
css: [
'@/assets/style/fonts.css',
@@ -241,23 +235,23 @@ export default {
'@mdi/font/css/materialdesignicons.css',
'~/assets/style/style.css',
'~/assets/style.css',
- 'material-design-icons-iconfont/dist/material-design-icons.css'
+ 'material-design-icons-iconfont/dist/material-design-icons.css',
],
env: {
EE: !!process.env.EE,
- NC_API_URL: 'https://nocodb.com'
+ NC_API_URL: 'https://nocodb.com',
},
pwa: {
workbox: {
/* workbox options */
assetsURLPattern: './_nuxt/',
- pagesURLPattern: './'
+ pagesURLPattern: './',
},
manifest: {
- publicPath: './'
- }
- }
-}
+ publicPath: './',
+ },
+ },
+};
/**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd
*