Skip to content

Commit

Permalink
Added logout page.
Browse files Browse the repository at this point in the history
This included the creation of a generic, multi-purpose screen and associated
template.
  • Loading branch information
ryugi committed May 23, 2017
1 parent 0d804f2 commit a395fab
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
12 changes: 12 additions & 0 deletions resources/templates/generic.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% extends "templates/layout.html" %}

{% block top-nav %}
{% include "templates/header.html" with active="generic" %}
{% endblock %}

{% block body %}
<h2>{{ title }}</h2>

<p>{{ text }}</p>

{% endblock %}
11 changes: 7 additions & 4 deletions src/clj/timi/server/web/routes.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[ring.util.mime-type :as mime]
[ring.util.response :as response]
[timi.server.web.screens.docs :as docs-screen]
[timi.server.web.screens.generic :as generic-screen]
[timi.server.web.screens.projects :as projects-screen]
[timi.server.web.screens.reports :as reports-screen]
[timi.server.web.screens.time :as time-screen]
Expand Down Expand Up @@ -72,10 +73,12 @@
request
request)
(GET "/logout"
{session :session}
(-> "/"
(response/redirect)
(assoc :session (dissoc session :identity))))
request
(-> request
(dissoc :session)
(generic-screen/get-page
{:title "Bye!"
:text "You have beeb logged out."})))
(GET "/user/settings"
request
(user-screen/get-settings request))
Expand Down
13 changes: 13 additions & 0 deletions src/clj/timi/server/web/screens/generic.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(ns timi.server.web.screens.generic
(:require
[ring.util.response :as response]))

(defn render
[client-state]
(response/response
{:template-data client-state
:selmer-template "templates/generic.html"}))

(defn get-page
[request page-data]
(render page-data))

0 comments on commit a395fab

Please sign in to comment.