diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 6fc0e4f..d1293eb 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -11,8 +11,8 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.6) coffee-script (2.4.1) @@ -21,7 +21,7 @@ GEM coffee-script-source (1.12.2) colorator (1.1.0) commonmarker (0.23.10) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) dnsruby (1.70.0) simpleidn (~> 0.2.1) @@ -38,7 +38,10 @@ GEM faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) gemoji (4.1.0) github-pages (230) @@ -96,7 +99,7 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) jekyll (3.9.5) addressable (~> 2.4) @@ -211,7 +214,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) @@ -238,12 +241,12 @@ GEM sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.4) + public_suffix (5.1.1) racc (1.7.3) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) + rexml (3.3.8) rouge (3.30.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) diff --git a/docs/_data/links.yml b/docs/_data/links.yml index 0604e62..f73e43d 100644 --- a/docs/_data/links.yml +++ b/docs/_data/links.yml @@ -1,8 +1,5 @@ donation: -- name: okawo.198@gmail.com - currently unavailable - img: assets/images/paypal-logo-small.png - text: true -- name: NAFO Armories Monobank Jar +- name: Our Monobank Jar img: assets/images/monobank-logo-small.png link: https://send.monobank.ua/jar/41VstyWxB9 diff --git a/docs/_data/stats.yml b/docs/_data/stats.yml index ae38deb..c8adc13 100644 --- a/docs/_data/stats.yml +++ b/docs/_data/stats.yml @@ -1,12 +1,17 @@ current_fundraiser: - title: 🎯Goal - count: 10237$/14000$ + tag: goal + count: 14000$ # calculated as total of the sum of all previous fundraisers (95126$) # plus the current fundraiser total +# TODO: remove this cuz its old and not used anymore define: &total_raised 105,363$ overall_stats: +- title: Total Money Raised + tag: total + count: *total_raised - title: Drop Rig Systems count: 800 - title: Leyleys @@ -19,5 +24,3 @@ overall_stats: count: 1 - title: Laptops count: 1 -- title: Total Money Raised - count: *total_raised diff --git a/docs/_includes/donate_section.html b/docs/_includes/donate_section.html index 4b5e0de..c165fd5 100644 --- a/docs/_includes/donate_section.html +++ b/docs/_includes/donate_section.html @@ -6,24 +6,25 @@
+ {% if include.title %} +

{{ include.title }}

+ {% endif %} {% for item in include.links %} - {% if item.text == true %} - \ No newline at end of file +
diff --git a/docs/_includes/half_circle_chart.html b/docs/_includes/half_circle_chart.html new file mode 100644 index 0000000..5937430 --- /dev/null +++ b/docs/_includes/half_circle_chart.html @@ -0,0 +1,140 @@ +
+ Loading... +
+ + diff --git a/docs/_includes/header.html b/docs/_includes/header.html index f774e57..c4f10ac 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -10,6 +10,39 @@ + + + + + + {% include head-custom.html %} @@ -35,4 +68,4 @@

{{ site.title }}

{% endfor %} - \ No newline at end of file + diff --git a/docs/_includes/lang-toggle.html b/docs/_includes/lang-toggle.html new file mode 100644 index 0000000..30a2100 --- /dev/null +++ b/docs/_includes/lang-toggle.html @@ -0,0 +1,13 @@ + + +
+ + + EN + UA +
+ diff --git a/docs/_includes/recent_donations.html b/docs/_includes/recent_donations.html new file mode 100644 index 0000000..eee6818 --- /dev/null +++ b/docs/_includes/recent_donations.html @@ -0,0 +1,39 @@ + +
+

Recent donations

+
+ + + + + + + + + + +
DateAmountName
+
+
+ + diff --git a/docs/_includes/stat_display.html b/docs/_includes/stat_display.html index f85589e..d2b29b9 100644 --- a/docs/_includes/stat_display.html +++ b/docs/_includes/stat_display.html @@ -1,7 +1,41 @@
+ {% if include.title %} +

{{ include.title }}

+ {% endif %} {% for item in include.stats %} + {% if item.tag == "total" %} +
+

{{ item.title }}: Loading...

+
+ {% elsif item.tag == "goal" %} +
+

{{ item.title }}: Loading... / {{ item.count }}

+
+ {% else %}

{{ item.title }}: {{ item.count }}

+ {% endif %} {% endfor %} -
\ No newline at end of file + + +{% if include.api %} + + + +{% endif %} diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 625a5d8..838ae11 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -1,5 +1,9 @@ {% include header.html %}
+ {% if page.enable_translate %} + {% include lang-toggle.html %} + {% endif %} + {{ content }}
-{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html index c665c47..088f56a 100644 --- a/docs/_layouts/home.html +++ b/docs/_layouts/home.html @@ -3,6 +3,10 @@ {% assign latest_update = site.posts | where: "categories", "update" | first %}
+ {% if page.enable_translate %} + {% include lang-toggle.html %} + {% endif %} + {% if latest_update %}
@@ -26,4 +30,4 @@

-{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/docs/_layouts/post.html b/docs/_layouts/post.html index b02e302..cbc145f 100644 --- a/docs/_layouts/post.html +++ b/docs/_layouts/post.html @@ -3,8 +3,12 @@

{{ page.title }}

{{ page.date | date_to_string }} - {{ page.author }}

+ {% if page.enable_translate %} + {% include lang-toggle.html %} + {% endif %} +
{{ content }}
-{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/docs/_layouts/posts.html b/docs/_layouts/posts.html index cea9bb9..9f3049f 100644 --- a/docs/_layouts/posts.html +++ b/docs/_layouts/posts.html @@ -5,6 +5,10 @@

{{ page.title }}

{{ content }} + {% if page.enable_translate %} + {% include lang-toggle.html %} + {% endif %} + {% assign update_posts = site.posts | sort: "date" | reverse %}
{% for pg_post in update_posts %} @@ -23,4 +27,4 @@

{% endfor %}

-{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/docs/_posts/2024-07-22-fundraiser-obbp-15.md b/docs/_posts/2024-07-22-fundraiser-obbp-15.md index 498341d..8d029e8 100644 --- a/docs/_posts/2024-07-22-fundraiser-obbp-15.md +++ b/docs/_posts/2024-07-22-fundraiser-obbp-15.md @@ -5,6 +5,7 @@ date: 2024-07-23 author: Wende categories: fundraisers update obbp15 image: assets/images/gallery/obbp15.jpeg + fundraiser_target: - title: 8" FPV Drones count: x16 @@ -14,9 +15,20 @@ fundraiser_target: count: x100 - title: Ecoflow count: x3 + +fundraiser_data: +- title: 🎯Goal + tag: goal + count: 14000$ + +fundraiser_chart_data: + min: 0 + max: 14000 + api: donations/get/default/total --- -{% include stat_display.html stats=site.data.stats.current_fundraiser %} +{% include stat_display.html stats=page.fundraiser_data +api="donations/get/default/total" api_id="goal" %} ![obbp13]({{ "assets/images/gallery/obbp15.jpeg" | relative_url }}) @@ -24,6 +36,7 @@ fundraiser_target: ## 𝐎𝐩𝐞𝐫𝐚𝐭𝐢𝐨𝐧 𝐁𝐨𝐨𝐦 𝐁𝐨𝐨𝐦 𝐏𝐨𝐰 𝐗𝐕: 𝐁𝐚𝐫𝐛𝐞𝐜𝐮𝐛𝐞𝐬 +{% include half_circle_chart.html data=page.fundraiser_chart_data %} # What’s it for: diff --git a/docs/assets/css/nafoarms.scss b/docs/assets/css/nafoarms.scss index 8d9d04a..d141112 100644 --- a/docs/assets/css/nafoarms.scss +++ b/docs/assets/css/nafoarms.scss @@ -111,7 +111,7 @@ body { border-radius: 40px; } -.nafoarms-news:nth-child(even), { +.nafoarms-news:nth-child(even) { background-color: #fce1f8; } @@ -138,42 +138,99 @@ body { padding-bottom: 2vw; } +.nafoarms-dono-chart { + width: min(30rem, 90%); + height: 22rem; + padding: 10px; + margin: 1em; + margin-left: auto; + margin-right: auto; + background-color: + lightcyan; + border-radius: 25px; +} + +.dono-elements { + padding: 10px; + width: min(30rem, 90%); + margin-left: auto; + margin-right: auto; + margin-top: 1rem; + margin-bottom: 1rem; + background-color: #d9e6fc; + border-radius: 20px; +} + +.dono-elements h2 { + margin-bottom: 0; +} + .link { - text-align: center; - background-color: lightskyblue; + width: auto; margin-top: 1rem; margin-bottom: 1rem; + margin-left: auto; + margin-right: auto; +} + +.link-inner { + background-color: lightskyblue; + width: 20rem; padding: 1rem; - height: 70px; - width: 350px; - align-items: center; display: flex; flex-direction: row; + align-items: center; + justify-items: center; + text-align: center; + gap: 10; border-radius: 20px; - margin-left: auto; +} + +.link-inner p { + width: auto; + margin: 0; + margin-left: 1rem; margin-right: auto; } +.link-inner img { + height: 50px; + width: auto; + border-radius: 15px; + margin-left: auto; + margin-right: 1rem; +} + .link a { text-decoration: none; - border-bottom: 1px dotted black; + color: black; + margin: 0; } -.link p { - display: inline; +.link-pre { + width: min-content; + margin-left: auto; + margin-right: auto; } -.link img { - height: 50px; - width: auto; - border-radius: 15px; - margin-right: 10px; +.link a:visited { + text-decoration: none; } -.dono-elements { - max-width: 100vw; - padding: 10px; - width: auto; +.link a:link { + text-decoration: none; +} + +.link a:hover { + text-decoration: none; +} + +.link a:active { + text-decoration: none; +} + +.link p { + display: inline; } .dono-img img { @@ -302,6 +359,246 @@ body { width: 12vw; } +.nafoarms-flex-row { + display: flex; + flex-direction: row; + gap: 1rem; + height: min-content; +} + +.nafoarms-flex-row div { + height: 100%; + margin-top: 0; +} + +.lang-button { + position: relative; + display: inline-block; + margin: 0 5px; +} +.lang-button > span { + position: absolute; + top: 14px; + pointer-events: none; + font-family: 'Helvetica', Arial, sans-serif; + font-weight: bold; + font-size: 12px; + text-transform: uppercase; + text-shadow: 0 1px 0 rgba(0, 0, 0, .06); + width: 50%; + text-align: center; +} + +input.lang-button-check:checked ~ .off { + color: #66fac9; +} + +input.lang-button-check:checked ~ .on { + color: #fff; +} + + +.lang-button > span.on { + left: 0; + padding-left: 2px; + color: #66fac9; +} + +.lang-button > span.off { + right: 0; + padding-right: 4px; + color: #fff; +} + +.lang-toggle { + position: absolute; + margin-left: -9999px; + visibility: hidden; +} +.lang-toggle + label { + display: block; + position: relative; + cursor: pointer; + outline: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +input.lang-button-check + label { + padding: 2px; + width: 97px; + height: 35px; + background-color: #66fac9; + -webkit-border-radius: 60px; + -moz-border-radius: 60px; + -ms-border-radius: 60px; + -o-border-radius: 60px; + border-radius: 60px; +} +input.lang-button-check + label:before, +input.lang-button-check + label:after { + display: block; + position: absolute; + content: ""; +} + +input.lang-button-check + label:before { + top: 2px; + left: 2px; + bottom: 2px; + right: 2px; + background-color: #66fac9; + -webkit-border-radius: 60px; + -moz-border-radius: 60px; + -ms-border-radius: 60px; + -o-border-radius: 60px; + border-radius: 60px; +} +input.lang-button-check + label:after { + top: 4px; + left: 4px; + bottom: 4px; + width: 48px; + background-color: #fff; + -webkit-border-radius: 52px; + -moz-border-radius: 52px; + -ms-border-radius: 52px; + -o-border-radius: 52px; + border-radius: 52px; + -webkit-transition: margin 0.2s; + -moz-transition: margin 0.2s; + -o-transition: margin 0.2s; + transition: margin 0.2s; +} + +input.lang-button-check:checked + label { +} + +input.lang-button-check:checked + label:after { + margin-left: 44px; +} + + +/* -------------------------------------------- */ + +.nafoarms-recent-dono-outter { + width: auto; + max-width: min(20rem, 95%); + background-color: lightcyan; + border-radius: 25px; + overflow: hidden; + margin: 2vw; + margin-left: auto; + margin-right: auto; +} + +.nafoarms-recent-dono-outter h2 { + padding: 0; + margin-bottom: 0; + margin-left: auto; + margin-right: auto; +} + +.nafoarms-recent-donations { + width: auto; + max-width: 95%; +} + +.nafoarms-recent-donations table { + table-layout: fixed; + border-collapse: collapse; + border-spacing: 0; + width: auto; + max-width: 100%; + overflow-x: auto; + border-top: 2.27px solid black; + border-bottom: 2.27px solid black; + box-shadow: 0 0 20px rgba(0, 0, 0, 0.15); + margin: 20px; + background-color: #66fac9; + display: block; +} + +.nafoarms-recent-donations thead { + display: block; + background-color: #a4fcdf !important; + width: 30vw; +} + +.nafoarms-recent-donations tbody { + display: block; + overflow-y: auto; + height: 400px; + width: 30vw; +} + + +.nafoarms-recent-donations th { + font-weight: 700; + font-size: 0.9em; + border: 0 none; + width: 10rem; + padding: 0.51rem; + line-height: 1.1; +} + +.nafoarms-recent-donations td { + border: 0 none; + width: 10rem; + padding: 0.51rem; + line-height: 1.1; +} + +.nafoarms-recent-donations table>tbody>tr:first-child>td, +.nafoarms-recent-donations table>tbody>tr:first-child>th { + border-top: 1.36px solid black; +} + +.nafoarms-recent-donations table>tbody>tr:last-child>td, +.nafoarms-recent-donations table>tbody>tr:last-child>th { + border-bottom: 1.36px solid black; +} + +.nafoarms-recent-donations tbody tr:hover td { + background-color: #f5f1da; +} + +/* -------------------------------------------- */ +.nafoarms-recent-donations-rounded table { + border-collapse: separate; + border: solid #b3b3b3 1px; + border-radius: 26px; + border-spacing: 0px; +} + +.nafoarms-recent-donations-rounded table>tbody>tr>td { + border-bottom: 1px solid #ccccccbb; +} + +.nafoarms-recent-donations-rounded table>tbody>tr:last-child>td { + border-bottom: thin #ccccccbb; +} + +.nafoarms-recent-donations-rounded table th:first-of-type { + border-top-left-radius: 26px; +} + +.nafoarms-recent-donations-rounded table th:last-of-type { + border-top-right-radius: 26px; +} + +.nafoarms-recent-donations-rounded table tr:last-child td:first-child { + border-bottom-left-radius: 23px; +} + +.nafoarms-recent-donations-rounded table tr:last-child td:last-child { + border-bottom-right-radius: 23px; +} + +/* -------------------------------------------- */ + .youtube-player { border-radius: 15px; overflow: hidden; @@ -347,6 +644,23 @@ body { } @media (max-width: 768px) { + .nafoarms-flex-row { + display: flex; + flex-direction: column; + gap: 1rem; + height: min-content; + } + + .nafoarms-flex-row div {} + + .nafoarms-recent-donations thead { + width: 100vw; + } + + .nafoarms-recent-donations tbody { + width: 100vw; + } + .nafoarms-masthead { flex-direction: column; justify-content: center; @@ -420,6 +734,7 @@ body { max-height: 200px; } } + } .nafoarms-navbar-anchor { diff --git a/docs/donate.markdown b/docs/donate.markdown index a8878cb..396a38e 100644 --- a/docs/donate.markdown +++ b/docs/donate.markdown @@ -5,13 +5,9 @@ permalink: /donate/ image: assets/images/pride_100x100.png --- -# Donate +{% include donate_section.html links=site.data.links.donation title="Donation options" %} -There are a few ways you can help us financially - -{% include donate_section.html links=site.data.links.donation %} - -If you want to get a patch, for a donation of 50$ or more, message {% include handle_link.md thing=site.data.twitter.wende %} afterwards! +If you want to get a patch, donate 50$ or more with "#NAPATCH" in the donation message, and ping {% include handle_link.md thing=site.data.twitter.wende %} afterwards! ## Where Your Money Goes diff --git a/docs/index.markdown b/docs/index.markdown index 66c70e0..dd35b96 100644 --- a/docs/index.markdown +++ b/docs/index.markdown @@ -5,6 +5,7 @@ layout: home title: "NAFO Armories" image: assets/images/pride_100x100.png + --- # So, what do we do here? @@ -13,8 +14,14 @@ Oh nothing much, we just supply the Ukrainian Armed Forces We do both manufacturing as well as procurement for stuff like this -{% include stat_display.html stats=site.data.stats.overall_stats %} +
+ +{% include stat_display.html stats=site.data.stats.overall_stats api="donations/get/total" api_id="total" title="Overall statistics" %} + +{% include recent_donations.html %} + +
And we have many more on the way, and even more so when our small OEM line is at full capacity. -Currently we are operating at limited capacity. \ No newline at end of file +Currently we are operating at limited capacity. diff --git a/docs/policies-eng.md b/docs/policies-eng.md new file mode 100644 index 0000000..057bc0d --- /dev/null +++ b/docs/policies-eng.md @@ -0,0 +1,23 @@ +--- +layout: default # change this too! +title: Policies-ENG +permalink: /policies-eng/ +--- + +# Code Of Conduct + +NAFO Armories aims to create a positive environment free of discrimination. Engaging in discriminatory behavior including the use of homophobic, transphobic, sexist, racist or in any other way abusive language or actions will result in a ban. + +# Rules + + +No taking prototypes, products or components from the workshop + + +No disclosure of the location or the workshop address, without permission + + +The nature of our work requires a degree of secrecy for everyone's safety. Do not disclose the location of the workshop or the names/personal information of its employees or volunteers to others! + +Be kind to one another, and have fun! If you are having any issues or questions, please do not hesitate to contact us! + diff --git a/docs/policies-ua.md b/docs/policies-ua.md new file mode 100644 index 0000000..9397b3e --- /dev/null +++ b/docs/policies-ua.md @@ -0,0 +1,23 @@ +--- +layout: default # change this too! +title: Policies-UA +permalink: /policies-ua/ +--- + +# Кодекс поведінки + +NAFO Armories прагне створити позитивну атмосферу для вільної дискусії. +Участь у дискримінаційній поведінці, включаючи використання гомофобних, трансфобних, сексистських, расистських або аб'юзівних висловлювань або дій, призведе до бану. + + +# Правила + +Не забирати прототипи, продукти чи компоненти з майстерні + + +Не розголошувати локацію чи адресу майстерні, без дозволу + + +Природа нашої роботи вимагає ступінь секретності задля безпеки усіх. Не розголошуйте локацію майстерні або імена / персональну інформацію робітників або волонтерів іншим. + +Будьте добрими один до одного та веселіться! Якщо у вас виникли проблеми або питання, будь ласка, не соромтеся зв'язатися з нами. diff --git a/docs/policies.md b/docs/policies.md index 2fc7a86..0651387 100644 --- a/docs/policies.md +++ b/docs/policies.md @@ -3,47 +3,24 @@ layout: default # change this too! title: Policies permalink: /policies/ image: assets/images/pride_100x100.png ---- - -`US/Анг:` - -# Code Of Conduct - -NAFO Armories aims to create a positive environment free of discrimination. Engaging in discriminatory behavior including the use of homophobic, transphobic, sexist, racist or in any other way abusive language or actions will result in a ban. - -# Rules - - -No taking prototypes, products or components from the workshop - - -No disclosure of the location or the workshop address, without permission - - -The nature of our work requires a degree of secrecy for everyone's safety. Do not disclose the location of the workshop or the names/personal information of its employees or volunteers to others! - -Be kind to one another, and have fun! If you are having any issues or questions, please do not hesitate to contact us! - - -`UA/Укр:` - -# Кодекс поведінки - -NAFO Armories прагне створити позитивну атмосферу для вільної дискусії. -Участь у дискримінаційній поведінці, включаючи використання гомофобних, трансфобних, сексистських, расистських або аб'юзівних висловлювань або дій, призведе до бану. +enable_translate: true +--- -# Правила +
-Не забирати прототипи, продукти чи компоненти з майстерні +{% assign page = site.pages | where: "url", "/policies-eng/" | first %} +{{ page.content }} -Не розголошувати локацію чи адресу майстерні, без дозволу +
+