Skip to content

Commit 4f760cd

Browse files
author
root
committed
modify myalert.css, add https support, add new depends
1 parent c725f1a commit 4f760cd

File tree

10 files changed

+47
-33
lines changed

10 files changed

+47
-33
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
*.pyc
22
*.db
3+
*.key
4+
*.crt
35
static/upload/*.png
46
static/upload/*.jpg
57
static/upload/*.jpeg

ezBlog.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
from flask_wtf import FlaskForm
1010
from wtforms import StringField, BooleanField, PasswordField, TextAreaField, SubmitField
1111
from wtforms.validators import DataRequired
12+
from flask_sslify import SSLify
1213
import datetime
1314

1415
app = Flask(__name__)
1516
app.permanent_session_lifetime = datetime.timedelta(hours=3)
17+
app.config['USE_HTTPS'] = False
1618
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data/ezBlog.db'
1719
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
1820
app.config["SECRET_KEY"] = "ezBlog" # for WTF-forms and login
@@ -29,6 +31,9 @@
2931
app.config["BLOGGING_POSTS_PER_PAGE"] = 8
3032
app.config["BLOGGING_ARCHIVES_PER_PAGE"] = 20
3133

34+
if app.config['USE_HTTPS']:
35+
sslify = SSLify(app)
36+
3237
db = SQLAlchemy(app)
3338

3439
class User(db.Model, UserMixin):
@@ -110,4 +115,9 @@ def logout():
110115
return redirect("/blog/")
111116

112117
if __name__ == "__main__":
113-
app.run(debug=True, host='::', port=80, use_reloader=True)
118+
if app.config['USE_HTTPS']:
119+
app.config["BLOGGING_SITEURL"] = app.config["BLOGGING_SITEURL"].replace('http', 'https')
120+
context = ('server.crt', 'server.key')
121+
app.run(debug=True, host='::', port=443, use_reloader=True, ssl_context=context)
122+
else:
123+
app.run(debug=True, host='::', port=80, use_reloader=True)

flask_blogging/views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,17 @@ def page_by_id(post_id, slug):
237237
blogging_engine.process_post(prev_post, render=render)
238238
if meta["is_user_blogger"] or prev_post["public"]:
239239
break
240+
else:
241+
prev_post = None
240242
prev_post_id -= 1
241243
while next_post_id <= max_posts:
242244
next_post = storage.get_post_by_id(next_post_id)
243245
if next_post is not None:
244246
blogging_engine.process_post(next_post, render=render)
245247
if meta["is_user_blogger"] or next_post["public"]:
246248
break
249+
else:
250+
next_post = None
247251
next_post_id += 1
248252
return render_template("blogging/page.html", post=post, config=config,
249253
meta=meta, tags=tags, prev_post=prev_post,next_post=next_post)

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Flask-Login==0.4.1
55
Markdown==2.6.11
66
slugify==0.0.1
77
Flask-Principal==0.4.0
8+
Flask-SSLify==0.1.5

static/css/myalert.css

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
}
2828

2929
.alert-primary {
30-
color: #004085;
31-
background-color: #cce5ff;
32-
border-color: #b8daff;
30+
color: #555;
31+
background-color: #dcdcdc;
32+
border-color: #dcdcdc;
3333
}
3434

3535
.alert-message {
3636
color: #555;
37-
background-color: #f5f5f5;
38-
border-color: #f5f5f5;
37+
background-color: #dcdcdc;
38+
border-color: #dcdcdc;
3939
}
4040

4141
.alert-primary hr {
42-
border-top-color: #f5f5f5;
42+
border-top-color: #dcdcdc;
4343
}
4444

4545
.alert-primary .alert-link {
@@ -48,12 +48,12 @@
4848

4949
.alert-secondary {
5050
color: #555;
51-
background-color: #f5f5f5;
52-
border-color: #f5f5f5;
51+
background-color: #dcdcdc;
52+
border-color: #dcdcdc;
5353
}
5454

5555
.alert-secondary hr {
56-
border-top-color: #f5f5f5;
56+
border-top-color: #dcdcdc;
5757
}
5858

5959
.alert-secondary .alert-link {
@@ -62,12 +62,12 @@
6262

6363
.alert-success {
6464
color: #555;
65-
background-color: #f5f5f5;
66-
border-color: #f5f5f5;
65+
background-color: #dcdcdc;
66+
border-color: #dcdcdc;
6767
}
6868

6969
.alert-success hr {
70-
border-top-color: #f5f5f5;
70+
border-top-color: #dcdcdc;
7171
}
7272

7373
.alert-success .alert-link {
@@ -76,12 +76,12 @@
7676

7777
.alert-info {
7878
color: #555;
79-
background-color: #f5f5f5;
80-
border-color: #f5f5f5;
79+
background-color: #dcdcdc;
80+
border-color: #dcdcdc;
8181
}
8282

8383
.alert-info hr {
84-
border-top-color: #f5f5f5;
84+
border-top-color: #dcdcdc;
8585
}
8686

8787
.alert-info .alert-link {
@@ -90,12 +90,12 @@
9090

9191
.alert-warning {
9292
color: #555;
93-
background-color: #f5f5f5;
94-
border-color: #f5f5f5;
93+
background-color: #dcdcdc;
94+
border-color: #dcdcdc;
9595
}
9696

9797
.alert-warning hr {
98-
border-top-color: #f5f5f5;
98+
border-top-color: #dcdcdc;
9999
}
100100

101101
.alert-warning .alert-link {
@@ -104,12 +104,12 @@
104104

105105
.alert-danger {
106106
color: #555;
107-
background-color: #f5f5f5;
108-
border-color: #f5f5f5;
107+
background-color: #dcdcdc;
108+
border-color: #dcdcdc;
109109
}
110110

111111
.alert-danger hr {
112-
border-top-color: #f5f5f5;
112+
border-top-color: #dcdcdc;
113113
}
114114

115115
.alert-danger .alert-link {
@@ -118,12 +118,12 @@
118118

119119
.alert-light {
120120
color: #555;
121-
background-color: #f5f5f5;
122-
border-color: #f5f5f5;
121+
background-color: #dcdcdc;
122+
border-color: #dcdcdc;
123123
}
124124

125125
.alert-light hr {
126-
border-top-color: #f5f5f5;
126+
border-top-color: #dcdcdc;
127127
}
128128

129129
.alert-light .alert-link {
@@ -132,12 +132,12 @@
132132

133133
.alert-dark {
134134
color: #555;
135-
background-color: #f5f5f5;
136-
border-color: #f5f5f5;
135+
background-color: #dcdcdc;
136+
border-color: #dcdcdc;
137137
}
138138

139139
.alert-dark hr {
140-
border-top-color: #f5f5f5;
140+
border-top-color: #dcdcdc;
141141
}
142142

143143
.alert-dark .alert-link {

static/css/normalize.min.css

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/bootstrap.min.js

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/popper.min.js

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/blogging/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ <h1 class="post-title">
200200
type: 'POST',
201201
url: url_to_delete,
202202
success: function (data) {
203-
$("body").html(data);
203+
//$("body").html(data);
204204
window.location.pathname='{{config.BLOGGING_URL_PREFIX}}';
205205
},
206206
error: function (error) {

templates/blogging/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ <h1 class="post-title">
162162
type: 'POST',
163163
url: url_to_delete,
164164
success: function (data) {
165-
$("body").html(data);
165+
//$("body").html(data);
166166
window.location.pathname='{{config.BLOGGING_URL_PREFIX}}';
167167
},
168168
error: function (error) {

0 commit comments

Comments
 (0)