#1169 simple layout works

yegor256 · Jan 5, 2024 · db14b70 · db14b70
1 parent 9cce08e
commit db14b70
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -52,3 +52,19 @@ body="important" and (author=yegor256 or #hello+ or $bye+ or
   (posted<2023-12-14 and title=~"something" and body=~"Hello"))
 ```
 
+## How to Test
+
+In order to test it locally, run:
+
+```
+$ bundle update
+$ bundle exec rake
+```
+
+In order to run it locally as a web service on your localhost, run:
+
+```
+$ bundle exec rake run
+```
+
+You should be able to see it at `http://localhost:4567`.
diff --git a/Rakefile b/Rakefile
@@ -73,7 +73,7 @@ task(:config) do
 end
 
 task(run: %i[pgsql liquibase]) do
-  `rerun -b "RACK_ENV=test rackup"`
+  `rerun -b "RACK_ENV=test ruby netbout.rb"`
 end
 
 task(:copyright) do

diff --git a/front/front_login.rb b/front/front_login.rb
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative 'objects/version'
+require_relative '../objects/version'
 
 before '/*' do
   @locals = {

diff --git a/front/front_telegram.rb b/front/front_telegram.rb
@@ -24,7 +24,6 @@
 
 require 'telebot'
 require_relative '../objects/urror'
-require_relative '../objects/daemon'
 
 get '/telegram' do
   id = params[:id].to_i
@@ -107,7 +106,7 @@ def reply(msg, login)
 end
 
 if settings.config['telegram']
-  Nb::Daemon.new.start do
+  Thread.new do
     Telebot::Bot.new(settings.config['telegram']['token']).run do |_, message|
       chat = message.chat.id
       if telechats.exists?(chat)

diff --git a/netbout.rb b/netbout.rb
@@ -56,7 +56,11 @@
     },
     'sentry' => ''
   }
-  config = YAML.safe_load(File.open(File.join(File.dirname(__FILE__), 'config.yml'))) unless ENV['RACK_ENV'] == 'test'
+  unless ENV['RACK_ENV'] == 'test'
+    cfg = File.join(File.dirname(__FILE__), 'config.yml')
+    raise "The #{cfg} file must exist or you should set RACK_ENV to 'test' " unless File.exist?(cfg)
+    config = YAML.safe_load(File.open())
+  end
   if ENV['RACK_ENV'] != 'test'
     Raven.configure do |c|
       c.dsn = config['sentry']
@@ -66,9 +70,9 @@
   end
   set :bind, '0.0.0.0'
   set :server, :thin
-  set :show_exceptions, false
-  set :raise_errors, false
-  set :dump_errors, false
+  set :show_exceptions, true
+  set :raise_errors, true
+  set :dump_errors, true
   set :config, config
   set :logging, true
   set :log, Loog::REGULAR

diff --git a/objects/version.rb b/objects/version.rb
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative 'objects/nb'
+require_relative 'nb'
 
 module Nb
   VERSION = '0.0.0'

diff --git a/public/icon.svg b/public/icon.svg
diff --git a/views/layout.haml b/views/layout.haml
@@ -7,13 +7,16 @@
     %meta{name: 'keywords', content: 'risks, risk management, risk quality, risk quantity'}
     %meta{name: 'description', content: 'Private Talks Made Easy'}
     %link{href: 'https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css.min.css', rel: 'stylesheet'}
-    %link{rel: 'shortcut icon', href: iri.cut('/logo-64.png')}
+    %link{href: 'https://cdn.jsdelivr.net/gh/yegor256/drops@gh-pages/drops-css.min.css', rel: 'stylesheet'}
+    %link{rel: 'shortcut icon', href: iri.cut('/icon.svg')}
     %script{src: 'https://code.jquery.com/jquery-3.3.1.min.js'}
     :css
-      .logo { width: 64px; height: 64px; }
+      .logo { width: 128px; height: 128px; }
+      article { border: none; }
+      footer nav ul, header nav ul { text-align: left; margin-bottom: 1px; }
   %body
     %section
-      %header
+      %header.small
         %nav
           %ul
             %li
@@ -41,8 +44,8 @@
           %ul
             %li
               &copy;
-              ='2009&ndash;' + '-2024'
-              %a{href: 'https://www.zerocracy.com'} Zerocracy
+              ="2009&ndash;#{Time.now.year}"
+              %a{href: 'https://www.netbout.com'} Netbout
             %li
               %a{href: iri.cut('/terms')} Terms of Use
         %nav