Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit e549030

Browse files
briancaffeybriancaffey
committed
Develop
1 parent 88b566c commit e549030

File tree

19 files changed

+373
-339
lines changed

19 files changed

+373
-339
lines changed

Diff for: ‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ include:
4242
# - backend/**/*
4343

4444
.Jest:
45-
image: node:12.16.3
45+
image: node:12.19.0
4646
stage: test
4747
before_script:
4848
- cd quasar

Diff for: ‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Documentation for this project can be found here:
44

55
[https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/](https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/)
66

7-
87
## Project Architecture Overview
98

109
Here is an overview of the project architecture, including the CI/CD pipeline and the AWS infrastructure that will be automatically provisioned through the AWS Cloud Development Kit:

Diff for: ‎awscdk/setup.py

+26-26
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@
1515
package_dir={"": "awscdk"},
1616
packages=setuptools.find_packages(where="awscdk"),
1717
install_requires=[
18-
"aws-cdk.core==1.42.0",
19-
"aws-cdk.aws_cloudformation==1.42.0",
20-
"aws-cdk.aws_autoscaling==1.42.0",
21-
"aws-cdk.aws_applicationautoscaling==1.42.0",
22-
"aws-cdk.aws_certificatemanager==1.42.0",
23-
"aws-cdk.aws_cloudwatch==1.42.0",
24-
"aws-cdk.aws_logs==1.42.0",
25-
"aws-cdk.aws_lambda==1.42.0",
26-
"aws-cdk.aws_events==1.42.0",
27-
"aws-cdk.aws_events_targets==1.42.0",
28-
"aws-cdk.aws_secretsmanager==1.42.0",
29-
"aws-cdk.aws_route53==1.42.0",
30-
"aws-cdk.aws_s3==1.42.0",
31-
"aws_cdk.aws_s3_deployment==1.42.0",
32-
"aws-cdk.aws_cloudfront==1.42.0",
33-
"aws-cdk.aws_route53_targets==1.42.0",
34-
"aws-cdk.aws_ecr==1.42.0",
35-
"aws-cdk.aws_ec2==1.42.0",
36-
"aws-cdk.aws_rds==1.42.0",
37-
"aws-cdk.aws_ssm==1.42.0",
38-
"aws-cdk.aws_elasticache==1.42.0",
39-
"aws-cdk.aws_elasticloadbalancingv2==1.42.0",
40-
"aws-cdk.aws_ecs==1.42.0",
41-
"aws-cdk.aws_ecs_patterns==1.42.0",
42-
"aws-cdk.aws_autoscaling==1.42.0",
43-
"aws-cdk.aws_sqs==1.42.0",
18+
"aws-cdk.core==1.70.0",
19+
"aws-cdk.aws_cloudformation==1.70.0",
20+
"aws-cdk.aws_autoscaling==1.70.0",
21+
"aws-cdk.aws_applicationautoscaling==1.70.0",
22+
"aws-cdk.aws_certificatemanager==1.70.0",
23+
"aws-cdk.aws_cloudwatch==1.70.0",
24+
"aws-cdk.aws_logs==1.70.0",
25+
"aws-cdk.aws_lambda==1.70.0",
26+
"aws-cdk.aws_events==1.70.0",
27+
"aws-cdk.aws_events_targets==1.70.0",
28+
"aws-cdk.aws_secretsmanager==1.70.0",
29+
"aws-cdk.aws_route53==1.70.0",
30+
"aws-cdk.aws_s3==1.70.0",
31+
"aws_cdk.aws_s3_deployment==1.70.0",
32+
"aws-cdk.aws_cloudfront==1.70.0",
33+
"aws-cdk.aws_route53_targets==1.70.0",
34+
"aws-cdk.aws_ecr==1.70.0",
35+
"aws-cdk.aws_ec2==1.70.0",
36+
"aws-cdk.aws_rds==1.70.0",
37+
"aws-cdk.aws_ssm==1.70.0",
38+
"aws-cdk.aws_elasticache==1.70.0",
39+
"aws-cdk.aws_elasticloadbalancingv2==1.70.0",
40+
"aws-cdk.aws_ecs==1.70.0",
41+
"aws-cdk.aws_ecs_patterns==1.70.0",
42+
"aws-cdk.aws_autoscaling==1.70.0",
43+
"aws-cdk.aws_sqs==1.70.0",
4444
],
4545
python_requires=">=3.6",
4646
classifiers=[

Diff for: ‎backend/apps/banking/migrations/0005_auto_20200606_1325.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ class Migration(migrations.Migration):
1414
migrations.AlterField(
1515
model_name='statementfile',
1616
name='statement_file',
17-
field=models.FileField(storage=backend.storage_backends.PrivateMediaStorage, upload_to='banking'),
17+
field=models.FileField(
18+
storage=backend.storage_backends.PrivateMediaStorage,
19+
upload_to='banking',
20+
),
1821
),
1922
]

Diff for: ‎backend/apps/core/views.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from django.conf import settings
44
from django.http import JsonResponse
5-
from django.views.generic import TemplateView
65
from rest_framework import viewsets
76
from rest_framework.decorators import (
87
api_view,
@@ -12,7 +11,7 @@
1211

1312

1413
from .utils.celery_utils import publish_celery_metrics
15-
from apps.core.tasks import debug_task, send_test_email_task, sleep_task
14+
from apps.core.tasks import send_test_email_task, sleep_task
1615

1716
r = settings.REDIS
1817

Diff for: ‎backend/requirements/base.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
boto3==1.13.16
1+
boto3==1.16.4
22

3-
celery==4.4.2
4-
kombu==4.6.8
3+
celery==4.4.7
4+
kombu==4.6.11
55

66
channels==2.4.0
77
channels-redis==2.4.2
88

99
daphne==2.5.0
1010

11-
graphene-django==2.10.1
11+
graphene-django==2.13.0
1212
django-graphql-jwt==0.3.1
1313

14-
Django==3.0.6
14+
Django==3.1.2
1515
django-filter==2.2.0
1616
djangorestframework==3.11.0
1717
djangorestframework_simplejwt==4.4.0
1818
django-debug-toolbar==2.2
1919

20-
gevent==20.6.2
20+
gevent==20.9.0
2121

2222
# Python Social Auth
2323

@@ -26,18 +26,18 @@ social-auth-core==3.3.3
2626

2727
# Django page caching is not working with this version of Redis
2828
# but this version is required by Celery
29-
django-redis==4.11.0
29+
django-redis==4.12.1
3030

31-
django-storages==1.9.1
31+
django-storages==1.10.1
3232

3333
# TODO: figure out why pandas is taking a long time to download
3434
# in cdk deploy step
3535
# pandas==0.24.2
3636

3737
gunicorn==20.0.4
3838

39-
psycopg2-binary==2.8.5
39+
psycopg2-binary==2.8.6
4040

41-
redis==3.5.2
41+
redis==3.5.3
4242

4343
requests==2.23.0

Diff for: ‎backend/requirements/dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
better_exceptions==0.2.2
22
django-extensions==2.2.9 # NOTE: in installed_apps
33
Werkzeug==1.0.1 # used for runserver_plus exception console
4-
ipython==7.14.0
4+
ipython==7.18.1
55
jupyter==1.0.0
66
gql==2.0.0

Diff for: ‎backend/requirements/test.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
black==19.10b0
2-
pytest==5.4.2
3-
pytest-cov==2.8.1
4-
pytest-django==3.9.0
5-
factory_boy==2.12.0
6-
flake8==3.8.1
7-
flake8-isort==3.0.0
8-
coverage==5.1
2+
pytest==6.1.1
3+
pytest-cov==2.10.1
4+
pytest-django==4.1.0
5+
factory_boy==3.1.0
6+
flake8==3.8.4
7+
flake8-isort==4.0.0
8+
coverage==5.3
9+
pytest-profiling==1.7.0

Diff for: ‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ services:
148148
flower:
149149
image: mher/flower
150150
container_name: flower
151-
command: --url_prefix=flower --inspect_timeout=20000
151+
command: flower --url_prefix=flower
152152
environment:
153-
- CELERY_BROKER_URL=${CELERY_BROKER_URL}
153+
- CELERY_BROKER_URL=redis://redis:6379
154154
- FLOWER_PORT=5555
155155
ports:
156156
- 5555:5555

Diff for: ‎documentation/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"@vuepress/plugin-google-analytics": "1.5.0"
1111
},
1212
"devDependencies": {
13-
"nodemon": "2.0.4"
13+
"nodemon": "2.0.6"
1414
}
1515
}

Diff for: ‎gitlab-ci/aws/cdk.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
services:
2727
- docker:19.03.5-dind
2828
stage: deploy
29-
environment:
30-
name: ${ENVIRONMENT}-${APP_NAME}
31-
url: https://${ENVIRONMENT}.${DOMAIN_NAME}
3229
variables:
3330
DOCKER_TLS_CERTDIR: ""
3431
before_script:
@@ -43,7 +40,8 @@
4340
.base_task: &task
4441
image: python:3.8
4542
stage: deploy
46-
when: manual
43+
rules:
44+
- when: manual
4745
before_script:
4846
- pip install awscli
4947
- apt-get -qq update && apt-get -y install jq

Diff for: ‎nginx/ci/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY quasar /app/
99
RUN quasar build -m pwa
1010

1111
# ci stage
12-
FROM nginx:1.18.0-alpine as ci-stage
12+
FROM nginx:1.19.3-alpine as ci-stage
1313
COPY nginx/ci/ci.conf /etc/nginx/nginx.conf
1414
COPY --from=build-stage /app/dist/pwa /dist/
1515
EXPOSE 80

Diff for: ‎nginx/dev/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.18.0-alpine
1+
FROM nginx:1.19.3-alpine
22
COPY nginx/dev/dev.conf /etc/nginx/nginx.conf
33
COPY backend/static /usr/src/app/static/
44
EXPOSE 80

Diff for: ‎nginx/flowerproxy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.18.0-alpine
1+
FROM nginx:1.19.3-alpine
22
COPY proxy.conf /etc/nginx/nginx.conf
33
EXPOSE 80
44
CMD ["nginx", "-g", "daemon off;"]

Diff for: ‎nginx/minikube/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ COPY quasar /app/
1717
RUN quasar build -m pwa
1818

1919
# ci stage
20-
FROM nginx:1.18.0-alpine as ci-stage
20+
FROM nginx:1.19.3-alpine as ci-stage
2121
COPY nginx/minikube/minikube.conf /etc/nginx/nginx.conf
2222
COPY --from=build-stage /app/dist/pwa /dist/
2323
EXPOSE 80

Diff for: ‎quasar/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:12.16.3
1+
FROM node:12.19.0
22

33
WORKDIR /app/
44

Diff for: ‎quasar/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@
1111
"test": "echo \"No test specified\" && exit 0"
1212
},
1313
"dependencies": {
14-
"@quasar/extras": "1.8.1",
14+
"@quasar/extras": "1.9.10",
1515
"apollo-cache-inmemory": "1.6.6",
16-
"apollo-client": "2.6.9",
16+
"apollo-client": "2.6.10",
1717
"apollo-link": "1.2.14",
1818
"apollo-link-context": "1.0.20",
1919
"apollo-link-http": "1.5.17",
20-
"axios": "0.19.2",
20+
"axios": "0.21.0",
2121
"emoji-mart-vue": "2.6.6",
22-
"graphql": "15.0.0",
23-
"graphql-tag": "2.10.3",
22+
"graphql": "15.3.0",
23+
"graphql-tag": "2.11.0",
2424
"highcharts": "8.1.0",
2525
"highcharts-vue": "1.3.5",
2626
"js-cookie": "2.2.1",
27-
"prettier": "^2.0.5",
28-
"quasar": "1.12.0",
27+
"prettier": "2.0.5",
28+
"quasar": "1.14.2",
2929
"vue-apollo": "3.0.3",
30-
"vue-i18n": "8.17.4",
30+
"vue-i18n": "8.22.1",
3131
"vue-native-websocket": "2.0.14"
3232
},
3333
"devDependencies": {
34-
"@quasar/app": "1.9.0",
34+
"@quasar/app": "1.9.6",
3535
"@vue/eslint-config-prettier": "6.0.0",
3636
"babel-eslint": "10.1.0",
37-
"eslint": "5.16.0",
37+
"eslint": "7.12.0",
3838
"eslint-loader": "4.0.2",
39-
"eslint-plugin-prettier": "3.1.3",
39+
"eslint-plugin-prettier": "3.1.4",
4040
"eslint-plugin-vue": "6.2.2"
4141
},
4242
"engines": {

Diff for: ‎quasar/src-electron/electron-flag.d.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
2+
// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
3+
import "quasar/dist/types/feature-flag";
4+
5+
declare module "quasar/dist/types/feature-flag" {
6+
interface QuasarFeatureFlags {
7+
electron: true;
8+
}
9+
}

0 commit comments

Comments
 (0)