diff --git a/.gitignore b/.gitignore index 37135ac..7098a14 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,6 @@ private/ .coveralls.yml -# ignore debugging certs -ssl/server.crt -ssl/server.key +# ignore debugging self-signed certs +# ssl/server.crt +# ssl/server.key diff --git a/.travis.yml b/.travis.yml index 9e2dab0..40211fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,19 @@ branches: - master - develop +# env: PATH="/usr/lib/chromium-browser:$PATH" + # __1 Use this to prepare the system to install prerequisites or dependencies before_install: - - echo "Nothing to do" + # http://docs.travis-ci.com/user/gui-and-headless-browsers/ + - echo "Init xvfb (X Virtual Framebuffer)" + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + - sleep 3 # give xvfb some time to start + # - sudo apt-get install -y chromium-chromedriver + # - echo "Current path: $PATH" + # - export PATH="/usr/lib/chromium-browser:$PATH" + # - ln -sf /usr/bin/chromium-browser /usr/bin/google-chrome # __2 Use this to install any prerequisites or dependencies necessary to run your build install: @@ -32,6 +42,8 @@ script: # put config file in the place expected by config.py - cp deploy/sample.settings.conf deploy/settings.conf - fab coverage + - fab run & + - behave # __5a after_success after_success: @@ -44,3 +56,8 @@ after_failure: # __6 after_script: echo "Cleanup." + +#addons: +# apt: +# packages: +# - chromium-chromedriver diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 0000000..cbb3c78 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,7 @@ +# Authors + +* Andrei Sura +* Ruchi Vivek Desai +* Sanath Pasumarthy +* Taeber Rapczak +* Nicholas Rejack diff --git a/README.md b/README.md index d71e02d..ec4e0a4 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,33 @@ # barebones-flask-app -[![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=master)](https://travis-ci.org/ctsit/barebones-flask-app?branch=master) -[![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=master) +| Branch | [Travis-CI](https://travis-ci.org/ctsit/barebones-flask-app/builds) | [Coveralls](https://coveralls.io/github/ctsit/barebones-flask-app) | +| :----- | :---------------------------: | :-------: | +| [Master](https://github.com/ctsit/barebones-flask-app/tree/master) | [![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=master)](https://travis-ci.org/ctsit/barebones-flask-app?branch=master) | [![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=master) | +| [Develop](https://github.com/ctsit/barebones-flask-app/tree/develop) | [![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=develop)](https://travis-ci.org/ctsit/barebones-flask-app?branch=develop) | [![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=develop) | -[![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=develop)](https://travis-ci.org/ctsit/barebones-flask-app?branch=develop) -[![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=develop) +This repo serves as an example of a python web application implemented using the +Flask micro-framework. It implements role-based authentication and can be used +for building more complex applications that interact with a database. -This is a basic python web app implemented using the Flask micro-framework # Contributing +We encourage input and collaboration from the community. +Please fork the code, implement changes, and submit a +[pull request](https://github.com/ctsit/barebones-flask-app/pulls). + +If you prefer to report a bug or make a suggestion, please create a GitHub +[issue](https://github.com/ctsit/barebone-flask-app/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 -@see [AUTHORS.md](AUTHORS.md) +The application was written by Andrei Sura with tremendous support and fedback +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) diff --git a/app/static/css/layout.css b/app/static/css/layout.css index aa67390..348d5a6 100644 --- a/app/static/css/layout.css +++ b/app/static/css/layout.css @@ -21,8 +21,8 @@ z-index:80002; /* ensures box appears above overlay */ } -.red-background { - background-color: #a51a11; +.theme-background { + background-color: #123C84; } a.logo-name:hover, a.logo-name:active, @@ -61,7 +61,6 @@ table.borderless td, table.borderless th { .login-form-container { margin-top: 3em; padding: 3em; - background-color: #a51a11; } .footer { diff --git a/app/static/css/parallax.css b/app/static/css/parallax.css index edab27a..ff222aa 100644 --- a/app/static/css/parallax.css +++ b/app/static/css/parallax.css @@ -13,14 +13,11 @@ This stylesheet and the associated (x)html may be modified in any way to fit you /* additional sections */ #home { - background: url(/static/img/bottles.jpg) no-repeat center center fixed; + background: url(/static/img/code.jpg) no-repeat center center fixed; display: table; height: 50vh; position: relative; width: 100%; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; background-size: cover; } @@ -28,7 +25,7 @@ This stylesheet and the associated (x)html may be modified in any way to fit you } #services { - background-color: #a51a11; + background-color: #123C84; color: #ffffff; } @@ -45,13 +42,14 @@ This stylesheet and the associated (x)html may be modified in any way to fit you } #information { - background: url(/static/img/oil.jpg) no-repeat center center fixed; + background: url(/static/img/code.jpg) no-repeat center center fixed; display: table; height: 300px; position: relative; width: 100%; background-size: cover; } + #information .panel { opacity: 0.85; } diff --git a/app/static/img/bottles.jpg b/app/static/img/bottles.jpg deleted file mode 100755 index 6fc443f..0000000 Binary files a/app/static/img/bottles.jpg and /dev/null differ diff --git a/app/static/img/code.jpg b/app/static/img/code.jpg new file mode 100644 index 0000000..51262b7 Binary files /dev/null and b/app/static/img/code.jpg differ diff --git a/app/static/img/oil.jpg b/app/static/img/oil.jpg deleted file mode 100755 index a66b7a3..0000000 Binary files a/app/static/img/oil.jpg and /dev/null differ diff --git a/app/templates/images/bottles.jpg b/app/templates/images/bottles.jpg deleted file mode 100644 index ff890ae..0000000 Binary files a/app/templates/images/bottles.jpg and /dev/null differ diff --git a/app/templates/images/bottles_sm.jpg b/app/templates/images/bottles_sm.jpg deleted file mode 100755 index 03a871a..0000000 Binary files a/app/templates/images/bottles_sm.jpg and /dev/null differ diff --git a/app/templates/images/drop-water.jpg b/app/templates/images/drop-water.jpg deleted file mode 100644 index f4d8cc9..0000000 Binary files a/app/templates/images/drop-water.jpg and /dev/null differ diff --git a/app/templates/images/megaphone-png-megaphone-1979px.png b/app/templates/images/megaphone-png-megaphone-1979px.png deleted file mode 100644 index a9f1784..0000000 Binary files a/app/templates/images/megaphone-png-megaphone-1979px.png and /dev/null differ diff --git a/app/templates/images/oil_red.jpg b/app/templates/images/oil_red.jpg deleted file mode 100755 index 3ed9272..0000000 Binary files a/app/templates/images/oil_red.jpg and /dev/null differ diff --git a/app/templates/images/phone-handle.gif b/app/templates/images/phone-handle.gif deleted file mode 100644 index d853a61..0000000 Binary files a/app/templates/images/phone-handle.gif and /dev/null differ diff --git a/app/templates/images/phone_icon.png b/app/templates/images/phone_icon.png deleted file mode 100644 index e4609a2..0000000 Binary files a/app/templates/images/phone_icon.png and /dev/null differ diff --git a/app/templates/layout.html b/app/templates/layout.html index 9dcec43..312ca3c 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -51,7 +51,7 @@ {%endif%} -