Merge branch 'release/0.0.3'

.travis.yml

@@ -12,6 +12,7 @@
 # http://docs.travis-ci.com/user/migrating-from-legacy/
 sudo: false
 language: python
+cache: pip
 python:
     - "2.7"
 

AUTHORS.md

@@ -1,7 +1,8 @@
-Kevin S. Hanson hansonks@gmail.com
-Andrei Sura asura@ufl.edu
-Christopher P. Barnes senrabc@gmail.com
-Philip Chase philipbchase@gmail.com
-Michael Buchholz ufbuck72@gmail.com
-Ruchi V. Desai ruchivdesai@gmail.com
-Taeber Rapczak taeber@ufl.edu
+# Authors
+
+* Andrei Sura             <sura.andrei@gmail.com>
+* Ruchi Vivek Desai       <ruchivdesai@gmail.com>
+* Sanath Pasumarthy       <sanath@ufl.edu>
+* Taeber Rapczak          <taeber@ufl.edu>
+* Kevin S. Hanson         <hansonks@gmail.com>
+* Christopher P. Barnes   <senrabc@gmail.com>

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [0.0.3] - 2015-08-26
+
+### Fixed
+* Issue #109 - AttributeError: 'NoneType' object has no attribute 'email' (Andrei)
+
+### Changed
+* Update AUTHORS.md (Andrei)
+
+### Added
+* Add sections for getting started, faq and support (Ruchi Vivek Desai)
+
+
 ## [0.0.2a] - 2015-08-20
 
 ### Added

README.md

@@ -1,11 +1,9 @@
 # RediDropper
 
-Master branch: [![Master Build Status](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=master)](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=master)
-[![Master Coverage Status](https://coveralls.io/repos/ctsit/redi-dropper-client/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/redi-dropper-client?branch=master)
-
-Develop branch: [![Develop Master Build Status](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=develop)](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=develop)
-[![Develop Coverage Status](https://coveralls.io/repos/ctsit/redi-dropper-client/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/redi-dropper-client?branch=develop)
-
+| Branch | [Travis-CI](https://travis-ci.org/ctsit/redi-dropper-client/builds) | [Coveralls](https://coveralls.io/github/ctsit/redi-dropper-client) |
+| :----- | :---------------------------: | :-------: |
+| [Master](https://github.com/ctsit/redi-dropper-client/tree/master) | [![Build Status](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=master)](https://travis-ci.org/ctsit/redi-dropper-client?branch=master) | [![Coverage Status](https://coveralls.io/repos/ctsit/redi-dropper-client/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/redi-dropper-client?branch=master) |
+| [Develop](https://github.com/ctsit/redi-dropper-client/tree/develop) | [![Build Status](https://travis-ci.org/ctsit/redi-dropper-client.svg?branch=develop)](https://travis-ci.org/ctsit/redi-dropper-client?branch=develop) | [![Coverage Status](https://coveralls.io/repos/ctsit/redi-dropper-client/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/redi-dropper-client?branch=develop) |
 
 
 ## Introduction
@@ -29,7 +27,8 @@ For running the unit tests please navigate to the
 
 ## Application Screenshots
 
-[![Searching a subject](docs/img/dropper_search_subject.png)]()
+[![Login page](docs/img/login.jpg)]()
+[![Upload page](docs/img/upload.jpg)]()
 
 For more screenshots please navigate to the [images folder](docs/img).
 
@@ -39,7 +38,29 @@ For more screenshots please navigate to the [images folder](docs/img).
 This software is distributed under the BSD 3-Clause License.
 For more information please read the [LICENSE](LICENSE) file.
 
-## Read the docs
+## Documentation
 
 For an easier navigation through the documentation please navigate to
 [Read the docs](http://redi-dropper-client.readthedocs.org/en/latest/).
+
+
+# Contributing
+
+We encourage input and collaboration from the community.
+Please fork the code, implement changes, and submit a
+[pull request](https://github.com/ctsit/redi-dropper-client/pulls).
+
+If you prefer to report a bug or make a suggestion, please create a GitHub
+[issue](https://github.com/ctsit/redi-dropper-client/issues); issues are a great
+place to ask public questions too. Please note that this project is released with
+a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/).
+By participating in this project you agree to abide by its terms.
+
+
+# Contributors
+
+The application was written by Andrei Sura with tremendous support, fedback
+and contributions from the entire
+[CTS-IT team](https://www.ctsi.ufl.edu/research/study-development/informatics-consulting/).
+
+For the complete list of contributors please see [AUTHORS.md](AUTHORS.md)

app/fabfile.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 The 'fabfile.py' is used by Fabric and must reside in the
 application root directory.
@@ -12,6 +13,9 @@
 from fabric.contrib.console import confirm
 from contextlib import contextmanager
 
+STATUS_PASS = '✔'
+STATUS_FAIL = '✗'
+
 
 @task
 def prep_deploy():
@@ -92,7 +96,9 @@ def coverage():
     # https://pytest.org/latest/example/pythoncollection.html
     local('python setup.py nosetests')
     """
-    local('py.test --tb=short -s --cov redidropper --cov-config tests/.coveragerc --cov-report term-missing --cov-report html tests/')
+    local(
+        'py.test --tb=short -s --cov redidropper --cov-config tests/.coveragerc --cov-report term-missing --cov-report html tests/')
+
 
 @task
 def lint():
@@ -108,6 +114,33 @@ def run():
     local('python run.py')
 
 
+@task
+def show_versions(url='https://localhost:5000'):
+    """ display latest tag and deployed tag at a specific url
+    Example: fab show_versions:url=https://stage.dropper.ctsi.ufl.edu
+    """
+    local('git fetch --tags')
+
+    cmd = """git tag \
+        | sort -t. -k 1,1n -k 2,2n -k 3,3n \
+        | tail -1"""
+    last_tag = local(cmd, capture=True)
+
+    cmd2 = 'curl -sk {}'.format(url) + """ \
+        | grep Version \
+        | grep -oE "[0-9.]{1,2}[0-9.]{1,2}[0-9a-z.]{1,4}" \
+        | tail -1"""
+    deployed_tag = local(cmd2, capture=True)
+
+    print("\nLast tag: {}".format(colors.yellow(last_tag)))
+    print("Deployed tag: {}".format(colors.yellow(deployed_tag)))
+
+    if last_tag != deployed_tag:
+        print("[{}] Tags do not match!".format(colors.red(STATUS_FAIL)))
+    else:
+        print("[{}] Tags do match.".format(colors.green(STATUS_PASS)))
+
+
 @contextmanager
 def virtualenv(venv_name):
     """ Activate a context """

app/redidropper/models/log_entity.py

@@ -55,12 +55,13 @@ def get_logs(per_page=25, page_num=1):
         def item_from_entity(entity):
             return {
                 'id': entity.id,
-                'user_email': entity.web_session.user.email,
+                'user_email': entity.web_session.user.email
+                if entity.web_session.user is not None else '',
                 'type': entity.log_type.type,
                 'details': entity.details,
                 'web_session_ip': entity.web_session.ip,
                 'date_time': utils.localize_est_datetime(entity.date_time),
-            }
+                }
 
         pagination = LogEntity.query.paginate(page_num, per_page, False)
         items = map(item_from_entity, pagination.items)

app/redidropper/routes/pages.py

@@ -336,18 +336,18 @@ def logout():
         https://shib.ncsu.edu/docs/logout.html
         https://wiki.shibboleth.net/confluence/display/CONCEPT/SLOIssues
     """
+    # Log the logout
+    if 'uuid' in session:
+        LogEntity.logout(session['uuid'])
+
     logout_user()
 
-    # Remove session keys set by Flask-Principal
-    for key in ('identity.name', 'identity.auth_type'):
+    # Remove session keys set by Flask-Principal, and `uuid` key set manually
+    for key in ('identity.name', 'identity.auth_type', 'uuid'):
         session.pop(key, None)
 
     # Tell Flask-Principal the user is anonymous
     identity_changed.send(current_app._get_current_object(),
                           identity=AnonymousIdentity())
 
-    # Log the logout
-    LogEntity.logout(session['uuid'])
-    # Also pop the session id
-    session.pop('uuid')
     return redirect('/')

app/redidropper/static/css/layout.css

@@ -22,7 +22,7 @@
 }
 
 .red-background {
-    background-color: #a51a11;
+    background-color: #993333;
 }
 
 a.logo-name:hover, a.logo-name:active,
@@ -61,7 +61,7 @@ table.borderless td, table.borderless th {
 .login-form-container {
     margin-top: 3em;
     padding: 3em;
-    background-color: #a51a11;
+    background-color: #993333;
 }
 
 .footer {

app/redidropper/static/css/parallax.css

@@ -11,11 +11,29 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
   padding: 50px 0;
 }
 
+.go-down {
+  border: 2px solid;
+  border-radius: 50%;
+  display: inline-block;
+  font-size: 28px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+  vertical-align: middle;
+  width: 60px;
+}
+
+.grey-color {
+  color: #D8D8D8;
+}
+
 /* additional sections */
-#home {
-  background: url(/static/img/bottles.jpg) no-repeat center center fixed; 
+#home,
+#image2,
+#image3 {
+  background: no-repeat center center fixed;
   display: table;
-  height: 50vh;
+  height: 45vh;
   position: relative;
   width: 100%;
   -webkit-background-size: cover;
@@ -24,12 +42,37 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
   background-size: cover;
 }
 
+#home {
+    background-image: url(/static/img/bottles.jpg);
+}
+
+#image2 {
+    background-image: url(/static/img/oil.jpg);
+}
+
+#image3 {
+    background-image: url(/static/img/oil.jpg);
+    transform: scaleY(-1);
+    filter: FlipV;
+}
+
 #about {
+  height: 55vh;
+}
+
+#scrolldownicon a {
+  color: #000000;
 }
 
 #services {
-  background-color: #a51a11;
+  background-color: #993333;
   color: #ffffff;
+  height: 100vh;
+}
+
+#services .container {
+  position: relative;
+  top: 20vh;
 }
 
 #services .glyphicon {
@@ -44,14 +87,76 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
   width: 140px;
 }
 
+#services a {
+  color: #FFFFFF;
+}
+
+
 #information {
-  background: url(/static/img/oil.jpg) no-repeat center center fixed; 
-  display: table;
-  height: 300px;
+    height: 100vh;
+    background: #fff no-repeat center center fixed;
+    display: table;
+    position: relative;
+    width: 100%;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+}
+
+#information:before {
+    background-image: url(/static/img/oil.jpg);
+    background-repeat: no-repeat;
+    content: ' ';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+    opacity: 0.3;
+    background-position: 50% 0;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+}
+
+
+#stardiv {
   position: relative;
-  width: 100%;
-  background-size: cover;
+  top: 20vh;
+}
+
+#gettingstarted {
+  height: 100vh;
+}
+
+#gettingstarted .container {
+  position: relative;
+  top: 10%;
 }
-#information .panel {
-  opacity: 0.85;
+
+#faq {
+  background-color: #993333;
+  color: #ffffff;
+  height: 100vh;
+}
+
+#faq .container {
+  position: relative;
+  top: 10%;
+}
+
+#support {
+  height: 100vh;
+}
+
+#support .container {
+  position: relative;
+  top: 5%;
+}
+
+#support button {
+  color: #FFFFFF;
 }