Skip to content

Commit

Permalink
Merge pull request #12 from metrico/main
Browse files Browse the repository at this point in the history
fix: dev update with cardinality fixes
  • Loading branch information
jacovinus authored Jul 11, 2024
2 parents 2089433 + c3b62f9 commit 56c8090
Show file tree
Hide file tree
Showing 174 changed files with 5,904 additions and 5,342 deletions.
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
commit-message:
prefix: "chore"
open-pull-requests-limit: 10
labels:
- "dependencies"

10 changes: 5 additions & 5 deletions .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2

- uses: pnpm/action-setup@v2.0.1
- uses: pnpm/action-setup@v4.0.0
with:
version: 6.32.2
version: 8

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "pnpm"

- name: Install dependencies
Expand Down
38 changes: 31 additions & 7 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 2
- uses: pnpm/action-setup@v2.0.1
- uses: pnpm/action-setup@v4.0.0
with:
version: 6.32.2
version: 8


- name: "Automated Version Bump"
Expand All @@ -36,14 +36,38 @@ jobs:
with:
tag-prefix: "v"
skip-tag: true
minor-wording: 'feat,add,Adds,new'
major-wording: 'MAJOR,cut-major'
patch-wording: 'Fix,patch,fixes,fix,dependabot,deps-dev,deps,Bumps,chore'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: "Main Package Version Bump"
if: github.event_name != 'pull_request'
id: main-version
uses: "phips28/gh-action-bump-version@master"
with:
tag-prefix: "v"
skip-tag: true
minor-wording: 'feat,add,Adds,new'
major-wording: 'MAJOR,cut-major'
patch-wording: 'Fix,patch,fixes,fix,dependabot,deps-dev,deps,Bumps,chore'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PACKAGEJSON_DIR: 'packages/main'

- name: "version check"
if: github.event_name != 'pull_request'
run: echo ${{steps.version.outputs.newTag}}

- name: "main version check"
if: github.event_name != 'pull_request'
run: echo ${{steps.main-version.outputs.newTag}}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
Expand All @@ -57,7 +81,7 @@ jobs:
- name: Test
run: pnpm test

- uses: vimtor/action-zip@v1
- uses: vimtor/action-zip@v1.1
if: github.event_name != 'pull_request'
with:
files: packages/main/dist/ README.md
Expand All @@ -77,7 +101,7 @@ jobs:
overwrite: true
- name: Prepare for Mothership
if: github.event_name != 'pull_request'
uses: GuillaumeFalourd/create-other-repo-branch-action@v1
uses: GuillaumeFalourd/create-other-repo-branch-action@v1.5
with:
repository_owner: metrico
repository_name: qryn
Expand Down
67 changes: 0 additions & 67 deletions .github/workflows/codeql-scanner.yml

This file was deleted.

81 changes: 0 additions & 81 deletions .github/workflows/codeql.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/node_modules/*
dist
dist
server
.env
*.cookie
packages/main/.env
10 changes: 5 additions & 5 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
##### install:

```bash
~/$ npm install
~/$ pnpm install
```

##### serve (development mode):

```bash
~/$ npm start
~/$ pnpm dev
```

will serve the UI on ``http://localhost:8080``
Expand All @@ -24,7 +24,7 @@ will serve the UI on ``http://localhost:8080``


```bash
~/$ npm run build
~/$ pnpm run build
```
#### *Serve (dist):*

Expand All @@ -37,7 +37,7 @@ will serve the UI on ``http://localhost:8080``
2 - Serve

```bash
~/$ serve -s build
~/$ serve -s ./packages/main/dist
```

will serve by default the UI on ``http://localhost:3000``
Expand All @@ -54,5 +54,5 @@ will serve by default the UI on ``http://localhost:3000``
- ``API_URL`` default: ``http://localhost:3100``

```bash
~/$ HOST=localhost PORT=8080 API_URL=http://qryn-host:3100 npm start
~/$ HOST=localhost PORT=8080 API_URL=http://qryn-host:3100 pnpm dev
```
33 changes: 30 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Install Serve (npm serve)
```bash
sudo npm i -g serve

serve -s build
serve -s ./packages/main/dist
```
---

Expand All @@ -88,16 +88,43 @@ _Use the [public client](https://view.cloki.org) _(no data goes through the serv
#### Environment Variables:

- ``HOST`` default: `` 0.0.0.0``

- ``PORT`` default: ``8080``

- ``API_URL`` default: ``http://localhost:3100``


##### Example
```bash
~/$ HOST=localhost PORT=8080 API_URL=http://qryn-host:3100 npm start
~/$ HOST=localhost PORT=8080 API_URL=http://qryn-host:3100 pnpm dev
```
------------

##### Available Routes

- qryn-view works under a hash router to make it flexible for static deployments and simpler to run over a single route.

Current available routes:

`/#/datasources` : Datasources settings


`/#/search` : Main search view


`/#/users` : users reserved route


`/#/plugins` : custom plugins

------------

##### URL Parameters
_cLoki-view can be controlled through URL parameters__


_qryn-view can be controlled globally through URL parameters__



| param | description | default |
|-------|-------------|---------|
Expand Down
Loading

0 comments on commit 56c8090

Please sign in to comment.