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

Add a status indicator, clean up the default header #334

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add a status indicator, clean up the default header #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
778a807
Send out a comment message immediately to trigger onopen
j-f1 Feb 21, 2021
e03901e
Cleaner display of non-user content markdown
j-f1 Feb 21, 2021
6dfe921
Fix onerror
j-f1 Feb 21, 2021
40d3380
Fix comment rendering
j-f1 Feb 21, 2021
b2c72b0
Add a status indicator
j-f1 Feb 21, 2021
bf00c21
Tweak layout
j-f1 Feb 21, 2021
69e7ddb
Adjust spacing
j-f1 Feb 21, 2021
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: 1 addition & 0 deletions grip/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ def _render_refresh(self, subpath=None):

def gen():
last_updated = self.reader.last_updated(subpath)
yield ': started\r\n\r\n'
try:
while not shutdown_event.is_set():
time.sleep(0.3)
Expand Down
89 changes: 74 additions & 15 deletions grip/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,52 @@
margin-top: 64px;
margin-bottom: 21px;
}
#grip-readme-header {
position: relative;
top: -1em;
color: #666;
}
#grip-status-indicator.grip-floating-indicator {
margin: calc(0.5em + 15px);
color: #666;
}
#grip-status-indicator {
float: right;
text-transform: uppercase;
cursor: default;
-webkit-user-select: none;
user-select: none;
font-weight: bold;
--yellow: #FFDC00;
--red: #FF4136;
--green: #2ECC40;
}
#grip-status-indicator::after {
content: "";
display: inline-block;
width: 0.85em;
height: 0.85em;
background: var(--color);
border-radius: 50%;
vertical-align: middle;
position: relative;
bottom: 1.5px;
margin-left: 0.5em;
}
#grip-status-indicator + #grip-content > :first-child {
margin-top: 0;
}
/* User-content tweaks */
.timeline-comment-wrapper {
padding-left: 0;
}
.timeline-comment-wrapper > .timeline-comment:after,
.timeline-comment-wrapper > .timeline-comment:before {
content: none;
}
.discussion-timeline {
float: none;
}
/* User-content overrides */
.discussion-timeline.wide {
width: 920px;
Expand Down Expand Up @@ -62,24 +103,40 @@
var source = new EventSource(eventSourceUrl);
var isRendering = false;

var statusElement = document.getElementById('grip-status-indicator');
statusElement.hidden = false;
statusElement.textContent = 'Connecting';
statusElement.style.setProperty('--color', 'var(--yellow)');

source.onopen = function() {
statusElement.textContent = 'Connected';
statusElement.style.setProperty('--color', 'var(--green)');
}

source.onmessage = function(ev) {
var msg = JSON.parse(ev.data);
if (msg.updating) {
isRendering = true;
statusElement.textContent = 'Updating';
statusElement.style.setProperty('--color', 'var(--yellow)');
document.title = '(Rendering) ' + document.title;
} else {
isRendering = false;
statusElement.textContent = 'Connected';
statusElement.style.setProperty('--color', 'var(--green)');
document.title = initialTitle;
contentElement.innerHTML = msg.content;
showCanonicalImages();
}
}

source.onerror = function(e) {
if (e.readyState === EventSource.CLOSED && isRendering) {
if (isRendering) {
isRendering = false;
document.title = initialTitle;
}
statusElement.textContent = 'Disconnected';
statusElement.style.setProperty('--color', 'var(--red)');
}
}

Expand Down Expand Up @@ -108,20 +165,18 @@

{% if not user_content %}

<div id="readme" class="Box Box--condensed instapaper_body md js-code-block-container">
{% if title or filename %}
<div class="Box-header d-flex flex-items-center flex-justify-between px-2">
<h3 class="Box-title pr-3">
<span class="octicon octicon-book"></span>
{{ title or filename }}
</h3>
</div>
{% endif %}
<div class="Box-body">
<article id="grip-content" class="markdown-body entry-content p-5" itemprop="text">
{{ content|safe }}
</article>
</div>
{% if title or filename %}
<h3 id="grip-readme-header" class="Box-title px-5">
<span class="octicon octicon-book"></span>
{{ title or filename }}
<span id="grip-status-indicator" hidden style="--color: var(--yellow)">Connecting</span>
</h3>
{% endif %}

<div id="readme" class="instapaper_body md js-code-block-container">
<article id="grip-content" class="markdown-body entry-content p-5" itemprop="text">
{{ content|safe }}
</article>
</div>

{% else %}
Expand All @@ -138,10 +193,14 @@ <h3 class="Box-title pr-3">
<div class="timeline-comment-header clearfix">
<h3 class="timeline-comment-header-text f5 text-normal">
<strong class="css-truncate expandable"><span class="author text-inherit css-truncate-target">{{ title }}</span></strong>
<span id="grip-status-indicator" hidden style="--color: var(--yellow)">Connecting</span>
</h3>
</div>
{% endif %}
<div class="edit-comment-hide">
{% if not title %}
<span id="grip-status-indicator" class="grip-floating-indicator" hidden style="--color: var(--yellow)">Connecting</span>
{% endif %}
<div class="d-block comment-body markdown-body js-comment-body" id="grip-content">
{{ content|safe }}
</div>
Expand Down