Skip to content

Commit 81ecf34

Browse files
committed
Open up search to public
1 parent 2694389 commit 81ecf34

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

routes/ajax.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ let defaultVars, baseURL;
1212
router.all('*', (req, res, next) => {
1313
defaultVars = req.app.get('defaultVars');
1414
baseURL = req.app.get('baseURL');
15-
16-
if (!req.session.loggedin) {
17-
res.redirect(baseURL + '/');
18-
} else {
19-
next();
20-
}
15+
next();
2116
});
2217

2318
router.get('/snippetLookup/:ref?/:version?', (req, res, next) => {

routes/index.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,8 @@ router.get('/register/guest', (req, res, next) => {
116116
});
117117

118118
router.get('/search', (req, res, next) => {
119-
if (req.session.loggedin) {
120-
res.render('search', _.merge(defaultVars, {socket: ':' + settings.general.socket, title: 'Search'}));
121-
} else {
122-
res.render('index', _.merge(defaultVars, {socket: ':' + settings.general.socket, title: 'Search'}));
123-
}
124-
})
119+
res.render('search', _.merge(defaultVars, {socket: ':' + settings.general.socket, title: 'Search'}));
120+
});
125121

126122
router.post('/register', (req, res, next) => {
127123
if (missingProps(req.body, ['username', 'password', 'timezone', 'g-recaptcha-response']) && process.env.spec !== "true") {

views/pages/search.ejs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,19 @@
99
<server hidden><%=socket%></server>
1010
<% include ../snippets/navbar %>
1111
<div class="main">
12+
<%
13+
let size = "five";
14+
if (session.loggedin) {
15+
%>
1216
<div class="two columns">
1317
<% include ../snippets/subnav %>
1418
</div>
15-
<div class="five columns">
19+
<%
20+
} else {
21+
size = "six"
22+
}
23+
%>
24+
<div class="<%=size%> columns">
1625
<h3>Search</h3>
1726
<input type='text' id='search' name='search' placeholder='Search for a snippet' maxlength='255' autofocus autocomplete='off'>
1827
<span id='found'><span class='green' id='foundNum'>0</span> snippet<span id='s'>s</span> found</span>
@@ -29,7 +38,7 @@
2938
</tbody>
3039
</table>
3140
</div>
32-
<div class="five columns">
41+
<div class="<%=size%> columns">
3342
<div id='snippetInfo'>
3443
</div>
3544
</div>

0 commit comments

Comments
 (0)