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

Google Code-in Add content into aboutPC.html, [MACC] (Systers, an Anita Borg Institute Community) #12

Open
wants to merge 64 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
3853476
Experimenting with Bootstrap forms
Nerdylicious Jul 18, 2015
ac5cfe5
Moved malaria functionality to its own Django app
Nerdylicious Jul 22, 2015
a961c37
Added update schema guide
Nerdylicious Jul 22, 2015
182b783
Moved malaria api code to its own Django app
Nerdylicious Jul 23, 2015
4be3e2d
Updated templates to use bootstrap components
Nerdylicious Jul 26, 2015
80d5497
Moved some code from create_post view function to services layer
Nerdylicious Jul 26, 2015
f94a5f5
Changed error message text to white and updated Post model regex vali…
Nerdylicious Jul 29, 2015
6182fd0
Fixed width of description post contents and changed the color of som…
Nerdylicious Jul 29, 2015
ce83754
Fixed how post description contents are displayed so that HTML line b…
Nerdylicious Jul 29, 2015
03f49cb
Updated description_post field in the Post model to be a TextField. U…
Nerdylicious Jul 31, 2015
0173720
Update author name displayed in Revision History so that the username…
Nerdylicious Jul 31, 2015
7c27890
Updated the update schema guide to remind the user to update the api …
Nerdylicious Jul 31, 2015
6d81ca1
Fixed header and footer to be responsive to window size changes
Nerdylicious Aug 1, 2015
da4f7f8
Added profile button in header
Nerdylicious Aug 4, 2015
93e7546
Added logout button to header
Nerdylicious Aug 4, 2015
b480a81
Updated views so that functionality is only accessible when a user is…
Nerdylicious Aug 5, 2015
9a5e5ba
Added tests for get_posts_by_id
Nerdylicious Aug 5, 2015
9ca1645
Added unit tests for deleting posts
Nerdylicious Aug 8, 2015
c7dc6a6
Added unit tests for create_revpost method
Nerdylicious Aug 8, 2015
5498b87
Added unit tests for get_revposts_of_owner function
Nerdylicious Aug 11, 2015
109326c
Added test cases with an additional owner
Nerdylicious Aug 14, 2015
41e7a42
Put import on multiple lines to comply with PEP8
Nerdylicious Aug 14, 2015
5b35438
Added .travis.yml file
Nerdylicious Aug 20, 2015
7c86f0f
Updated .travis.yml
Nerdylicious Aug 20, 2015
0693cfa
Updated .travis.yml
Nerdylicious Aug 20, 2015
248026f
Added Travis CI status image in README.md
Nerdylicious Aug 20, 2015
98eb4ee
Added Travis CI status image in README.md
Nerdylicious Aug 20, 2015
6ae95a1
Update .travis.yml file
Nerdylicious Aug 20, 2015
50f00e0
Update .travis.yml file so that builds are sent to container-based in…
Nerdylicious Aug 20, 2015
2c2bb8a
Updated .travis.yml file
Nerdylicious Aug 20, 2015
66ed26a
Merge pull request #29 from Nerdylicious/master
Nerdylicious Jan 11, 2016
298b99b
PeaceTrack App removed
medhach Jun 15, 2016
de68179
Moved registration functionality to own django app
medhach Jun 18, 2016
f6662ad
Merge pull request #53 from medhach/develop
Nerdylicious Jun 18, 2016
d6d9d07
Allow ' in Post description
medhach Jun 19, 2016
d7e59e5
Separated CSS from HTML.
medhach Jun 19, 2016
8d1cb0b
Made necessary changes in signup app
medhach Jun 21, 2016
ebc1b2b
Profile functionality moved to separate app
medhach Jun 21, 2016
113dc26
Merge pull request #55 from medhach/develop
Nerdylicious Jun 22, 2016
e09e69b
Changed app name from malaria to malaria_web
medhach Jun 24, 2016
a03cdad
Changed Contents to link systers/Installation Guide
medhach Jun 24, 2016
c4aa830
Removed revpost title_change and description_change fields
medhach Jun 24, 2016
ce6f49a
Travis Build repairs
medhach Jun 24, 2016
7d18b72
Travis repair
medhach Jun 24, 2016
8a76de1
Merge pull request #56 from medhach/develop
Nerdylicious Jun 25, 2016
d2aac5f
Added PCSA front-end pages and in-app functionality
medhach Jul 6, 2016
67b85cb
Merge pull request #57 from medhach/develop
AngieSky Jul 10, 2016
64c606c
serializers.py added to Pcsa
medhach Jul 13, 2016
6c99c17
Merge pull request #60 from medhach/develop
Nerdylicious Jul 17, 2016
81f4342
Implemented model and serializer for Malaria users
medhach Jul 20, 2016
faa3d0c
Added id attribute to pcsa serializer
medhach Jul 20, 2016
7bdf097
Merge pull request #62 from medhach/develop
AngieSky Jul 24, 2016
df660a5
Added Get Help Now from PCSA to MACC
medhach Aug 16, 2016
ac81de3
Deleted unwanted file
medhach Aug 16, 2016
6425e57
Travis Build changes for failure.
medhach Aug 16, 2016
fa907ab
Travis build error
medhach Aug 16, 2016
bcc14e4
PCSA-MACC Integration : Implemented Safety Tools
medhach Aug 19, 2016
7027eab
Merge pull request #63 from medhach/develop
AngieSky Aug 24, 2016
98f2306
Readme updated
medhach Nov 18, 2016
4d4236f
Merge pull request #64 from medhach/develop
Nov 28, 2016
bc17225
Update README.md
Nov 28, 2016
b56fa6a
Update README.md
Nov 28, 2016
66dd55c
Add files via upload
isiratc Dec 9, 2016
acbc4af
Add files via upload
isiratc Dec 11, 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
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "nightly"

# command to install dependencies
install: "pip install -r requirements.txt"

# command to run tests
script: nosetests
install:
- "pip install -r requirements.txt"
before_script:
- psql -c "create role myuser with createrole createdb login password 'mypassword';" -U postgres
- psql -c "create database webapp;" -U postgres
script: python manage.py test
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

45 changes: 8 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
<h1>Malaria App Project</h1>
#Mobile App Control Center (MACC)
MACC is a backend platform for the Peace Corps mobile applications - Malaria and FirstAide. The Mobile App Control Center allows the volunteers at Peace Corps HQ to send or edit any information in their mobile applications through a set of APIs.

The malaria-app-readme repository is intended to be the central repo for discussions, decision making, and feedback about the project goals and features so that the user experience across platforms is uniform. Comments and coding for a specific platform can happen at the repositories linked to below.
#On Malaria App
MACC works on Malaria Prevention application as infoHub, a portal where posts can be added and notified to the mobile app users(volunteers). Posts on infoHub mainly focus on malaria prevention tips and malaria awareness.

<h3>Link to README Repo:</h3> https://github.com/PeaceCorps/malaria-app-readme
#On FirstAide App
MACC works on PCSA mobile and web apps, MACC makes the mobile apps fully dynamic and all the information present in the mobile apps is fetched from MACC through APIs.


Please keep all discussion regarding features that will be cross-platform on that repository, and code-specific discussion on this one.




<h2>Application Description</h2>

Peace Corps is looking to build a mobile app that will aid the Volunteer in sustaining life-saving malaria prevention tactics over their 2+ years of service. Prevention is focused on sustained use of preventive medications, which are taken either daily or weekly, depending on the medicine. The application will feature a reminder system; an ability to indicate that medication was taken on time or missed; the ability for the volunteer to track their usage history; a trip indicator to help remind volunteers to pack certain supplies to prevent malaria if they leave their home village; and an Info Hub that will provide accurate information about Malaria and the medications they are taking.

Included in this repository are Adobe Illustrator (.ai), and Adobe PDF (.pdf) files that were created by University of Michigan design students to meet the requirements listed above. These resources are intended to be the building blocks of iOS and Android applications.

Also included in this repository for reference and background are two recent studies conducted by the CDC pertaining to use of preventative tactics by volunteers and their reasons for compliance or non-compliance with taking their medicine.
<h2>Asset Information</h2>
Included in this repository are files to help you get started:
<ul>
<li>Mock Up Version 8 (the latest mock up file) is included in pdf, png, and in the original Adobe Illustrator format.</li>
<li>A research folder containing a map of Malaria Prevalence, and additional information about Malaria from the Centers for Disease Control and Prevention.</li>
</ul>

<h3>Contact Information:</h3>


Patrick Choquette

Director of the Office of Innovation

[email protected]


Matthew McAllister

Special Assistant in the Office of Innovation

[email protected]
Installation Guide - [here](https://github.com/systers/app-web-server/blob/develop/docs/API%20Documentation.pdf)
API Documentation - [here](https://docs.google.com/document/d/1uQ42HQGIEOWoD-PtRRGoKLN15S-EhEkWgsIxiceNMGI/edit?usp=sharing)
Loading