From cfa0924ea76e5304d96fa51211f1fdfa79512b55 Mon Sep 17 00:00:00 2001 From: Gregorio Chiko Putra Date: Thu, 5 Oct 2017 16:41:34 +0700 Subject: [PATCH 1/4] Mithril now can walks by itself --- .gitignore | 1 + App/Controllers/Api.php | 5 - App/Controllers/Posts.php | 12 + App/Models/Post.php | 2 +- App/Views/Data/mithril.html | 196 +- App/Views/base.html | 37 +- assets/js/components/activePost.js | 18 + assets/js/components/allPost.js | 18 + assets/js/components/inactivePost.js | 18 + assets/js/components/listAdmin.js | 45 + assets/js/components/nav.js | 28 + assets/js/components/soonPost.js | 18 + assets/js/index.js | 20 + assets/js/landing.js | 56 + assets/js/models/post.js | 20 + {public/js => assets/js/vendor}/marked.js | 0 {public/js => assets/js/vendor}/rome.js | 0 .../js => assets/js/vendor}/simplemde.min.js | 0 lepisi.sql | 22 +- package-lock.json | 3487 +++++++++++++++++ package.json | 30 + public/js/index.js | 232 ++ public/js/landing.js | 241 ++ public/js/mithril.js | 1242 ------ public/js/slidr.min.js | 48 - webpack.config.js | 27 + 26 files changed, 4299 insertions(+), 1524 deletions(-) create mode 100644 assets/js/components/activePost.js create mode 100644 assets/js/components/allPost.js create mode 100644 assets/js/components/inactivePost.js create mode 100644 assets/js/components/listAdmin.js create mode 100644 assets/js/components/nav.js create mode 100644 assets/js/components/soonPost.js create mode 100644 assets/js/index.js create mode 100644 assets/js/landing.js create mode 100644 assets/js/models/post.js rename {public/js => assets/js/vendor}/marked.js (100%) rename {public/js => assets/js/vendor}/rome.js (100%) rename {public/js => assets/js/vendor}/simplemde.min.js (100%) create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 public/js/index.js create mode 100644 public/js/landing.js delete mode 100644 public/js/mithril.js delete mode 100644 public/js/slidr.min.js create mode 100644 webpack.config.js diff --git a/.gitignore b/.gitignore index 6b074f7..4459ebe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ App/Config.php +node_modules diff --git a/App/Controllers/Api.php b/App/Controllers/Api.php index 8188315..ae299d9 100644 --- a/App/Controllers/Api.php +++ b/App/Controllers/Api.php @@ -16,7 +16,6 @@ class Api public function posts($args = ['id' => '1']) { $get = []; - $get['count'] = 0; if ($args['id'] == 3) { $get['data'] = $this->model->showJoin(); @@ -42,10 +41,6 @@ class Api $temp_data = []; } - if ($get['data'] != false) { - $get['count'] = count($get['data']); - } - header('Content-Type: application/json'); echo json_encode($get); } diff --git a/App/Controllers/Posts.php b/App/Controllers/Posts.php index a968daf..8b94b2a 100644 --- a/App/Controllers/Posts.php +++ b/App/Controllers/Posts.php @@ -291,6 +291,12 @@ class Posts Redirect::to('/posts/category'); } } else { + // Calculate delay by character + // 60 characters for 5 secs + // 1 character for 84 ms + $length = strlen($args['content']); + $args['delay'] = $length * 84; + if ($this->model->entry($args)) { Session::flash('info', 'Data berhasil diunggah'); Redirect::to('/'); @@ -348,6 +354,12 @@ class Posts } } + // Calculate delay by character + // 60 characters for 5 secs + // 1 character for 84 ms + $length = strlen($args['content']); + $args['delay'] = $length * 84; + if ($this->model->update($args, $id)) { Session::flash('info', 'Data berhasil diperbarui'); Redirect::to('/'); diff --git a/App/Models/Post.php b/App/Models/Post.php index ba729b2..a229274 100644 --- a/App/Models/Post.php +++ b/App/Models/Post.php @@ -122,7 +122,7 @@ class Post extends \Core\Model try { $db = static::connectDB(); - $sql = "SELECT pengumuman.id, kategori.category, kategori.background, kategori.foreground, date(pengumuman.valid_at) as valid_at, date(pengumuman.expired_at) as expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; + $sql = "SELECT pengumuman.id, kategori.category, kategori.background, kategori.foreground, date(pengumuman.valid_at) as valid_at, date(pengumuman.expired_at) as expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status, pengumuman.delay FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; if ($conditions) { $sql .= " WHERE"; diff --git a/App/Views/Data/mithril.html b/App/Views/Data/mithril.html index 63076b6..5f2128f 100644 --- a/App/Views/Data/mithril.html +++ b/App/Views/Data/mithril.html @@ -23,7 +23,7 @@ {% block body %}
-
+
@@ -31,198 +31,4 @@
- -{% if user != false %} - -{% else %} - -{% endif %} - {% endblock %} diff --git a/App/Views/base.html b/App/Views/base.html index d496d9b..1095c9f 100644 --- a/App/Views/base.html +++ b/App/Views/base.html @@ -50,14 +50,6 @@ z-index: 10001; } - .fl { - float: left; - } - - .fr { - float: right; - } - td, th { padding: .3em .45em .3em .6em; } @@ -70,18 +62,21 @@ text-align: center; } - #slidr-div p { + #slidr-div p, + .fitty p { margin: 0; text-align: center; line-height: 1; } @media screen and (orientation: landscape) { - #slidr-div p { + #slidr-div p, + .fitty p { font-size: 8vw; } } @media screen and (orientation: portrait) { - #slidr-div p { + #slidr-div p, + .fitty p { font-size: 10vh; } } @@ -149,10 +144,6 @@ background-color: rgba(17, 17, 17, .05); } - .fitty > p { - margin: 0; - } - nav { max-width: 100vw; } @@ -195,6 +186,10 @@ bottom: 0; padding: .3em; } + + .swiper-container { + height: 100vh; + } @@ -204,14 +199,16 @@ {% block nav %}{% endblock %} - - - - - + {% block body %} {% endblock %} + {% if user %} + + {% else %} + + {% endif %} +