Skip to content

Commit

Permalink
add github fetch api commit data
Browse files Browse the repository at this point in the history
  • Loading branch information
fscheidt committed Jun 25, 2022
1 parent cf82a70 commit 48c5453
Show file tree
Hide file tree
Showing 7 changed files with 261 additions and 265 deletions.
363 changes: 171 additions & 192 deletions index.html

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions pages/css.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<header class="cheader">
<span class="logo">
<i class="fas fa-cog"></i>
<i class="fas fa-code"></i>
</span>
<h1>CSS</h1>
</header>
Expand All @@ -11,8 +11,6 @@ <h1>CSS</h1>

<article class="cbody sec0 active">

<!-- <pre><code class="language-css css">a{color:red;}</code></pre> -->

<div class="md-content"></div>

</article>
Expand Down
2 changes: 1 addition & 1 deletion pages/html.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<header class="cheader">
<span class="logo">
<i class="fas fa-cog"></i>
<i class="fas fa-code"></i>
</span>
<h1>HTML</h1>
</header>
Expand Down
4 changes: 2 additions & 2 deletions pages/js.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<header class="cheader">
<span class="logo">
<i class="fas fa-cog"></i>
<i class="fas fa-code"></i>
</span>
<h1>JavaScript</h1>
</header>
Expand All @@ -11,7 +11,7 @@ <h1>JavaScript</h1>

<article class="cbody sec0 active">

<div class="md-content"></div>
<div class="md-content"></div>

</article>

Expand Down
80 changes: 40 additions & 40 deletions pages/tools.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,46 @@ <h1>Ferramentas</h1>
</header>

<article class="cbody sec0 active">
<div class="hbar">
<ul class="hmenu">
<li><a data-h=".tag">All</a></li>
<li><a data-h=".tag.js">JavaScript</a></li>
<li><a data-h=".tag.css">CSS</a></li>
<li><a data-h=".tag.html">HTML</a></li>
</ul>
</div>
<p>
<ul class="list-card">
<li>
<span class="tag html">HTML</span>
<a target="_blank" href="https://validator.w3.org/#validate_by_input">Validação HTML</a>
</li>
<li>
<span class="tag html">HTML</span>
<a target="_blank" href="https://www.w3schools.com/tags/default.asp">HTML Tags</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://jigsaw.w3.org/css-validator/#validate_by_input">Validação CSS</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://fontawesome.com/v5/cheatsheet">FontAwesome</a>
</li>
<li>
<span class="tag js">JS</span>
<a target="_blank" href="https://jquery.com/">JQuery</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Learn/CSS">Tutorial CSS</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML">Tutorial HTML</a>
</li>
</ul>
</p>
<div class="hbar">
<ul class="hmenu">
<li><a data-h=".tag">All</a></li>
<li><a data-h=".tag.js">JavaScript</a></li>
<li><a data-h=".tag.css">CSS</a></li>
<li><a data-h=".tag.html">HTML</a></li>
</ul>
</div>
<p>
<ul class="list-card">
<li>
<span class="tag html">HTML</span>
<a target="_blank" href="https://validator.w3.org/#validate_by_input">Validação HTML</a>
</li>
<li>
<span class="tag html">HTML</span>
<a target="_blank" href="https://www.w3schools.com/tags/default.asp">HTML Tags</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://jigsaw.w3.org/css-validator/#validate_by_input">Validação CSS</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://fontawesome.com/v5/cheatsheet">FontAwesome</a>
</li>
<li>
<span class="tag js">JS</span>
<a target="_blank" href="https://jquery.com/">JQuery</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Learn/CSS">Tutorial CSS</a>
</li>
<li>
<span class="tag css">CSS</span>
<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML">Tutorial HTML</a>
</li>
</ul>
</p>
</article>

</div>
Expand Down
6 changes: 4 additions & 2 deletions static/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ div.sidebar ul.menu a{
text-align: right;
}
article.cbody{
padding: 10px 20px;
padding: 10px 20px 30px 20px;
grid-area: article;
background: #e8f6f1;
display: none;
Expand All @@ -319,7 +319,9 @@ div.wrapper-cards{
grid-template-columns: repeat(auto-fill, minmax(480px, 1fr));
}
}

.hbar{
margin: 20px 0px;
}
figure{
border: 3px solid rosybrown;
text-align: center;
Expand Down
67 changes: 42 additions & 25 deletions static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,53 @@ const clientData = {
}
}
function getData(){
$.getJSON( "pages/data.json", function( data ) {
$("#slide-set").html('');
$.each( data, function( key, val ) {
let slides = data[key];
slides.forEach(el => {
let pdf_el = `<object class="pdf" data="${el.url}" type='application/pdf'></object>`;
if(clientData.isAndroid){
pdf_el = `<iframe class="gviewer" src="https://docs.google.com/gview?embedded=true&url=${el.url}&amp;embedded=true"></iframe>`;
}
$("<details/>", {
class: 'sld',
html: `<summary class="title">
${el.title}
</summary>
${pdf_el}`
}).appendTo("#slide-set");
});
});
})
$.getJSON( "pages/data.json", function( data ) {
$("#slide-set").html('');
$.each( data, function( key, val ) {
let slides = data[key];
slides.forEach(el => {
let pdf_el = `<object class="pdf" data="${el.url}" type='application/pdf'></object>`;
if(clientData.isAndroid)
pdf_el = `<iframe class="gviewer" src="https://docs.google.com/gview?embedded=true&url=${el.url}&amp;embedded=true"></iframe>`;
$("<details/>", {
class: 'sld',
html: `<summary class="title">
${el.title}
</summary>
${pdf_el}`
}).appendTo("#slide-set");
});
});
})
}
const app = {
version: '1.95.1',
version: '1.95.2',
site: 'https://fscheidt.github.io/site',
repo: 'https://github.com/fscheidt/site',
title: 'WEB1',
prefix: '/site',
local: false,
repo: {
data: null,
url: `https://github.com/fscheidt/site`,
api: `https://api.github.com/repos/fscheidt/site/branches/main`,
getData: function(){
return app.repo.data || app.repo.getApiData();
},
getApiData: function(){
fetch(app.repo.api)
.then(response => response.json())
.then(data => {
app.repo.data = data;
$("#app-last-commit").text(
new Date(data.commit.commit.author.date).toLocaleString('pt-br')
);
});
},
},
paths: {
"html": "md/html",
"css": "md/css",
"js": "md/js"
"html": "md/html",
"css": "md/css",
"js": "md/js"
},
isLocal: function(url){
return url.indexOf('localhost') !== -1 || url.indexOf('127.0.0.1') !== -1;
Expand All @@ -52,8 +68,9 @@ const app = {
this.local = this.isLocal(document.location.href);
$("#app-version").text(this.version);
$("#app-site").text(this.site).attr('href',this.site);
$("#app-repo").text(app.repo).attr('href',app.repo);
$("#app-repo").text(app.repo.url).attr('href',app.repo.url);
$("#app-local").text(this.local);
app.repo.getData();
$("#app-client").html(clientData.tohtml());
if(this.local){
this.prefix = '';
Expand Down

0 comments on commit 48c5453

Please sign in to comment.