Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production Release - 4 November 2024 #94

Merged
merged 220 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
de21fb4
email + google login and signup forms using allautn
guillermodoghel Aug 16, 2024
b520628
email + google login and signup forms using allautn
guillermodoghel Aug 16, 2024
2b46980
email + google login and signup forms using allautn
guillermodoghel Aug 16, 2024
50fe19a
ENVS
guillermodoghel Aug 16, 2024
7b8b129
Add DB_PORT for superbase
guillermodoghel Aug 17, 2024
3ccaf89
Zappa envs
guillermodoghel Aug 17, 2024
dd9dc0e
Zappa envs
guillermodoghel Aug 17, 2024
c9b8c12
Zappa envs
guillermodoghel Aug 17, 2024
b22391c
Zappa envs
guillermodoghel Aug 17, 2024
4b04f8c
Zappa envs
guillermodoghel Aug 17, 2024
a1bd566
Zappa envs
guillermodoghel Aug 17, 2024
3c749b3
Zappa envs
guillermodoghel Aug 17, 2024
e8952db
Zappa envs
guillermodoghel Aug 17, 2024
7b04811
Merge pull request #28 from fuegoaustral/feature/allauth
guillermodoghel Aug 17, 2024
7254b8a
Fix Broken imports
guillermodoghel Aug 17, 2024
f948b61
Add missing migration
guillermodoghel Aug 17, 2024
8424c6f
Merge pull request #29 from fuegoaustral/dev-ci-pipeline
guillermodoghel Aug 17, 2024
bdc6f44
Fix CI pipeline
guillermodoghel Aug 17, 2024
3bfc0e5
Fix CI pipeline
guillermodoghel Aug 17, 2024
9030324
Fix CI pipeline
guillermodoghel Aug 17, 2024
fc59f66
Fix CI pipeline
guillermodoghel Aug 17, 2024
b08003d
Fix CI pipeline
guillermodoghel Aug 17, 2024
73df7ce
Fix CI pipeline
guillermodoghel Aug 17, 2024
f975ee7
Fix CI pipeline
guillermodoghel Aug 17, 2024
7118001
Fix CI pipeline
guillermodoghel Aug 17, 2024
1c471df
Fix CI pipeline
guillermodoghel Aug 17, 2024
6fb3de2
Fix CI pipeline
guillermodoghel Aug 17, 2024
3385b9f
Fix CI pipeline
guillermodoghel Aug 17, 2024
60ef2a3
Fix CI pipeline
guillermodoghel Aug 17, 2024
ca49668
Broken styles
guillermodoghel Aug 17, 2024
33c9fae
Broken styles
guillermodoghel Aug 17, 2024
c907d48
Broken styles
guillermodoghel Aug 17, 2024
267c8ff
Broken styles
guillermodoghel Aug 17, 2024
f3db39a
Broken styles
guillermodoghel Aug 17, 2024
1baa5c6
Broken styles
guillermodoghel Aug 18, 2024
debef76
Merge pull request #30 from fuegoaustral/main
guillermodoghel Aug 18, 2024
ef9e888
Broken styles
guillermodoghel Aug 18, 2024
905cf4a
Merge remote-tracking branch 'origin/dev' into dev
guillermodoghel Aug 18, 2024
f017aa4
Broken styles
guillermodoghel Aug 18, 2024
6129579
Broken styles
guillermodoghel Aug 18, 2024
86259a0
app_url adjustment
guillermodoghel Aug 18, 2024
d843c5f
Add loadings to some templates
guillermodoghel Aug 18, 2024
6747d1a
Disable phone verification button upon submit
guillermodoghel Aug 18, 2024
393fadc
Prevent confusing . thing on dotenv
guillermodoghel Aug 18, 2024
c68b417
"keep_warm": false on dev
guillermodoghel Aug 18, 2024
ef39268
set up dev domain
guillermodoghel Aug 18, 2024
85b47ce
Min visual adjustments
guillermodoghel Aug 19, 2024
9729cce
Visual adjustments
guillermodoghel Aug 19, 2024
582abbe
Major checkout refactor
guillermodoghel Aug 21, 2024
5b129a7
Major checkout refactor
guillermodoghel Aug 21, 2024
08aa56b
Merge pull request #32 from fuegoaustral/feature/checkout
guillermodoghel Aug 21, 2024
3de50bd
Ui enhancements
guillermodoghel Aug 22, 2024
44b4909
Ui enhancements + New tickets model + Transfer tickets
guillermodoghel Aug 22, 2024
c598dd1
Ui enhancements + New tickets model + My tickets screen
guillermodoghel Aug 22, 2024
f3f8690
My tickets screen
guillermodoghel Aug 22, 2024
4043377
My tickets screen
guillermodoghel Aug 22, 2024
04f4528
My tickets screen
guillermodoghel Aug 22, 2024
50ae9e7
My tickets screen
guillermodoghel Aug 23, 2024
56cd36c
CHATWOOT + misc enhancements
guillermodoghel Aug 24, 2024
772fea3
Bug on minting + misc enhancements
guillermodoghel Aug 25, 2024
3b6e37a
Transfers part 1
guillermodoghel Aug 25, 2024
7bcaa1c
Workflow optimization?
guillermodoghel Aug 25, 2024
34f881c
Workflow optimization?
guillermodoghel Aug 25, 2024
d8c5494
Misc Enhancements + Order email + settngs cleanup
guillermodoghel Aug 26, 2024
a75356c
Fix broken header menu
guillermodoghel Aug 26, 2024
2a6b57e
Flujos de transferencias de tickets
guillermodoghel Aug 27, 2024
8547637
Flujos de transferencias de tickets
guillermodoghel Aug 27, 2024
0deee9c
Flujos de transferencias de tickets
guillermodoghel Aug 27, 2024
13b1090
Flujos de transferencias de tickets
guillermodoghel Aug 27, 2024
70451b7
Flujos de transferencias de tickets
guillermodoghel Aug 27, 2024
9e0a820
Emails
guillermodoghel Aug 28, 2024
7035471
Emails
guillermodoghel Aug 28, 2024
2e14db0
Emails cron logic
guillermodoghel Aug 28, 2024
e3ec2a7
Emails cron logic
guillermodoghel Aug 28, 2024
be839a4
Emails cron logic
guillermodoghel Aug 28, 2024
5c2c230
Emails cron logic / chat token
guillermodoghel Aug 28, 2024
acbb6d8
Emails cron logic / chat token
guillermodoghel Aug 28, 2024
beabbc7
Emails cron logic / chat token
guillermodoghel Aug 28, 2024
44b0b35
Idempotency for sent emails
guillermodoghel Aug 29, 2024
0a69775
Idempotency for sent emails
guillermodoghel Aug 29, 2024
bd46272
Idempotency for sent emails
guillermodoghel Aug 29, 2024
180b118
Idempotency for sent emails
guillermodoghel Aug 29, 2024
f2a1a44
Idempotency for sent emails
guillermodoghel Aug 29, 2024
1d70af2
Actual emails
guillermodoghel Aug 29, 2024
374a7e6
Actual emails
guillermodoghel Aug 29, 2024
5b0acae
Actual emails
guillermodoghel Aug 29, 2024
a72bf99
Cleanup
guillermodoghel Aug 30, 2024
488187a
Admin tickets
guillermodoghel Aug 31, 2024
f89dae6
Admin tickets
guillermodoghel Aug 31, 2024
93b87bc
Admin tickets
guillermodoghel Aug 31, 2024
daa97b2
Admin tickets
guillermodoghel Sep 1, 2024
9883333
Admin tickets
guillermodoghel Sep 1, 2024
ccb3537
Fix: Make hero image full-width and cover the entire .site-header
vfonic Sep 9, 2024
6f7a3cb
Surround branch names with inline code backticks; Minor formatting
vfonic Sep 9, 2024
8225346
Merge pull request #34 from vfonic/doc-updates
vfonic Sep 9, 2024
86ae8b5
Merge pull request #33 from vfonic/fix-site-header-hero-image-sizing
vfonic Sep 9, 2024
15e99c0
Merge branch 'refs/heads/main' into dev
guillermodoghel Oct 15, 2024
eff167f
Stuff
guillermodoghel Oct 15, 2024
7b6cfeb
Stuff
guillermodoghel Oct 15, 2024
28d195d
Stuff
guillermodoghel Oct 15, 2024
ce36996
Stuff
guillermodoghel Oct 15, 2024
086dabc
Updates on Caja
guillermodoghel Oct 20, 2024
dab2075
Updates on Caja
guillermodoghel Oct 20, 2024
103f916
Update admin_caja.html
guillermodoghel Oct 21, 2024
052a887
Bonos dirigidos
guillermodoghel Oct 21, 2024
ab04d40
Bonos dirigidos
guillermodoghel Oct 21, 2024
37c9792
Comments
guillermodoghel Oct 21, 2024
5a021ca
Merge branch 'refs/heads/feature/admin-bonos' into feature/admin-bono…
guillermodoghel Oct 21, 2024
e2f1e15
Updates
guillermodoghel Oct 21, 2024
ca6f269
Direct bonus admin
guillermodoghel Oct 22, 2024
50d0adc
Direct bonus admin
guillermodoghel Oct 22, 2024
393934c
Merge pull request #39 from fuegoaustral/feature/admin-bonos
guillermodoghel Oct 22, 2024
a7a3724
Merge branch 'refs/heads/dev' into feature/admin-bonos-dirigidos
guillermodoghel Oct 22, 2024
c0fd10c
load env file
rasca Oct 25, 2024
843dc4d
Select tickets: Add quantity 1 for selected homepage ticket; Update s…
vfonic Oct 26, 2024
3fbe156
Remove DONATION_AMOUNT context variable
vfonic Oct 26, 2024
b7f160e
Select donations: Remove quantity; Add suggested donation amounts
vfonic Oct 26, 2024
90667da
De-emphasize back button
vfonic Oct 26, 2024
07d8293
remove pipelines in favour of plain css files
rasca Oct 25, 2024
f35254f
revert removing nested structures as per @vfonic suggestion
rasca Oct 27, 2024
94b4646
extracted profile to new accounts app
rasca Oct 25, 2024
4cf1cc7
fix some titles stuff
rasca Oct 25, 2024
ade45c1
better account nav
rasca Oct 25, 2024
50a7fdb
google social login first
rasca Oct 25, 2024
b30debd
add missing google img
rasca Oct 25, 2024
71189db
new donation links
rasca Oct 25, 2024
71d0b10
Merge branch 'refs/heads/dev' into feature/admin-bonos-dirigidos
guillermodoghel Oct 27, 2024
e7464bf
move profile model to profile app
rasca Oct 27, 2024
001ba73
Translate to Spanish; Fix formatting (#46)
vfonic Oct 27, 2024
037a40f
Homepage: Format ticket prices
vfonic Oct 25, 2024
8536e0a
Format prices
vfonic Oct 25, 2024
4ff31d5
Update error message when selected too many tickets
vfonic Oct 27, 2024
0bdeb43
Merge remote-tracking branch 'origin/dev' into select-tickets-page-up…
vfonic Oct 27, 2024
619353e
Select tickets: Fix: Don't allow choosing more than `available_ticket…
vfonic Oct 27, 2024
3d7928c
Venta dirigida
guillermodoghel Oct 28, 2024
dd8a24b
Venta dirigida
guillermodoghel Oct 28, 2024
fad4616
Merge branch 'refs/heads/dev' into feature/admin-bonos-dirigidos
guillermodoghel Oct 28, 2024
9a35d05
Venta dirigida
guillermodoghel Oct 28, 2024
409f276
add new volunteer enabled unitl field
rasca Oct 27, 2024
4136336
move profile model to profile app
rasca Oct 27, 2024
63636a2
refactor ticket processing to approve an order in the admin
rasca Oct 27, 2024
1803787
new design for mis bonos and transferable tickets
rasca Oct 28, 2024
fa2372e
revamped volunteers and add security checks
rasca Oct 28, 2024
489455b
Merge pull request #48 from fuegoaustral/select-tickets-page-updates
rasca Oct 28, 2024
4029285
Merge branch 'dev' into feature/volunteers-revamp
rasca Oct 28, 2024
dc9e732
Merge pull request #51 from fuegoaustral/feature/volunteers-revamp
rasca Oct 28, 2024
e7b2363
Merge branch 'select-donations-page-updates' into feature/checkout-de…
rasca Oct 28, 2024
d1e770d
style select tickets
rasca Oct 28, 2024
9f1bf99
design checkout process
rasca Oct 28, 2024
a7184dc
small fixes
rasca Oct 28, 2024
9a68806
new design for all account views
rasca Oct 28, 2024
c7a6793
add profile views design
rasca Oct 28, 2024
b4dc395
fix links
rasca Oct 28, 2024
fa75f89
Merge pull request #53 from fuegoaustral/feature/checkout-design
rasca Oct 28, 2024
f5a4d23
design home header footer
rasca Oct 28, 2024
c8e9157
Merge pull request #54 from fuegoaustral/feature/checkout-design
rasca Oct 28, 2024
f37df16
fix menu links
rasca Oct 28, 2024
fa09dfa
Merge pull request #55 from fuegoaustral/feature/checkout-design
rasca Oct 28, 2024
318b0da
fix login url
rasca Oct 28, 2024
7f60979
fix form style
rasca Oct 28, 2024
0283c61
Merge pull request #56 from fuegoaustral/fixes
rasca Oct 28, 2024
78fea9c
Merge branch 'refs/heads/dev' into feature/admin-bonos-dirigidos
guillermodoghel Oct 29, 2024
9f0e8cf
Venta dirigida
guillermodoghel Oct 29, 2024
7413772
no mostrar tickets de venta dirigida
guillermodoghel Oct 29, 2024
f5b9ea7
Merge pull request #40 from fuegoaustral/feature/admin-bonos-dirigidos
guillermodoghel Oct 29, 2024
aaec66d
fix ticket transfer
rasca Oct 29, 2024
59da72f
Merge pull request #65 from fuegoaustral/fix/transfer-bono
rasca Oct 29, 2024
a7fc89a
Fix rapipago
guillermodoghel Nov 1, 2024
941fc1c
Merge pull request #74 from fuegoaustral/feature/mp-rapipago
guillermodoghel Nov 1, 2024
ed4bad5
Fix disable transfer button
guillermodoghel Nov 2, 2024
f426d54
Fix disable transfer button
guillermodoghel Nov 2, 2024
559e9f4
Merge pull request #76 from fuegoaustral/fix/disable-transfer-button
guillermodoghel Nov 2, 2024
5131d9d
Fix caja y bonos dirigidos
guillermodoghel Nov 3, 2024
a5f686b
Preloads email upon trasnfer to a new account
guillermodoghel Nov 3, 2024
fa9a5ee
Preloads email upon trasnfer to a new account
guillermodoghel Nov 3, 2024
826d221
Merge pull request #79 from fuegoaustral/fix/admin-caja
guillermodoghel Nov 3, 2024
c3ef3b6
Merge pull request #80 from fuegoaustral/feature/preload-email-upon-t…
guillermodoghel Nov 3, 2024
74a29fb
Preloads email upon trasnfer to a new account
guillermodoghel Nov 3, 2024
a1750b1
Merge pull request #81 from fuegoaustral/feature/preload-email-upon-t…
guillermodoghel Nov 3, 2024
2fcf7d4
Point to Django 4.2 docs
vfonic Nov 3, 2024
c9da9d9
Formatting
vfonic Nov 3, 2024
180b740
Change the header bg to solid color
vfonic Nov 3, 2024
1cf986e
Home: Donations: Fix styles
vfonic Nov 3, 2024
975de43
Remove global.css and fuego.css from new design pages
vfonic Nov 3, 2024
501c7b5
Fix copy (text)
vfonic Nov 3, 2024
52e5ec3
Fix social icons; Fix headings
vfonic Nov 3, 2024
99cd583
Fix h1 styles; Fix Google login button styles; Simplify "Verify your …
vfonic Nov 3, 2024
530aa97
Rename `.empty-results` => `.main-card-spacing`
vfonic Nov 3, 2024
eb6a434
Complete profile styles
vfonic Nov 3, 2024
fe4850a
Fix form fields styles
vfonic Nov 3, 2024
3c0d5fe
Fix checkout flow styles
vfonic Nov 3, 2024
775718d
Fix header btn-secondary styles
vfonic Nov 3, 2024
ba39d3b
Rename `twitter.com` => `x.com`
vfonic Nov 3, 2024
735c6fb
Merge pull request #84 from fuegoaustral/style-fixes
vfonic Nov 3, 2024
4d2b9f5
Fix buttons line-height
vfonic Nov 3, 2024
045fcbe
Select donations: Fix input border-radius
vfonic Nov 3, 2024
10a7ca1
Payment callback: Fix styles
vfonic Nov 3, 2024
70a2b6b
add import csv to direct ticket template
rasca Nov 3, 2024
e92bfe3
Merge pull request #85 from fuegoaustral/feature/import-csv
rasca Nov 3, 2024
78363d1
Collectstatic on github action
guillermodoghel Nov 3, 2024
9b0d1b5
Collectstatic on github action
guillermodoghel Nov 3, 2024
cf04236
add groups for volunteer admin and caja
rasca Nov 3, 2024
dd88656
Merge pull request #87 from fuegoaustral/feature/admin-permissions
rasca Nov 3, 2024
c325b5d
- Cuando quisimos transferir un bono ya asignado, va a pantalla negra.
guillermodoghel Nov 3, 2024
71d7421
fixes #82 wrong form error on empty dni
rasca Nov 3, 2024
964ad4f
- Cuando quisimos transferir un bono ya asignado, va a pantalla negra.
guillermodoghel Nov 3, 2024
8e0e458
- Cuando quisimos transferir un bono ya asignado, va a pantalla negra.
guillermodoghel Nov 3, 2024
d2649f2
Merge pull request #88 from fuegoaustral/fix/transferir-mi-bono
guillermodoghel Nov 3, 2024
94f1a7b
fixes #60 copy for the direct sale admin congrats
rasca Nov 3, 2024
16dcd88
WIP: Homepage mobile styles
vfonic Nov 3, 2024
27e6d09
add modeladmins and fix my tickets buttons css
rasca Nov 3, 2024
dea7181
Merge remote-tracking branch 'origin/style-fixes' into small-fixes
rasca Nov 3, 2024
cee1583
Fix button styles
vfonic Nov 4, 2024
b676795
Merge pull request #89 from fuegoaustral/style-fixes
vfonic Nov 4, 2024
0644d99
Fix bonos que desaparecen despues de transferidos
guillermodoghel Nov 4, 2024
48b95d5
Merge pull request #92 from fuegoaustral/fix/bonos-que-desaparecen
guillermodoghel Nov 4, 2024
a88093c
Merge branch 'dev' into small-fixes
rasca Nov 4, 2024
9c9982d
Merge pull request #90 from fuegoaustral/small-fixes
rasca Nov 4, 2024
bf1017f
Prepare prod CI and zappa config
guillermodoghel Nov 4, 2024
5617cf9
Prepare prod CI and zappa config
guillermodoghel Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CHATWOOT_TOKEN=example
CHATWOOT_IDENTITY_VALIDATION=example
55 changes: 55 additions & 0 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Deploy to Dev

on:
push:
branches:
- dev

jobs:
deploy:
runs-on: ubuntu-latest
environment: DEV

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'


- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: 'us-east-1'

- name: Download env.dev from S3
run: |
aws s3 cp s3://faprivate/envs/env.dev env.dev

- name: Create Virtual Environment and Install dependencies
run: |
python -m venv venv
source venv/bin/activate
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Update Zappa environment variables and deploy
run: |
source venv/bin/activate
python update_zappa_envs.py dev
zappa update dev

- name: Run Migrations
run: |
source venv/bin/activate
zappa manage dev migrate

- name: Run Collectstatic
run: |
source venv/bin/activate
zappa manage dev "collectstatic --noinput"
55 changes: 55 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Deploy to Prod

on:
push:
branches:
- main

jobs:
deploy:
runs-on: ubuntu-latest
environment: PROD

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'


- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: 'us-east-1'

- name: Download env.prod from S3
run: |
aws s3 cp s3://faprivate/envs/env.prod env.prod

- name: Create Virtual Environment and Install dependencies
run: |
python -m venv venv
source venv/bin/activate
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Update Zappa environment variables and deploy
run: |
source venv/bin/activate
python update_zappa_envs.py prod
zappa update prod

- name: Run Migrations
run: |
source venv/bin/activate
zappa manage prod migrate

- name: Run Collectstatic
run: |
source venv/bin/activate
zappa manage prod "collectstatic --noinput"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ deprepagos/media
*DS_Store
dbs/
venv/*
.env
62 changes: 51 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,50 @@ source venv/bin/activate
pip install -r requirements.txt
pip install -r requirements-dev.txt
cp deprepagos/local_settings.py.example deprepagos/local_settings.py
whoami # copy the output
open deprepagos/local_settings.py # and paste the output as `DB_USER` value
cp .env.example .env
createdb deprepagos_development
```

## Set envs.

You can copy the values from dev environment.

### DB

Use your recently created local DB

```
DB_DATABASE
DB_HOST
DB_PORT
DB_USER
```

### MercadoPago

Create a SELLER TEST USER in MercadoPago and set the following
envs. [Instructions here]('https://www.mercadopago.com.ar/developers/es/docs/your-integrations/test/accounts')

Set the envs `MERCADOPAGO_PUBLIC_KEY`, `MERCADOPAGO_ACCESS_TOKEN` with the onces from the SELLER TEST USER.

Then set up a [webhook]('https://www.mercadopago.com.ar/developers/es/docs/your-integrations/notifications/webhooks')
pointing to `{your local env url}/webhooks/mercadopago`. And set the env `MERCADOPAGO_WEBHOOK_SECRET` with the secret
you set in the webhook creation.

I recommend using
a [cloudflare tunnel]('https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/get-started/create-remote-tunnel/'),
or [ngrok]('https://ngrok.com/), or similar to expose your local server to the internet.

### Login with Google

Create a project in Google Cloud Platform and enable the Google+ API. Then create OAuth 2.0 credentials and set the envs
`GOOGLE_CLIENT_ID` and `GOOGLE_CLIENT_SECRET` with the values from the credentials.

On the OAuth consent screen, set the authorized redirect URIs to `{your local env url}/accounts/google/login/callback/`

### Once you have the envs set up, you can run the following commands:

```sh
python manage.py migrate
whoami # copy the output
python manage.py createsuperuser # paste the output as username, leave email empty, and set some password
Expand All @@ -32,17 +73,11 @@ deactivate # if you want to deactivate the virtualenv

## Deploy

The project is meant to be deployed in AWS Lambda. `django-zappa` handles the
upload and configuration for us. You can see the config in
[`zappa_settings.json`](zappa_settings.json).

To deploy from a local dev environment follow these steps:
### DEV

1. Setup your personal AWS credentials as the `[default]` profile (needed by
Zappa)

2. Deploy with `zappa update dev` (or `zappa update prod`)
Just push to the `dev` branch and the pipeline will deploy to the dev environment.

### PROD
> [!IMPORTANT]
> In OS X you need to use a Docker image to have the same linux environment
> as the one that runs in AWS Lambda to install the correct dependencies.
Expand All @@ -54,6 +89,11 @@ To deploy from a local dev environment follow these steps:
> zappashell> zappa update dev
> ```

Please don't push to the `main` branch directly. Create a PR and merge it on `dev` first. Then create a PR from `dev` to `main`.

`TODO ongoing: The pipeline will deploy to the prod environment.`

If for some horrible reason you need to push to `main` directly, PLEASE, make sure to backport the changes to `dev` afterwards.
3. Update the static files to S3:

$ python manage.py collectstatic --settings=deprepagos.settings_prod
Expand Down
33 changes: 0 additions & 33 deletions deprepagos/local_settings.py.example
Original file line number Diff line number Diff line change
@@ -1,40 +1,7 @@
import os

DEBUG = True

EXTRA_INSTALLED_APPS = ['django_extensions']

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.environ.get('DB_DATABASE', 'deprepagos_development'),
'USER': os.environ.get('DB_USER', '<FIND_ME_BY_TYPING_whoami_IN_TERMINAL>'),
'PASSWORD': os.environ.get('DB_PASSWORD', ''),
'HOST': os.environ.get('DB_HOST', '127.0.0.1'),
'PORT': '5432',
}
}

PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
STATIC_ROOT = os.path.join(PROJECT_ROOT, 'collected_static')

PIPELINE = {
'PIPELINE_ENABLED': False,
'SHOW_ERRORS_INLINE': False,
'COMPILERS': (
'libsasscompiler.LibSassCompiler',
),
'CSS_COMPRESSOR': 'pipeline.compressors.csshtmljsminify.CssHtmlJsMinifyCompressor',
'STYLESHEETS': {
'main': {
'source_filenames': (
'scss/fuego.scss',
'scss/global.scss',
),
'output_filename': 'css/main.css',
'extra_context': {
'media': 'screen,projection',
},
},
},
}
Binary file modified deprepagos/media/events/heros/no-image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading