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.

Sign up for GitHub

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

Develop #1

Merged
merged 4 commits into from
Jul 20, 2019
Merged

Develop #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c7adf5
Add infinite scroll for board articles
therealjamesjung Jul 19, 2019
54eaa4d
Fix bugs on infinite scroll when changing themes
therealjamesjung Jul 20, 2019
2fc66c7
Merge branch 'altmshfkgudtjr/MODAKBUL' into 'master'
therealjamesjung Jul 20, 2019
f648b2b
Merge branch altmshfkgudtjr/master into develop
therealjamesjung Jul 20, 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
1 change: 0 additions & 1 deletion src/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from flask import Flask, render_template, redirect, request, jsonify
import MySQLdb
import os
app = Flask(__name__)

Expand Down
150 changes: 149 additions & 1 deletion src/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,154 @@ input:-ms-input-placeholder { color: #adadad;}



/*image board CSS================================================================*/
.M_image_contents_container {
position: relative;
margin: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 70%;
height: auto;
max-width: 800px;
padding-left: 5%;
}
@media screen and (min-width: 450px) {
.M_image_contents_container {
position: relative;
margin: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 100%;
max-width: 800px;
height: auto;
}
}

.M_user_profile_color {
display: inline-block;
width: 1%;
height: 28%;
background-color: mediumpurple;
border-radius: 20%;
margin-left: 2%;
margin-top: 1%;
float: left;
}

.M_user_name {
display: inline-block;
margin-top: 1%;
margin-left: 1%;
float: left;
font-weight: bold;
}

.M_time_info {
display: inline-block;
margin-top: 1%;
margin-left: 1%;
opacity: 0.6;
}

.M_board_content_title {
display: block;
margin-top: 2%;
margin-left: 2%;
font-size: 130%;
font-weight: bold;
}

.M_board_content_icon {
float: right;
opacity: 0.7;
margin-right: 1%;
margin-top: 0.5%
}

.M_board_content_info {
float: right;
opacity: 0.7;
margin-right: 1%;
}
.M_image_content {
cursor: pointer;
}
.M_image_content_title {
position: fixed;
top: 100px;
left: 50px;
font-size: 40px;
}
@media screen and (max-width: 450px){
.M_image_content_title {
position: fixed;
top: 70px;
left: 20px;
font-size: 40px;
}
}
.pseudo-scroller {
height: 3300px !important;
}
@media screen and (min-width: 1284px){
.pseudo-scroller {
height: 2200px !important;
}
}



/*image board CSS================================================================*/
.M_image_contents_container {
position: relative;
margin: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 70%;
height: auto;
max-width: 800px;
padding-left: 5%;
}
@media screen and (min-width: 450px) {
.M_image_contents_container {
position: relative;
margin: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 100%;
max-width: 800px;
height: auto;
}
}
.M_image_content {
cursor: pointer;
}
.M_image_content_title {
position: fixed;
top: 100px;
left: 50px;
font-size: 40px;
}
@media screen and (max-width: 450px){
.M_image_content_title {
position: fixed;
top: 70px;
left: 20px;
font-size: 40px;
}
}
.pseudo-scroller {
height: 3300px !important;
}
@media screen and (min-width: 1284px){
.pseudo-scroller {
height: 2200px !important;
}
}
/*==========



/*image board CSS================================================================*/
.M_image_contents_container {
position: relative;
Expand Down Expand Up @@ -992,6 +1140,6 @@ input:-ms-input-placeholder { color: #adadad;}
@media screen and (min-width: 1284px){
.pseudo-scroller {
height: 2200px !important;
}
}
}
/*===============================================================================*/
26 changes: 26 additions & 0 deletions src/static/js/infinitescroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
$(window).scroll(function() {
if ($(window).scrollTop() == $(document).height() - $(window).height()) {
let div_class = 'M_info_div M_board_content M_boxshadow M_board_content wow flipInX';
if (localStorage.getItem('modakbul_theme') === 'dark') {
div_class += ' M_boxshadow_dark_shadow" style="' +
'visibility: visible; background-color: rgb(73, 78, 82); color: rgb(245, 246, 250); border: 0px solid rgb(221, 221, 221);';
}

$(".M_board_contents_container")
.append(
'<div class="' + div_class + '">' +
'<div class="M_user_profile_color"></div>' +
'<div class="M_user_name">정재경</div>' +
'<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>' +
'<i class="fas fa-paperclip M_board_content_icon"></i>' +
'<i class="fas fa-image M_board_content_icon"></i>' +
'<div class="M_board_content_info">40</div>' +
'<i class="fas fa-comment M_board_content_icon"></i>' +
'<div class="M_board_content_info">15</div>' +
'<i class="fas fa-heart M_board_content_icon"></i>' +
'<div class="M_board_content_info">30</div>' +
'<i class="fas fa-eye M_board_content_icon"></i>' +
'<div class="M_board_content_title">제목입니다</div>' +
'</div>');
}
});
156 changes: 113 additions & 43 deletions src/templates/board.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,50 +167,119 @@ <h5 class="M_board_tag_title">#세종소융봉사</h5>
<h5 class="M_board_tag_title">#멘토링 1조</h5>
</div>
<div class="M_board_contents_container">
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
</div>
<div id="M_board_content" class="M_info_div M_boxshadow M_board_content wow flipInX">
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>
<div class="M_info_div M_board_content M_boxshadow M_board_content wow flipInX">
<div class="M_user_profile_color"></div>
<div class="M_user_name">정재경</div>
<div class="M_time_info">| 2019년 7월 21일 20:48:12</div>
<i class="fas fa-paperclip M_board_content_icon"></i>
<i class="fas fa-image M_board_content_icon"></i>
<div class="M_board_content_info">40</div>
<i class="fas fa-comment M_board_content_icon"></i>
<div class="M_board_content_info">15</div>
<i class="fas fa-heart M_board_content_icon"></i>
<div class="M_board_content_info">20</div>
<i class="fas fa-eye M_board_content_icon"></i>
<div class="M_board_content_title">제목입니다</div>
</div>

</div>
</div>
<!--Page footer-->
Expand Down Expand Up @@ -251,4 +320,5 @@ <h5 class="M_board_tag_title">#멘토링 1조</h5>
<script src="../static/js/test_url.js"></script>
<script src="../static/js/login.js"></script>
<script src="../static/js/themeChange.js"></script>
<script src="../static/js/infinitescroll.js"></script>
</html>