Skip to content

GitLab

Commit d68dd57c authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'prepare_prod' into 'master' 

Prepare prod

See merge request !26
parents 2813b4e2 27afa5e6
Pipeline #2791 passed with stage
in 7 seconds
Expand all Hide whitespace changes
Inline Side-by-side
package-lock.json
View file @ d68dd57c
This diff is collapsed.
package.json
View file @ d68dd57c
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"test": "" "test": ""
}, },
"dependencies": { "dependencies": {
"async": "^3.2.0",
"axios": "^0.20.0", "axios": "^0.20.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"compression": "^1.7.4", "compression": "^1.7.4",
...@@ -32,9 +33,8 @@ ...@@ -32,9 +33,8 @@
"helmet": "^3.23.3", "helmet": "^3.23.3",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"nodemon": "1.9.2",
"passport": "0.3.2", "passport": "0.3.2",
"passport-saml": "0.15.0", "passport-saml": "^1.3.4",
"pug": "^2.0.4" "pug": "^2.0.4"
}, },
"engines": { "engines": {
......
routes/routes-project.js
View file @ d68dd57c
...@@ -362,12 +362,11 @@ module.exports = function (app) { ...@@ -362,12 +362,11 @@ module.exports = function (app) {
perPage+'&order_by=id&sort=asc&id_after='+idAfter) perPage+'&order_by=id&sort=asc&id_after='+idAfter)
} }
app.get('/projectlist', async function(req, res){ // Projektdaten
app.get('/projektdaten', async function(req, res){
let projectArr = [] let projectArr = []
let websiteArr = []
let isProject = true let isProject = true
let firstId = 0 let firstId = 0
let webname = "";
while (isProject == true) { while (isProject == true) {
let projects = await getProjectsFromGitlab(10, firstId) let projects = await getProjectsFromGitlab(10, firstId)
...@@ -382,44 +381,95 @@ module.exports = function (app) { ...@@ -382,44 +381,95 @@ module.exports = function (app) {
if (projectData[i].name == "template_gitlab_page") { if (projectData[i].name == "template_gitlab_page") {
continue continue
} }
// only repo
if (!projectData[i].tag_list.includes('website')) {
// M4_LAB logo for all projects that do not have logo
if (projectData[i].avatar_url == null) {
projectData[i].avatar_url = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png"
}
// for all projects that have no description
if (projectData[i].description == "") {
projectData[i].description = "- no description -"
}
// M4_LAB logo for all projects that do not have logo let project = {
if (projectData[i].avatar_url == null) { logo: projectData[i].avatar_url,
projectData[i].avatar_url = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png" name: projectData[i].name,
weburl: projectData[i].web_url,
desc: projectData[i].description,
keywords: projectData[i].tag_list
}
projectArr.push(project)
}
}
firstId = projectData[projectData.length-1].id
}
}
res.render(lang+'/project/projectList', {
project: projectArr
})
})
// Projektinformationen
app.get('/projektinformationen', async function(req, res){
let pagesArr = []
let isProject = true
let firstId = 0
while (isProject == true) {
let projects = await getProjectsFromGitlab(10, firstId)
let projectData = projects.data
if (projectData.length == 0) {
isProject = false
}
else {
for(let i = 0; i < projectData.length; i++){
// skip template project
if (projectData[i].name == "template_gitlab_page") {
continue
} }
// websites // websites
if (projectData[i].tag_list.includes('website')) { if (projectData[i].tag_list.includes('website')) {
// M4_LAB logo for all projects that do not have logo
if (projectData[i].avatar_url == null) {
projectData[i].avatar_url = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png"
}
// for all projects that have no description
if (projectData[i].description == "") {
projectData[i].description = "- no description -"
}
// customize website name // customize website name
if (projectData[i].name == "Visualization") { if (projectData[i].name == "Visualization") {
webname = "https://transfer.hft-stuttgart.de/pages/visualization" projectData[i].web_url = "https://transfer.hft-stuttgart.de/pages/visualization"
} }
else if (projectData[i].name == "IN-Source") { else if (projectData[i].name == "IN-Source") {
webname = "https://transfer.hft-stuttgart.de/pages/INsource" projectData[i].web_url = "https://transfer.hft-stuttgart.de/pages/INsource"
} }
else if (projectData[i].name == "3DS_Visualization_Cesium") { else if (projectData[i].name == "3DS_Visualization_Cesium") {
webname = "https://transfer.hft-stuttgart.de/pages/3ds_visualization_cesium" projectData[i].web_url = "https://transfer.hft-stuttgart.de/pages/3ds_visualization_cesium"
} }
else { else {
webname = "https://transfer.hft-stuttgart.de/pages/"+projectData[i].name projectData[i].web_url = "https://transfer.hft-stuttgart.de/pages/"+projectData[i].name
} }
let website = { // remove 'website' from tag list
logo: projectData[i].avatar_url, const index = projectData[i].tag_list.indexOf('website');
name: projectData[i].name, if (index > -1) {
weburl: webname, projectData[i].tag_list.splice(index, 1);
desc: projectData[i].description
} }
websiteArr.push(website)
} // fill in pagesArr
// project repo let pages = {
else {
let project = {
logo: projectData[i].avatar_url, logo: projectData[i].avatar_url,
name: projectData[i].name, name: projectData[i].name,
weburl: projectData[i].web_url, weburl: projectData[i].web_url,
desc: projectData[i].description desc: projectData[i].description,
keywords: projectData[i].tag_list
} }
projectArr.push(project) pagesArr.push(pages)
} }
} }
...@@ -427,11 +477,9 @@ module.exports = function (app) { ...@@ -427,11 +477,9 @@ module.exports = function (app) {
} }
} }
res.render(lang+'/project/projectList', { res.render(lang+'/project/pagesList', {
project: projectArr, pages: pagesArr
website: websiteArr
}) })
}) })
}; };
\ No newline at end of file
views/DE/project/pagesList.pug 0 → 100644
View file @ d68dd57c
doctype html
html(lang="de")
head
title= "Projektinformationen"
meta(charset="UTF-8")
meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap.min.css")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/m4lab.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
style.
.title-container {
position: relative;
color: white;
}
.card-title-bottom-left {
position: absolute;
bottom: 0px;
width: 100%;
color: black;
font-weight: bold;
background: rgb(255, 255, 255, 0.5);
text-align: left;
padding: 5px
}
.card-img-top {
height: 15vw;
object-fit: cover;
}
body
div(class="container")
div(class="row")
div(class="col-md-12" style="margin-bottom: 40px;")
img(class="mx-auto" src="/img/Projektinformationen.png" width="100%")
div(class="container")
div(class="pt-4 pb-4 form-row")
div(class="form-group col-md-10")
input(id="searchInput", class="form-control", type="text", placeholder="Suchen Sie hier nach Themen und Projekten", onkeyup="searchFunction()")
div(class="form-group col-md-2")
select(class="form-control")
option uncategorized
p Hier finden Sie Informationen zu den bei uns gehosteten Projekten, wie z.B. Projektbeschreibungen, Projektwebseiten, Visualisierungen, Demonstrationen.
p Für eine Übersicht über den bei uns gehosteten Projektcode und andere Projektdaten klicken Sie <a href="/projektdaten"> hier </a>.
div(class="container")
p#pagesCounter #{pages.length} Projektinformationen werden angezeigt
| <div class="row">
for item in pages
div(class="py-4 col-sm")
div(class="card", style="width: 18rem;")
div(class="title-container")
h5(class="card-title-bottom-left") #{item.name}
img(class="card-img-top", src=item.logo)
div(class="card-body")
div(class="row")
each key in item.keywords
h6
span(class="badge badge-pill badge-primary px-2") #{key}
| &nbsp;
div(class="row")
div(class="col-9")
p(class="card-text") #{item.desc}
div(class="col-3")
svg(class="bi bi-chevron-right", width="32", height="32", viewBox="0 0 20 20", fill="currentColor", xmlns="http://www.w3.org/2000/svg")
| <a xlink:href="#{item.weburl}" target="_blank"><path fill-rule="evenodd" d="M6.646 3.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L12.293 10 6.646 4.354a.5.5 0 010-.708z"></path></a>
| </div>
// jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// Header
script(src="/js/headfoot.js")
script.
function searchFunction() {
var input = document.getElementById("searchInput")
var filter = input.value.toUpperCase()
var cardsCol = document.getElementsByClassName("col-sm")
var cardTitle, cardText, titleValue, textValue
var i
var counterBlock = 0
for (i = 0; i < cardsCol.length; i++) {
cardTitle = cardsCol[i].getElementsByClassName("card-title-bottom-left");
cardBody = cardsCol[i].getElementsByClassName("card-body");
cardText = cardsCol[i].getElementsByClassName("card-text");
titleValue = cardTitle[0].textContent || cardTitle[0].innerText;
bodyValue = cardBody[0].textContent || cardBody[0].innerText;
textValue = cardText[0].textContent || cardText[0].innerText;
if (titleValue.toUpperCase().indexOf(filter) > -1 || bodyValue.toUpperCase().indexOf(filter) > -1 || textValue.toUpperCase().indexOf(filter) > -1) {
cardsCol[i].style.display = "block"
counterBlock++
} else {
cardsCol[i].style.display = "none"
}
}
document.getElementById("pagesCounter").innerHTML = counterBlock+" Projektinformationen werden angezeigt"
}
\ No newline at end of file
views/DE/project/projectList.pug
View file @ d68dd57c
doctype html doctype html
html(lang="de") html(lang="de")
head head
title= "Project List" title= "Projektdaten"
meta(charset="UTF-8") meta(charset="UTF-8")
meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no") meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap.min.css") link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap.min.css")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/m4lab.css") link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/m4lab.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous") link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
style.
.title-container {
position: relative;
color: white;
}
.card-title-bottom-left {
position: absolute;
bottom: 0px;
width: 100%;
color: black;
font-weight: bold;
background: rgb(255, 255, 255, 0.5);
text-align: left;
padding: 5px
}
.card-img-top {
height: 15vw;
object-fit: cover;
}
body body
div(class="container") div(class="container")
div(class="pt-4 pb-4") div(class="row")
input(id="searchInput", class="form-control form-control-dark w-100", type="text", placeholder="Suchen Sie hier nach Themen und Projekten", onkeyup="searchFunction()") div(class="col-md-12" style="margin-bottom: 40px;")
h3(class="mb-3 font-weight-bold") Projekte img(class="mx-auto" src="/img/ProjektcodeDaten.png" width="100%")
table(class="table table-striped") div(class="container")
tbody div(class="pt-4 pb-4 form-row")
for item in project div(class="form-group col-md-10")
tr input(id="searchInput", class="form-control", type="text", placeholder="Suchen Sie hier nach Themen und Projekten", onkeyup="searchFunction()")
td div(class="form-group col-md-2")
img(src=item.logo, width="40", height="40") select(class="form-control")
td <a href="#{item.weburl}" target="_blank">#{item.name}</a> option uncategorized
td #{item.desc} p Hier finden Sie den direkten Zugang zu den Inhalten der bei uns gehosteten Projekte.
p Weitere Informationen zu den bei uns gehosteten Projekten finden Sie <a href="/projektinformationen">hier</a>.
if website.length > 0 div(class="container")
h3(class="mb-3 font-weight-bold") Websites p#projectCounter #{project.length} Projektdaten werden angezeigt
table(class="table table-striped") | <div class="row">
for item in website for item in project
tr div(class="py-4 col-sm")
td div(class="card", style="width: 18rem;")
img(src=item.logo, width="40", height="40") div(class="title-container")
td <a href="#{item.weburl}" target="_blank">#{item.name}</a> h5(class="card-title-bottom-left") #{item.name}
td #{item.desc} img(class="card-img-top", src=item.logo)
div(class="card-body")
div(class="row")
each key in item.keywords
h6
span(class="badge badge-pill badge-primary px-2") #{key}
| &nbsp;
div(class="row")
div(class="col-9")
p(class="card-text") #{item.desc}
div(class="col-3")
svg(class="bi bi-chevron-right", width="32", height="32", viewBox="0 0 20 20", fill="currentColor", xmlns="http://www.w3.org/2000/svg")
| <a xlink:href="#{item.weburl}" target="_blank"><path fill-rule="evenodd" d="M6.646 3.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L12.293 10 6.646 4.354a.5.5 0 010-.708z"></path></a>
| </div>
// jQuery // jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js") script(src="https://code.jquery.com/jquery-3.3.1.min.js")
...@@ -38,32 +70,33 @@ html(lang="de") ...@@ -38,32 +70,33 @@ html(lang="de")
// Bootstrap // Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous") script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// Header // Header
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js") script(src="/js/headfoot.js")
script. script.
function searchFunction() { function searchFunction() {
var input, filter, rows, col, txtValue; var input = document.getElementById("searchInput")
var isFound = true; var filter = input.value.toUpperCase()
input = document.getElementById("searchInput");
filter = input.value.toUpperCase();
rows = document.getElementsByTagName("tr"); var cardsCol = document.getElementsByClassName("col-sm")
for (i = 0; i < rows.length; i++) { var cardTitle, cardText, titleValue, textValue
cols = rows[i].getElementsByTagName("td");
// check all cos var i
for (j = 0; j < cols.length; j++) { var counterBlock = 0
txtValue = cols[j].textContent || cols[j].innerText; for (i = 0; i < cardsCol.length; i++) {
if (txtValue.toUpperCase().indexOf(filter) > -1) { cardTitle = cardsCol[i].getElementsByClassName("card-title-bottom-left");
isFound = true; cardBody = cardsCol[i].getElementsByClassName("card-body");
break; cardText = cardsCol[i].getElementsByClassName("card-text");
} else {
isFound = false; titleValue = cardTitle[0].textContent || cardTitle[0].innerText;
} bodyValue = cardBody[0].textContent || cardBody[0].innerText;
} textValue = cardText[0].textContent || cardText[0].innerText;
if (isFound) {
rows[i].style.display = "block"; if (titleValue.toUpperCase().indexOf(filter) > -1 || bodyValue.toUpperCase().indexOf(filter) > -1 || textValue.toUpperCase().indexOf(filter) > -1) {
} cardsCol[i].style.display = "block"
else { counterBlock++
rows[i].style.display = "none"; } else {
cardsCol[i].style.display = "none"
} }
} }
document.getElementById("projectCounter").innerHTML = counterBlock+" Projektdaten werden angezeigt"
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal