Skip to content

Commit

Permalink
Added authors from Github
Browse files Browse the repository at this point in the history
  • Loading branch information
@gastaldi
gastaldi committed Jul 9, 2015
1 parent 17b16c6 commit 3189ffc
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 85 deletions.
2 changes: 1 addition & 1 deletion app/js/controllers/docCtrl.js
View file
Expand Up @@ -9,7 +9,7 @@ angular.module('jboss-forge').controller('docCtrl', function($rootScope, $scope,
});
backendAPI.fetchDocToc($stateParams.docId, function (_htmlContents) {
$scope.docToc = (_htmlContents.trim()) ? _htmlContents : "No Content";
});
});
} else {
$scope.levels = ['Beginner', 'Intermediate', 'Advanced'];

Expand Down
12 changes: 6 additions & 6 deletions app/js/services/backendAPIService.js
View file
Expand Up @@ -21,6 +21,9 @@ angular.module('jboss-forge').service('backendAPI', function($http, config){
this.fetchAddonDocContentsById = function(addonId, docId, _success) {
return this.fetch('/api/addons/'+addonId+'/docs/'+docId, _success);
}
this.fetchContributors = function(_success) {
return this.fetch('/api/contributors', _success);
}
this.fetchDocs = function(_success) {
return this.fetch('/api/docs', _success);
}
Expand All @@ -33,6 +36,9 @@ angular.module('jboss-forge').service('backendAPI', function($http, config){
this.fetchDocToc = function(docId, _success) {
return this.fetch('/api/docs/' + docId + '/toc', _success);
}
this.fetchMetadata = function(_success) {
return this.fetch('/api/metadata', _success);
}
this.fetchNews = function(_success) {
return this.fetch('/api/news', _success);
}
Expand All @@ -45,11 +51,5 @@ angular.module('jboss-forge').service('backendAPI', function($http, config){
this.fetchNewsToc = function(newsId, _success) {
return this.fetch('/api/news/' + newsId + '/toc', _success);
}
this.fetchMetadata = function(_success) {
return this.fetch('/api/metadata', _success);
}
this.fetchContributors = function(_success) {
return this.fetch('/api/contributors', _success);
}
});

6 changes: 3 additions & 3 deletions app/views/addons.html
View file
Expand Up @@ -110,7 +110,7 @@ <h3 class="display-sm hidden-xs">Three categories of Addons to enhance your <br
<img ng-src="{{addon.logo || 'images/forge_120x120.png'}}" alt="{{addon.name}}">
</div>
<h2>{{addon.name}}</h2>
<h3>{{addon.author}}</h3>
<h3>{{addon.author.name}}</h3>
<p>{{addon.description}}</p>
<div class="star-row" data-rating="{{addon.rating}}"></div>
</div><!-- / end .click-modal -->
Expand Down Expand Up @@ -144,7 +144,7 @@ <h3>{{addon.author}}</h3>
<img ng-src="{{addon.logo || 'images/forge_120x120.png'}}" alt="{{addon.name}}">
</div>
<h2>{{addon.name}}</h2>
<h3>{{addon.author}}</h3>
<h3>{{addon.author.name}}</h3>
<p>{{addon.description}}</p>
<div class="star-row" data-rating="{{addon.rating}}"></div>
</div><!-- / end .click-modal -->
Expand Down Expand Up @@ -179,7 +179,7 @@ <h3>{{addon.author}}</h3>
<img ng-src="{{addon.logo || 'images/forge_120x120.png'}}" alt="{{addon.name}}">
</div>
<h2>{{addon.name}}</h2>
<h3>{{addon.author}}</h3>
<h3>{{addon.author.name}}</h3>
<p>{{addon.description}}</p>
<div class="star-row" data-rating="{{addon.rating}}"></div>
</div><!-- / end .click-modal -->
Expand Down
6 changes: 3 additions & 3 deletions app/views/addons_page.html
View file
Expand Up @@ -70,7 +70,7 @@ <h2>Installation instructions</h2>
<div class="col-xs-12 author-div">
<h2>Authors</h2>
<ul class="author-ul">
<li><img src="images/place-img-300x300.jpg" alt="Author Image"> <span class="author-line">{{addon.author}}</span></li>
<li><img src="{{addon.author.avatar_url}}" alt="Author Image"> <span class="author-line">{{addon.author.name}}</span></li>
</ul>
</div><!-- /. author-div -->
</div>
Expand Down Expand Up @@ -109,12 +109,12 @@ <h1 class="hidden-xs">{{addon.name}}</h1>
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12 author-info-div">
<div class="row">
<div class="col-lg-3 col-md-4 col-sm-5 col-xs-2 author-img">
<img src="images/place-img-300x300.jpg" alt="{{addon.author}}">
<img src="{{addon.author.avatar_url}}" alt="{{addon.author.name}}">
</div><!-- / .author-info-div -->

<div class="col-lg-4 col-md-5 col-sm-6 col-xs-12 author-name-title">
<h1>Authors</h1>
<p>{{addon.author}}</p>
<p>{{addon.author.name}}</p>
</div><!-- / .author-name-title -->
</div><!-- / .row -->
</div>
Expand Down
55 changes: 3 additions & 52 deletions app/views/documentation_page.html
View file
@@ -1,41 +1,3 @@
<!-- PAGE SECTION NEWS/NAV TOP BAR -->
<!--<div class="page-section static white nav-news-bar">-->
<!--<div class="container">-->
<!--<div class="row hidden-xs page-navigation-line">-->
<!-- Documentation / Installation /-->


<!--<ol class="breadcrumb sibling-switch-menu ">-->
<!--<li class="menu-bar-li">Documentation</li>-->
<!--<li class="menu-bar-li"><a href="#" data-menu-level="0" class="level-one sibling-switch-ctrl"></a><span>Installation</span>-->
<!--<ol class="sub-menu">-->
<!--<li><a href="#">Getting Started</a></li>-->
<!--<li><a href="#">Next Option Item</a></li>-->
<!--<li><a href="#">Next Option Item</a></li>-->
<!--</ol>-->
<!--</li>-->
<!--<li class="menu-bar-li"><a href="#" data-menu-level="1" class="level-two sibling-switch-ctrl"></a><span>Getting Started</span>-->
<!--<ol class="sub-menu">-->
<!--<li><a href="#">Install Forge</a></li>-->
<!--<li><a href="#">Getting Help</a></li>-->
<!--<li><a href="#">Start Basic Java EE</a></li>-->
<!--<li><a href="#">Install Addons</a></li>-->
<!--</ol>-->
<!--</li>-->
<!--</ol>-->
<!--</div>--><!-- / .row -->

<!-- Heading for smaller device window widths -->
<!--<div class="row visible-xs phone-width">-->
<!--<h1>{{doc.title}}</h1>-->
<!--</div>-->
<!-- / End heading for smaller device window widths -->



<!--</div>--><!-- /.container -->
<!--</div>--><!-- / .page-section -->

<!-- Smaller Device Window Language Selector Menu -->
<div class="language-select-container">
<div class="col-sm-3 col-sm-offset-9 col-xs-8 col-xs-offset-2 language-selector hidden">
Expand Down Expand Up @@ -71,17 +33,6 @@
</div>
<!-- / End Smaller Device Window Language Selector Menu -->



<!-- Smaller Device Window Language Selector Menu -->
<!--<div class="row language-select-bar visible-xs">
<div class="row">
Small screen width language selector Here
</div>
</div>-->
<!-- / End Smaller Device Window Language Selector Menu -->


<!-- PAGE SECTION CONTENT SECTION-->
<div class="page-section static white doc-content">
<!--<div class="container">-->
Expand All @@ -93,7 +44,7 @@
<div class="col-xs-12 author-div">
<h2>Authors</h2>
<ul class="author-ul">
<li><img src="images/place-img-300x300.jpg" alt="Author Image"> <span class="author-line">{{doc.author}}</span></li>
<li><img src="{{doc.author.avatar_url}}" alt="Author Image"> <span class="author-line">{{doc.author.name}}</span></li>
</ul>
</div><!-- /. author-div -->
</div>
Expand Down Expand Up @@ -136,12 +87,12 @@ <h1 class="hidden-xs">{{doc.title}}</h1>
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12 author-info-div">
<div class="row">
<div class="col-lg-3 col-md-4 col-sm-5 col-xs-2 author-img">
<img src="images/place-img-300x300.jpg" alt="{{doc.author}}">
<img src="{{doc.author.avatar_url}}" alt="{{doc.author.name}}">
</div><!-- / .author-info-div -->

<div class="col-lg-4 col-md-5 col-sm-6 col-xs-12 author-name-title">
<h1>Authors</h1>
<p>{{doc.author}}</p>
<p>{{doc.author.name}}</p>
</div><!-- / .author-name-title -->
</div><!-- / .row -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/news.html
View file
Expand Up @@ -141,12 +141,12 @@ <h2>Learn More About What's Changed</h2>
<div class="col-sm-4 col-xs-6 news-author-img-container-box">
<div class="row">
<div class="col-lg-4 col-sm-5 col-xs-4 news-author-img-box">
<img src="images/anvil_image500x493.png" alt="{{newsItem.author}}">
<img src="{{newsItem.author.avatar_url}}" alt="{{newsItem.author.name}}">
</div>

<div class="col-lg-8 col-sm-7 col-xs-8 news-author-title-box">
<h3>Author</h3>
<p class="author-names-bottom">{{newsItem.author}}</p>
<p class="author-names-bottom">{{newsItem.author.name}}</p>
</div>
</div><!-- / .row -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/news_page.html
View file
Expand Up @@ -38,12 +38,12 @@ <h2>Table of contents</h2>
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12 author-info-div">
<div class="row">
<div class="col-lg-3 col-md-4 col-sm-5 col-xs-2 author-img">
<img src="images/place-img-300x300.jpg" alt="{{selectedNews.author}}">
<img src="{{selectedNews.author.avatar_url}}" alt="{{selectedNews.author.name}}">
</div><!-- / .author-info-div -->

<div class="col-lg-4 col-md-5 col-sm-6 col-xs-12 author-name-title">
<h1>Authors</h1>
<p>{{selectedNews.author}}</p>
<p>{{selectedNews.author.name}}</p>
</div><!-- / .author-name-title -->
</div><!-- / .row -->
</div>
Expand Down
32 changes: 16 additions & 16 deletions server.js
View file
Expand Up @@ -33,7 +33,7 @@ var config = cc()
'FORGE_WEBSITE_DATA_DIR': (process.env.OPENSHIFT_TMP_DIR || '/tmp') + '/website-data'
}),
app = restify.createServer(),
cache = new NodeCache({stdTTL: 1000, checkperiod: 120 } );
cache = new NodeCache({stdTTL: 1000, checkperiod: 120 });

app.use(restify.gzipResponse());
app.use(restify.queryParser());
Expand All @@ -55,7 +55,7 @@ app.get('/api/addons/:addonsId', function (req,res) {
res.status(404);
res.end();
} else {
res.json(item);
res.json(item);
}
});

Expand Down Expand Up @@ -362,20 +362,6 @@ function fetchRedoculous(item, res, _callback) {
});
}

function transposeImages(urlInfo, response) {
$ = cheerio.load(response);
$('img').each(function (index, element) {
var imgSrc = $(this).attr('src');
if (imgSrc.indexOf("./") == 0) imgSrc = imgSrc.substring(1);
if (imgSrc.indexOf('http') != 0) {
//FIXME : This won't work for images outside forge/docs
var newSrc = 'https://raw.githubusercontent.com/forge/docs/master/' + urlInfo.path.substring(0,urlInfo.path.lastIndexOf('/')) + "/" + imgSrc;
$(this).attr('src',newSrc);
}
});
return $.html();
}

function fetchTOC(col, id, res) {
var item = findById(col,id);
if (!item) {
Expand Down Expand Up @@ -408,6 +394,20 @@ function findById(col, id) {
})[0];
}

function transposeImages(urlInfo, response) {
$ = cheerio.load(response);
$('img').each(function (index, element) {
var imgSrc = $(this).attr('src');
if (imgSrc.indexOf("./") == 0) imgSrc = imgSrc.substring(1);
if (imgSrc.indexOf('http') != 0) {
//FIXME : This won't work for images outside forge/docs
var newSrc = 'https://raw.githubusercontent.com/forge/docs/master/' + urlInfo.path.substring(0,urlInfo.path.lastIndexOf('/')) + "/" + imgSrc;
$(this).attr('src',newSrc);
}
});
return $.html();
}

/** Loads the YAML content into a JS object */
function yamlLoadAll(body) {
var allEntries = [];
Expand Down

0 comments on commit 3189ffc

Please sign in to comment.