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

Jekyll #28

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7645e51
Correção dos links
jeffersonss999 Mar 28, 2019
ad9dbfe
Merge branch 'master' into correcao-pagina-04
damorais Apr 2, 2019
35ce398
Merge pull request #21 from ifspcodelab/correcao-pagina-04
damorais Apr 2, 2019
1ce45bc
Correções dos merges feitos no css
viniciusecortez Apr 2, 2019
67f321e
Reestruturação inicial jekyll
viniciusecortez Apr 2, 2019
4414c92
Arrumados parte dos links
viniciusecortez Apr 2, 2019
eab5f49
Adicionados todos os links da navbar
viniciusecortez Apr 2, 2019
87e5b71
Parcerias adequado com Jekyll
viniciusecortez Apr 2, 2019
4805b99
Equipe adequado com Jekyll
viniciusecortez Apr 2, 2019
6bc48ab
Contato adequado com Jekyll
viniciusecortez Apr 2, 2019
74dce5b
Adaptada página de notícias
viniciusecortez Apr 3, 2019
138e383
Corrigido contato e modificado artigos
viniciusecortez Apr 3, 2019
151b8cd
Adaptada página de projetos para jekyll
viniciusecortez Apr 3, 2019
865e33f
Adaptado projetox
viniciusecortez Apr 3, 2019
8218f27
Corrigida a página publicações
viniciusecortez Apr 3, 2019
34b8f45
Criados includes e alterados layouts
viniciusecortez Apr 3, 2019
deb68ec
Adequado ao jekyll a página artigos-detalhe
viniciusecortez Apr 3, 2019
ade5b15
Colocado subtitulo vazio para a padronização
viniciusecortez Apr 3, 2019
dbd7a86
Arrumada notícia
viniciusecortez Apr 3, 2019
4a3df1d
Ajustado tamanho da fonte nos paragrafos da pagina missao-visao-valores
matheusreisl Apr 4, 2019
4ed9495
Testes dos links para membros da equipe
jeffersonss999 Apr 4, 2019
bd76f07
Difinição de um tamanho fixo para imagens em equipe
jeffersonss999 Apr 4, 2019
5e8c21c
Arrumados links
viniciusecortez Apr 4, 2019
e1c9553
Colocado layout para as páginas de membros
viniciusecortez Apr 4, 2019
ac8a2c3
Adicionado atributo titulo aos membros
viniciusecortez Apr 4, 2019
02e4847
Colocado if para selecionar membros colaboradores
viniciusecortez Apr 4, 2019
5ea2b09
Alterações no .gitignore para retirar os novos arquivos executáveis
viniciusecortez Apr 4, 2019
bf068c9
Adicionado o .md do latorre
viniciusecortez Apr 4, 2019
d95c217
Nome matheus completo adicionado
matheusreisl Apr 4, 2019
0f3a394
Adição do nome Jefferson Souza Santos e correção da coluna de colabor…
jeffersonss999 Apr 4, 2019
49e8b90
criado colecao de artigos
thiagoxra Apr 5, 2019
f301569
criado colecao de artigos
thiagoxra Apr 5, 2019
e152d1a
Merge remote-tracking branch 'origin/jekyll-equipe' into jekyll
viniciusecortez Apr 5, 2019
498b9d0
Apagada pasta adicional
viniciusecortez Apr 5, 2019
a6510f3
Ciação da coleção de noticias*
jeffersonss999 Apr 5, 2019
c1e0deb
Correção do ultimo commit da coleção de noticias
jeffersonss999 Apr 5, 2019
2cda284
Corrigida erro em artigos
viniciusecortez Apr 8, 2019
7729932
Criado projetos-detalhe e sua collection
matheusreisl Apr 8, 2019
67c8321
Criação do if para escrever somente as noticias existentes
jeffersonss999 Apr 8, 2019
99615d1
Criação do if para escrever somente as noticias existentes
jeffersonss999 Apr 8, 2019
000c828
Implementação do metodo para exibir noticias por ordem de data
jeffersonss999 Apr 8, 2019
ae7cb7c
Adequada publicações ao jekyll
viniciusecortez Apr 8, 2019
335ca7b
Merge branch 'jekyll' of https://github.com/ifspcodelab/ifspcodelab.g…
viniciusecortez Apr 8, 2019
9e9e4d3
Arrumado merge
viniciusecortez Apr 8, 2019
b9d0e56
Edição na aparencia dos links nos cards
matheusreisl Apr 9, 2019
8e136d7
Merge branch 'jekyll-noticia' into jekyll
Apr 9, 2019
29bb827
Merge da branch jekyll-noticias na branch jekyll
Apr 9, 2019
e2012c7
Correção dos botões de notícia
viniciusecortez Apr 11, 2019
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_site/
.sass-cache/
.vscode/
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions .vscode/settings.json

This file was deleted.

9 changes: 9 additions & 0 deletions _artigos/artigo01.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: artigos-detalhe
titulo: Artigo 01
data: 15/03/2019
sub-titulo: artigo 01 teste chamada
link: /artigos/artigo01.html
imagem: ../assets/images/icone.png
---

13 changes: 13 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
collections:
membros:
output: true

artigos:
output: true

noticias:
output: true

projetos:
output: true

38 changes: 38 additions & 0 deletions _data/publicacoes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"data": "2020",
"grupo":[
{
"nome": "Cras justo odio",
"link": "#"
},
{
"nome": "Cras justo odio",
"link": "#"
},
{
"nome": "Cras justo odio",
"link": "#"
}


]
},
{
"data": "2021",
"grupo":[
{
"nome": "Cras justo odio",
"link": "#"
},
{
"nome": "Cras justo odio",
"link": "#"
}


]
}


]
23 changes: 23 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<aside id="entre-em-contato">
<div class="container">
<div class="row p-4">
<div class="col-sm">
<p>
<b>Faça parte da equipe do IFSP CodeLab</b>
</p>
</div>
<div class="col-sm ">
<button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
</div>
</div>
</div>
</aside>
<footer>
<div class="container">
<div class="row">
</div>
</div>
</footer>
<script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
<script src="../bootstrap/js/popper.min.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script>
8 changes: 8 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/estilo_layout.css">
<title>{{ page.titulo }} - CODELAB</title>
</head>

47 changes: 47 additions & 0 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<header>
<div class="container">
<nav class="navbar navbar-expand-md navbar-light bg-light">
<a class="navbar-brand " href="/">
>IFSP
<span>CODELAB</span>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
aria-expanded="false" aria-label="Alterna navegação">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav ml-auto ">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
O laboratório
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="/pages/missao-visao-valores.html">Missão, Visão e Valores</a>
<a class="dropdown-item" href="/pages/publicacoes.html">Publicações</a>
<a class="dropdown-item" href="/pages/equipe.html">Equipe</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="/pages/projetos.html">Projetos</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/pages/parcerias.html">Parcerias</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/pages/noticias.html">Notícias</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/pages/artigos.html">Artigos</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/pages/contato.html">Contato</a>
</li>
</ul>
<!--fim lista -->
</div>
<!--Fim de dropdown-->
</nav>
</div>
<!--Fim de container -->
</header>
10 changes: 10 additions & 0 deletions _includes/titulo.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="titulo-pagina">
<div class="container">
<div class="row">
<div class="col-md-12 p-4">
<h1>{{ page.titulo }}</h1>
<p class="lead"> {{ page.subtitulo }} </p>
</div>
</div>
</div>
</div>
24 changes: 24 additions & 0 deletions _layouts/artigos-detalhe.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
layout: layout
---

<div class="container-fluid">
<div class="row">
<div class="col p-3">
<img src="../assets/images/icone-centro.png" class="objectImage rounded mx-auto d-block img-recursiva">
</div>
</div>
<div class="container">
<div class="row">
<div class="col">
<time class="data" datetime="2017-02-14"></time>
<p class="negrito">{{ page.data }}</p>
</div>
</div>
<div class="row">
<div class="col preenchimento">
{{ content }}
</div>
</div>
</div>
</div>
17 changes: 17 additions & 0 deletions _layouts/detalhe-noticia.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout: layout
---
<div class="container">
<div class="row">
<div class="col-md-12">
<img src="../assets/images/imagemNoticia.png" class="img-fluid imagem-principal" alt="Responsive image"/>
</div>
</div>
<div class="row">
<div class="col-md-12 texto-principal">
<p class=""> {{ content }} </p>
</div>
</div>
</div>


23 changes: 23 additions & 0 deletions _layouts/layout.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!doctype html>
<html lang="pt-br">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/estilo_layout.css">
<title>{{ page.titulo }} - CODELAB</title>
</head>

<body>
{% include navbar.html %}
<article>
{% include titulo.html %}
<div class="container">
{{ content }}
</div>
</article>
{% include footer.html %}
</body>

</html>
74 changes: 74 additions & 0 deletions _layouts/membro-equipe.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
---

---

<!doctype html>
<html lang="pt-br">

{% include head.html %}
<body>
{% include navbar.html %}
<article>
<div class="titulo-pagina">
<div class="container">
<div class="row">
<div class="col-lg-3 col-md-4 col-sm-12">
<img src="{{ page.imagem }}" class="rounded-circle mx-auto d-block img-membro">
</div>
<div class="col-lg-9 col-md-8 col-sm-12 p-4">
<h1>{{ page.nome }} - {{ page.funcao }}</h1>
<p class="lead">{{ content }}</p>
<img src="../assets/images/icone3.png" class="float-left p-1">
<img src="../assets/images/icone3.png" class="float-left p-1">
<img src="../assets/images/icone3.png" class="float-left p-1">
<img src="../assets/images/icone3.png" class="float-left p-1">
</div>
</div>
</div>
</div>
<div class="container aumenta-margem borda-bottom formatacao-link">
<main class="row">
<div class="col-md-12">
<h2>Projetos</h2>
</div>
</main>
<main class="row">
<div class="col-md-4 col-sm-6">
<div class="text-center">
<img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
<a href="#">
<h3>Pojeto de Software X</h3>
</a>
<h3>Aplicação Web</h3>
</div>
</div>
<div class="col-md-4 col-sm-6">
<div class="text-center">
<img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
<a href="#">
<h3>Pojeto de Software Y</h3>
</a>
<h3>Aplicação Web</h3>
</div>
</div>
</main>
<main class="row">
<div class="col-md-12">
<h2>Publicações</h2>
</div>
</main>
<main class="row final-do-texto">
<div class="col-md-12">
<div class="list-group preenchimento">
<a href="#" class="list-group-item list-group-item-action">Dapibus ac facilisis in</a>
<a href="#" class="list-group-item list-group-item-action">Morbi leo risus</a>
<a href="#" class="list-group-item list-group-item-action">Porta ac consectetur ac</a>
</div>
</div>
</main>
</div>
</article>
{% include footer.html %}
</body>

</html>
Loading