Skip to content
This repository was archived by the owner on Sep 23, 2021. It is now read-only.

Commit 230ea3a

Browse files
msoedovmsoedov
authored
Merge pull request #40 from msoedov/icon
Favicon and cleanup
2 parents 8f35a55 + 7f1d961 commit 230ea3a

File tree

6 files changed

+77
-72
lines changed

6 files changed

+77
-72
lines changed

‎Makefile‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
GIT_SUMMARY := $(shell git describe --tags --dirty --always)
22
REPO=msoedov/hacker-slides
3-
3+
DOCKER_IMAGE := $(REPO):$(GIT_SUMMARY)
44
default: repo
55

66
repo:
7-
@echo $(REPO):$(GIT_SUMMARY)
7+
@echo $(DOCKER_IMAGE)
88

99
build:
1010
@GOOS=linux CGO_ENABLE=0 go build main.go
11-
@docker build -t $(REPO):$(GIT_SUMMARY) .
12-
@docker tag $(REPO):$(GIT_SUMMARY) $(REPO)
11+
@docker build -t $(DOCKER_IMAGE) .
12+
@docker tag $(DOCKER_IMAGE) $(REPO)
1313

1414
push:
15-
@docker push $(REPO):$(GIT_SUMMARY)
15+
@docker push $(DOCKER_IMAGE)
1616
@docker push $(REPO)
1717

1818
r:
19-
@docker run -it -p 8080:8080 $(REPO):$(GIT_SUMMARY)
19+
@docker run -it -p 8080:8080 $(DOCKER_IMAGE)
20+
21+
release:
22+
@build
23+
@push

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func NewApp() *gin.Engine {
7373
mustHaveSession := func(c *gin.Context) (string, error) {
7474
session := sessions.Default(c)
7575
val := session.Get("name")
76-
emptySession := errors.New("Emtpy session")
76+
emptySession := errors.New("Empty session")
7777
if val == nil {
7878
c.String(400, "No context")
7979
return "", emptySession

‎static/js/index.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(function() {
1+
$(function () {
22

33
function slideSeparatorLines(text) {
44
var lines = text.split('\n');
@@ -19,7 +19,7 @@ $(function() {
1919
var text = ace.edit("editor").getValue();
2020
var separatorPositions = slideSeparatorLines(text);
2121
var slideNumber = separatorPositions.length;
22-
separatorPositions.every(function(pos, num) {
22+
separatorPositions.every(function (pos, num) {
2323
if (pos >= cursorLine) {
2424
slideNumber = num;
2525
return false;
@@ -35,14 +35,14 @@ $(function() {
3535
editor.getSession().setMode("ace/mode/markdown");
3636
editor.getSession().setUseWrapMode(true);
3737
editor.setShowPrintMargin(true);
38-
$.get('/slides.md', function(data) {
38+
$.get('/slides.md', function (data) {
3939
editor.setValue(data, -1);
4040
});
4141
var lastSRow = -1;
42-
ace.edit('editor').getSession().selection.on('changeCursor', function(e) {
42+
ace.edit('editor').getSession().selection.on('changeCursor', function (e) {
4343
var cursorRow = ace.edit('editor').getCursorPosition().row;
44-
if(lastSRow === cursorRow){
45-
return; // no update
44+
if (lastSRow === cursorRow) {
45+
return; // no update
4646
}
4747
lastSRow = cursorRow;
4848
var currentSlide = currentCursorSlide(cursorRow);

‎static/js/save.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
$(function() {
1+
$(function () {
22
function reloadMarkdown() {
33
$('#slides-frame')[0].contentWindow.postMessage(JSON.stringify({
44
method: 'reloadMarkdown'
55
}), window.location.origin);
66
}
77

8-
window.save = function() {
8+
window.save = function () {
99
var editor = ace.edit("editor");
1010

1111
$.ajax("/slides.md", {

‎static/js/slides.js‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -17,67 +17,67 @@ function initializeReveal() {
1717

1818
// Optional reveal.js plugins
1919
dependencies: [{
20-
src: '/static/reveal.js/lib/js/classList.js',
21-
condition: function() {
22-
return !document.body.classList;
23-
}
24-
},
25-
26-
// Interpret Markdown in <section> elements
27-
{
28-
src: '/static/reveal.js/plugin/markdown/marked.js',
29-
condition: function() {
30-
return !!document.querySelector('[data-markdown]');
31-
}
32-
}, {
33-
src: '/static/reveal.js/plugin/markdown/markdown.js',
34-
condition: function() {
35-
return !!document.querySelector('[data-markdown]');
36-
}
37-
},
38-
39-
// Syntax highlight for <code> elements
40-
{
41-
src: '/static/reveal.js/plugin/highlight/highlight.js',
42-
async: true,
43-
callback: function() {
44-
hljs.initHighlightingOnLoad();
45-
}
46-
},
47-
48-
// Zoom in and out with Alt+click
49-
{
50-
src: '/static/reveal.js/plugin/zoom-js/zoom.js',
51-
async: true
52-
},
53-
54-
// Speaker notes
55-
{
56-
src: '/static/reveal.js/plugin/notes/notes.js',
57-
async: true
58-
},
59-
60-
// MathJax
61-
{
62-
src: '/static/reveal.js/plugin/math/math.js',
63-
async: true
64-
},
65-
66-
{
67-
src: '/static/reveal.js/lib/js/classList.js',
68-
condition: function() {
69-
return !document.body.classList;
70-
}
20+
src: '/static/reveal.js/lib/js/classList.js',
21+
condition: function () {
22+
return !document.body.classList;
7123
}
24+
},
25+
26+
// Interpret Markdown in <section> elements
27+
{
28+
src: '/static/reveal.js/plugin/markdown/marked.js',
29+
condition: function () {
30+
return !!document.querySelector('[data-markdown]');
31+
}
32+
}, {
33+
src: '/static/reveal.js/plugin/markdown/markdown.js',
34+
condition: function () {
35+
return !!document.querySelector('[data-markdown]');
36+
}
37+
},
38+
39+
// Syntax highlight for <code> elements
40+
{
41+
src: '/static/reveal.js/plugin/highlight/highlight.js',
42+
async: true,
43+
callback: function () {
44+
hljs.initHighlightingOnLoad();
45+
}
46+
},
47+
48+
// Zoom in and out with Alt+click
49+
{
50+
src: '/static/reveal.js/plugin/zoom-js/zoom.js',
51+
async: true
52+
},
53+
54+
// Speaker notes
55+
{
56+
src: '/static/reveal.js/plugin/notes/notes.js',
57+
async: true
58+
},
59+
60+
// MathJax
61+
{
62+
src: '/static/reveal.js/plugin/math/math.js',
63+
async: true
64+
},
65+
66+
{
67+
src: '/static/reveal.js/lib/js/classList.js',
68+
condition: function () {
69+
return !document.body.classList;
70+
}
71+
}
7272
]
7373
});
7474

7575
themesCtrl();
7676
}
7777

7878
function highlightAnyCodeBlocks() {
79-
$(document).ready(function() {
80-
$('pre code').each(function(i, block) {
79+
$(document).ready(function () {
80+
$('pre code').each(function (i, block) {
8181
hljs.highlightBlock(block);
8282
});
8383
});
@@ -108,7 +108,7 @@ function reloadMarkdown() {
108108
}
109109

110110
function externalLinksInNewWindow() {
111-
$(document.links).filter(function() {
111+
$(document.links).filter(function () {
112112
return this.hostname != window.location.hostname;
113113
}).attr('target', '_blank');
114114
}
@@ -119,7 +119,7 @@ initializeReveal();
119119
function themesCtrl() {
120120
var defaultTheme = "black.css",
121121
currentTheme = localStorage.getItem('theme?') ||
122-
defaultTheme;
122+
defaultTheme;
123123

124124
function setTheme(theme) {
125125
cssEl = $("#theme");
@@ -145,12 +145,12 @@ function themesCtrl() {
145145
"white.css",
146146
];
147147
themeEl = $("#themes");
148-
availableThemes.forEach(function(theme) {
148+
availableThemes.forEach(function (theme) {
149149
elem = $("<option value=" + theme + ">" + theme + "</option>");
150150
themeEl.append(elem);
151151
})
152152
themeEl.val(currentTheme);
153-
themeEl.change(function() {
153+
themeEl.change(function () {
154154
val = themeEl.val()
155155
setTheme(val);
156156
});

‎templates/index.tmpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<title>Hacker Slides</title>
1010

1111
<link rel="stylesheet" href="/static/css/index.css">
12+
<link href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIsSURBVFhH7dg/SFVhGMfxg4FgJGVEGQSBBILYUAQl2NCftUkanKwhcmkQsq0iLIKiGiSwpQYDhSAadIlSl+aIpmzQzdwUTMToz/d3vQcuL885vnrP+16w+4MPeN7He9/nXj3nvOdN/oecxBUcLB1t5Dj6cKR0VMNcwx/8xQIuYhC/ymMrOIua5DBWoUbyzKMR0TMEqyFLL6JnDlYzlg+ImlOwGsmyjr2Ikla8gtVInlvYg2C5hGmkZ+12rGEMJ1BoXsOacLt0GdI3WkiaoU9uTVSN7ygsHXiMj/gGa8LN6Jr5FRO4A11Hg0WfXpM+wxN8KR+ndNZO4jamymOPEC03oUlflo6S5Bh+Im1Q33QTdGnRneQ39DvRshu670o7zlUcp05DCwn93IVCswtH0RbJIXhH347+mdM/Vyw6Cb1yBtYbhLYIr3TDeoPQluCVeoMZ6g1Wq95gtYI0qMXrfeh+69a0annnjOUJ0qCWXsow3NoFaJnmjmcJ0uAMlHG4tcs44IzlCdLgGyhaXrm1G1DSXYbNBGnwORRrcXEPirZE3JolSIN3oehG79ZeQPkMt2YJ0mA/GqAVs1t7C+U93JrFu8GtLLd6oG03q/YJyiisuusHvKJnCfchKIu21jqdsdQslKew6q6H8I7vkl/baudhTbgMZT+s11aq3PwsPAOwGhRNXpNoa1dbFyPI23XQLfABrkMnU7RchdVQFu0qbOnJrYjsQ4snPSnuxCTJP2DL0jFAlrNjAAAAAElFTkSuQmCC" rel="icon" type="image/x-icon">
1213
</head>
1314

1415
<body>

0 commit comments

Comments
 (0)