diff --git a/.github/workflows/dco-check.yml b/.github/workflows/dco-check.yml new file mode 100644 index 0000000000..abd006c044 --- /dev/null +++ b/.github/workflows/dco-check.yml @@ -0,0 +1,17 @@ +name: DCO Check +on: [pull_request] + +jobs: + commits_check_job: + runs-on: ubuntu-latest + name: Commits Check + steps: + - name: Get PR Commits + id: 'get-pr-commits' + uses: tim-actions/get-pr-commits@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: DCO Check + uses: tim-actions/dco@master + with: + commits: ${{ steps.get-pr-commits.outputs.commits }} diff --git a/README.md b/README.md index 3396c12b48..f01baeaec6 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart-spreadshe ### Using Docker ```bash -docker run --name nocodb -p 8080:8080 nocodb/nocodb +docker run -d --name nocodb -p 8080:8080 nocodb/nocodb ``` ### Using Npm @@ -130,20 +130,34 @@ And connection params for this database can be specified in `NC_DB` environment #### Example MySQL ``` -docker run -p 8080:8080 -e NC_DB="mysql2://host:port?u=user&p=password&d=database" nocodb/nocodb +docker run -d -p 8080:8080 \ + -e NC_DB="mysql2://host.docker.internal:3306?u=root&p=password&d=d1" \ + -e NC_AUTH_JWT_SECRET="569a1821-0a93-45e8-87ab-eb857f20a010" \ + nocodb/nocodb ``` #### Example Postgres ``` -docker run -p 8080:8080 -e NC_DB="pg://host:port?u=user&p=password&d=database" nocodb/nocodb +docker run -d -p 8080:8080 \ + -e NC_DB="pg://host:port?u=user&p=password&d=database" \ + -e NC_AUTH_JWT_SECRET="569a1821-0a93-45e8-87ab-eb857f20a010" \ + nocodb/nocodb ``` #### Example SQL Server ``` -docker run -p 8080:8080 -e NC_DB="mssql://host:port?u=user&p=password&d=database" nocodb/nocodb +docker run -d -p 8080:8080 \ + -e NC_DB="mssql://host:port?u=user&p=password&d=database" \ + -e NC_AUTH_JWT_SECRET="569a1821-0a93-45e8-87ab-eb857f20a010" \ + nocodb/nocodb ``` - +## Docker Compose +``` +cd docker-compose +cd mysql or pg or mssql +docker-compose up +``` ## Environment variables @@ -157,6 +171,32 @@ docker run -p 8080:8080 -e NC_DB="mssql://host:port?u=user&p=password&d=database | NC_CONNECT_TO_EXTERNAL_DB_DISABLED | No | Disable Project creation with external database | | | NC_DISABLE_TELE | No | Disable telemetry | | +# Running locally +``` +git clone https://github.com/nocodb/nocodb +cd nocodb + +# run backend +cd packages/nocodb +npm install +npm run watch:run + +# open localhost:8080/dashboard in browser + +# run frontend +cd packages/nc-gui +npm install +npm run dev + +# open localhost:3000/dashboard in browser +``` + +Changes made to code automatically restart. + +# Contributing +- Please take a look at ./contribute/HowToApplyLicense.md +- Ignore adding headers for .json or .md or .yml + # 🎯 Why are we building this ? Most internet businesses equip themselves with either spreadsheet or a database to solve their business needs. Spreadsheets are used by a Billion+ humans collaboratively every single day. However, we are way off working at similar speeds on databases which are way more powerful tools when it comes to computing. Attempts to solve this with SaaS offerings has meant horrible access controls, vendor lockin, data lockin, abrupt price changes & most importantly a glass ceiling on what's possible in future. @@ -167,23 +207,28 @@ Our mission is to provide the most powerful no-code interface for databases whic [//]: contributor-faces - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + diff --git a/packages/nc-cli/package-lock.json b/packages/nc-cli/package-lock.json index 186bf3b0eb..c7fe5e3ff2 100644 --- a/packages/nc-cli/package-lock.json +++ b/packages/nc-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "create-nocodb-app", - "version": "0.1.17", + "version": "0.1.21", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/nc-gui/assets/img/lang/en.json b/packages/nc-gui/assets/img/lang/en.json deleted file mode 100644 index 8437b0c360..0000000000 --- a/packages/nc-gui/assets/img/lang/en.json +++ /dev/null @@ -1,3 +0,0 @@ - { - "create-new-project": "Create New Project" -} diff --git a/packages/nc-gui/assets/img/lang/ja.json b/packages/nc-gui/assets/img/lang/ja.json deleted file mode 100644 index 4a50ec6db5..0000000000 --- a/packages/nc-gui/assets/img/lang/ja.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "create-new-project": "新しいプロジェクトを作成する" -} diff --git a/packages/nc-gui/assets/img/lang/zh.json b/packages/nc-gui/assets/img/lang/zh.json deleted file mode 100644 index ff028a2dd9..0000000000 --- a/packages/nc-gui/assets/img/lang/zh.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "create-new-project": "创建新项目" -} diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js index 1d710c2c20..7bd2bd83c2 100644 --- a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js +++ b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js @@ -32,7 +32,7 @@ export default { }, isFloat() { return this.abstractType === 'float'; }, isDate() { - return this.abstractType === 'date'; + return this.abstractType === 'date' || this.column.uidt === 'Date'; }, isTime() { return this.abstractType === 'time'; }, isDateTime() { diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue index 510bd47082..a6018317a8 100644 --- a/packages/nc-gui/pages/projects/index.vue +++ b/packages/nc-gui/pages/projects/index.vue @@ -1,58 +1,77 @@