From 59fc7a0a5b28068002f62749502f7eaa1871c055 Mon Sep 17 00:00:00 2001 From: Stas Medvedev Date: Tue, 11 Jun 2024 00:43:21 +0300 Subject: =?UTF-8?q?=D0=9D=D0=B0=D0=BA=D0=B8=D0=B4=D0=B0=D0=BB=20html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- app/main.py | 21 +- readme.md | 5 + static/favicon.ico | Bin 0 -> 270398 bytes static/style.css | 781 +++++++++++++++++++++++++++++++++++++++ tailwind.config.js | 11 +- templates/index.html | 90 +---- templates/partials/about.html | 36 ++ templates/partials/avatars.html | 29 ++ templates/partials/header.html | 5 + templates/partials/palette.html | 7 + templates/partials/services.html | 14 + templates/style.css | 57 +++ 13 files changed, 980 insertions(+), 79 deletions(-) create mode 100644 static/favicon.ico create mode 100644 static/style.css create mode 100644 templates/partials/about.html create mode 100644 templates/partials/avatars.html create mode 100644 templates/partials/header.html create mode 100644 templates/partials/palette.html create mode 100644 templates/partials/services.html create mode 100644 templates/style.css diff --git a/.gitignore b/.gitignore index becda0c..b889fda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ venv __pycache__ -node_modules \ No newline at end of file +node_modules +*.jpg \ No newline at end of file diff --git a/app/main.py b/app/main.py index d9ea01c..891adb1 100644 --- a/app/main.py +++ b/app/main.py @@ -1,11 +1,27 @@ +from pathlib import Path + from fastapi import FastAPI, Request from fastapi.responses import HTMLResponse +from fastapi.staticfiles import StaticFiles from starlette.templating import Jinja2Templates import httpx +templates = Jinja2Templates(directory="templates") + app = FastAPI() +app.mount("/static", StaticFiles(directory="static"), name="static") -templates = Jinja2Templates(directory="templates") + +def get_avatar_urls(): + path = Path('./static') / 'avatars' + if not path.exists(): + path.mkdir() + + return sorted([ + str(jpg_avatar) + for jpg_avatar + in path.glob('*.jpg') + ]) def get_client_host(request: Request): @@ -31,6 +47,7 @@ async def index(request: Request): "request": request, "client_geo": await get_client_geo( get_client_host(request) - ) + ), + "avatar_urls": get_avatar_urls() } ) diff --git a/readme.md b/readme.md index 6fb6d3f..9f09811 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,8 @@ # Портфоли Выбрал cgit как средство отображения по тому что ему надо очень мало реcурсов + +``` +npx tailwindcss -i ./templates/style.css -o ./static/style.css --watch + +``` \ No newline at end of file diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..11cb85e Binary files /dev/null and b/static/favicon.ico differ diff --git a/static/style.css b/static/style.css new file mode 100644 index 0000000..03fae5b --- /dev/null +++ b/static/style.css @@ -0,0 +1,781 @@ +/* +! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com +*/ + +/* +1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) +2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) +*/ + +*, +::before, +::after { + box-sizing: border-box; + /* 1 */ + border-width: 0; + /* 2 */ + border-style: solid; + /* 2 */ + border-color: #e5e7eb; + /* 2 */ +} + +::before, +::after { + --tw-content: ''; +} + +/* +1. Use a consistent sensible line-height in all browsers. +2. Prevent adjustments of font size after orientation changes in iOS. +3. Use a more readable tab size. +4. Use the user's configured `sans` font-family by default. +5. Use the user's configured `sans` font-feature-settings by default. +6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS +*/ + +html, +:host { + line-height: 1.5; + /* 1 */ + -webkit-text-size-adjust: 100%; + /* 2 */ + -moz-tab-size: 4; + /* 3 */ + -o-tab-size: 4; + tab-size: 4; + /* 3 */ + font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + /* 4 */ + font-feature-settings: normal; + /* 5 */ + font-variation-settings: normal; + /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ +} + +/* +1. Remove the margin in all browsers. +2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. +*/ + +body { + margin: 0; + /* 1 */ + line-height: inherit; + /* 2 */ +} + +/* +1. Add the correct height in Firefox. +2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) +3. Ensure horizontal rules are visible by default. +*/ + +hr { + height: 0; + /* 1 */ + color: inherit; + /* 2 */ + border-top-width: 1px; + /* 3 */ +} + +/* +Add the correct text decoration in Chrome, Edge, and Safari. +*/ + +abbr:where([title]) { + -webkit-text-decoration: underline dotted; + text-decoration: underline dotted; +} + +/* +Remove the default font size and weight for headings. +*/ + +h1, +h2, +h3, +h4, +h5, +h6 { + font-size: inherit; + font-weight: inherit; +} + +/* +Reset links to optimize for opt-in styling instead of opt-out. +*/ + +a { + color: inherit; + text-decoration: inherit; +} + +/* +Add the correct font weight in Edge and Safari. +*/ + +b, +strong { + font-weight: bolder; +} + +/* +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. +*/ + +code, +kbd, +samp, +pre { + font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + /* 1 */ + font-feature-settings: normal; + /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ +} + +/* +Add the correct font size in all browsers. +*/ + +small { + font-size: 80%; +} + +/* +Prevent `sub` and `sup` elements from affecting the line height in all browsers. +*/ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* +1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) +2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) +3. Remove gaps between table borders by default. +*/ + +table { + text-indent: 0; + /* 1 */ + border-color: inherit; + /* 2 */ + border-collapse: collapse; + /* 3 */ +} + +/* +1. Change the font styles in all browsers. +2. Remove the margin in Firefox and Safari. +3. Remove default padding in all browsers. +*/ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + /* 1 */ + font-feature-settings: inherit; + /* 1 */ + font-variation-settings: inherit; + /* 1 */ + font-size: 100%; + /* 1 */ + font-weight: inherit; + /* 1 */ + line-height: inherit; + /* 1 */ + letter-spacing: inherit; + /* 1 */ + color: inherit; + /* 1 */ + margin: 0; + /* 2 */ + padding: 0; + /* 3 */ +} + +/* +Remove the inheritance of text transform in Edge and Firefox. +*/ + +button, +select { + text-transform: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Remove default button styles. +*/ + +button, +input:where([type='button']), +input:where([type='reset']), +input:where([type='submit']) { + -webkit-appearance: button; + /* 1 */ + background-color: transparent; + /* 2 */ + background-image: none; + /* 2 */ +} + +/* +Use the modern Firefox focus style for all focusable elements. +*/ + +:-moz-focusring { + outline: auto; +} + +/* +Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) +*/ + +:-moz-ui-invalid { + box-shadow: none; +} + +/* +Add the correct vertical alignment in Chrome and Firefox. +*/ + +progress { + vertical-align: baseline; +} + +/* +Correct the cursor style of increment and decrement buttons in Safari. +*/ + +::-webkit-inner-spin-button, +::-webkit-outer-spin-button { + height: auto; +} + +/* +1. Correct the odd appearance in Chrome and Safari. +2. Correct the outline style in Safari. +*/ + +[type='search'] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + +/* +Remove the inner padding in Chrome and Safari on macOS. +*/ + +::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Change font properties to `inherit` in Safari. +*/ + +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + +/* +Add the correct display in Chrome and Safari. +*/ + +summary { + display: list-item; +} + +/* +Removes the default spacing and border for appropriate elements. +*/ + +blockquote, +dl, +dd, +h1, +h2, +h3, +h4, +h5, +h6, +hr, +figure, +p, +pre { + margin: 0; +} + +fieldset { + margin: 0; + padding: 0; +} + +legend { + padding: 0; +} + +ol, +ul, +menu { + list-style: none; + margin: 0; + padding: 0; +} + +/* +Reset default styling for dialogs. +*/ + +dialog { + padding: 0; +} + +/* +Prevent resizing textareas horizontally by default. +*/ + +textarea { + resize: vertical; +} + +/* +1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) +2. Set the default placeholder color to the user's configured gray 400 color. +*/ + +input::-moz-placeholder, textarea::-moz-placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +input::placeholder, +textarea::placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +/* +Set the default cursor for buttons. +*/ + +button, +[role="button"] { + cursor: pointer; +} + +/* +Make sure disabled buttons don't get the pointer cursor. +*/ + +:disabled { + cursor: default; +} + +/* +1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) +2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) + This can trigger a poorly considered lint error in some tools but is included by design. +*/ + +img, +svg, +video, +canvas, +audio, +iframe, +embed, +object { + display: block; + /* 1 */ + vertical-align: middle; + /* 2 */ +} + +/* +Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) +*/ + +img, +video { + max-width: 100%; + height: auto; +} + +/* Make elements with the HTML hidden attribute stay hidden by default */ + +[hidden] { + display: none; +} + +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + +:root { + --color-primary-500: #d946ef; + --color-secondary-500: #14b8a6; + --color-complementary-yellow-400: #facc15; + --color-complementary-rose-500: #f43f5e; + --color-complementary-blue-500: #3b82f6; +} + +.primary { + background-color: var(--color-primary-500); +} + +.secondary { + background-color: var(--color-secondary-500); +} + +.complementary-yellow { + background-color: var(--color-complementary-yellow-400); +} + +.complementary-rose { + background-color: var(--color-complementary-rose-500); +} + +.complementary-blue { + background-color: var(--color-complementary-blue-500); +} + +.color-box { + width: 100px; + height: 100px; + margin: 10px; + display: inline-block; +} + +div { + border-radius: 0.375rem; +} + +.text-interactive { + --tw-text-opacity: 1; + color: rgb(20 184 166 / var(--tw-text-opacity)); +} + +.text-interactive:hover { + --tw-text-opacity: 1; + color: rgb(192 38 211 / var(--tw-text-opacity)); +} + +.header { + display: flex; + width: 66.666667%; + --tw-bg-opacity: 1; + background-color: rgb(240 171 252 / var(--tw-bg-opacity)); + padding: 0.5rem; +} + +.about { + justify-items: center; + border-width: 4px; + border-style: dashed; + --tw-border-opacity: 1; + border-color: rgb(245 208 254 / var(--tw-border-opacity)); + padding: 0.5rem; +} + +.about p { + font-size: 1.5rem; + line-height: 2rem; +} + +.about li a { + text-decoration-line: underline; + text-decoration-color: #14b8a6; +} + +.about li a:hover { + text-decoration-color: #e879f9; +} + +.source-code-pro-500 { + font-family: "Source Code Pro", monospace; + font-optical-sizing: auto; + font-weight: 500; + font-style: normal; +} + +.absolute { + position: absolute; +} + +.relative { + position: relative; +} + +.inset-x-0 { + left: 0px; + right: 0px; +} + +.z-10 { + z-index: 10; +} + +.m-auto { + margin: auto; +} + +.my-10 { + margin-top: 2.5rem; + margin-bottom: 2.5rem; +} + +.ml-6 { + margin-left: 1.5rem; +} + +.block { + display: block; +} + +.flex { + display: flex; +} + +.hidden { + display: none; +} + +.w-screen { + width: 100vw; +} + +.list-outside { + list-style-position: outside; +} + +.list-disc { + list-style-type: disc; +} + +.flex-col { + flex-direction: column; +} + +.items-center { + align-items: center; +} + +.justify-around { + justify-content: space-around; +} + +.gap-4 { + gap: 1rem; +} + +.gap-2 { + gap: 0.5rem; +} + +.border-2 { + border-width: 2px; +} + +.border-neutral-500 { + --tw-border-opacity: 1; + border-color: rgb(115 115 115 / var(--tw-border-opacity)); +} + +.bg-neutral-100 { + --tw-bg-opacity: 1; + background-color: rgb(245 245 245 / var(--tw-bg-opacity)); +} + +.bg-stone-50 { + --tw-bg-opacity: 1; + background-color: rgb(250 250 249 / var(--tw-bg-opacity)); +} + +.p-2 { + padding: 0.5rem; +} + +.text-2xl { + font-size: 1.5rem; + line-height: 2rem; +} + +.text-3xl { + font-size: 1.875rem; + line-height: 2.25rem; +} + +.text-sm { + font-size: 0.875rem; + line-height: 1.25rem; +} + +.text-black { + --tw-text-opacity: 1; + color: rgb(0 0 0 / var(--tw-text-opacity)); +} + +.text-secondary-400 { + --tw-text-opacity: 1; + color: rgb(45 212 191 / var(--tw-text-opacity)); +} + +.marker\:text-secondary-300 *::marker { + color: rgb(94 234 212 ); +} + +.marker\:text-secondary-300::marker { + color: rgb(94 234 212 ); +} + +.hover\:text-secondary-300:hover { + --tw-text-opacity: 1; + color: rgb(94 234 212 / var(--tw-text-opacity)); +} + +.group:hover .group-hover\:inline-block { + display: inline-block; +} diff --git a/tailwind.config.js b/tailwind.config.js index 80af1a8..c901e71 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,7 +1,16 @@ /** @type {import('tailwindcss').Config} */ + +const colors = require('tailwindcss/colors') + module.exports = { - content: ["./templates/*.{html,js}"], + content: ["./templates/**/*.{html,js}"], theme: { + colors: { + primary: colors.fuchsia, + secondary: colors.teal, + neutral: colors.gray, + ...colors + }, extend: {}, }, plugins: [], diff --git a/templates/index.html b/templates/index.html index 6d05087..87145fd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -9,7 +9,13 @@ href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap" rel="stylesheet" /> - + + Document - -
-
- yetsam.ru -
- -
-
-
-

Привет, меня зовут Стас

-

Я вычислил тебя по ip: {{client_geo['query']}}

- - {% if 'city' in client_geo %} -

{{client_geo['country']}}

-

{{client_geo['city']}}

- {% endif %} -
+ + {% include 'partials/palette.html' %} -
-
-
Slide 1
-
Slide 2
-
Slide 3
-
+ {% include 'partials/header.html' %} -
-
-
-
+ {% include 'partials/about.html' %} - - diff --git a/templates/partials/about.html b/templates/partials/about.html new file mode 100644 index 0000000..b53a127 --- /dev/null +++ b/templates/partials/about.html @@ -0,0 +1,36 @@ +
+

Привет, меня зовут Стас

+

+ Я + + backend + + + разработчик +

+

+ В основном пишу на + python +

+

Вычислил тебя по ip: {{client_geo['query']}}

+ + {% if 'city' in client_geo %} +

{{client_geo['country']}}

+

{{client_geo['city']}}

+ {% endif %} +

+ (Шутка в том что такая возможность есть у любого сайта) +

+
diff --git a/templates/partials/avatars.html b/templates/partials/avatars.html new file mode 100644 index 0000000..fd2c247 --- /dev/null +++ b/templates/partials/avatars.html @@ -0,0 +1,29 @@ +
+
+
+ {% for url in avatar_urls %} + + {% endfor %} +
+ +
+
+
+
+ + + diff --git a/templates/partials/header.html b/templates/partials/header.html new file mode 100644 index 0000000..83fb77a --- /dev/null +++ b/templates/partials/header.html @@ -0,0 +1,5 @@ +
+ yetsam.ru +
\ No newline at end of file diff --git a/templates/partials/palette.html b/templates/partials/palette.html new file mode 100644 index 0000000..6efa551 --- /dev/null +++ b/templates/partials/palette.html @@ -0,0 +1,7 @@ +
+
+
+
+
+
+
\ No newline at end of file diff --git a/templates/partials/services.html b/templates/partials/services.html new file mode 100644 index 0000000..8209cc0 --- /dev/null +++ b/templates/partials/services.html @@ -0,0 +1,14 @@ +
+

Так же на этом сервере:

+ +
\ No newline at end of file diff --git a/templates/style.css b/templates/style.css new file mode 100644 index 0000000..6e43c21 --- /dev/null +++ b/templates/style.css @@ -0,0 +1,57 @@ +@tailwind base; +@tailwind components; + +:root { + --color-primary-500: #d946ef; + --color-secondary-500: #14b8a6; + --color-complementary-yellow-400: #facc15; + --color-complementary-rose-500: #f43f5e; + --color-complementary-blue-500: #3b82f6; +} +.primary { + background-color: var(--color-primary-500); +} +.secondary { + background-color: var(--color-secondary-500); +} +.complementary-yellow { + background-color: var(--color-complementary-yellow-400); +} +.complementary-rose { + background-color: var(--color-complementary-rose-500); +} +.complementary-blue { + background-color: var(--color-complementary-blue-500); +} +.color-box { + width: 100px; + height: 100px; + margin: 10px; + display: inline-block; +} +div { + @apply rounded-md; +} +.text-interactive { + @apply text-secondary-500 hover:text-fuchsia-600; +} +.header { + @apply w-2/3 bg-primary-300 flex p-2; +} +.about { + @apply border-4 border-fuchsia-200 border-dashed p-2 justify-items-center; +} +.about p { + @apply text-2xl; +} +.about li a { + @apply underline decoration-secondary-500 hover:decoration-primary-400; +} +.source-code-pro-500 { + font-family: "Source Code Pro", monospace; + font-optical-sizing: auto; + font-weight: 500; + font-style: normal; +} + +@tailwind utilities; -- cgit v1.2.3