diff --git a/lib/SeMeet.pm b/lib/SeMeet.pm
index b20a5a6f6a8df7bc031223c393208a74f561d31e..3b47aa6d51bce831a014e0e2fcc9dfc2fb6578cf 100644
--- a/lib/SeMeet.pm
+++ b/lib/SeMeet.pm
@@ -134,7 +134,11 @@ sub startup( $self ) {
$r->get('/')->to(cb => sub { shift->render('index'); });
$r->get('/meets/:id')->requires(authenticated => 1)->to('Meets#meet');
- $r->get('/meets/:id')->to(cb => sub { shift->render('unauthorized'); });
+ $r->get('/meets/:id')->to(cb => sub {
+ my $c = shift;
+ $c->session->{id} = $c->stash->{id};
+ $c->render('index');
+ });
$r->get('/guest/:token')->to('Invites#meet');
$r->websocket('/ws')->to('Websockets#main');
diff --git a/lib/SeMeet/Controller/Auth.pm b/lib/SeMeet/Controller/Auth.pm
index e0dbf8784608db133fd7db1784f3fbd6d4930470..88e1911760ad980121bafde9f848bf4c4276b6a8 100644
--- a/lib/SeMeet/Controller/Auth.pm
+++ b/lib/SeMeet/Controller/Auth.pm
@@ -64,7 +64,14 @@ sub callback ($c) {
};
$c->authenticate();
- $c->redirect_to('/');
+ if ($c->session->{id}) {
+ my $id = $c->session->{id};
+ delete $c->session->{id};
+ $c->redirect_to("/meets/$id");
+ }
+ else {
+ $c->redirect_to('/');
+ }
}
sub do_logout($c) { # nesmi se jmenovat logout - rekurze
diff --git a/lib/SeMeet/Controller/Meets.pm b/lib/SeMeet/Controller/Meets.pm
index 4fd168985752dff6c7757b811d8fed0f9d674cce..ba1f60f5fed57f7168f5b63e09182f917591d632 100644
--- a/lib/SeMeet/Controller/Meets.pm
+++ b/lib/SeMeet/Controller/Meets.pm
@@ -237,12 +237,20 @@ sub meet($c) { #NENI API!
id => $c->current_user->{id}
});
- return $c->error(404, 'NOT_FOUND') if ! $meet;
+ if (! $meet) {
+ $c->render('unauthorized');
+ return;
+ }
+# return $c->error(404, 'NOT_FOUND') if ! $meet;
my $roles = $meet->user_roles($user, $c->current_user->{groups});
$c->trace($roles);
- return $c->error(404, 'NOT_FOUND') if ! $roles->{any};
+# return $c->error(404, 'NOT_FOUND') if ! $roles->{any};
+ if (! $roles->{any}) {
+ $c->render('unauthorized');
+ return;
+ }
$c->stash->{meet} = $meet;
$c->stash->{roles} = $roles;
diff --git a/public/img/bg.jpg b/public/img/bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..75d30f23ac554bb2909aea98a8d5c3388169b519
Binary files /dev/null and b/public/img/bg.jpg differ
diff --git a/public/img/motivator/1.jpg b/public/img/motivator/1.jpg
deleted file mode 100644
index ac170ba0f35a201906dd48b36ec4e08ffd567c0c..0000000000000000000000000000000000000000
Binary files a/public/img/motivator/1.jpg and /dev/null differ
diff --git a/public/img/motivator/2.jpg b/public/img/motivator/2.jpg
deleted file mode 100644
index b92e17f4f9db59fe4e8c02aaacc497206bf23f3c..0000000000000000000000000000000000000000
Binary files a/public/img/motivator/2.jpg and /dev/null differ
diff --git a/public/img/motivator/3.jpg b/public/img/motivator/3.jpg
deleted file mode 100644
index 3dd523ca1a28d38f700d1bf21e8c135c29e02f8f..0000000000000000000000000000000000000000
Binary files a/public/img/motivator/3.jpg and /dev/null differ
diff --git a/public/img/motivator/4.jpg b/public/img/motivator/4.jpg
deleted file mode 100644
index d4ac5d9df2b66ed3ae6ad504c446c8268d292bce..0000000000000000000000000000000000000000
Binary files a/public/img/motivator/4.jpg and /dev/null differ
diff --git a/public/img/motivator/5.jpg b/public/img/motivator/5.jpg
deleted file mode 100644
index b1028b501e4a453419573d845dbab41220e68d57..0000000000000000000000000000000000000000
Binary files a/public/img/motivator/5.jpg and /dev/null differ
diff --git a/public/img/og1.jpg b/public/img/og1.jpg
deleted file mode 100644
index ee3f9389321e00503368bcdac5e68de409ebfc6d..0000000000000000000000000000000000000000
Binary files a/public/img/og1.jpg and /dev/null differ
diff --git a/public/img/og1.png b/public/img/og1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9677fed4b42fda9c61379bad94fbe9239f9f7e4
Binary files /dev/null and b/public/img/og1.png differ
diff --git a/templates/includes/head.html.ep b/templates/includes/head.html.ep
new file mode 100644
index 0000000000000000000000000000000000000000..b5f06e8d3ef03cb0deb82167ea3b9121f0296ae0
--- /dev/null
+++ b/templates/includes/head.html.ep
@@ -0,0 +1,37 @@
+<head>
+ <meta charset="utf-8"/>
+ <link rel="apple-touch-icon" href="<%= config->{styleguide} %>images/favicons/favicon-196x196.png">
+ <link rel="icon" type="image/png" href="<%= config->{styleguide} %>images/favicons/favicon-196x196.png" sizes="196x196">
+ <meta name="application-name" content="<%= config->{name} %>">
+ <meta name="msapplication-TileColor" content="#000000">
+ <meta name="msapplication-TileImage" content="<%= config->{styleguide} %>images/favicons/mstile-144x144.png">
+ <meta name="msapplication-square70x70logo" content="<%= config->{styleguide} %>images/favicons/mstile-70x70.png">
+ <meta name="msapplication-square150x150logo" content="<%= config->{styleguide} %>images/favicons/mstile-150x150.png">
+ <meta name="msapplication-wide310x150logo" content="<%= config->{styleguide} %>images/favicons/mstile-310x150.png">
+ <meta name="msapplication-square310x310logo" content="<%= config->{styleguide} %>images/favicons/mstile-310x310.png">
+ <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/>
+ <meta name="theme-color" content="#000000"/>
+ <meta property="og:url" content="<%= config->{base_url} %>"/>
+ <meta property="og:type" content="website"/>
+ <meta property="og:title" content="<%= config->{name} %>"/>
+ <meta property="og:image" content="<%= config->{base_url} %>/img/og1.png"/>
+ <meta property="og:description" content="<%= config->{description} %>"/>
+ <meta name="description" content="<%= config->{description} %>"/>
+ <title><%= config->{name} %></title>
+ <link rel="manifest" href="/manifest.json"/>
+ <link rel="stylesheet" href="<%= config->{styleguide} %>css/styles.css"/>
+ <link rel="stylesheet" href="/custom.css"/>
+% if ( $c->stash->{meet} ) {
+ <script src='https://jitsi.pirati.cz/external_api.js'></script>
+% }
+ <script src="https://cdn-unpkg.pirati.cz/vue@2.7.8/dist/vue.min.js"></script>
+ <script src="<%= config->{styleguide} %>js/main.bundle.js"></script>
+
+ <script src="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/index.min.js"></script>
+ <script src="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/locale/cs.js"></script>
+ <link href="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/index.css" rel="stylesheet">
+ <style>
+ .mx-input { height: 48px; border-color: #adadad; border-radius: 0; }
+ </style>
+</head>
+
diff --git a/templates/index.html.ep b/templates/index.html.ep
index 6a0d0a1357213a67eec406b595ad1de104e2019d..a6f2406a6b1f4876f89722602134952128bd093d 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -1,16 +1,2 @@
-% layout 'default';
-
-<div class="flex flex-row justify-items-center">
-
-<div class="w-80 mr-10">
-<figure class="figure">
- <img src="/img/motivator/<%= int(rand(5))+1 %>.jpg" alt="" />
-</figure>
-</div>
-
-<div>
-<h1 class="head-alt-lg">BezpeÄŤnĂ˝ jitsi<br/>jenom pro ověřenĂ© účastnĂky</h1>
-<h1 class="head-alt-lg text-red-600 pt-10">TestovacĂ provoz</h1>
-</div>
-</div>
-
+% layout 'unauthorized';
+<h1 class="head-alt-lg text-center my-12">BezpeÄŤnĂ˝ jitsi jenom pro ověřenĂ© účastnĂky</h1>
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index d0b1ca9a443cbc3484471356948b424da67ec8b0..650d102c94091e8e558d2c02bf550d814e5653b4 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -1,43 +1,9 @@
<!doctype html>
<html lang="en">
<head>
- <meta charset="utf-8"/>
- <link rel="apple-touch-icon" href="<%= config->{styleguide} %>images/favicons/favicon-196x196.png">
- <link rel="icon" type="image/png" href="<%= config->{styleguide} %>images/favicons/favicon-196x196.png" sizes="196x196">
- <meta name="application-name" content="<%= config->{name} %>">
- <meta name="msapplication-TileColor" content="#000000">
- <meta name="msapplication-TileImage" content="<%= config->{styleguide} %>images/favicons/mstile-144x144.png">
- <meta name="msapplication-square70x70logo" content="<%= config->{styleguide} %>images/favicons/mstile-70x70.png">
- <meta name="msapplication-square150x150logo" content="<%= config->{styleguide} %>images/favicons/mstile-150x150.png">
- <meta name="msapplication-wide310x150logo" content="<%= config->{styleguide} %>images/favicons/mstile-310x150.png">
- <meta name="msapplication-square310x310logo" content="<%= config->{styleguide} %>images/favicons/mstile-310x310.png">
- <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/>
- <meta name="theme-color" content="#000000"/>
- <meta property="og:url" content="<%= config->{base_url} %>"/>
- <meta property="og:type" content="website"/>
- <meta property="og:title" content="<%= config->{name} %>"/>
- <meta property="og:image" content="<%= config->{base_url} %>/img/og1.jpg"/>
- <meta property="og:description" content="<%= config->{description} %>"/>
- <meta name="description" content="<%= config->{description} %>"/>
- <title><%= config->{name} %></title>
- <link rel="manifest" href="/manifest.json"/>
- <link rel="stylesheet" href="<%= config->{styleguide} %>css/styles.css"/>
- <link rel="stylesheet" href="/custom.css"/>
-% if ( $c->stash->{meet} ) {
- <script src='https://jitsi.pirati.cz/external_api.js'></script>
-% }
- <script src="https://cdn-unpkg.pirati.cz/vue@2.7.8/dist/vue.min.js"></script>
- <script src="<%= config->{styleguide} %>js/main.bundle.js"></script>
-
- <script src="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/index.min.js"></script>
- <script src="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/locale/cs.js"></script>
- <link href="https://cdn-unpkg.pirati.cz/vue2-datepicker@3.11.1/index.css" rel="stylesheet">
- <style>
- .mx-input { height: 48px; border-color: #adadad; border-radius: 0; }
- </style>
+%= include 'includes/head'
</head>
<body>
-
<nav class="navbar navbar--simple __js-root">
<ui-app inline-template>
<ui-navbar inline-template>
@@ -59,7 +25,6 @@
</div>
<div class="flex items-center space-x-4">
-% if ( is_user_authenticated ) {
<div class="flex items-center space-x-4">
<span class="head-heavy-2xs"><%= current_user->{displayname} %></span>
<div class="avatar avatar--2xs">
@@ -67,18 +32,6 @@
</div>
<a href="/logout"><button class="text-grey-200 hover:text-white"><i class="ico--log-out"></i></button></a>
</div>
-% } else {
- <a href="<%= oidc->authorize %>">
- <button class="btn btn--icon btn--grey-125 btn--hoveractive">
- <div class="btn__body-wrap">
- <div class="btn__body">Přihlásit se</div>
- <div class="btn__icon">
- <i class="ico--pirati"></i>
- </div>
- </div>
- </button>
- </a>
-% }
</div>
</div>
</div>
@@ -94,6 +47,5 @@
</main>
</section>
</div>
-
</body>
</html>
diff --git a/templates/layouts/unauthorized.html.ep b/templates/layouts/unauthorized.html.ep
new file mode 100644
index 0000000000000000000000000000000000000000..6d0fe4c3f7c59d705b363ea250bc5c3c1194e188
--- /dev/null
+++ b/templates/layouts/unauthorized.html.ep
@@ -0,0 +1,45 @@
+<!doctype html>
+<html lang="en">
+<body>
+<head>
+%= include 'includes/head'
+<style>
+#all {
+ width: 100vw;
+ height: 100vh;
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: url( '/img/bg.jpg') no-repeat center center;
+ background-size: cover;
+}
+</style>
+</head>
+<div id="all">
+<div class="container container--default py-8">
+ <section>
+ <main>
+ <div class="card elevation-9" style="background-color: #fff; opacity: .7" >
+ <div class="card__body">
+
+<%= content %>
+
+<a href="<%= oidc->authorize %>">
+<button class="btn btn--icon text-lg btn--fullwidth btn--violet-500 btn--hoveractive">
+ <div class="btn__body-wrap">
+ <div class="btn__body">Přihlásit se</div>
+ <div class="btn__icon">
+ <i class="ico--pirati"></i>
+ </div>
+ </div>
+</button>
+</a>
+ </div>
+ </div>
+
+ </main>
+ </section>
+</div>
+</div>
+</body>
+</html>
diff --git a/templates/unauthorized.html.ep b/templates/unauthorized.html.ep
index 54726fc41edae05fcb733bc9f8a5227ea26c29b3..412b59affbc81d75ef3a7641058fe1eaa990388c 100644
--- a/templates/unauthorized.html.ep
+++ b/templates/unauthorized.html.ep
@@ -1,14 +1,6 @@
+% if ( is_user_authenticated ) {
% layout 'default';
-
-<h1 class="head-alt-lg">Nemáte oprávnÄ›nĂ pro pĹ™Ăstup do tĂ©to mĂstnosti</h1>
-
-<a href="<%= oidc->authorize %>">
-<button class="btn btn--icon btn--grey-125 btn--hoveractive">
- <div class="btn__body-wrap">
- <div class="btn__body">Přihlásit se</div>
- <div class="btn__icon">
- <i class="ico--pirati"></i>
- </div>
- </div>
-</button>
-</a>
+% } else {
+% layout 'unauthorized';
+% }
+<h1 class="head-alt-lg text-center my-12">Nemáte oprávnÄ›nĂ pro pĹ™Ăstup do tĂ©to mĂstnosti</h1>