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

Checkpoint 4 review #4

Merged
merged 59 commits into from
Mar 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
205b040
[chore] bootstrap project phedit
collinmutembei Feb 16, 2016
41cd317
[feature] create user endpoint
collinmutembei Feb 23, 2016
bc7fda3
[feature] create image endpoint
collinmutembei Feb 24, 2016
d2216fb
[chore] prepare project for deployment
collinmutembei Feb 24, 2016
df7e4c0
[chore] force https on deployed app
collinmutembei Feb 24, 2016
0d4c75d
[feature] implement social authentication
collinmutembei Feb 24, 2016
6b9299f
[fix] change custom user model
collinmutembei Feb 25, 2016
5d41178
[feature] implement social authentication
collinmutembei Feb 25, 2016
25bfee5
[chore] finish api
collinmutembei Feb 26, 2016
c389b53
Merge pull request #1 from andela-cmutembei/feature/API
collinmutembei Feb 26, 2016
d53b57d
[chore] add tests
collinmutembei Feb 26, 2016
818b3ac
[chore] add badges to readme
collinmutembei Feb 26, 2016
7338e0e
[chore] document classes and methods
collinmutembei Feb 28, 2016
91cc7a2
[feature] initialize phedit webapp
collinmutembei Feb 28, 2016
8b718b1
[feature] include twitter bootstrap files
collinmutembei Feb 28, 2016
e5141aa
[feature] add dashboard template
collinmutembei Feb 28, 2016
00b5fd0
[feature] add tests for views
collinmutembei Feb 29, 2016
3ab7923
[chore] refactor templates
collinmutembei Mar 1, 2016
8cb0cf6
[chore] refactor readme
collinmutembei Feb 29, 2016
a568913
[feature] display uploded image for editing
collinmutembei Mar 1, 2016
8a73ba2
[feature] implement image upload
collinmutembei Feb 29, 2016
b2b6ef5
Merge pull request #2 from andela-cmutembei/feature/dragndrop
collinmutembei Mar 1, 2016
ff19453
[chore] update tests
collinmutembei Mar 1, 2016
cc52866
[feature] implement apply and save buttons
collinmutembei Mar 2, 2016
60e186d
[feature] implement image effect button
collinmutembei Mar 2, 2016
c4ef4c7
[fix] remove nosetests
collinmutembei Mar 2, 2016
39b8175
[feature] create buttons to add effects
collinmutembei Mar 4, 2016
12b27ba
[feature] implement endpoint for edited images
collinmutembei Mar 8, 2016
876ad19
[chore] add script for analytics
collinmutembei Mar 9, 2016
0044bc9
[feature] apply PIL filters on images
collinmutembei Mar 10, 2016
4ec6c79
[chore] update fixtures
collinmutembei Mar 11, 2016
deebf6d
[feature] update image when effect applied
collinmutembei Mar 14, 2016
5648480
[feature] add image effects
collinmutembei Mar 14, 2016
78c9a8e
[feature] implement sharing to social accounts
collinmutembei Mar 16, 2016
dea0d6b
Merge pull request #3 from andela-cmutembei/feature/app
collinmutembei Mar 17, 2016
bf2686d
[chore] check off completed tasks
collinmutembei Mar 17, 2016
b7f1702
[fix] add tests to increase code coverage
collinmutembei Mar 21, 2016
6f5718f
[chore] include project plan in repo
collinmutembei Mar 21, 2016
42061f6
[chore] configure redirects
collinmutembei Mar 21, 2016
6fd3222
[fix] refactor templates
collinmutembei Mar 21, 2016
8bd940b
[fix] update tests to fix failing build
collinmutembei Mar 21, 2016
c90cf92
[feature] move the effects section
collinmutembei Mar 23, 2016
84a0d7f
[feature] add test
collinmutembei Mar 23, 2016
7f7aecb
[feature] make checkboxes more appealing
collinmutembei Mar 23, 2016
fab0c1c
[feature] restructure the landing page
collinmutembei Mar 23, 2016
46d921a
[feature] configure user logout
collinmutembei Mar 24, 2016
7a7f0c5
[fix] update README
collinmutembei Mar 25, 2016
10c0c45
[fix] follow PEP8 standard for comments
collinmutembei Mar 25, 2016
7b1b955
[fix] remove commented out code
collinmutembei Mar 25, 2016
34762bb
[fix] reoder imports
collinmutembei Mar 25, 2016
d75afee
[fix] include socialaccounts template tag
collinmutembei Mar 25, 2016
a2fac5c
[fix] fix display of landing page
collinmutembei Mar 25, 2016
08c2af2
[fix] capitalize text
collinmutembei Mar 25, 2016
391373d
[feature] add clear button
collinmutembei Mar 29, 2016
8993204
[fix] indicate loading during latency
collinmutembei Mar 29, 2016
5288080
[fix] move logout button into dropdown
collinmutembei Mar 29, 2016
2c1209e
[feature] add gallery template
collinmutembei Mar 29, 2016
be3a1e4
[fix] add tests
collinmutembei Mar 29, 2016
b6ef2a9
[feature] implemented save button for edited image
collinmutembei Mar 29, 2016
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
10 changes: 10 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[report]
omit =
*virtualenv*

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Quality - Nitpick
Sample review comment.

*envs*
*migrations/*
*/python?.?/*
*__init__*
*/tests/*
*manage.py
*settings.py
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,10 @@ target/

#Ipython Notebook
.ipynb_checkpoints

# exclude ssl cert and key
*.crt
*.key

# coveralls config file
*.coveralls.yml
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: python
python:
- "3.5"
install: pip install -r requirements.txt
env:
global:
- TRAVIS_BUILD=true
script:
- coverage run --append manage.py test tests
branches:
only:
- master
- develop
- feature/app
after_success:
- coveralls
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: gunicorn phedit.wsgi --log-file -
62 changes: 53 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,64 @@
[![Build Status](https://travis-ci.org/andela-cmutembei/IV.svg?branch=develop)](https://travis-ci.org/andela-cmutembei/IV)
[![Coverage Status](https://coveralls.io/repos/andela-cmutembei/IV/badge.svg?branch=develop)](https://coveralls.io/github/andela-cmutembei/IV?branch=develop)
[![Code Issues](https://www.quantifiedcode.com/api/v1/project/9e68169eaae44b4ea781295f597949dd/snapshot/origin:develop:HEAD/badge.svg)](https://www.quantifiedcode.com/app/project/9e68169eaae44b4ea781295f597949dd)

## [PHEDIT](https://phedit.herokuapp.com)

> A picture is worth a thousand words - [English idiom](https://en.wikipedia.org/wiki/A_picture_is_worth_a_thousand_words)

Phedit is a modern photo editing application that lets you express yourself through pictures. This project in still in development, you can view the project plan [here.](https://goo.gl/5zVk0I)
Phedit is a modern photo editing application that lets you express yourself through pictures. Users can upload images to Phedit and apply any of the close to a dozen effects. The edited images can be shared to facebook or twitter through a public url. To view what other people have shared as well as share your edits on twitter use the hashtag [#phedited](https://twitter.com/search?f=tweets&q=%23phedited%20since%3A2016-02-23%20include%3Aretweets&src=typd)

#### Depedencies
Phedit is built using the following technologies:
- [Django](https://www.djangoproject.com/)
- [Django Rest Framework](http://www.django-rest-framework.org/)
- [Pillow](http://pillow.readthedocs.org/en/3.1.x/)
- [Postgresql](http://www.postgresql.org/)
- [AngularJS](https://angularjs.org/)

#### Installation
To setup Phedit locally follow the following instructions:

1 . Clone the repo and navigate to the project directory
```shell
$ git clone https://github.com/andela-cmutembei/IV.git && cd IV
```


2 . Install the project dependencies
```shell
$ pip3 install -r requirements.txt
```

3 . Create a database called `phedit` and configure the following environment variables
```shell
export SECRET=classified
export DATABASE_URL=postgres://<db-username>:@127.0.0.1:5432/phedit
```

#### TODO

- [ ] User can login with Facebook
- [ ] User can view their uploaded images
- [ ] User can upload images on the application in a non-blocking manner
- [ ] User can edit images by applying filter and effects
- [ ] User can share images via a public url or on facebook
4 . Run the projects migrations and initialize the projects data
```shell
$ python3 manage.py migrate
$ python3 manage.py loaddata init-data.json
```


5 . Start the server for the project
```shell
$ python3 manage.py runserver
```

6 . Open http://127.0.0.1:8000 on your favorite web browser

#### Running tests

To run the projects' tests
```shell
$ python3 manage.py test
```

#### License
Copyright &copy; 2016 - Collin Mutembei

This project is licensed under the terms of the [MIT license.](https://github.com/andela-cmutembei/IV/blob/master/LICENSE)

[![forthebadge](http://forthebadge.com/images/badges/made-with-crayons.svg)](http://forthebadge.com)
Empty file added api/__init__.py
Empty file.
8 changes: 8 additions & 0 deletions api/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from django.contrib import admin
from api.models.user import User
from api.models.image import Image
from api.models.phedited import PheditedImage

admin.site.register(User)
admin.site.register(Image)
admin.site.register(PheditedImage)
9 changes: 9 additions & 0 deletions api/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from __future__ import unicode_literals

from django.apps import AppConfig


class ApiConfig(AppConfig):
"""configuration for api app
"""
name = 'api'
Loading