Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
kaleanych committed Aug 28, 2023
1 parent c7e6fea commit c24f693
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 25 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: 3.10
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade setuptools pip wheel
Expand All @@ -33,11 +33,11 @@ jobs:
envkey_VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
- name: Run unit tests
run: make test
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# - name: SonarCloud Scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PM2_SCRIPT := ${PROJECT_PATH}/${FRONTEND_HOME}/node_modules/pm2/bin/pm2

install: install-backend install-frontend

install-dev: install-dev-backend install-dev-frontend
install-dev: install-dev-backend install-frontend-dev

install-backend:
@ echo "Installing BACKEND requirements"
Expand Down
2 changes: 1 addition & 1 deletion infra/frontend/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
env_file:
- ../../.env
build:
context: ./../../mapping_workbench/ui
context: ./../../mapping_workbench/frontend
dockerfile: ./../../infra/frontend/Dockerfile
args:
- ENV_FILE=.env
Expand Down
29 changes: 21 additions & 8 deletions mapping_workbench/frontend/.babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
{
"plugins": [
["prismjs", {
"languages": ["javascript", "css", "markup"],
"plugins": ["line-numbers"],
"theme": "okaidia",
"css": true
}]
"presets": [
"@babel/preset-env",
["@babel/preset-react", {"runtime": "automatic"}]
],
"plugins": [
[
"prismjs",
{
"languages": [
"javascript",
"css",
"markup"
],
"plugins": [
"line-numbers"
],
"theme": "okaidia",
"css": true
}
]
}
]
}
13 changes: 8 additions & 5 deletions mapping_workbench/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "@devias-kit-pro/next-pages",
"version": "6.4.0",
"author": "Devias",
"homepage": "https://devias.io",
"name": "@meaningfy/mapping-workebench-frontend",
"version": "0.0.1",
"author": "Meaningfy",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -14,6 +13,9 @@
"lint-fix": "next lint --fix",
"test": ""
},
"engines": {
"node": ">=12.x"
},
"dependencies": {
"@auth0/auth0-spa-js": "2.0.4",
"@aws-amplify/auth": "5.3.6",
Expand Down Expand Up @@ -51,7 +53,7 @@
"mapbox-gl": "2.14.1",
"moment": "^2.29.4",
"mui-one-time-password-input": "1.1.0",
"next": "13.4.2",
"next": "13.4.19",
"nprogress": "0.2.0",
"numeral": "2.0.6",
"prismjs": "^1.29.0",
Expand Down Expand Up @@ -95,6 +97,7 @@
"@types/react-redux": "7.1.25",
"@types/react-slick": "0.23.10",
"@types/react-syntax-highlighter": "15.5.6",
"babel-plugin-prismjs": "^2.1.0",
"eslint": "8.40.0",
"eslint-config-next": "13.4.2",
"sass": "^1.65.1",
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ log_cli_date_format = %Y-%m-%d %H:%M:%S


addopts =
; --cov=mapping_workbench
; --cov-report=html
; --cov-report=term
; --cov-report=xml
--cov=mapping_workbench
--cov-report=html
--cov-report=term
--cov-report=xml
--junitxml=junit_report.xml
-r a
-q
Expand Down

0 comments on commit c24f693

Please sign in to comment.