Fix workflows (#82)
* Delete npm from the project part 1 * Fix frontend test and change readme.md * Try to fix frontend test * Try to fix workflow frontend * Add yarn to .gitignore * Try to fix backend test. * Try to fix backend * Update README.md * Delete cache from project * Add cache folder to .gitignore * Fix backdend and frontend test * Update License Date * Remove yarn from README.md * Add special workflow requirements.txt * Change Location requirements.txt * Delete pytz entry * Delete pytest-django entry * Add pytest-django to requirements.txt
This commit is contained in:
parent
d2bc0959e6
commit
5a208feec0
8 changed files with 11454 additions and 8457 deletions
7
.github/workflows/backend.yml
vendored
7
.github/workflows/backend.yml
vendored
|
@ -11,9 +11,9 @@
|
||||||
# needed because the postgres container does not provide a healthcheck
|
# needed because the postgres container does not provide a healthcheck
|
||||||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v2
|
||||||
- name: Set up Python 3.9
|
- name: Set up Python 3.9
|
||||||
uses: actions/setup-python@v1
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
- name: psycopg2 prerequisites
|
- name: psycopg2 prerequisites
|
||||||
|
@ -21,7 +21,6 @@
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install -r requirements.txt
|
pip install -r .github/workflows/requirements.txt
|
||||||
pip install pytest-django
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: python manage.py test
|
run: python manage.py test
|
||||||
|
|
12
.github/workflows/frontend.yml
vendored
12
.github/workflows/frontend.yml
vendored
|
@ -2,11 +2,15 @@
|
||||||
on: [push]
|
on: [push]
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- name: Check out code
|
||||||
- name: Install npm
|
uses: actions/checkout@v2
|
||||||
run: npm install --prefix frontend
|
- name: Install deps
|
||||||
|
working-directory: ./frontend
|
||||||
|
run: npm install --immutable
|
||||||
- name: Build app
|
- name: Build app
|
||||||
run: npm run build --prefix frontend
|
working-directory: ./frontend
|
||||||
|
run: npm run build
|
9
.github/workflows/requirements.txt
vendored
Normal file
9
.github/workflows/requirements.txt
vendored
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
beautifulsoup4
|
||||||
|
bs4
|
||||||
|
Django
|
||||||
|
requests
|
||||||
|
cryptography
|
||||||
|
djangorestframework
|
||||||
|
django-cors-headers
|
||||||
|
pytz
|
||||||
|
pytest-django
|
2
LICENSE
2
LICENSE
|
@ -186,7 +186,7 @@
|
||||||
same "printed page" as the copyright notice for easier
|
same "printed page" as the copyright notice for easier
|
||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
Copyright 2022 Wulkanowy Web Team.
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
@ -14,7 +14,11 @@
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
npm i --prefix frontend
|
```
|
||||||
|
And in frontend:
|
||||||
|
```sh
|
||||||
|
cd frontend
|
||||||
|
npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
## 2. Make migrations
|
## 2. Make migrations
|
||||||
|
@ -30,7 +34,7 @@ python manage.py migrate
|
||||||
python manage.py runserver
|
python manage.py runserver
|
||||||
```
|
```
|
||||||
And in frontend:
|
And in frontend:
|
||||||
```shell
|
```sh
|
||||||
cd frontend
|
cd frontend
|
||||||
npm run build
|
npm run build
|
||||||
```
|
```
|
||||||
|
|
1
frontend/.gitignore
vendored
1
frontend/.gitignore
vendored
|
@ -24,3 +24,4 @@ pnpm-debug.log*
|
||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
*.sln
|
||||||
*.sw?
|
*.sw?
|
||||||
|
|
||||||
|
|
19815
frontend/package-lock.json
generated
19815
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "0.1.0",
|
"packageManager": "yarn@3.1.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "vue-cli-service serve",
|
"serve": "vue-cli-service serve --openssl-legacy-provider",
|
||||||
"build": "vue-cli-service build",
|
"build": "vue-cli-service build --openssl-legacy-provider",
|
||||||
"test:unit": "vue-cli-service test:unit",
|
"test:unit": "vue-cli-service test:unit",
|
||||||
"test:e2e": "vue-cli-service test:e2e",
|
"test:e2e": "vue-cli-service test:e2e",
|
||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
|
@ -22,6 +22,8 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.2.11",
|
"@types/chai": "^4.2.11",
|
||||||
"@types/mocha": "^5.2.4",
|
"@types/mocha": "^5.2.4",
|
||||||
|
"@types/node": "^16.11.12",
|
||||||
|
"@types/webpack-env": "^1.16.3",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.18.0",
|
"@typescript-eslint/eslint-plugin": "^4.18.0",
|
||||||
"@typescript-eslint/parser": "^4.18.0",
|
"@typescript-eslint/parser": "^4.18.0",
|
||||||
"@vue/cli-plugin-babel": "~4.5.0",
|
"@vue/cli-plugin-babel": "~4.5.0",
|
||||||
|
@ -37,14 +39,17 @@
|
||||||
"@vue/eslint-config-typescript": "^7.0.0",
|
"@vue/eslint-config-typescript": "^7.0.0",
|
||||||
"@vue/test-utils": "^1.0.3",
|
"@vue/test-utils": "^1.0.3",
|
||||||
"chai": "^4.1.2",
|
"chai": "^4.1.2",
|
||||||
|
"deepmerge": "^4.2.2",
|
||||||
"eslint": "^6.7.2",
|
"eslint": "^6.7.2",
|
||||||
"eslint-plugin-import": "^2.20.2",
|
"eslint-plugin-import": "^2.20.2",
|
||||||
"eslint-plugin-vue": "^6.2.2",
|
"eslint-plugin-vue": "^6.2.2",
|
||||||
"node-sass": "^4.12.0",
|
"eslint-plugin-vuejs-accessibility": "^1.1.0",
|
||||||
"sass": "^1.32.0",
|
"node-sass": "latest",
|
||||||
|
"regenerator-runtime": "^0.13.9",
|
||||||
|
"sass": "~1.32.0",
|
||||||
"sass-loader": "^10.0.0",
|
"sass-loader": "^10.0.0",
|
||||||
"typescript": "~4.1.5",
|
"typescript": "~4.1.5",
|
||||||
"vue-cli-plugin-vuetify": "~2.3.1",
|
"vue-cli-plugin-vuetify": "^2.3.1",
|
||||||
"vue-template-compiler": "^2.6.11",
|
"vue-template-compiler": "^2.6.11",
|
||||||
"vuetify-loader": "^1.7.0"
|
"vuetify-loader": "^1.7.0"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue