Removed whenisit
This commit is contained in:
Asaf Gartner
parent
c5c773e82a
commit
f706709c34
|
|
@ -40,10 +40,6 @@ func TestHomepage(t *testing.T) {
|
|||
AssertSubdomain(t, hero.BuildHomepage(), "hero")
|
||||
}
|
||||
|
||||
func TestWhenIsIt(t *testing.T) {
|
||||
AssertRegexMatch(t, BuildWhenIsIt(), RegexWhenIsIt, nil)
|
||||
}
|
||||
|
||||
func TestAtomFeed(t *testing.T) {
|
||||
AssertRegexMatch(t, BuildAtomFeed(), RegexAtomFeed, nil)
|
||||
AssertRegexMatch(t, BuildAtomFeedForProjects(), RegexAtomFeed, map[string]string{"feedtype": "projects"})
|
||||
|
|
|
|||
|
|
@ -28,13 +28,6 @@ func (c *UrlContext) BuildHomepage() string {
|
|||
return c.Url("/", nil)
|
||||
}
|
||||
|
||||
var RegexWhenIsIt = regexp.MustCompile("^/whenisit$")
|
||||
|
||||
func BuildWhenIsIt() string {
|
||||
defer CatchPanic()
|
||||
return Url("/whenisit", nil)
|
||||
}
|
||||
|
||||
var RegexJamsIndex = regexp.MustCompile("^/jams$")
|
||||
|
||||
func BuildJamsIndex() string {
|
||||
|
|
|
|||
|
|
@ -1,138 +0,0 @@
|
|||
{{ template "base.html" . }}
|
||||
|
||||
{{ define "extrahead" }}
|
||||
<style type="text/css">
|
||||
.sidebar { display:none; }
|
||||
|
||||
.display {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.display .event_title {
|
||||
font-size: 80px;
|
||||
line-height: 80px;
|
||||
}
|
||||
|
||||
.display .date {
|
||||
margin-top: 40px;
|
||||
font-size: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
.display .precounter {
|
||||
margin: 40px 0 0 0;
|
||||
font-size: 50px;
|
||||
line-height: 50px;
|
||||
}
|
||||
|
||||
.display .postcounter {
|
||||
margin: 0 0 40px 0;
|
||||
font-size: 50px;
|
||||
line-height: 50px;
|
||||
}
|
||||
|
||||
.display .counter {
|
||||
margin: 20px 0;
|
||||
font-size: 50px;
|
||||
line-height: 50px;
|
||||
font-family: consolas, inconsolata, monospace;
|
||||
white-space: pre;
|
||||
}
|
||||
|
||||
.display > a {
|
||||
display: inline-block;
|
||||
margin-top: 20px;
|
||||
}
|
||||
</style>
|
||||
{{ end }}
|
||||
|
||||
{{ define "content" }}
|
||||
<div class="display">
|
||||
<p class="event_title"></p>
|
||||
<a class="external event_url" target="_blank" rel="nofollow"></a>
|
||||
<p class="date"></p>
|
||||
<p class="precounter"></p>
|
||||
<p class="counter"></p>
|
||||
<p class="postcounter">ago</p>
|
||||
<input id="notify_checkbox" type="checkbox"><label for="notify_checkbox">Notify me when it starts (Keep this tab open to receive notification)</label><br />
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
var timestamp = {{ .Timestamp }};
|
||||
var title = "{{ .Name }}";
|
||||
var url = "{{ .Url }}";
|
||||
var happened = false;
|
||||
var notificationState = "unknown";
|
||||
timestamp *= 1000;
|
||||
var date = new Date(timestamp);
|
||||
happened = timestamp < new Date().getTime();
|
||||
document.querySelector(".display .event_title").textContent = title;
|
||||
var eventUrl = document.querySelector(".display .event_url");
|
||||
if (url && url.length > 0) {
|
||||
eventUrl.textContent = url;
|
||||
if (!(url.startsWith("http://") || url.startsWith("https://"))) {
|
||||
url = "//" + url;
|
||||
}
|
||||
eventUrl.setAttribute("href", url);
|
||||
} else {
|
||||
eventUrl.style.display = "none";
|
||||
}
|
||||
document.querySelector(".display .date").textContent = date.toDateString() + ", " + date.toLocaleTimeString();
|
||||
if (document.querySelector("#notify_checkbox").checked) {
|
||||
if (Notification.permission == "granted") {
|
||||
notificationState = "on";
|
||||
} else {
|
||||
document.querySelector("#notify_checkbox").checked = false;
|
||||
}
|
||||
}
|
||||
document.querySelector("#notify_checkbox").addEventListener("change", updateNotifications);
|
||||
updateTimer();
|
||||
|
||||
function updateTimer() {
|
||||
function pad(t) {
|
||||
var str = t.toString();
|
||||
if (str.length == 1) {
|
||||
str = " " + str;
|
||||
}
|
||||
return str;
|
||||
}
|
||||
var now = new Date().getTime();
|
||||
var delta = Math.floor((timestamp - now) / 1000);
|
||||
var past = delta < 0;
|
||||
if (!happened && past) {
|
||||
happened = true;
|
||||
if (notificationState == "on") {
|
||||
new Notification(title + " is starting!!");
|
||||
}
|
||||
}
|
||||
delta = Math.abs(delta);
|
||||
var days = Math.floor(delta / 60 / 60 / 24);
|
||||
var hours = Math.floor(delta / 60 / 60) % 24;
|
||||
var minutes = Math.floor(delta / 60) % 60;
|
||||
var seconds = delta % 60;
|
||||
document.querySelector(".display .precounter").textContent = (past ? "Started" : "Starts in");
|
||||
document.querySelector(".display .counter").textContent = (days > 0 ? days + "d " : "") + (days > 0 || hours > 0 ? pad(hours) + "h " : "") + pad(minutes) + "m " + pad(seconds) + "s";
|
||||
document.querySelector(".display .postcounter").style.visibility = (past ? "visible" : "hidden");
|
||||
setTimeout(updateTimer, 1000);
|
||||
}
|
||||
|
||||
function updateNotifications() {
|
||||
var checked = document.querySelector("#notify_checkbox").checked;
|
||||
if (checked) {
|
||||
if (Notification.permission == "granted") {
|
||||
notificationState = "on";
|
||||
} else {
|
||||
Notification.requestPermission().then(function(permission) {
|
||||
if (permission == "granted") {
|
||||
document.querySelector("#notify_checkbox").checked = true;
|
||||
notificationState = "on";
|
||||
} else {
|
||||
document.querySelector("#notify_checkbox").checked = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
notificationState = "off";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{{ end }}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
{{ template "base.html" . }}
|
||||
|
||||
{{ define "extrahead" }}
|
||||
<style type="text/css">
|
||||
.sidebar { display:none; }
|
||||
|
||||
.editor {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.editor {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.editor label {
|
||||
display: inline-block;
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
.editor input {
|
||||
font-size: 20px;
|
||||
width: 250px;
|
||||
}
|
||||
|
||||
.editor a {
|
||||
font-family: monospace;
|
||||
}
|
||||
</style>
|
||||
{{ end }}
|
||||
|
||||
{{ define "content" }}
|
||||
<div class="editor">
|
||||
<h1>Make a timer</h1>
|
||||
<label for="date_input">Date:</label> <input id="date_input" type="date"><br />
|
||||
<label for="time_input">Time:</label> <input id="time_input" type="time"></br />
|
||||
<label for="title_input">Title:</label> <input id="title_input" type="text"><br />
|
||||
<label for="url_input">URL:</label> <input id="url_input" type="text"><br />
|
||||
<a target="_blank" href="javascript:;"></a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
document.querySelector("#title_input").addEventListener("input", updateLink);
|
||||
document.querySelector("#url_input").addEventListener("input", updateLink);
|
||||
document.querySelector("#date_input").addEventListener("input", updateLink);
|
||||
document.querySelector("#time_input").addEventListener("input", updateLink);
|
||||
|
||||
function updateLink() {
|
||||
var title = document.querySelector("#title_input").value.trim();
|
||||
var urlInput = document.querySelector("#url_input").value.trim();
|
||||
var date = document.querySelector("#date_input").value.trim();
|
||||
var time = document.querySelector("#time_input").value.trim();
|
||||
var linkParams = "";
|
||||
var link = document.querySelector(".editor a");
|
||||
if (date.length > 0 && time.length > 0) {
|
||||
var d = new Date(date + " " + time);
|
||||
linkParams = "t=" + d.getTime()/1000 + (title.length > 0 ? "&n=" + encodeURIComponent(title) : "") + (urlInput.length > 0 ? "&u=" + encodeURIComponent(urlInput) : "");
|
||||
var url = location.href.replace(location.search, "").replace("?", "") + "?" + linkParams;
|
||||
link.setAttribute("href", url);
|
||||
link.textContent = url;
|
||||
} else {
|
||||
link.setAttribute("href", "");
|
||||
link.textContent = "";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{{ end }}
|
||||
|
|
@ -105,7 +105,6 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler {
|
|||
hmnOnly.GET(hmnurl.RegexMonthlyUpdatePolicy, MonthlyUpdatePolicy)
|
||||
hmnOnly.GET(hmnurl.RegexProjectSubmissionGuidelines, ProjectSubmissionGuidelines)
|
||||
hmnOnly.GET(hmnurl.RegexConferences, Conferences)
|
||||
hmnOnly.GET(hmnurl.RegexWhenIsIt, WhenIsIt)
|
||||
|
||||
hmnOnly.GET(hmnurl.RegexJamsIndex, JamsIndex)
|
||||
hmnOnly.GET(hmnurl.RegexJamIndex, func(c *RequestContext) ResponseData {
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
package website
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"git.handmade.network/hmn/hmn/src/templates"
|
||||
)
|
||||
|
||||
type WhenIsItData struct {
|
||||
templates.BaseData
|
||||
Timestamp int
|
||||
Name string
|
||||
Url string
|
||||
}
|
||||
|
||||
func WhenIsIt(c *RequestContext) ResponseData {
|
||||
timestampStr := c.Req.URL.Query().Get("t")
|
||||
timestamp := 0
|
||||
hasTimestamp := false
|
||||
|
||||
if timestampStr != "" {
|
||||
var err error
|
||||
timestamp, err = strconv.Atoi(timestampStr)
|
||||
hasTimestamp = (err == nil)
|
||||
}
|
||||
|
||||
baseData := getBaseDataAutocrumb(c, "When is it?")
|
||||
|
||||
baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{
|
||||
Property: "og:title",
|
||||
Value: baseData.Title,
|
||||
})
|
||||
baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{
|
||||
Property: "og:url",
|
||||
Value: c.FullUrl(),
|
||||
})
|
||||
|
||||
if hasTimestamp {
|
||||
name := c.Req.URL.Query().Get("n")
|
||||
url := c.Req.URL.Query().Get("u")
|
||||
|
||||
if name != "" {
|
||||
baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{
|
||||
Property: "og:description",
|
||||
Value: fmt.Sprintf("Find out when %s starts.", name),
|
||||
})
|
||||
}
|
||||
|
||||
var res ResponseData
|
||||
res.MustWriteTemplate("whenisit.html", WhenIsItData{
|
||||
BaseData: baseData,
|
||||
Timestamp: timestamp,
|
||||
Name: name,
|
||||
Url: url,
|
||||
}, c.Perf)
|
||||
return res
|
||||
} else {
|
||||
baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{
|
||||
Property: "og:description",
|
||||
Value: "A countdown timer",
|
||||
})
|
||||
var res ResponseData
|
||||
res.MustWriteTemplate("whenisit_setup.html", baseData, c.Perf)
|
||||
return res
|
||||
}
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
- [x] theme-color-light is used only for buttons
|
||||
- [x] center-layout vs. margin-center
|
||||
- [x] Make sure old projects look ok (background images are gone)
|
||||
- [ ] Audit or delete whenisit
|
||||
- [x] Audit or delete whenisit
|
||||
- [ ] optionbar fixes
|
||||
- [ ] Remove "external" styles (width, padding, etc.)
|
||||
- [ ] Fix options (no more "buttons")
|
||||
|
|
|
|||
Loading…
Reference in New Issue