Commit 5778b9c1 authored by colmoneill's avatar colmoneill

Merge branch 'master' of gitlab.com:bemaker/eu.bemaker.flask

parents 0fea0c3c d4e2ed0b
......@@ -40,7 +40,7 @@ app.config['MAIL_DEFAULT_SENDER'] = 'automatic@colm.be'
mail = Mail(app)
# MongoDB Config
app.config['MONGODB_DB'] = 'mydatabase'
app.config['MONGODB_DB'] = 'mydatabase' # change me before prod!
app.config['MONGODB_HOST'] = 'localhost'
app.config['MONGODB_PORT'] = 27017
......@@ -160,7 +160,6 @@ def not_found(error):
@login_required
def dashboard():
user = current_user.get_id()
#user = str(user)
print('user: ' + user)
db_user = User.objects.get(id=user).update(inc__dashboard_view_count=1, upsert=True)
message = 'Welcome to your dashboard ' + current_user.get_id()
......
title: weather station
published: 2010-12-22
desc: petite station meteo
cat: usinage
#STATION METEO / introduction à ARDUINO
......
title: bras robotique
published: 2010-12-24
featured_image: page_images/test.jpg
quiz: robotArmQuiz
badge: electronique
desc: creation d'un petit bras robotique
cat: elec
......
......@@ -205,6 +205,7 @@ ul#menuSecond li a:hover {
margin-bottom: 30px;
border-radius: 2%;
text-align: center;
max-height: 300px;
}
.tutoItem .tutoBox img {
max-width: 110%;
......@@ -231,26 +232,26 @@ ul#menuSecond li a:hover {
margin-left: -10px;
transition: all 0.2s ease;
}
.tutoItem .tutoBox .green.overTuto:before {
.tutoItem .tutoBox .elec.overTuto:before {
background: #90ee90;
}
.tutoItem .tutoBox .blue.overTuto:before {
.tutoItem .tutoBox .prog.overTuto:before {
background: blue;
}
.tutoItem .tutoBox .red.overTuto:before {
.tutoItem .tutoBox .usinage.overTuto:before {
background: red;
}
.tutoItem .tutoBox:hover .green.overTuto:before {
background: url(../img/chip.png) no-repeat #90ee90;
.tutoItem .tutoBox:hover .elec.overTuto:before {
background: url(../img/electronique.png) no-repeat #90ee90;
background-position: center !important;
background-size: 40%;
}
.tutoItem .tutoBox:hover .blue.overTuto:before {
.tutoItem .tutoBox:hover .prog.overTuto:before {
background: url(../img/cncico.png) no-repeat blue;
background-position: center;
background-size: 40%;
}
.tutoItem .tutoBox:hover .red.overTuto:before {
.tutoItem .tutoBox:hover .usinage.overTuto:before {
background: url(../img/3dprint.png) no-repeat red;
background-position: center;
background-size: 40%;
......@@ -352,6 +353,10 @@ ul#menuSecond li a:hover {
background-image: url(../img/3dprint.png);
}
.maker {
background-image: url(../img/3dprint.png);
}
.badgeImg.active {
background-color: #2ecc71;
}
......
......@@ -371,6 +371,11 @@ ul {
}
.maker {
background-image: url(../img/3dprint.png) ;
}
.badgeImg.active{
......
......@@ -2,6 +2,8 @@
{% block content %}
{{page.quiz}}
<div id="myCarousel" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="carousel-item active">
......@@ -23,4 +25,9 @@
{{page}}
</div>
</div>
{% if page.quiz %}
{% include 'quiz.html' %}
{% endif %}
{% endblock %}
......@@ -16,19 +16,37 @@
</div>
</div>
<div class="tutoWrapper">
<H3>LEARN</H3>
{% for article in articles %}
<li>
{% if article.featured_image %}
<div class="thumbnail">
<img class="document_thumbnail_img" src="../static/{{article.featured_image}}">
<div class="container-fluid">
<H3>LEARN</H3>
<div class="row no-gutter">
<div class="col col-12 col-sm-12 col-md-12 col-lg-12">
<div class="row">
{% for article in articles %}
<div class="col col-12 col-sm-6 col-md-4 col-lg-3 tutoItem">
<div class="tutoBox">
{% if article.featured_image %}
<img src="../static/{{article.featured_image}}">
<div class="overTuto {{ article.cat }}">
<h4>{{article.title}}</h4>
<span class="desc">{{article.desc}}</span>
</div>
{% else %}
<img src="../static/placeholder.jpg">
<div class="overTuto {{ article.cat }}">
<h4>{{article.title}}</h4>
<span class="desc">{{article.desc}}</span>
</div>
{% endif%}
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% else %}
<div class="thumbnail no-img"></div>
{% endif %}
<a href="/learn/{{article.path}}">{{article.title}}</a>
{% endfor %}
</li>
</div>
{% endblock %}
db.getCollection('user').find({})
\ 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