Skip to content

Commit

Permalink
Added frontend. Changed CI pipeline.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tudor Groza committed Apr 9, 2021
1 parent e9f90bc commit 022b8b9
Show file tree
Hide file tree
Showing 70 changed files with 52,009 additions and 9 deletions.
77 changes: 68 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ services:
- docker:dind

stages:
- build
- docker
- docker-release
- build-frontend
- build-artefact
- build-container
- build-frontend-release
- build-artefact-release
- build-container-release
- deploy-sandbox
- deploy-fallback
- deploy-live
Expand All @@ -16,27 +19,84 @@ variables:
REGISTRY_IMAGE: ebispot/ontotools-curation-service
SERVICE_NAME: ontotools-curation-service

build-front:
image: node:10.15.3
stage: build-frontend
script:
- npm -v
- node -v
- cd frontend
- rm -rf node_modules
- npm install
- CI=false npm run build:sandbox
artifacts:
paths:
- frontend/build/*
only:
- develop

maven-build:
image: maven:3-jdk-12
stage: build
stage: build-artefact
script:
- mvn clean install -B -Dspring.profiles.active=test
- mkdir src/main/webapp
- mv frontend/build/* src/main/webapp/
- ls -lah src/main/webapp
- mvn clean package spring-boot:repackage -DskipTests=true
dependencies:
- build-front
artifacts:
paths:
- target/*.jar
- target/*.war
only:
- develop

build-container:
stage: docker
stage: build-container
script:
- echo "$DOCKER_HUB_PASSWORD" > dhpw.txt
- docker login -u "${DOCKER_HUB_USER}" --password-stdin < dhpw.txt
- docker build --cache-from $REGISTRY_IMAGE:latest -t $REGISTRY_IMAGE:$CI_COMMIT_SHA .
- docker push $REGISTRY_IMAGE:$CI_COMMIT_SHA
only:
- develop

build-front-release:
image: node:10.15.3
stage: build-frontend-release
script:
- npm -v
- node -v
- cd frontend
- rm -rf node_modules
- npm install
- CI=false npm run build:prod
artifacts:
paths:
- frontend/build/*
only:
- tags

maven-build-release:
image: maven:3-jdk-12
stage: build-artefact-release
script:
- mkdir src/main/webapp
- mv frontend/build/* src/main/webapp/
- ls -lah src/main/webapp
- mvn clean package spring-boot:repackage -DskipTests=true
dependencies:
- build-front-release
artifacts:
paths:
- target/*.war
only:
- tags

build-release:
variables:
GIT_STRATEGY: none
stage: docker-release
stage: build-container-release
script:
- echo "$DOCKER_HUB_PASSWORD" > dhpw.txt
- docker login -u "${DOCKER_HUB_USER}" --password-stdin < dhpw.txt
Expand Down Expand Up @@ -64,7 +124,6 @@ deploy-sandbox:
only:
- develop


deploy-fallback:
image: dtzar/helm-kubectl:2.13.1
stage: deploy-fallback
Expand Down
4 changes: 4 additions & 0 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
REACT_APP_APIURL="http://localhost:8080/ontotools/curation/api"
PUBLIC_URL=""

4 changes: 4 additions & 0 deletions frontend/.env.prod
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
REACT_APP_APIURL="/curator"
PUBLIC_URL="/curator"

4 changes: 4 additions & 0 deletions frontend/.env.sandbox
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
REACT_APP_APIURL="/curator"
PUBLIC_URL="/curator"

23 changes: 23 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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

npm-debug.log*
yarn-debug.log*
yarn-error.log*
46 changes: 46 additions & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `yarn start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.

### `yarn test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `yarn build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `yarn eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).
Loading

0 comments on commit 022b8b9

Please sign in to comment.