Skip to content

Commit

Permalink
tw config -> require
Browse files Browse the repository at this point in the history
  • Loading branch information
alextim committed Mar 12, 2022
1 parent 41e9a83 commit 06fde4c
Show file tree
Hide file tree
Showing 145 changed files with 667 additions and 784 deletions.
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{package.json,*.yml}]
[{*.json,*.toml,*.yml}]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
trim_trailing_whitespace = false
max_line_length = off

20 changes: 12 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ module.exports = {
version: 'detect',
},
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx']
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
'import/resolver': {
typescript: {
project: ['./tsconfig.json']
project: ['./tsconfig.json'],
},
node: {
project: ['./tsconfig.json']
}
}
project: ['./tsconfig.json'],
},
},
},
env: {
node: true,
Expand All @@ -48,9 +48,13 @@ module.exports = {
'plugin:import/errors',
'prettier',
],
plugins: ['@typescript-eslint', 'import', 'jsx-a11y',
plugins: [
'@typescript-eslint',
'import',
'jsx-a11y',
// 'react', 'react-hooks',
'prettier'],
'prettier',
],

rules: {
indent: ['error', 2, { SwitchCase: 1 }],
Expand All @@ -61,7 +65,7 @@ module.exports = {
'no-console': ['error', { allow: ['warn', 'error'] }],
'no-plusplus': 'off',
'no-restricted-exports': 'off',
/*
/*
'react/no-array-index-key': 'warn',
'react/no-danger': 0,
'react/jsx-props-no-spreading': 0,
Expand Down
9 changes: 3 additions & 6 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
node_modules
public
package.json
package-lock.json
s-bars.content
yarn.lock
/content/website/src/data/blog-posts
/dist
/node_modules
pnpm-lock.yaml
dist

45 changes: 45 additions & 0 deletions .vscode/css_custom_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"version": 1.1,
"atDirectives": [
{
"name": "@tailwind",
"description": "Use the `@tailwind` directive to insert Tailwind's `base`, `components`, `utilities` and `screens` styles into your CSS.",
"references": [
{
"name": "Tailwind Documentation",
"url": "https://tailwindcss.com/docs/functions-and-directives#tailwind"
}
]
},
{
"name": "@responsive",
"description": "You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive:\n```css\n@responsive {\n .alert {\n background-color: #E53E3E;\n }\n}\n```\n",
"references": [
{
"name": "Tailwind Documentation",
"url": "https://tailwindcss.com/docs/functions-and-directives#responsive"
}
]
},
{
"name": "@screen",
"description": "The `@screen` directive allows you to create media queries that reference your breakpoints by **name** instead of duplicating their values in your own CSS:\n```css\n@screen sm {\n /* ... */\n}\n```\n…gets transformed into this:\n```css\n@media (min-width: 640px) {\n /* ... */\n}\n```\n",
"references": [
{
"name": "Tailwind Documentation",
"url": "https://tailwindcss.com/docs/functions-and-directives#screen"
}
]
},
{
"name": "@variants",
"description": "Generate `hover`, `focus`, `active` and other **variants** of your own utilities by wrapping their definitions in the `@variants` directive:\n```css\n@variants hover, focus {\n .btn-brand {\n background-color: #3182CE;\n }\n}\n```\n",
"references": [
{
"name": "Tailwind Documentation",
"url": "https://tailwindcss.com/docs/functions-and-directives#variants"
}
]
}
]
}
2 changes: 1 addition & 1 deletion .vscode/extesions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"recommendations": ["esbenp.prettier-vscode", "bradlc.vscode-tailwindcss"]
"recommendations": ["astro-build.astro-vscode", "bradlc.vscode-tailwindcss", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "editorconfig.editorconfig"]
}
9 changes: 8 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@
},
"editor.quickSuggestions": {
"strings": true
}
},
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"cSpell.words": ["Astro", "tailwindcss", "eleventy", "viber"],
"cSpell.language": "en,ru",
"prettier.documentSelectors": ["**/*.astro", "**/*.ts"],
"css.customData": [".vscode/css_custom_data.json"]
}
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ https://www.defined.net/blog/internationalizing-docs-pages-with-astro/

https://rodneylab.com/sveltekit-image-plugin/


https://github.com/warpsio
https://github.com/warpsio/astro-localization

Expand All @@ -18,13 +17,12 @@ https://github.com/Princesseuh/princesseuh.dev
// Astro.request.params (slug, locale)

<script define:vars={{ schema }} type="application/ld+json">{schema}</script>
"let schema="

"let schema="

Ошибка Astro: Если в в Frontmatteк есть знак | перевода на новую сторку, то обрамляющие кавычки не удаляются
и


https://www.npmjs.com/~rafidmuhymin
astro-spa
A component for Astro JS that turns a website into an SPA
Expand Down
3 changes: 1 addition & 2 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default /** @type {import('astro').AstroUserConfig} */ ({
exclude: ['astro-eleventy-img'],
},
*/
/**
/**
* Due to an issue in the current version of Vite used by Astro, you need to add the following to your astro project config file:
*
*/
Expand All @@ -31,4 +31,3 @@ export default /** @type {import('astro').AstroUserConfig} */ ({
plugins: [],
},
});

12 changes: 6 additions & 6 deletions content/data/contacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ emails:

#openingHours:
# - ['mo-sa', '09:00', '18:00']
# - ["mo", "10:00", "18:00"]
# - ["tu", "10:00", "18:00"]
# - ["we", "10:00", "18:00"]
# - ["th", "10:00", "18:00"]
# - ["fr", "10:00", "18:00"]
# day off
# - ["mo", "10:00", "18:00"]
# - ["tu", "10:00", "18:00"]
# - ["we", "10:00", "18:00"]
# - ["th", "10:00", "18:00"]
# - ["fr", "10:00", "18:00"]
# day off
# - ['su', '00:00', '00:00']
# 24/7
#- ["su", "00:00", "23:59"]
Expand Down
3 changes: 1 addition & 2 deletions content/data/locales/address/address.ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ postalAddress:
streetAddress:
addressLocality: Кемер
addressRegion:
postalCode:
postalCode:
addressCountry: Турция

#contactPoint:
# - name:
# description:
Expand Down
1 change: 0 additions & 1 deletion content/data/locales/address/address.tr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ postalAddress:
addressRegion:
postalCode:
addressCountry: Türkiye

#contactPoint:
# - name:
# description:
Expand Down
2 changes: 1 addition & 1 deletion content/data/locales/social-links/social-links.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ facebook:
to: https://facebook.com/Скалолазание-в-Турции-Climbing-in-Turkey-100463228491933
title: Facebook
vk:
to: https://vk.com/skalolazanie_v_turcii
to: https://vk.com/skalolazanie_v_turcii
title: VKontakte
2 changes: 1 addition & 1 deletion content/data/locales/social-links/social-links.ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ facebook:
to: https://facebook.com/Скалолазание-в-Турции-Climbing-in-Turkey-100463228491933
title: Facebook
vk:
to: https://vk.com/skalolazanie_v_turcii
to: https://vk.com/skalolazanie_v_turcii
title: VKontakte
2 changes: 1 addition & 1 deletion content/data/locales/social-links/social-links.tr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ facebook:
to: https://facebook.com/Скалолазание-в-Турции-Climbing-in-Turkey-100463228491933
title: Facebook
vk:
to: https://vk.com/skalolazanie_v_turcii
to: https://vk.com/skalolazanie_v_turcii
title: VKontakte
1 change: 0 additions & 1 deletion content/pages/home.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ headline: Group and personal lessons with a guide
metaTitle: Промисловий альпінізм та висотні роботи, промальп | Сніжний Барс
metaDescription: Послуги промислового альпінізму по Україні, замовляйте будівельні роботи на висоті ☎ + 38 (096) 555-30-92 від компанії Сніжний Барс.
---

1 change: 1 addition & 0 deletions content/sections/1-services.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ items:
title: Восхождения
content: Треккинг и несложные восхождения на горы Турции.
---

Равным образом укрепление и развитие структуры в значительной степени обуславливает создание позиций, занимаемых участниками в отношении поставленных задач. Задача организации, в особенности же постоянный количественный рост и сфера нашей активности позволяет выполнять важные задания по разработке форм развития. Задача организации, в особенности же реализация намеченных плановых заданий обеспечивает широкому кругу (специалистов) участие в формировании системы обучения кадров, соответствует насущным потребностям.
3 changes: 1 addition & 2 deletions content/sections/2-about.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ image:
alt: masha
src: assets/images/about/face.jpg
---
Climbing instructor and guide on mountain routes in Turkey and Krasnoyarsk.

Climbing instructor and guide on mountain routes in Turkey and Krasnoyarsk.

Originally from Krasnoyarsk, for about 17 years I have been mountaineering and rock climbing. Master of sports in mountaineering. Champion of Russia in mountaineering and prize-winner of the Russian championships in mountaineering in the rock class.


Currently I live in Turkey (Geykbairi, Kemer)
3 changes: 1 addition & 2 deletions content/sections/2-about.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ image:
alt: masha
src: assets/images/about/face.jpg
---
Инструктор скалолазания и гид по горным маршрутам Турции и Красноярска.

Инструктор скалолазания и гид по горным маршрутам Турции и Красноярска.

Родом из Красноярска, около 17 лет занимаюсь альпинизмом и скалолазанием. Мастер спорта по альпинизму. Чемпион России по альпинизму и призер чемпионатов России по альпинизму в скальном классе.


В настоящее время проживаю в Турции (Гейкбаири, Кемер)
3 changes: 1 addition & 2 deletions content/sections/2-about.tr.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ image:
alt: masha
src: assets/images/about/face.jpg
---
ürkiye ve Krasnoyarsk'taki dağ rotalarında tırmanma eğitmeni ve rehberi.

ürkiye ve Krasnoyarsk'taki dağ rotalarında tırmanma eğitmeni ve rehberi.

Aslen Krasnoyarsk'lıyım, yaklaşık 17 yıldır dağcılık ve kaya tırmanışı yapıyorum. Dağcılıkta spor ustası. Dağcılıkta Rusya Şampiyonu ve rock sınıfında dağcılıkta Rusya şampiyonasında ödül sahibi.


Şu anda Türkiye'de yaşıyorum (Geykbairi, Kemer)
12 changes: 6 additions & 6 deletions content/sections/5-gallery.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@
title: Gallery
subtitle: Lorem ipsum dolor sit amet consectetur.
items:
- image:
- image:
alt: bla
src: assets/images/gallery/01-full.jpg
title: Threads
subtitle: Illustration

- image:
- image:
alt: bla
src: assets/images/gallery/02-full.jpg
title: Explorer
subtitle: Graphic Design

- image:
- image:
alt: bla
src: assets/images/gallery/03-full.jpg
title: Finish
subtitle: Identity

- image:
- image:
alt: bla
src: assets/images/gallery/04-full.jpg
title: Lines
subtitle: Branding

- image:
- image:
alt: bla
src: assets/images/gallery/05-full.jpg
title: Southwest
subtitle: Website Design

- image:
- image:
alt: bla
src: assets/images/gallery/06-full.jpg
title: Window
Expand Down
12 changes: 6 additions & 6 deletions content/sections/5-gallery.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@
title: Галерея
subtitle: Lorem ipsum dolor sit amet consectetur.
items:
- image:
- image:
alt: bla
src: assets/images/gallery/01-full.jpg
title: Threads
subtitle: Illustration

- image:
- image:
alt: bla
src: assets/images/gallery/02-full.jpg
title: Explorer
subtitle: Graphic Design

- image:
- image:
alt: bla
src: assets/images/gallery/03-full.jpg
title: Finish
subtitle: Identity

- image:
- image:
alt: bla
src: assets/images/gallery/04-full.jpg
title: Lines
subtitle: Branding

- image:
- image:
alt: bla
src: assets/images/gallery/05-full.jpg
title: Southwest
subtitle: Website Design

- image:
- image:
alt: bla
src: assets/images/gallery/06-full.jpg
title: Window
Expand Down
Loading

0 comments on commit 06fde4c

Please sign in to comment.