Skip to content

Commit

Permalink
Merge pull request #345 from metrico/dev
Browse files Browse the repository at this point in the history
Upgrade react version from 16 to 18
Update and fix components for the new version
Change builder from create-react-app / Webpack to Vite with Turbo
Split workflows into dev and release
Update React Material UI custom components
Cardinality feature (go version)
  • Loading branch information
jacovinus authored Dec 1, 2023
2 parents 9543254 + 65158bb commit e8a7456
Show file tree
Hide file tree
Showing 664 changed files with 16,203 additions and 47,785 deletions.
27 changes: 0 additions & 27 deletions .babelrc

This file was deleted.

1 change: 0 additions & 1 deletion .env

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: CI-DEV

on:
push:
branches: ["dev"]
paths-ignore:
- "**/README.md"
- "**/workflows/*.yml"
pull_request:
types: [opened, synchronize]
paths-ignore:
- "**/README.md"
- "**/workflows/*.yml"

jobs:
build:
name: Build and Test
timeout-minutes: 15
runs-on: ubuntu-latest

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

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

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

- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm build

- name: Test
run: pnpm test
106 changes: 106 additions & 0 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
name: CI-RELEASE

on:
push:
branches: ["main"]
paths-ignore:
- "**/README.md"
- "**/workflows/*.yml"
pull_request:
branches: [main]
types: [opened, synchronize]
paths-ignore:
- "**/README.md"
- "**/workflows/*.yml"

jobs:
release:
name: Qryn-View Release
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: pnpm/action-setup@v2.0.1
with:
version: 6.32.2


- name: "Automated Version Bump"
if: github.event_name != 'pull_request'
id: version
uses: "phips28/gh-action-bump-version@master"
with:
tag-prefix: "v"
skip-tag: true

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "version check"
if: github.event_name != 'pull_request'
run: echo ${{steps.version.outputs.newTag}}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"

- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm build

- name: Test
run: pnpm test

- uses: vimtor/action-zip@v1
if: github.event_name != 'pull_request'
with:
files: packages/main/dist/ README.md
dest: dist.zip
- name: Upload release binaries
if: github.event_name != 'pull_request'
uses: boxpositron/upload-multiple-releases@1.0.7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_config: |
dist.zip
tag_name: ${{steps.version.outputs.newTag}}
release_name: qryn-view-${{steps.version.outputs.newTag}}
draft: false
prerelease: false
overwrite: true
- name: Prepare for Mothership
if: github.event_name != 'pull_request'
uses: GuillaumeFalourd/create-other-repo-branch-action@v1
with:
repository_owner: metrico
repository_name: qryn
new_branch_name: view_${{steps.version.outputs.newTag}}
new_branch_ref: master
access_token: ${{ secrets.GH_PUSH }}
- name: Push to Mothership
if: github.event_name != 'pull_request'
uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.GH_PUSH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
source-directory: "packages/main/dist"
target-directory: "view"
target-branch: view_${{steps.version.outputs.newTag}}
destination-github-username: "metrico"
destination-repository-name: "qryn"
user-email: lorenzo.mangani@gmail.com
commit-message: Upgrade view to ${{steps.version.outputs.newTag}}
- name: Deploy to gh-pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.2.3
with:
branch: gh-pages
folder: packages/main/dist
2 changes: 1 addition & 1 deletion .github/workflows/codeql-scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
branches: [ main, dev ]
schedule:
- cron: '27 18 * * 6'

Expand Down
94 changes: 0 additions & 94 deletions .github/workflows/npm_build_test.yml

This file was deleted.

32 changes: 2 additions & 30 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,30 +1,2 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
.nvimrc
.vscode
.vscode/*
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# certs (ssl)
cert.pem
key.pem
src/setupProxy.js
src/setupProxy.ts
/node_modules/*
dist
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,18 @@ Clone Repo
```bash
git clone https://github.com/metrico/qryn-view
```

Install packages
```bash
npm install
pnpm install
```
---

**Local Build:**

Build local clone
```bash
npm run build
pnpm run build
```
Install Serve (npm serve)
```bash
Expand Down
Loading

0 comments on commit e8a7456

Please sign in to comment.