diff --git a/lib/thirdparty/Asana.class.php b/lib/thirdparty/Asana.class.php
index cb55de93..d9c3fc71 100644
--- a/lib/thirdparty/Asana.class.php
+++ b/lib/thirdparty/Asana.class.php
@@ -63,29 +63,29 @@ class Asana
$groupCategories = ['ongoing', 'upcoming'];
$tasks = [];
- foreach($projects as $projectId => $projectTuple)
+ $tags = [
+ 192699565737944 => 'Ongoing',
+ 192699565737946 => 'Upcoming',
+ 192699565737948 => 'Future'
+ ];
+
+ foreach($tags as $tagId => $tagLabel)
{
- list($projectName, $projectUrl) = $projectTuple;
- $projectTasks = static::get('/tasks', ['completed_since' => 'now', 'project' => $projectId], $cache);
- $group = null;
- foreach ($projectTasks as $task)
+ $taggedTasks = static::get('/tags/' . $tagId . '/tasks', ['completed_since' => 'now'], $cache);
+ foreach ($taggedTasks as $task)
{
- if (mb_substr($task['name'], -1) === ':') //if task ends with ":", it is a category heading so switch the active key
+ $fullTask = static::get('/tasks/' . $task['id']);
+ $projectId = $fullTask['memberships'][0]['project']['id'] ?? null;
+ if ($fullTask['name'] && $projectId && isset($projects[$projectId]))
{
- $group = array_reduce($groupCategories, function($carry, $candidate) use($task) {
- return $carry ?: (strcasecmp($task['name'], $candidate . ':') === 0 ? $candidate : null);
- });
- }
- elseif ($group && $task['name'])
- {
- $fullTask = static::get('/tasks/' . $task['id']);
- $tasks[$group][] = array_intersect_key($fullTask, ['name' => null]) + [
+ list($projectName, $projectUrl) = $projects[$projectId];
+ $tasks[$tagLabel][] = array_intersect_key($fullTask, ['name' => null]) + [
'project_label' => $projectName,
'badge' => $projectName,
'date' => $fullTask['due_on'] ?? null,
'body' => $fullTask['notes'],
'url' => $projectUrl,
- 'group' => $group,
+ 'group' => $tagLabel,
'assignee' => $fullTask['assignee'] ? ucwords($fullTask['assignee']['name']) : ''
];
}
diff --git a/lib/thirdparty/Github.class.php b/lib/thirdparty/Github.class.php
index 76a35cb4..2cdf150b 100644
--- a/lib/thirdparty/Github.class.php
+++ b/lib/thirdparty/Github.class.php
@@ -42,10 +42,7 @@ class Github
$allReleases = [];
$projects = [
- 'lbry' => 'LBRY Data Network',
- 'lbry-web-ui' => 'LBRY Browser',
- 'lbrycrdd' => 'LBRY Blockchain',
- 'lbryum' => 'LBRY Wallet'
+ 'lbry' => ''
];
foreach($projects as $project => $label)
diff --git a/view/template/content/roadmap.php b/view/template/content/roadmap.php
index 2324502f..c157d4bd 100644
--- a/view/template/content/roadmap.php
+++ b/view/template/content/roadmap.php
@@ -22,7 +22,7 @@
">
-
+
@@ -50,7 +50,7 @@
-
+
No description' ?>
@@ -65,75 +65,4 @@
-
-
-
- Recent Changes
-
-
-
- Release |
- Date |
- Notes |
-
- $changeset): ?>
- 5 ? 'style="display: none"' : '' ?>>
-
-
-
- prerelease
-
- |
- |
- |
-
-
-
- v0.1-v0.2.2 |
- |
- These releases were not tagged and noted properly. We were too busy creating awesome! |
-
-
-
-
- show all changes
-
- $('#show-all-changesets').click(function() {
- $(this).hide();
- $('#changeset-table').find('tr').show();
- });
-
-
-
- Upcoming Changes
-
-
- Item |
- Date |
- Component |
- Owner |
-
-
-
- |
- |
-
-
-
-
-
-
- |
-
- unassigned' ?>
- |
-
-
-
-
-
-
-
- */ ?>
\ No newline at end of file
+
\ No newline at end of file
diff --git a/web/scss/_roadmap.scss b/web/scss/_roadmap.scss
index 14e84ecf..59930ff7 100644
--- a/web/scss/_roadmap.scss
+++ b/web/scss/_roadmap.scss
@@ -41,6 +41,8 @@ $radius-roadmap: 10px;
display: none;
}
+$title-spur: 8 * $width-roadmap;
+
.roadmap-group-title
{
&:before
@@ -51,11 +53,11 @@ $radius-roadmap: 10px;
height: $width-roadmap;
margin-right: 10px;
vertical-align: middle;
- width: 8 * $width-roadmap;
+ width: $title-spur;
}
cursor: pointer;
font-weight: 400;
- margin: $spacing-vertical * 1.5 0 $spacing-vertical * 1.5 0;
+ margin: $spacing-vertical * 2 0 $spacing-vertical * 1 0;
padding: 0;
}
@@ -68,18 +70,19 @@ $radius-roadmap: 10px;
letter-spacing: 0;
padding: 0 10px;
text-align: center;
+ width: calc(100% - #{$title-spur} - 20px);
}
.roadmap-item
{
$left-margin: 20px;
- $item-padding: 10px;
+ $item-padding: $spacing-vertical / 2;
margin-bottom: $spacing-vertical;
position: relative;
margin-left: $left-margin;
position: relative;
padding: $item-padding;
- background: #e8e8e8;
+ background: #f2f2f2;
@include border-radius($radius-roadmap);
&:before {
border-top: $width-roadmap-item solid $color-roadmap-border;
@@ -100,7 +103,7 @@ $radius-roadmap: 10px;
position: absolute;
top: 0;
left: -1 * $width-date;
- color: $color-meta-lighter;
+ color: $color-meta-light;
line-height: 42px;
}