diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 0281773..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensourcehelpcommunity@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Procfile b/Procfile deleted file mode 100644 index 23294d2..0000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: gunicorn --pythonpath oshc oshc.wsgi --log-file - diff --git a/README.md b/README.md index 2925473..2e51847 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,10 @@ We are trying to create a medium where people who want to start with contributin [Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP] -After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch. This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/). Feel free to suggest a better design. -Please submit your pull request on develop branch, it will have the most recent changes. ## Installations Run diff --git a/oshc/main/static/main/css/.app.css.swp b/oshc/main/static/main/css/.app.css.swp new file mode 100644 index 0000000..831afb6 Binary files /dev/null and b/oshc/main/static/main/css/.app.css.swp differ diff --git a/oshc/main/static/main/css/app.css b/oshc/main/static/main/css/app.css index 2765c35..631bc11 100644 --- a/oshc/main/static/main/css/app.css +++ b/oshc/main/static/main/css/app.css @@ -1,241 +1,65 @@ -/* GLOBAL DEFINATIONS STARTS */ - -* { - padding: 0; - margin: 0; - box-sizing: border-box; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - transition: opacity 0.7s ease-in-out; - font-family: "Montserrat", sans-serif -} - body { - overflow-x: hidden; - padding-top: 50px; -} - -a { - cursor: pointer; - color: #0275d8; - text-decoration: none; -} - -.line-gap-10px { - height: 10px; -} - - -/* NAVBAR CSS STARTS */ - -.navbar { - margin-bottom: 0; -} - -.navbar-inverse .navbar-brand { - color: #eee; -} - -.navbar-inverse { - background-color: #24292e; -} - -.navbar-inverse { - border-color: #24292e; -} - - -/* SECTION ONE STARTS */ - -.main-section { - min-height: 70vh; - height: auto; - padding-top: 40px; - background: white; - background-color: white; - position: relative; - clear: both; -} - -.logo-image { - width: 200px; - display: block; - margin-left: auto; - margin-right: auto -} - -.jumbotron { - background-color: white; - word-wrap: break-word; - display: block; -} - -.jumbotron h1 { - font-size: 60px; - color: #0275d8; -} - -.jumbotron h4 { - color: #999; - font-size: 18px; - padding-top: 20px; -} - - -/* SECTION TWO START */ - -.section-two { - height: auto; - padding: 70px 0; - background-color: #eee; - word-wrap: break-word; - display: block; + padding: 20px 0; } -.section-two h3 { - font-size: 30px; - color: #444444; +#logo { + width: 180px; + height: 180px; } -.bi { - text-align: center; - font-style: italic; - padding: 10px 0; - font-size: 15px; +.navbar ul { + margin-top: 5px; } -.section-two .intro { - color: #666666; - font-size: 18px; - line-height: 35px; - text-align: justify; +.navbar .navbar-brand { + color: #ED1B49; + font-size: 175%; + font-weight: 100; } - -/* SECTION THREE START */ - -.section-three { - height: auto; - min-height: 500px; - padding: 40px 0; -} - -.left-session-info { - padding: 30px 50px; -} - -.sRegister { - color: white; - font-size: 15px; - background-color: #0275d8; - border-color: #0275d8; -} - -.sRegister a { - color: white; - text-decoration: none; -} - -.left-social-section { - padding: 0 50px; -} - - -/* FOOTER CSS STARTS */ - footer { - height: auto; - min-height: 120px; - padding-top: 10px; - background-color: #24292e; -} - -footer .container { - width: 70%; - position: sticky; - display: block; -} - -.rectangle { - height: 30px; - line-height: 30px; - margin-top: 15px; + height:70px; + background-color: #e7e7e7; + text-align: center; + border-radius: 7px; + border-style: solid !important; + border:1px; + border-color: #bdbdbd; + padding-top: 15px; + padding-left: 5px; } -.backToTop { - float: right; - color: #999; +footer .col-sm-6 a{ + color: #777; + padding: 10px; } -.backToTop a { - text-decoration: none; +.navbar .navbar-brand:hover { + color: rgb(255, 100, 100); } -.copyright { - color: #fff; - line-height: 30px; - min-height: 30px; - padding: 7px 0; -} +#organizers { + margin: 40px 0 40px; + background: #f4f4f4; + padding: 40px 20px 20px; + border-radius: 12px; -.social { - color: #fff; - line-height: 30px; - min-height: 30px; - padding: 7px 0; } -.social .left-align { - text-align: left; +#organizers h2 { + font-weight: 100; } -.social .right-align { - text-align: right; +#organizers .title h2 { + font-size: 250%; + top: 85px; + color: #26A9E0; } -.social ul { - list-style: none; -} - -.social ul li { - width: 40px; - height: 30px; - color: #eee; - font-size: 22px; - display: inline-block; -} - -.social a { - color: #fff; -} - - -/*Media queries*/ - -@media (max-width: 320px) { - .jumbotron h1 { - font-size: 30px; - } -} - -@media (min-width: 321px) and (max-width: 480px) { - .jumbotron h1 { - font-size: 38px; - } -} - -@media (max-width: 768px) { - .main-section { - min-height: 50vh; - height: auto; - clear: both; - } +.jumbotron { + background-color:#ffffff; + background-size:80px 50px; } - -@media (min-width: 769px) and (max-width: 1024px) { - .main-section { - min-height: 50vh; - height: auto; - clear: both; - } +.jumbotron h1 { + color: #26A9E0; } diff --git a/oshc/main/static/main/images/oshc-logo.png b/oshc/main/static/main/images/oshc-logo.png index bf3fa3b..e0fb9d1 100644 Binary files a/oshc/main/static/main/images/oshc-logo.png and b/oshc/main/static/main/images/oshc-logo.png differ diff --git a/oshc/main/static/main/js/script.js b/oshc/main/static/main/js/script.js deleted file mode 100644 index 21b83e5..0000000 --- a/oshc/main/static/main/js/script.js +++ /dev/null @@ -1,8 +0,0 @@ -$(document).ready(function() { - - $("#toTop").click(function() { - $("html, body").animate({ - scrollTop: 0 - }, 1000); - }); -}); diff --git a/oshc/main/templates/base.html b/oshc/main/templates/base.html index ad6b368..010331e 100644 --- a/oshc/main/templates/base.html +++ b/oshc/main/templates/base.html @@ -1,76 +1,49 @@ {% load static %} + + - {% include 'header.html' %} - - {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} + {% include 'header.html' %} + + + {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} + - -
- {% block content %}{% endblock %} - {% block footer %} - - {% endblock %} -
+
+ +
+ +
+ {% block content %}{% endblock %} +
+ + + - - - diff --git a/oshc/main/templates/header.html b/oshc/main/templates/header.html index 7d7b59f..9366ea9 100644 --- a/oshc/main/templates/header.html +++ b/oshc/main/templates/header.html @@ -1,11 +1,13 @@ {% load static %} + {% if site.author %}{% endif %} {% if site.description %}{% endif %} + - + - + diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 9226ea3..5abd819 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -1,79 +1,60 @@ {% extends 'base.html' %} {% load static %} {% block content %} -
-
-
- Open Source Help Community Logo -

Open Source Help Community

-

A Virtual Platform To Help People To Start Contributing To Open Source Projects

-
-
-
+
+
+ +

Open Source Help Community

+

A Virtual Platform To Help People To Start Contributing To Open Source Projects.

+
+
-
-
-

Our Mission

-

- "Open Source Help Community is an a virtual platform to help people to start contributing to open source projects" -

-

- OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects. -

-
-

- If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com -

-
-
-
-
-

Upcoming Sessions

+
-
-
-
-
-

Open Source Contributor's Chat Session with Himanshu Mishra

-
-
- Himanshu is a pre-final year undergraduate student at IIT Kharagpur. He has been a Google Summer of Code student in 2015 and 2016 and is currently a mentor in Python Software Foundation. -
- Date: Wed, June 21, 2017 8:30 PM – 9:30 PM IST -
- -
-
-
-
-

Open Source Contributor's Chat Session with Joannah Nanjekye

-
-
- Joannah Nanjekye is a software engineer that graduated from Makerere University in Uganda with a Bachelor of Science Degree in software Engineering. -
- Sat, July 8, 2017 5:30 PM – 6:30 PM IST -
- -
-
-
+
-
- -
-
-
-
+
+

Our Mission

+

Open Source Help Community is an a virtual platform to help people to start contributing to open source projects.

OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects.

+

If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com.

+

Recent Tweets

+
+ +
+
+
+

Upcoming Sessions +

+ +
Powered by Eventbrite
+
+ + + + +
+ + + +
{% endblock %} diff --git a/requirements.txt b/requirements.txt index 89d5bdb..6405be5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,10 @@ -Django==1.11.2 -gunicorn==19.7.1 -pytz==2017.2 -whitenoise==3.3.0 +Django==1.7.6 +South==1.0.1 +argparse==1.2.1 +wsgiref==0.1.2 +dj-database-url==0.3.0 +dj-static==0.0.6 +gunicorn==19.1.1 +psycopg2==2.5.1 +whitenoise==2.0.6 +static==0.4