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

projects.html: Get related issues states from webservices #733

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .coafile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ignore =
_projects/README.md,
data/locale/en/projects/README.md,
# README.md symlinks: https://github.com/coala/coala-bears/issues/2950
max_lines_per_file = 500
max_lines_per_file = 1000

[filenames]
bears = FilenameBear
Expand Down
10 changes: 7 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@
<div class="row">
<div class="col s12">
<ul class="tabs uppercase">
<li class="tab col m4"><a ng-click="tc.setTab('/projects')" onmousedown="keyPressed(event, '#/projects')" ng-class="{active:tc.isSet('/projects')}">Projects</a>
<li class="tab col s2"><a ng-click="tc.setTab('/projects')" onmousedown="keyPressed(event, '#/projects')" ng-class="{active:tc.isSet('/projects')}">Projects</a>
</li>
<li class="tab col m4"><a ng-click="tc.setTab('/mentors')" onmousedown="keyPressed(event, '#/mentors')" ng-class="{active:tc.isSet('/mentors')}">Mentors</a>
<li class="tab col s2"><a ng-click="tc.setTab('/mentors')" onmousedown="keyPressed(event, '#/mentors')" ng-class="{active:tc.isSet('/mentors')}">Mentors</a>
</li>
<li class="tab col m4"><a ng-click="tc.setTab('/faq')" onmousedown="keyPressed(event, '#/faq')" onerror="" ng-class="{active:tc.isSet('/faq')}">Faq</a>
<li class="tab col s2"><a ng-click="tc.setTab('/faq')" onmousedown="keyPressed(event, '#/faq')" onerror="" ng-class="{active:tc.isSet('/faq')}">Faq</a>
</li>
<li class="tab col s2"><a ng-click="tc.setTab('/forms')" onmousedown="keyPressed(event, '#/forms')" onerror="" ng-class="{active:tc.isSet('/forms')}">Forms</a>
</li>
<li class="tab col s2"><a ng-click="tc.setTab('/events')" onmousedown="keyPressed(event, '#/events')" onerror="" ng-class="{active:tc.isSet('/events')}">Events</a>
</li>
</ul>
</div>
Expand Down
39 changes: 39 additions & 0 deletions partials/tabs/events.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<div class="main-content container-fluid">
<div class="row">
<div class="col m8 offset-m2">
<h1 class="fine center">Organization Events</h1>
<br>
</div>
</div>
</div>
<div class="all-events-detail" ng-repeat="category in eventsList">
<div class="events-detail" ng-show="category.events.length>0">
<h5 class="lighter-font">{{ category.name }}</h5>
<hr>
<div class="apply-flex">
<div class="card blue-grey darken-1 event-card" ng-repeat="event in category.events">
<div class="card-content white-text constant-content-height">
<span class="card-title">{{ event.title }}</span>
<p class="break-word">{{ event.description }}</p>
<em class="break-word" ng-show="event.description === null">No event description available!</em>
</div>
<div class="card-action">
<a>
{{ event.start_date_time | date:"medium" }}
<span ng-show="event.end_date_time !== null">
- {{ event.end_date_time | date:"medium" }}
</span>
</a>
</div>
</div>
</div>
</div>
</div>
<div class="apply-flex no-events-available" ng-hide="eventsData.length>0">
<h6 class="center-align-text">
No Events Found! If you're already a member of organization and a developer,
you can share it with us on <a href="https://community.coala.io/">Community website</a>
by logging-in.
</h6>
</div>
46 changes: 46 additions & 0 deletions partials/tabs/forms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<div class="main-content container-fluid">
<div class="row">
<div class="col m8 offset-m2">
<h1 class="fine center">Open Source Forms</h1>
<br>
</div>
</div>
</div>
<section>
<div class="container">
<table class="striped" ng-show="osforms.formsList.length !== 0" style="margin-bottom:20px;">
<thead>
<tr class="center-align-text">
<th>Title</th>
<th>Submissions Till</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="form in osforms.formsList">
<td>
<div>
<strong><a href="{{ form.url }}" data-proofer-ignore>{{ form.title }}</a></strong>
<div style="padding-left: 10px;">
<p ng-show="form.description !== null">{{ form.description }}</p>
<p ng-show="form.user !== null">
Uploaded by: <a href="https://github.com/{{ form.user }}" data-proofer-ignore>{{ form.user }}</a>
</p>
</div>
</div>
</td>
<td>
{{ form.expiry_date | date:"medium" }}
</td>
</tr>
</tbody>
</table>
<div class="apply-flex" ng-show="osforms.formsList.length === 0" style="padding: 5% 0;">
<h6>
No forms have been uploaded, yet! If you are already a member of organization and a developer,
you can share it with us on <a href="https://community.coala.io/">Community website</a>
by logging-in.
</h6>
</div>
</div>
</section>
8 changes: 4 additions & 4 deletions partials/tabs/mentors.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="col m8 offset-m2">
<h1 class="fine center">Hello there!</h1>
<h4 class="light center">
We are the mentors for coala in GSoC 2018.
We are the mentors for coala in GSoC {{ gic.nextProgramYear }}.
</h4>
<h4 class="light center">
Just drop a message on <a href="https://coala.io/chat" class="bear-link">Gitter</a> -
Expand All @@ -18,7 +18,7 @@ <h4 class="light center">
<div class="row user">
<div class="parent-wrapper">
<div class="parent">
<div ng-repeat="member in gic.mentorsList" class="card child card-main sc">
<div ng-repeat="member in gic.mentorsList" class="card child card-main sc black-shadow">
<a ng-href="https://github.com/{{member.github_handle}}">
<div class="empty"></div>
<!-- data-proofer-ignore as html-proofer doesn't recognise ng-src -->
Expand All @@ -42,7 +42,7 @@ <h4 class="light center">
<div class="col m8 offset-m2">
<h1 class="fine center">Admins</h1>
<h4 class="light center">
We are the admins for coala in GSoC 2018.
We are the admins for coala in GSoC {{ gic.nextProgramYear }}.
</h4>
<h4 class="light center">
Just drop a message on <a href="https://coala.io/chat" class="bear-link">Gitter</a>
Expand All @@ -55,7 +55,7 @@ <h4 class="light center">
<div class="row user">
<div class="parent-wrapper">
<div class="parent">
<div ng-repeat="member in gic.adminsList" class="card card-main child sc">
<div ng-repeat="member in gic.adminsList" class="card card-main child sc black-shadow">
<a ng-href="https://github.com/{{member.github_handle}}">
<div class="empty"></div>
<!-- data-proofer-ignore as html-proofer doesn't recognise ng-src -->
Expand Down
42 changes: 39 additions & 3 deletions partials/tabs/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,39 @@
<br>
<div class="main-content container">
<div class="col m8 col offset-m2 s12">
<div class="input-field searchbar">
<input ng-model="searchText" placeholder="Search for a project" id="search" type="search" class="validate"> </div>
<div class="filter-projects-inputs">
<div class="input-field searchbar">
<input ng-model="searchText" placeholder="Search for a project" id="search" type="search" class="validate"> </div>
<div class="filter-btn apply-flex center-content">
<a id="filters" class="waves-effect waves-light btn-large" ng-click="toggleFiltersDisplay()">
<b>Filter Projects</b>
</a>
</div>
</div>
<div ng-class="{'display-none':!lc.displayFilters}" ng-click="toggleFiltersDisplay()">
<i class="fa fa-times close-filters"></i>
</div>
<div class="all-filters-option apply-flex center-content fade-in" ng-class="{'display-none':!lc.displayFilters}">
<h6><b>Filter Google Summer of Code Projects</b></h6>
<div class="filters-inputs apply-flex">
<div class="filter-select-fields apply-flex evenly-spread-content">
<label class="project-filter" ng-repeat="(filter, metadata) in projectFilterOptions">
<select class="{{ filter }}-selector" ng-model="metadata.model" ng-change="setModelList(filter, metadata.model)" name="{{ filter }}-selector" multiple>
<option value="" disabled>{{ metadata.label }}</option>
<option value="{{ value }}" ng-repeat="(key, value) in metadata.options">{{ key }}</option>
</select>
</label>
</div>
<div class="filter-btns">
<a class="waves-effect waves-light btn" ng-click="applyFilters()">
<i class="fa fa-check" aria-hidden="true"> Apply Filters</i>
</a>
<a class="waves-effect waves-light btn" ng-click="clearFilters()">
<i class="fa fa-trash-o clear-filters"> Clear Filters</i>
</a>
</div>
</div>
</div>
<div style="text-align: center;">
For more project ideas, <a href="https://github.com/coala/projects/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22Project+Proposal%22">click here</a>.
<br>
Expand All @@ -21,6 +52,9 @@
<div class="row outline">
<div class="parent-wrapper">
<div class="parent">
<div class="no-projects-found" ng-show="projectList.length === 0">
{{ message.noProjectsFound }}
</div>
<div ng-repeat="project in projectList | filter: searchText | orderBy: sortOrder" class="card child">
<div class="card-content waves-effect" ng-click="lc.showProject(project)">
<div class="card-title center">{{ project.name }}</div>
Expand Down Expand Up @@ -72,7 +106,7 @@
<div ng-show="currentProject.developers_involved.length>0" class="project-detail-element">
<div class="small-heading uppercase">Developers Involved</div> <span class="pr-element-detail chip" ng-repeat="developers in currentProject.developers_involved">@{{developers}}</span> </div>
<div ng-show="currentProject.issues.length>0" class="project-detail-element">
<div class="small-heading uppercase">Related issues</div> <span ng-click="redirect(issue)" class="pr-element-detail chip clickable" ng-repeat="issue in currentProject.issues">{{ issue | format_issue }}</span>
<div class="small-heading uppercase">Related issues</div> <span ng-click="redirect(issue)" class="pr-element-detail chip clickable" ng-class="lc.getIssueStateClass(issue)" ng-repeat="issue in currentProject.issues">{{ issue | format_issue }}</span>
<br>
<br>
<br>
Expand All @@ -97,6 +131,8 @@
'slow');
})

$('.filter-select-fields select').material_select();

$('.modal').modal({
dismissible: true, // Modal can be dismissed by clicking outside of the modal
opacity: 0.8, // Opacity of modal background
Expand Down
123 changes: 123 additions & 0 deletions resources/css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,59 @@
.all-filters-option {
position: relative;
z-index: 1002;
min-width: 350px;
margin: 10px 0;
background-color: white;
box-shadow: 0 0 15px 2px black;
border-radius: 20px;
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}
.apply-flex {
display: flex;
flex-flow: row wrap;
align-items: center;
}
.black-shadow {
box-shadow: 0 0 15px 2px black;
}
.break-word {
word-wrap: break-word;
}
.center-align-text {
text-align: center;
}
.constant-content-height {
height: 150px;
}
.center-content {
justify-content: center;
}
.closed {
background-color: #cb2431;
color: white
}
.close-filters {
right: 6%;
margin-top: 1.25rem;
position: absolute;
z-index: 1003;
}
.display-none {
display: none;
}
.event-card {
width: 320px;
margin-right: 20px;
}
.events-detail {
margin: 15px 0;
}
.evenly-spread-content {
justify-content: space-evenly;
}
.hash_value_dup {
position: 'absolute';
left: '-9999px';
Expand Down Expand Up @@ -32,6 +88,56 @@
.fa-clipboard:hover .hinttext {
visibility: visible;
}
.filter-projects-inputs {
display: flex;
flex-flow: row wrap;
justify-content: space-evenly;
margin-top: 1rem;
}
.filter-btn {
width: 165px;
z-index: 0;
}
.filter-btn .btn-large {
border-radius: 100px;
box-shadow: 0 0 10px 1px darkslategray;
}
.filters-btns {
width: 50%;
}
.filters-inputs {
justify-content: space-around;
padding: 20px 0;
}
.filter-select-fields {
width: 100%;
padding-top: 20px;
padding-bottom: 10px;
justify-content: space-around;
}
i.fa {
cursor: pointer;
}
.lighter-font {
font-weight: lighter;
}
.merged {
background-color: #6f42c1;
color: white;
}
.no-events-available {
font-size: 1.2em;
height: 30vh;
justify-content: center;
flex-direction: column;
}
.no-state {
background-color: #e4e4e4;
}
.open, .opened {
background-color: #2cbe4e;
color: white;
}
.project-detail-element > .clickable:hover, .clickable:hover .chip:hover {
cursor: pointer;
background-color: #f3f5f8;
Expand Down Expand Up @@ -114,6 +220,11 @@
border: 0;
z-index: 9;
}
.searchbar {
width: 85%;
min-width: 340px;
margin-top: 0;
}
.sha256sum_hash {
display: flex;
justify-content: space-evenly;
Expand All @@ -126,3 +237,15 @@
#sha256sum_hash_value {
word-wrap: break-word;
}
@-webkit-keyframes fade-in {
0% {opacity: 0;}
100% {opacity: 1;}
}
@keyframes fade-in {
0% {opacity: 0;}
100% {opacity: 1;}
}
.fade-in {
-webkit-animation-name: fade-in;
animation-name: fade-in;
}
Loading