Skip to content

Commit

Permalink
Release 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcus Mann committed Apr 2, 2022
1 parent 7f20f38 commit 5c6c990
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GOOGLE_SECRET_KEY=
GOOGLE_CLIENT_ID=
Empty file added .run/Django Server.run.xml
Empty file.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - 2022-??-??
## [2.0.0] - 2022-4-2
### Added
- Added Bootstrap layout
- Added better login/logout workflow
- Added default profile picture
- Added basic Recipe form/view
### Changed
- **BREAKING CHANGE:** `SECRET_KEY` and `CLIENT_ID` -> `GOOGLE_SECRET_KEY`, `GOOGLE_CLIENT_ID`
- login/logout workflow - no intermediate page, just go straight to the google "choose your account" page.
### Removed
- the `DEV` environment variable - was too confusing to set up locally. Now we assume that you are a local developer until told otherwise by the `PROD` environment variable
## [1.0.0] - 2022-03-12
### Added
- Added PostgreSQL support for Heroku deployments (@the-mann)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
2. For the "Authorized Redirect URLs", set it to be `http://localhost:8000/accounts/google/login/callback/`. (TODO: See above)
3. (side note: if you are running into errors, keep in mind that `localhost` and `127.0.0.1` are two different domain names, even though they resolve to the same place)
5. Run migrations: `python manage.py migrate`
6. Create superuser: `python manage.py createsuperuser`
7. Go to `localhost:8000/admin`, go to "Social Applications", and add the application with the "Client ID" and "Secret Key" that we got from our GCP console.
8. In Django Admin, edit `example.com` to be `localhost` (as opposed to editing SITE_ID in settings.py)
9. Set up environment variables. First, make a file in the root directory called `.env` and set the variables `GOOGLE_SECRET_KEY` and `GOOGLE_CLIENT_ID` to their respective values. Next, the `DEV` environment variable must be set manually to anything through the use of cmd, terminal, or by modifying the `activate.bat` file for your virtual environment.
6. Create superuser: `python manage.py createsuperuser` - note that if you create it with your google email that you'll be testing with, there will be a conflict, so feel free to use a dummy email here.
7. Copy `.env.template` over to your very own local `.env` file - note that this file is in `.gitignore` for a good reason - we don't want anybody to have access to anybody else's `.env` file.
8. Copy the client id and secret key (gotten from the GCP console) into the corresponding environment variables into your new `.env`.

0 comments on commit 5c6c990

Please sign in to comment.