BDIC
/
q-a_platform
mirror of https://csgitlab.ucd.ie/19206226/q-a_platform
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'collection' into 'master'

Browse Source 
Collection

See merge request 19206226/q-a_platform!6
master
王宇洋 3 years ago
parent 3b66ede7fd 00acf9f107
commit e2ae17c43f
9 changed files with 160 additions and 141 deletions
Show Stats Download Patch File Download Diff File

1
.gitlab-ci.yml
Unescape Escape View File

@ -60,3 +60,4 @@ docker:
# - master
#include:
#- template: Security/SAST.gitlab-ci.yml
#- template: Security/Secret-Detection.gitlab-ci.yml

2
app/main/views.py
Unescape Escape View File

@ -1016,7 +1016,7 @@ def edit_answer_md(answer_id):
answer.recent_activity = datetime.utcnow()
db.session.add(answer)
db.session.commit()
if post.is_anonymous:
if answer.is_anonymous:
flash("You have just modified an answer anonymously", 'success')
else:
flash("You have just modified an answer", 'success')

23
app/static/interact.css
Unescape Escape View File

@ -69,12 +69,31 @@
margin: 10px auto;
font-size: 75%;
line-height: 1;
max-width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.not-very-hot-post{
margin: 10px auto;
font-size: 75%;
line-height: 1;
max-width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
a>h4{
margin: 0;
padding: 0;
}
.inner3 .hot-post a {
color: #0077e6;
}
.inner3 .hot-post a:hover {
text-decoration: none;
text-decoration: underline;
}

6
app/templates/Posts/_comments.html
Unescape Escape View File

@ -4,7 +4,7 @@
<div class="comment-content col-sm-12">
{% if comment.is_anonymous %}
<div class="comment-footer">
<div class="comment-footer text-left">
<span class="comment-thumbnail">
<span class="head-photo">
<img class="img-rounded profile-thumbnail" src="{{ url_for('static',filename='Image/anonymous.png') }}" alt="avatar" style="width: 25px; height: 25px">
@ -14,7 +14,7 @@
<span class="comment-date">{{ moment(comment.timestamp).fromNow() }}</span>
</div>
{% else %}
<div class="comment-footer">
<div class="comment-footer text-left">
<span class="comment-thumbnail">
<a href="{{ url_for('.user', username=comment.author.username) }}">
{% if comment.author.avatar_img %}
@ -60,7 +60,7 @@
<div class="comment-body">
<div class="comment-body text-left">
{{ comment.body }}
<div class="footer">

34
app/templates/index/index_activities.html
Unescape Escape View File

@ -356,36 +356,36 @@
<ul class="posts list-unstyled">
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[0].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[0].title }}</span>
<span>{{ posts5[0].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[1].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[1].title }}</span>
<span>{{ posts5[1].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[2].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[2].title }}</span>
<span>{{ posts5[2].body }}</span>
</a></li>
<li><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].body }}</small>
</h4></a></li>
</ul>
</ul>

35
app/templates/index/index_follows.html
Unescape Escape View File

@ -359,41 +359,40 @@
<ul class="posts list-unstyled">
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[0].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[0].title }}</span>
<span>{{ posts5[0].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[1].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[1].title }}</span>
<span>{{ posts5[1].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[2].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[2].title }}</span>
<span>{{ posts5[2].body }}</span>
</a></li>
<li><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].body }}</small>
</h4></a></li>
</ul>
</ul>
</div>
</div>
{% endif %}
</div>

34
app/templates/index/index_posts.html
Unescape Escape View File

@ -460,36 +460,36 @@
<ul class="posts list-unstyled">
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[0].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[0].title }}</span>
<span>{{ posts5[0].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[1].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[1].title }}</span>
<span>{{ posts5[1].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[2].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[2].title }}</span>
<span>{{ posts5[2].body }}</span>
</a></li>
<li><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].body }}</small>
</h4></a></li>
</ul>
</ul>

34
app/templates/index/index_transactions.html
Unescape Escape View File

@ -354,36 +354,36 @@
<ul class="posts list-unstyled">
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[0].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[0].title }}</span>
<span>{{ posts5[0].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[1].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[1].title }}</span>
<span>{{ posts5[1].body }}</span>
</a></li>
<li class="hot-post"><a href="{{ url_for('.post', id=posts5[2].id) }}">
<span class="glyphicon glyphicon-fire"></span>
<span>{{ posts5[2].title }}</span>
<span>{{ posts5[2].body }}</span>
</a></li>
<li><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[3].id) }}"><h4>
<small>4. {{ posts5[3].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[4].id) }}"><h4>
<small>5. {{ posts5[4].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[5].id) }}"><h4>
<small>6. {{ posts5[5].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[6].id) }}"><h4>
<small>7. {{ posts5[6].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[7].id) }}"><h4>
<small>8. {{ posts5[7].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[8].id) }}"><h4>
<small>9. {{ posts5[8].body }}</small>
</h4></a></li>
<li><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].title }}</small>
<li class="not-very-hot-post"><a href="{{ url_for('.post', id=posts5[9].id) }}"><h4>
<small>10. {{ posts5[9].body }}</small>
</h4></a></li>
</ul>
</ul>

BIN
data-dev.sqlite
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save