Skip to content

Commit

Permalink
Merge branch 'main' of github.com:opentargets/ot-ui-apps into cc-plat…
Browse files Browse the repository at this point in the history
…form-e2e
  • Loading branch information
carcruz committed Jul 3, 2024
2 parents a481db8 + 1b1fe2e commit c4cd395
Show file tree
Hide file tree
Showing 705 changed files with 17,215 additions and 15,574 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: ["custom"],
};
41 changes: 41 additions & 0 deletions .github/workflows/ci-genetics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: CI Genetics

on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]

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

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

- name: Install yarn
run: |-
curl -fsSL --create-dirs -o $HOME/bin/yarn \
https://github.com/yarnpkg/yarn/releases/download/v1.22.19/yarn-1.22.19.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: "18.17.1"
cache: "yarn"

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Lint
run: yarn lint

- name: Build
run: yarn build:genetics
41 changes: 41 additions & 0 deletions .github/workflows/ci-platform.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: CI Platform

on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]

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

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

- name: Install yarn
run: |-
curl -fsSL --create-dirs -o $HOME/bin/yarn \
https://github.com/yarnpkg/yarn/releases/download/v1.22.19/yarn-1.22.19.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: "18.17.1"
cache: "yarn"

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Lint
run: yarn lint

- name: Build
run: yarn build:platform
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint
9 changes: 9 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
**/bundle-genetics
**/bundle-platform
**/node_modules
**/.github
**/.husky
**/public
**/__generated__
packages/eslint-config-custom
packages/tsconfig
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"printWidth": 100,
"semi": true,
"trailingComma": "es5",
"arrowParens": "avoid",
"tabWidth": 2,
"bracketSpacing": true
}
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ deploy:
skip_cleanup: true
on:
tags: true
all_branches: true
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": "0.1.0",
"configurations": [
{
"command": "yarn dev:platform",
"name": "Run platform dev",
"request": "launch",
"type": "node-terminal"
},
{
"type": "chrome",
"request": "launch",
"name": "Launch Platform Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/apps/platform/src/"
}
]
}
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[![CI Platform](https://github.com/opentargets/ot-ui-apps/actions/workflows/ci-platform.yml/badge.svg)](https://github.com/opentargets/ot-ui-apps/actions/workflows/ci-platform.yml)
[![CI Genetics](https://github.com/opentargets/ot-ui-apps/actions/workflows/ci-genetics.yml/badge.svg)](https://github.com/opentargets/ot-ui-apps/actions/workflows/ci-genetics.yml)

# Open Targets Apps

This repository holds the Open Targets web applications.
Expand All @@ -21,9 +24,9 @@ From the root directory run: `yarn build`. This will generate on each applicatio

As same as development, you can run `yarn build:platform` or `yarn build:genetics` to scope the build only for one of the applications.

## Copyright
## Copyright

Copyright 2014-2018 Biogen, Celgene Corporation, EMBL - European Bioinformatics Institute, GlaxoSmithKline, Takeda Pharmaceutical Company and Wellcome Sanger Institute
Copyright 2014-2024 EMBL - European Bioinformatics Institute, Genentech, GSK, MSD, Pfizer, Sanofi and Wellcome Sanger Institute

This software was developed as part of the Open Targets project. For more information please see: http://www.opentargets.org

Expand Down
2 changes: 1 addition & 1 deletion apps/genetics/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.15.1
18.17.1
6 changes: 0 additions & 6 deletions apps/genetics/.prettierrc

This file was deleted.

13 changes: 0 additions & 13 deletions apps/genetics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,8 @@
"@types/react-helmet": "^6.1.6",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.0.4",
"browserstack-local": "^1.4.5",
"cross-fetch": "^3.1.4",
"husky": ">=4",
"lint-staged": ">=10",
"nanoid-cli": "^1.1.0",
"nightwatch": "^1.1.13",
"prettier": "^2.7.1",
"rollup-plugin-polyfill-node": "^0.9.0",
"sass": "^1.49.10",
"source-map-explorer": "^2.0.0",
Expand All @@ -93,13 +88,5 @@
"vite": "^4.1.4",
"vite-plugin-simple-gql": "^0.5.0",
"vite-plugin-svgr": "^2.4.0"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,css,md}": "prettier --write"
}
}
13 changes: 13 additions & 0 deletions apps/genetics/src/@types/graphql.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
declare module '*.graphql' {
import { DocumentNode } from 'graphql';
const Schema: DocumentNode;

export default Schema;
}

declare module '*.gql' {
import { DocumentNode } from 'graphql';
const Schema: DocumentNode;

export default Schema;
}
4 changes: 2 additions & 2 deletions apps/genetics/src/__generated__/gql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c4cd395

Please sign in to comment.