diff --git a/Gemfile b/Gemfile index f470941..42363f8 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ gem "github-pages", "~> 230", group: :jekyll_plugins # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.12" + gem "jekyll-feed", "~> 0.17" + gem "jekyll-sitemap", "~> 1.4" end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem @@ -27,11 +28,11 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do end # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] +gem "wdm", "~> 0.1", :platforms => [:mingw, :x64_mingw, :mswin] # Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem # do not have a Java counterpart. -gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] +gem "http_parser.rb", "~> 0.6", :platforms => [:jruby] # Starting with Ruby version 3.0.0, "webrick" is no longer included in the default # set of Ruby libraries. This addition ensures compatibility with Ruby 3.0.0 and diff --git a/Gemfile.lock b/Gemfile.lock index 08b42db..8c3f63b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -283,11 +283,12 @@ PLATFORMS DEPENDENCIES github-pages (~> 230) - http_parser.rb (~> 0.6.0) - jekyll-feed (~> 0.12) + http_parser.rb (~> 0.6) + jekyll-feed (~> 0.17) + jekyll-sitemap (~> 1.4) tzinfo (>= 1, < 3) tzinfo-data - wdm (~> 0.1.1) + wdm (~> 0.1) webrick (~> 1.8) BUNDLED WITH diff --git a/_config.yml b/_config.yml index c4e0be3..d720f59 100644 --- a/_config.yml +++ b/_config.yml @@ -1,12 +1,12 @@ # Permalinks -permalink: "/:year/:month/:day/:title" +permalink: "/blog/:title" # Time Zone -timezone: "Europe/Samara" +timezone: "Europe/Moscow" # Catalogs include: - - "_pages" + - "_pages" # Parsers highlighter: "rouge" @@ -14,54 +14,44 @@ markdown: "kramdown" # Markdown kramdown: - input: "GFM" - hard_wrap: false - syntax_highlighter: "rouge" + input: "GFM" + hard_wrap: false + syntax_highlighter: "rouge" # SASS/SCSS sass: - sass_dir: "_scss" - style: ":compressed" - -# AutoPrefixer -autoprefixer: - browsers: - - "> 1%" - - "last 10 versions" + sass_dir: "_scss" + sourcemap: "never" + style: ":compressed" # Compress HTML compress_html: - blanklines: false - clippings: "all" - comments: [""] - endings: [] - profile: false - startings: [] + blanklines: false + clippings: "all" + comments: [""] + endings: [] + profile: false + startings: [] # Website address -url: "https://valentineus.link" +url: "https://valentineus.github.io" baseurl: "" # Site description -title: "My homepage" -description: "I'm Full-Stack Web Developer" +title: "Valentin Popov's Technology Blog" +description: "Tech insights and coding best practices from an OpenSource enthusiast and ethical hacker." +email: "valentin@popov.link" rss: "/atom.xml" lang: "ru" -# About the author -author: - email: "info@valentineus.link" - name: "Valentin Popov" - url: "https://valentineus.link" - # Plugins plugins: - - "octopress-autoprefixer" + - jekyll-sitemap # Exceptions exclude: - - ".*" - - "Gemfile" - - "Gemfile.lock" - - "LICENSE.txt" - - "README.md" + - ".*" + - "Gemfile" + - "Gemfile.lock" + - "LICENSE.txt" + - "README.md" diff --git a/_data/meta.yml b/_data/meta.yml deleted file mode 100644 index 3342b40..0000000 --- a/_data/meta.yml +++ /dev/null @@ -1,8 +0,0 @@ -- name: "google-site-verification" - content: "BkBsaYAO1LuQDRceyK2odvcpfuP2al0y04LnBda1uvE" - -- name: "yandex-verification" - content: "14221e61b87bbd27" - -- name: "robots" - content: "index, follow" diff --git a/_data/navbar.yml b/_data/navbar.yml new file mode 100644 index 0000000..dd8906b --- /dev/null +++ b/_data/navbar.yml @@ -0,0 +1,5 @@ +- title: "Home" + path: "/" + +- title: "Blog" + path: "/blog/" diff --git a/_includes/comments.html b/_includes/comments.html new file mode 100644 index 0000000..e69de29 diff --git a/_includes/counter.html b/_includes/counter.html new file mode 100644 index 0000000..e69de29 diff --git a/_includes/disqus.html b/_includes/disqus.html deleted file mode 100644 index 4ebcc7e..0000000 --- a/_includes/disqus.html +++ /dev/null @@ -1,16 +0,0 @@ -
- diff --git a/_includes/head.html b/_includes/head.html index a97bd87..936368f 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,41 +1,25 @@ - - - - - - - - {% for tag in site.data.meta %} - - {% endfor %} - - - - - - - + + + + - - + {{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }} - - - - - - + - + + + + - + \ No newline at end of file diff --git a/_includes/navbar.html b/_includes/navbar.html new file mode 100644 index 0000000..431b268 --- /dev/null +++ b/_includes/navbar.html @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/_includes/reading-time.html b/_includes/reading-time.html new file mode 100644 index 0000000..2515099 --- /dev/null +++ b/_includes/reading-time.html @@ -0,0 +1,7 @@ +{% capture words %} +{{ content | number_of_words | minus: 180 }} +{% endcapture %} + +{% unless words contains '-' %} +{{ words | plus: 150 | divided_by: 150 | append: ' min read' }} +{% endunless %} \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index cabcd0b..ca65e32 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,10 +4,19 @@ layout: compress - {% include head.html %} - +{% include head.html %} + + +
+ {% include navbar.html %} +
+ +
{{ content }} - +
- + {% include counter.html %} + + + \ No newline at end of file diff --git a/_layouts/page.html b/_layouts/page.html index 32c9b9f..84f03f7 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,10 +2,4 @@ layout: default --- -
-
-

{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}

-
- - {{ content }} -
+{{ content }} \ No newline at end of file diff --git a/_layouts/post.html b/_layouts/post.html index 9aedb0b..9ff87ac 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,19 +2,25 @@ layout: default --- -
- - Published - - on - {{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }} - | - Permalink - +
+

{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}

-
-

{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}

-
+

+ + Posted + + by + Valentin Popov +  ‐ + {% include reading-time.html %} + +

+
+
{{ content }} -
+ + +
+ {% include comments.html %} +
\ No newline at end of file diff --git a/_pages/404.html b/_pages/404.html index dd15c35..aca708f 100644 --- a/_pages/404.html +++ b/_pages/404.html @@ -1,7 +1,13 @@ --- layout: page -permalink: "404.html" -title: "404: Not Found" +permalink: /404.html --- -

Sorry, this page doesn't exist.

+
+

404

+

Page not found.

+ + +

If you see this message, please let me know.

+ +
\ No newline at end of file diff --git a/_pages/atom.xml b/_pages/atom.xml index db00cf3..cdaab52 100644 --- a/_pages/atom.xml +++ b/_pages/atom.xml @@ -1,7 +1,6 @@ --- layout: null -permalink: "atom.xml" -title: "RSS" +permalink: /atom.xml --- diff --git a/_pages/blog.html b/_pages/blog.html new file mode 100644 index 0000000..847129e --- /dev/null +++ b/_pages/blog.html @@ -0,0 +1,20 @@ +--- +layout: page +permalink: /blog.html +--- + +
+

Latest posts

+
+ +
+ +
\ No newline at end of file diff --git a/_pages/index.html b/_pages/index.html index 71414c7..de3ea3a 100644 --- a/_pages/index.html +++ b/_pages/index.html @@ -1,9 +1,8 @@ --- layout: page -permalink: "index.html" -title: "" +permalink: /index.html --- {% include contacts.html %} {% include links.html %} -{% include posts.html %} +{% include posts.html %} \ No newline at end of file diff --git a/_pages/robots.txt b/_pages/robots.txt index 0e79b92..a16a265 100644 --- a/_pages/robots.txt +++ b/_pages/robots.txt @@ -1,9 +1,9 @@ --- -permalink: "robots.txt" layout: null +permalink: /robots.txt --- User-agent: * -Allow: {{ site.baseurl | relative_url | uri_escape }} Disallow: {{ "/404.html" | relative_url | uri_escape }} +Allow: / Sitemap: {{ "sitemap.xml" | absolute_url | uri_escape }} diff --git a/_pages/sitemap.xml b/_pages/sitemap.xml deleted file mode 100644 index 9b70b46..0000000 --- a/_pages/sitemap.xml +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: null -permalink: "sitemap.xml" ---- - - - - - -{% for item in site.html_pages %} - - {{ item.url | absolute_url | xml_escape }} - {{ site.time | date_to_xmlschema }} - -{% endfor %} - -{% for item in site.posts %} - - {{ item.url | absolute_url | xml_escape }} - {{ item.date | date_to_xmlschema }} - -{% endfor %} - - diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png deleted file mode 100644 index 4301d9f..0000000 Binary files a/assets/apple-touch-icon.png and /dev/null differ diff --git a/assets/favicon-16x16.png b/assets/favicon-16x16.png deleted file mode 100644 index bea9bbc..0000000 Binary files a/assets/favicon-16x16.png and /dev/null differ diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png deleted file mode 100644 index 070079d..0000000 Binary files a/assets/favicon-32x32.png and /dev/null differ diff --git a/assets/fonts/open-sans/license.txt b/assets/fonts/open-sans/license.txt deleted file mode 100644 index 989e2c5..0000000 --- a/assets/fonts/open-sans/license.txt +++ /dev/null @@ -1,201 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/assets/fonts/open-sans/open-sans-regular.ttf b/assets/fonts/open-sans/open-sans-regular.ttf deleted file mode 100644 index 5ca8393..0000000 Binary files a/assets/fonts/open-sans/open-sans-regular.ttf and /dev/null differ diff --git a/assets/fonts/open-sans/open-sans-regular.woff b/assets/fonts/open-sans/open-sans-regular.woff deleted file mode 100644 index 699e5ad..0000000 Binary files a/assets/fonts/open-sans/open-sans-regular.woff and /dev/null differ diff --git a/assets/fonts/open-sans/open-sans-regular.woff2 b/assets/fonts/open-sans/open-sans-regular.woff2 deleted file mode 100644 index 4359426..0000000 Binary files a/assets/fonts/open-sans/open-sans-regular.woff2 and /dev/null differ