Update readme, fix formatting

README.md

@@ -1,51 +1,57 @@
-# Semkov Gorodok blog  
+# Semkov Gorodok blog
 
-## About  
+## About
 
-[![Wagtail 2.12](https://img.shields.io/badge/wagtail-2.12-green.svg)](https://pypi.org/project/wagtail/)
+[![Wagtail 5.2.2](https://img.shields.io/badge/wagtail-5.2.2-green.svg)](https://pypi.org/project/wagtail/)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 [![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://bitbucket.org/manti_by/semkov/raw/c61190bd891b532908a64fdbdb1cd53a7f259c87/LICENSE)
 
 Author: Alexander Chaika <manti.by@gmail.com>
 
 Source link: https://github.com/manti-by/semkov
 
-Requirements: Docker, Python 3.9, SQLite  
+Requirements: Docker, Python 3.11, PostgreSQL
 
 
-## Setup development environment  
+## Setup development environment
 
-1. Install virtualenv and sqlite3
+1. Create and activate virtualenv
 
-        $ sudo apt install virtualenv sqlite3
+    ```shell
+    virtualenv .venv
+    source .venv/bin/activate
+    ```
 
-2. Install, create and activate virtualenv
+2. Clone sources and install pip packages
 
-        $ pip install virtualenv  
-        $ virtualenv -p python3 --no-site-packages --prompt=smk- venv
-        $ source venv/bin/activate  
+    ```shell
+    git clone git@github.com:manti-by/semkov.git .
+    pip install -r requirements.txt
+    ```
 
-3. Clone sources and install pip packages
-
-        $ git clone git@github.com:manti-by/semkov.git && cd semkov/
-        $ pip install -r requirements/dev.txt
+3. Run migration and local dev server
 
-4. Run migration and local dev server
+    ```shell
+    python manage.py migrate
+    python manage.py runserver
+    ```
 
-        $ python manage.py migrate
-        $ python manage.py runserver
-
-
-**NOTICE**: Before pushing your changes, run next commands
-
-    $ make check
+**NOTICE**: Before pushing your changes, run the next commands
 
+```shell
+make django-check
+make check
+make test
+```
 
 ## Run in production
 
 To run app in production mode, clone repo, build image and run it
 
-    $ git clone git@github.com:manti-by/semkov.git && cd semkov/
-    $ make build
-    $ docker-compose up -d
-    $ make migrate static
+```shell
+git clone git@github.com:manti-by/semkov.git .
+make build
+docker compose up -d
+make migrate
+make static
+```

config/nginx.conf

@@ -1,44 +1,28 @@
 server {
-    if ($host = www.semkov-gorodok.by) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-
-    if ($host = semkov-gorodok.by) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-
     listen 80;
     http2 on;
     server_name semkov-gorodok.by www.semkov-gorodok.by;
     return 301 https://semkov-gorodok.by$request_uri;
-
-
-
-
 }
 
 server {
     listen 443 ssl;
     http2 on;
     server_name www.semkov-gorodok.by;
-    return 404;
+    return 301 https://semkov-gorodok.by$request_uri;
 
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-    ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem; # managed by Certbot
-
-    return 301 https://semkov-gorodok.by$request_uri;
 
+    ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem;
 }
 
 server {
     listen 443 ssl;
     http2 on;
     server_name semkov-gorodok.by;
-    
+
     charset utf-8;
     client_max_body_size 10M;
 
@@ -111,8 +95,7 @@ server {
 
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-    ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem; # managed by Certbot
+
+    ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem;
- # managed by Certbot
 }
-

config/proxy-params.conf

@@ -22,4 +22,4 @@ proxy_set_header        X-Forwarded-For         $remote_addr;
 proxy_set_header        Authorization           '';
 
 proxy_buffering         off;
-proxy_redirect          off;
+proxy_redirect          off;

semkov/static/css/home.css

@@ -63,4 +63,4 @@ main.home .main-menu li li a {
 
 main.home .main-menu li li a:hover {
   color: #bf4b31;
-}
+}

semkov/static/css/index.css

@@ -268,7 +268,7 @@ button.secondary:hover {
   background-color: #9F9F9F;
 }
 
-button.primary.focus, 
+button.primary.focus,
 button.outline.primary:focus {
   box-shadow: 0 0 0 0.2rem rgba(255, 111, 97, .5);
 }
@@ -488,7 +488,7 @@ article .read-more {
 article .info .left,
 article .info .right {
   width: 50%;
-}  
+}
 
 article .info .left,
 article .info .right {
@@ -629,4 +629,4 @@ article .map {
   display: block;
   opacity: .5;
   transition: all .15s;
-}
+}

semkov/static/css/responsive.css

@@ -112,7 +112,7 @@
     max-width: initial;
     font-size: 2.5rem;
   }
-  
+
   main.home h1 {
     padding: 1rem 0 1.25rem;
   }
@@ -261,4 +261,4 @@
   main.home .main-menu li li:first-child:before {
     display: none;
   }
-}
+}

semkov/static/css/schedule.css

@@ -52,4 +52,4 @@
 
 .position tr:hover {
   background-color: #c6e0c5;
-}
+}

semkov/static/manifest.json

@@ -1,50 +1,50 @@
 {
-  "name": "Semkov Gorodok",
-  "short_name": "Semkov Gorodok",
-  "start_url": "https://semkov-gorodok.by/",
-  "display": "standalone",
   "background_color": "#FFFFFF",
-  "theme_color": "#ff6f61",
+  "display": "standalone",
   "icons": [
     {
-      "src": "/static/img/appicon/18x18.png",
       "sizes": "18x18",
+      "src": "/static/img/appicon/18x18.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/24x24.png",
       "sizes": "24x24",
+      "src": "/static/img/appicon/24x24.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/36x36.png",
       "sizes": "36x36",
+      "src": "/static/img/appicon/36x36.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/48x48.png",
       "sizes": "48x48",
+      "src": "/static/img/appicon/48x48.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/72x72.png",
       "sizes": "72x72",
+      "src": "/static/img/appicon/72x72.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/96x96.png",
       "sizes": "96x96",
+      "src": "/static/img/appicon/96x96.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/144x144.png",
       "sizes": "144x144",
+      "src": "/static/img/appicon/144x144.png",
       "type": "image/png"
     },
     {
-      "src": "/static/img/appicon/192x192.png",
       "sizes": "192x192",
+      "src": "/static/img/appicon/192x192.png",
       "type": "image/png"
     }
-  ]
-}
+  ],
+  "name": "Semkov Gorodok",
+  "short_name": "Semkov Gorodok",
+  "start_url": "https://semkov-gorodok.by/",
+  "theme_color": "#ff6f61"
+}

semkov/static/robots.txt

@@ -1 +1 @@
-User-agent: *
+User-agent: *

semkov/templates/ads/ads_form.html

@@ -22,4 +22,4 @@ <h3 class="title">
       <button type="submit" class="primary">{% trans 'Submit' %}</button>
     </form>
   </div>
-</div>
+</div>