Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
ee1359e
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 19, 2022
e4fe47c
create django app name: ecard
StephenTurk90 Sep 20, 2022
0fc9b5a
restframework installed
Ajsteph89 Sep 20, 2022
af8c1a4
update setting database to include postgresql, included heroku settin…
StephenTurk90 Sep 20, 2022
ef8d528
created static/css/styles.css, updated settings.py to include Heroku …
StephenTurk90 Sep 20, 2022
2d9f5ea
added init.py and 0001 initial migration
StephenTurk90 Sep 20, 2022
359249a
style.css added
StephenTurk90 Sep 20, 2022
b36e281
add .gitignore and static/.gitkeep
StephenTurk90 Sep 21, 2022
5b5c3fa
Merge pull request #2 from Momentum-Team-14/rest-framework
Ajsteph89 Sep 21, 2022
8b6771e
add heroku and postgresql
StephenTurk90 Sep 21, 2022
1753c42
Merge pull request #3 from Momentum-Team-14/start-postgresql-and-heroku
StephenTurk90 Sep 21, 2022
57aef29
add basic models
Ajsteph89 Sep 21, 2022
2d83215
Merge pull request #4 from Momentum-Team-14/add-models
Ajsteph89 Sep 21, 2022
67f172d
registered models
Ajsteph89 Sep 21, 2022
775b4f0
Merge pull request #5 from Momentum-Team-14/register-models
Ajsteph89 Sep 21, 2022
5e09f36
added CORS headers
Ajsteph89 Sep 21, 2022
b6eca3a
Merge pull request #6 from Momentum-Team-14/add-CORS-header
Ajsteph89 Sep 21, 2022
12706f2
add card model, serializers, urls, etc.
StephenTurk90 Sep 21, 2022
89b0958
Merge pull request #7 from Momentum-Team-14/card-feature
StephenTurk90 Sep 21, 2022
5a04b78
add comments serializers, urls, views
StephenTurk90 Sep 21, 2022
525b0e9
Merge pull request #8 from Momentum-Team-14/comments-endpoint
StephenTurk90 Sep 21, 2022
5382e8f
attempt push to heroku using tutorial, did not work**
StephenTurk90 Sep 21, 2022
2875ae6
add error text file
StephenTurk90 Sep 21, 2022
a1be8d6
updated pipfile to django 4.0.0
StephenTurk90 Sep 21, 2022
c8fb5a3
update pipfile for django 4.0.0
StephenTurk90 Sep 22, 2022
1906917
pipenv install django-environ
StephenTurk90 Sep 22, 2022
3ef43ff
fixed typo in settings in line 140
StephenTurk90 Sep 22, 2022
ca12828
Merge pull request #9 from Momentum-Team-14/heroku-push
StephenTurk90 Sep 22, 2022
020234a
remove staticfiles from git
StephenTurk90 Sep 22, 2022
0eab8dd
add staticfile to gitignore
StephenTurk90 Sep 22, 2022
e8b2e09
added pk to json data
Ajsteph89 Sep 22, 2022
5e438b7
Merge pull request #10 from Momentum-Team-14/updating-fields-for-json…
Ajsteph89 Sep 22, 2022
1a1a054
push migrations to main
StephenTurk90 Sep 22, 2022
4cf874c
update urls and views and changed code to CORS_ALLOW_ORIGINS = TRUE
StephenTurk90 Sep 23, 2022
d67a54f
Merge pull request #12 from Momentum-Team-14/this-rad-feature
StephenTurk90 Sep 23, 2022
a54b08e
added nesting info to owner field
Ajsteph89 Sep 23, 2022
ee6e877
update to views for json user data, moved cors info up in middleware …
Ajsteph89 Sep 23, 2022
88b10c1
Merge pull request #13 from Momentum-Team-14/nesting-user-json
Ajsteph89 Sep 23, 2022
e53bd6f
corrected owner json output, added pagination
Ajsteph89 Sep 23, 2022
9136713
Merge pull request #14 from Momentum-Team-14/json-username
Ajsteph89 Sep 23, 2022
4e3a4d0
added comments to card serializer
Ajsteph89 Sep 24, 2022
4566e7d
changes to comments list on card
Ajsteph89 Sep 24, 2022
d78cea9
changes owner to read only
Ajsteph89 Sep 24, 2022
3ce0a91
Merge pull request #16 from Momentum-Team-14/comments-to-card
Ajsteph89 Sep 26, 2022
564b49c
removed errormessage.txt
StephenTurk90 Sep 26, 2022
6a21446
added endpoint for creating a style
Ajsteph89 Sep 26, 2022
286405c
Merge pull request #17 from Momentum-Team-14/style-options
Ajsteph89 Sep 26, 2022
5c27105
add djoser
StephenTurk90 Sep 26, 2022
692e178
Merge pull request #18 from Momentum-Team-14/djoser-add
StephenTurk90 Sep 26, 2022
8ec741b
update pipfile
StephenTurk90 Sep 26, 2022
ad2556c
added permissions
Ajsteph89 Sep 27, 2022
f3c5f61
Merge pull request #19 from Momentum-Team-14/add-permissions
Ajsteph89 Sep 27, 2022
be76bdf
updated models, serializers, urls, views to include follower
StephenTurk90 Sep 27, 2022
5c5922f
updated to view username
StephenTurk90 Sep 27, 2022
0d49e07
added api root
Ajsteph89 Sep 27, 2022
dbeaa68
Merge pull request #20 from Momentum-Team-14/api-root
Ajsteph89 Sep 27, 2022
7fef5ed
Merge branch 'main' into card-show-all-comments
StephenTurk90 Sep 28, 2022
53e893b
added api root from a merge-branch
StephenTurk90 Sep 28, 2022
9ba3810
updates for follower
Ajsteph89 Sep 28, 2022
3b75f4d
update urls
StephenTurk90 Sep 28, 2022
f0cd04f
updated djoser setting to require rekey of password on registration
Ajsteph89 Sep 28, 2022
1d37b69
added basic readme
Ajsteph89 Sep 28, 2022
04759a2
Merge pull request #21 from Momentum-Team-14/readme
Ajsteph89 Sep 28, 2022
a98203d
Merge branch 'follower' of https://github.com/Momentum-Team-14/social…
Ajsteph89 Sep 28, 2022
4b50b7c
constrained following to once per user
Ajsteph89 Sep 28, 2022
23ec0dd
added endpoint for viewing a following detail and destroy said relati…
Ajsteph89 Sep 28, 2022
09db4fc
updates to readme
Ajsteph89 Sep 28, 2022
06232a9
updates to urls
Ajsteph89 Sep 28, 2022
edda52a
Merge pull request #22 from Momentum-Team-14/follower-ajs
Ajsteph89 Sep 28, 2022
9319a94
missed parens on url
Ajsteph89 Sep 28, 2022
6f1f5b3
removed follower field from follow serializer
Ajsteph89 Sep 28, 2022
3e05168
Merge pull request #23 from Momentum-Team-14/follow-updates
Ajsteph89 Sep 28, 2022
70c3341
updates to creating a card, added new serializer
Ajsteph89 Sep 28, 2022
a80805f
Merge pull request #24 from Momentum-Team-14/new-card-updates
Ajsteph89 Sep 28, 2022
c4902aa
removed heroku folder, attempt to remove env folder
StephenTurk90 Sep 29, 2022
9b138d3
Merge pull request #25 from Momentum-Team-14/folders-ignore
StephenTurk90 Sep 29, 2022
20f2c64
removed env folder
StephenTurk90 Sep 29, 2022
bde813a
Merge pull request #26 from Momentum-Team-14/folders-ignore
StephenTurk90 Sep 29, 2022
bb08299
added endpoint for followees cards
Ajsteph89 Sep 29, 2022
a82621b
Merge pull request #27 from Momentum-Team-14/minor-updates
Ajsteph89 Sep 29, 2022
2e4660c
update to readmen
Ajsteph89 Sep 29, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/.keep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
179 changes: 179 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
# Created by https://www.toptal.com/developers/gitignore/api/django
# Edit at https://www.toptal.com/developers/gitignore?templates=django

### Django ###
*.log
*.pot
*.pyc
__pycache__/
local_settings.py
db.sqlite3
db.sqlite3-journal
media

# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
# in your Git repository. Update and uncomment the following line accordingly.
staticfiles/


### Django.Python Stack ###
# Byte-compiled / optimized / DLL files
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo

# Django stuff:

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.venv
venv/
ENV/
env/
env.bak/
venv.bak/
powerful-island-75819


# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

# End of https://www.toptal.com/developers/gitignore/api/django

.vscode/
.env
19 changes: 19 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
django = "==4.0.0"
psycopg2-binary = "*"
django-on-heroku = "*"
gunicorn = "*"
djangorestframework = "*"
django-cors-headers = "*"
django-environ = "*"
djoser = "*"

[dev-packages]

[requires]
python_version = "3.10"
Loading