Skip to content

Commit

Permalink
Merge branch 'develop' into #216-AddModalWindowEmailVarify
Browse files Browse the repository at this point in the history
  • Loading branch information
whooaami authored Oct 11, 2023
2 parents 334e316 + 3341be1 commit 805e047
Show file tree
Hide file tree
Showing 156 changed files with 4,747 additions and 2,278 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Lint

on: pull_request

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: psf/black@stable
26 changes: 26 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: EsLint

on: pull_request

jobs:
linting:
name: Linting # job name (unique id)
runs-on: ubuntu-latest # on which machine to run
steps: # list of steps
- name: Install NodeJS
uses: actions/setup-node@v2
with:
node-version: '14'

- name: Code Checkout
uses: actions/checkout@v3

- name: Install Dependencies
run: |
cd FrontEnd
npm install
- name: Code Linting
run: |
cd FrontEnd
npm run lint
56 changes: 56 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Testing BE
on: pull_request

env:
SECRET_KEY: django-insecure-8p_=_(i8$#=t_n26md(d7=gpc%5sss!4-1a0cp(lir3-0x^$8%
PG_DB: db
PG_USER: postgres
PG_PASSWORD: postgres
DB_HOST: 127.0.0.1
DB_PORT: 5432
EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
EMAIL_HOST: smtp.gmail.com
EMAIL_PORT: 572
EMAIL_USE_TLS: 1
EMAIL_HOST_USER: [email protected]
EMAIL_HOST_PASSWORD: Test1234
CORS_ORIGIN_WHITELIST: ''

jobs:
build:
name: Testing
runs-on: ubuntu-latest
services:
# Label used to access the service container ?
postgres:
# Docker Hub image
image: postgres:14
# Provide the password for postgres
env:
POSTGRES_USER: postgres
POSTGRES_DB: db
POSTGRES_PASSWORD: postgres
# # Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v3
with:
python-verion: 3.10
- name: install requirements.txt
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Create Migrations
run: |
python manage.py makemigrations
python manage.py migrate
- name: running tests
run: python manage.py test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/venv
/.venv
/.env
env
/*/.env
/.DS_Store
__pycache__/
Expand Down
52 changes: 52 additions & 0 deletions FrontEnd/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"env": {
"node": true,
"jest": true,
"browser": true,
"es2021": true
},
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:react-hooks/recommended"],
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"plugins": ["react", "react-hooks"],
"rules": {
"react/react-in-jsx-scope": "off",
"react/prop-types": "warn",
"max-len": [
"warn",
{
"code": 120,
"ignoreTemplateLiterals": true
}
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
],
"no-console": [
"warn",
{
"allow": [
"warn",
"error",
"info"
]
}
],
"no-trailing-spaces": 2,
"jsx-quotes": ["error", "prefer-double"]
}
}
Loading

0 comments on commit 805e047

Please sign in to comment.