From 3ea75d83d2c92ad2505d05b14f0ec5e3bbcc2a0b Mon Sep 17 00:00:00 2001 From: ScuroNeko Date: Fri, 19 May 2023 02:28:46 +0300 Subject: [PATCH] Herping the derp --- .gitignore | 30 +++++++++++++++++ public/._favicon.png | Bin 4096 -> 0 bytes public/favicon.png | Bin 6870 -> 0 bytes public/icon-192x192.png | Bin 0 -> 1662 bytes public/icon-256x256.png | Bin 0 -> 1299 bytes public/icon-384x384.png | Bin 0 -> 2490 bytes public/icon-512x512.png | Bin 0 -> 2099 bytes public/index.html | 14 +++++--- public/manifest.webmanifest | 31 +++++++++++++----- src/components/App/App.tsx | 4 +-- src/components/Navbar/Navbar.tsx | 4 +-- src/components/Navbar/Navbas.scss | 4 +++ src/index.tsx | 7 +--- .../GenshinDownloads/GenshinDownloads.scss | 10 ++++++ .../GenshinDownloads/GenshinDownloads.tsx | 13 ++++---- src/pages/Main/Main.scss | 12 +++---- src/pages/Main/Main.tsx | 17 +++------- src/pages/Projects/Projects.scss | 17 ++++++++++ src/pages/Projects/Projects.tsx | 9 +++-- .../StarRailDownloads/StarRailDownloads.tsx | 5 +++ src/ui/Loading/Loading.tsx | 2 +- src/ui/ProjectBadge/ProjectLinkBadge.sass | 3 -- src/ui/ProjectBadge/ProjectLinkBadge.scss | 5 +++ src/ui/ProjectBadge/ProjectLinkBadge.tsx | 2 +- src/ui/ProjectBadge/ProjectStackBadge.sass | 3 -- src/ui/ProjectBadge/ProjectStackBadge.scss | 5 +++ src/ui/ProjectBadge/ProjectStackBadge.tsx | 2 +- src/ui/ProjectBadge/ProjectStatusBadge.sass | 17 ---------- src/ui/ProjectBadge/ProjectStatusBadge.scss | 19 +++++++++++ src/ui/ProjectBadge/ProjectStatusBadge.tsx | 2 +- src/ui/ProjectCard/ProjectCard.sass | 23 ------------- src/ui/ProjectCard/ProjectCard.scss | 30 +++++++++++++++++ src/ui/ProjectCard/ProjectCard.tsx | 2 +- 33 files changed, 187 insertions(+), 105 deletions(-) delete mode 100644 public/._favicon.png delete mode 100644 public/favicon.png create mode 100644 public/icon-192x192.png create mode 100644 public/icon-256x256.png create mode 100644 public/icon-384x384.png create mode 100644 public/icon-512x512.png create mode 100644 src/pages/StarRailDownloads/StarRailDownloads.tsx delete mode 100644 src/ui/ProjectBadge/ProjectLinkBadge.sass create mode 100644 src/ui/ProjectBadge/ProjectLinkBadge.scss delete mode 100644 src/ui/ProjectBadge/ProjectStackBadge.sass create mode 100644 src/ui/ProjectBadge/ProjectStackBadge.scss delete mode 100644 src/ui/ProjectBadge/ProjectStatusBadge.sass create mode 100644 src/ui/ProjectBadge/ProjectStatusBadge.scss delete mode 100644 src/ui/ProjectCard/ProjectCard.sass create mode 100644 src/ui/ProjectCard/ProjectCard.scss diff --git a/.gitignore b/.gitignore index 4de40fd..a822b7c 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,33 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +build/ \ No newline at end of file diff --git a/public/._favicon.png b/public/._favicon.png deleted file mode 100644 index 4a00e3dde05024db1a4b0cdfbe453903ba3e6b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 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 WujzRtg8xhbfR&kzX|}O*$iD&DUlG~> diff --git a/public/icon-192x192.png b/public/icon-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b7b565160eed7ba08abe48c40000f1a625bfd7 GIT binary patch literal 1662 zcmZWqdsNbA82;(h7@F3WmUvxX4Z_UiKm_BB z&EzsCHoGF!x_=*UD>j-?JNW*$aRv^v1yYfKwYV7SJUlWrN18w{nN93~568Da z{aVpZ1B#||I#Kqd~z#0F=^0lwzG=3ZoHO?7>c zN`&h6kT!%N(%_|yc_pGhpG1WREynNU&RB2)1B95f;iZIG3%fzz5lBjte-p^{@OnU@ zXAYPHWzOm;VCW~|<+FJD``}!JAR(%~)O8Np3W+}ALylRmqYkXb;cmJ{;lLw)^YM|L^YG*k z!5H=txxvk|jQs9W&y5*kvABbP+-9^Oq`gm`?v^+#Teh^L9ic!p4qZMIB^*n*9w(Re z->&8J`PcxMHeVtM3vN#IMr9%KgNzQ?IuHO_HL=5g95Wd`9lO*yl+X2iHxV$x6ra7G zn@edQWRV>8Oi>mPW?dcio`1DLM$oZiWp>g+shLCn&_oM2I;NUAeZF3ph^jhJSyg3V zmJlD`FxxmX^(>f}o&~-bsa)Yo;EDr;c7YEFmZt?be~^WtNb|M{Z$*}-Y$h|mt*z~L zt(BEk8#f4xeIu}KHQOw8dy7n9hD z3NbT*lB_QgHR0RX;M)579Jee}{S5Kopx`Axmm)=(W_6FxK$w?{x-43Uy)@NVxJ2cb zA>6y9l&2eu#8vUR_XQ_G+S=OZ5nJzOrAzeeF_ zngtF{_28a}2AOg6em_5iBRvub)G(v>#BsL!o__Y-KaNqcK1gL6CA(|xRT@aeK4g`d zRQ&&AXErw#6vO6pv{J7WeQ&+Vw?xV7pU`wSaaQ`ra86I+SX;Bkt;{`C zN&RzWuFanbnE0*X1T`D1vDyIY0HU)X=lmh6$ik$V#bPbZzd$n)qKF1oPoXCbd99(L z!8Llez1>y0k|oC3LU9Y}U^2@aFVqvASe&Ehp|rckXKYNfj7(CJ*oC}P5~3=`R=&e^ z0Ip8{4ebNYU`^%S*BqSfgJ+{_tM9%}qDnEOrNZDxF9PC@DZ{x!oeZQXV`C*c1DDk} Yu%Y8Qx*InuKNP@YKgOkMZ|F~d1I!8AkN^Mx literal 0 HcmV?d00001 diff --git a/public/icon-256x256.png b/public/icon-256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..99a29eee576d91f63d81eeebe57d98be588f5d95 GIT binary patch literal 1299 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%U;1OBOz`%C|gc+x5^GP!> zupIStaSW-r_4ck|-{TO810T<8hqS<5}%a9`LM`|goPbl{TY ztzTYViky|}>*&ln^Sgv~{glJA_I(s=U|?Wk z;9yW-z{)6JSJnRiS!HkYw~qqt6$MA{CUj(fDcq`F!_2_KAi&@Naz8ePM%kA_zxW@E zH=o;|({cWNmiJwzB(o#RpEkgr4<w7l^u5y}u`L{l(*`JFK-IxvBy)k-)J7XqYlY1<&f1bVS+PBIq2Xt}8G$;{#@Q=LQ;GD?6Cg!q4{N(G` zO6S^KEVrBgxWYzlZSE|!Tibl=&R5Q#n*I76^95_q?h~8`K34SXdw=;{{{7>RA3x?| ztmxag;rPPcc;hNA^qxt=qbWD5P5P319?#fPHf!0F_7XGS$u;w4E%UU?dllTOtW>r; z_Dz|!_*tgk2HFhmhYv3Qe~3dzwqaZDWcRA#d3?wR4wgR_R|(s@7u+H?K8g= z?Z9w{K>W<^@Q}MH)t2ZHn;rC~EcUvnIq!|qxx(K!?VYmOrqVcc=KI?khJW~r+^UMd zZH#94AdN576|iSLq+F@8D$Hh^I``*oW|zJEe|+V|lJk%V9{QiBpS8ZshX!f4A#DcANGbGv~UfVp4iAJ&?MLD#ba5(wx_f7qHSq?K(Muf8VCp|AP~1QN|iz^ z4;3TCSHTv6N_ZF`B%+m~lBiMB0D*`=LK!x z(xH^O(>k@7*4Iqo@#8k`tU@~IEBbJQlNzEarr%L5av za@oz`8ru$WLP3hVonHc)gb|wXtW6XTM2aKLRf~R9%Wks${dJe?b<5;vSC5eD(U)Vi z7w!Z2NKX`i01*I70MH1=_c!5tvED~%97(MMqhRO6%&E?9uK5({G=(~#ROQFGc=0u& z2+gFRQ9>12g|osW^pvw}KW+C_g=ghd|G6gGkEOxdSR!e`0$>UN3e3e6kj9qYqzo-D zs<|<;%Hq6hxHfZN_sd5n%r;q% z3y)g8LpRd%^!1zG&b|?qz93$Chb!)Ds8Z`*#CgRY>@j3tnHWB-kqtsY)oPyFE1h1Qv{zH{7Rs8p#9QA*d@xZ)Zu|ifl+x zY&kK{^ukJ;4>GTo@@*M^^|mk*Ug={qo>`MpS@})LmgG8hfHAip>rFqqmKB~{G%*o5 z5SuR=q~?WXn=untOmUz8D$fkm;yCFFY~BK~Xk9V}?X<4#z#T7oLTt|^BirS3EmwFp zP2ugO&T>40qD)K4r&-KQm-*-?%WEU+dsK>HS>xv6)a%>&hK6F45?{T7kDt63$?8&b zroA(}M%|o2`nmij(V89tcl>!3|L(0U3kgG3QBmQOGIF8KSENv%FDa?iHB{wADbn*2 zE%0X$J?7k22+nvyJLBVNk5tLfqKHJ_+|fE|?UasDS6BCxAxlKe?{nx zTe-Qpqho_&oP@f@u1KVy@rQ-N&{FZf{IqVVbYFrf`;SY~G|iBdv%uKMA~DPNh~6hF zD@!(Cz)PFJFE!_-r9Y5Lw}(a3f3V*RiuIzTOa0yT zy`yGbOeT|6tR5e)GqH!{;)TYUA!P_v$DF{T_9%0&ws_B&L&7Asp%sppnF7er?&vKA z^Ztu@r62t`7$0-s8HwrW%gvY?r)SeBWnWSPS}_<*e_!A2jV{veZs9JscuS1OlALql z$=qKJ)#f-j+{1++m0D;z>qcrrjbs!ZgJN&?`?vp2=V7BgiqkZ^NJ>1KwNrb?S zt*(Aot-ytIPxkj)&W_Q$ZqPh{NEBq4tQV|pP5}^51kZ+6xz9NSyRa}kRi=xAyxvvM zwX2HcJLa@Lf5!A*rPs(>yqg`FttIPkTzZ|-H13~C#l?0J10gWnOSt@mdL%9h}^ tryiUnj4j@cLcQfOhieN$1o=l}uQ!XtNu!PM$D;u9kOM+DRerYX=-*mSVJH9q literal 0 HcmV?d00001 diff --git a/public/icon-512x512.png b/public/icon-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..052eead446d709769ab2525873e2d40f43a4c938 GIT binary patch literal 2099 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Hfk$L90|Va?5N4dJ%_q&k z!2Z}E;?*aO>iivdZ$1GA9e$r+SVE%m2Za|u%-o!I zaqGh+`L6L_PtNC+uQhmk&cz&i&|+BU0Q4lm;0EbJkDUYRU5B=UEWR#%F8c8LUr)}n z&9e~r9+tilm?Sbhuv<@_RUqpzB0_(=#K9+zQrH-vu}W;x!7z+)fcJ?f_pFJqIG**( z=bQ1{wuJW${Wq=eFfcec149nOVMK){P#0kbyGQpl+&pr_``X^P^{TJuoqs;5bbIdV z%Kg*5Pwuh|vlq|95-k|sa{wxWI7tD>LXX7;pcoz>yz4Y{lVbi8n|5}+h~PZ&0%l}q zNf3@7%Nx+&aP5?DUh1X5O=6u;)LbVJ+k>RtEGYFDJ=m2EtEN4;DOe z1(9k1h9|b@{?WeZp)tsN`^*~L`Ic!|&x)Gc2@KQ)ioi68EdmJI1k#1gCX@`^u((xl zkMA^{S(%>>6tlZbkrh0rMu)PHOL<1zw(18y`E#%5PrF#OyTpye%7!S - + - - + - + - + + + + + + diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest index 8d921b7..1333fa2 100644 --- a/public/manifest.webmanifest +++ b/public/manifest.webmanifest @@ -1,11 +1,26 @@ { - "short_name": "Nix13", - "name": "Nix13", + "theme_color": "#222222", + "background_color": "#222222", + "display": "browser", + "scope": "/", + "start_url": "/", + "name": "Nix13 website", + "short_name": "Nix13 website", "icons": [{ - "src": "favicon.png", - "sizes": "512x512", - "type": "image/png" - }], - "display": "fullscreen", - "start_url": "/" + "src": "/icon-192x192.png", + "sizes": "192x192", + "type": "image/png" + },{ + "src": "/icon-256x256.png", + "sizes": "256x256", + "type": "image/png" + }, { + "src": "/icon-384x384.png", + "sizes": "384x384", + "type": "image/png" + }, { + "src": "/icon-512x512.png", + "sizes": "512x512", + "type": "image/png" + }] } \ No newline at end of file diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx index bb309f9..b9df3f3 100644 --- a/src/components/App/App.tsx +++ b/src/components/App/App.tsx @@ -9,11 +9,11 @@ const App: FC = () => (
-
+
-
+
); diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index 78efc4e..a269aa2 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -1,13 +1,13 @@ import './Navbas.scss'; const Navbar = () => ( - + ); export default Navbar; \ No newline at end of file diff --git a/src/components/Navbar/Navbas.scss b/src/components/Navbar/Navbas.scss index 27ccb9d..1ac765d 100644 --- a/src/components/Navbar/Navbas.scss +++ b/src/components/Navbar/Navbas.scss @@ -24,6 +24,10 @@ &_Link { font-size: 20px; + &:hover { + text-decoration: underline var(--accent-color); + } + &:not(:last-child) { margin-right: 8px; } diff --git a/src/index.tsx b/src/index.tsx index 499e156..872851c 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,11 +1,6 @@ import { createRoot } from 'react-dom/client'; -import { BrowserRouter } from "react-router-dom"; import App from './components/App/App'; const container = document.getElementById('root') as HTMLElement; -createRoot(container).render( - - - -); \ No newline at end of file +createRoot(container).render(); \ No newline at end of file diff --git a/src/pages/GenshinDownloads/GenshinDownloads.scss b/src/pages/GenshinDownloads/GenshinDownloads.scss index 1e79152..0ef1e1a 100644 --- a/src/pages/GenshinDownloads/GenshinDownloads.scss +++ b/src/pages/GenshinDownloads/GenshinDownloads.scss @@ -2,6 +2,15 @@ .GenshinDownloads { padding-top: var(--navbar-height); + display: flex; + flex-direction: column; + + &__Title { + font-size: 3rem; + text-align: center; + font-weight: 200; + text-decoration: underline var(--accent-color); + } &__Item { &_Title { @@ -35,6 +44,7 @@ &__Actual, &__Outdated, &__Beta { text-align: center; + font-size: 2rem; border-bottom: 1px solid #fff; margin-bottom: 4px; padding-bottom: 4px; diff --git a/src/pages/GenshinDownloads/GenshinDownloads.tsx b/src/pages/GenshinDownloads/GenshinDownloads.tsx index c244b76..335502c 100644 --- a/src/pages/GenshinDownloads/GenshinDownloads.tsx +++ b/src/pages/GenshinDownloads/GenshinDownloads.tsx @@ -1,7 +1,6 @@ import {useEffect, useState} from "react"; import './GenshinDownloads.scss'; import Loading from "../../ui/Loading/Loading"; -import * as url from "url"; const GenshinDownloads = () => { const [genshinDL, setGenshinDL] = useState([]); @@ -10,9 +9,7 @@ const GenshinDownloads = () => { const [betaCollapse, setBetaCollapse] = useState(true); useEffect(() => { - // const url = 'https://baka.nix13.pw/genshin'; - const url = 'http://localhost:8099/genshin' - fetch(url) + fetch('https://baka.nix13.pw/genshin') .then(r => r.json()) .then(r => setGenshinDL(r.genshin)) .then(_ => setLoading(false)); @@ -21,7 +18,9 @@ const GenshinDownloads = () => { if(loading || !genshinDL) return ; return (
-

Актуальная версия

+
Genshin Impact
+ + Актуальная версия {genshinDL.filter(dl => !dl.outdated && !dl.beta).map(dl => (

{dl.name}

@@ -40,7 +39,7 @@ const GenshinDownloads = () => {
))} -

setOutdatedCollapse(!outdatedCollapse)}>Устаревшие версии

+ setOutdatedCollapse(!outdatedCollapse)}>Устаревшие версии {!outdatedCollapse && genshinDL.filter(dl => dl.outdated && !dl.beta).map(dl => (

{dl.name}

@@ -58,7 +57,7 @@ const GenshinDownloads = () => {
))} -

setBetaCollapse(!betaCollapse)}>Бета версии

+ setBetaCollapse(!betaCollapse)}>Бета версии {!betaCollapse && genshinDL.filter(dl => dl.beta).map(dl => (

{dl.name}

diff --git a/src/pages/Main/Main.scss b/src/pages/Main/Main.scss index db820da..1005c4a 100644 --- a/src/pages/Main/Main.scss +++ b/src/pages/Main/Main.scss @@ -2,8 +2,9 @@ .Main { width: 100%; - height: calc(100vh - var(--navbar-height)); + height: calc(100vh - var(--navbar-height) - env(safe-area-inset-top)); box-sizing: border-box; + padding-bottom: calc(8px + env(safe-area-inset-bottom)); &__Center { height: calc(100% - var(--navbar-height)); @@ -33,15 +34,10 @@ &_Link { display: flex; align-items: center; - - & > :first-child { - margin-right: 4px; - } + font-size: 2rem; &:not(:last-child) { - margin-right: 4px; - padding-right: 4px; - border-right: 1px solid white; + margin-right: 12px; } } } diff --git a/src/pages/Main/Main.tsx b/src/pages/Main/Main.tsx index 9fffbdb..e13185c 100644 --- a/src/pages/Main/Main.tsx +++ b/src/pages/Main/Main.tsx @@ -12,6 +12,10 @@ const Main = () => { 'Golang fullstack', 1000, 'Python fullstack', + 1000, + 'Kotlin developer', + 1000, + 'Web developer', 1000 ]} repeat={Infinity} @@ -22,36 +26,23 @@ const Main = () => { - - {/*
*/} - {/* */} - {/* */} - {/* */} - {/*
*/}
); } diff --git a/src/pages/Projects/Projects.scss b/src/pages/Projects/Projects.scss index 0b00ff1..565193d 100644 --- a/src/pages/Projects/Projects.scss +++ b/src/pages/Projects/Projects.scss @@ -1,7 +1,24 @@ .Projects { padding-top: var(--navbar-height); width: 100%; + display: flex; + flex-direction: column; + &_Title { + font-size: 3rem; + text-align: center; + font-weight: 200; + text-decoration: underline var(--accent-color); + } + + &__Title { + text-align: center; + font-size: 2rem; + border-bottom: 1px solid #fff; + margin-bottom: 4px; + padding-bottom: 4px; + } + &__List { margin-top: 8px; } diff --git a/src/pages/Projects/Projects.tsx b/src/pages/Projects/Projects.tsx index 330a291..f1534e6 100644 --- a/src/pages/Projects/Projects.tsx +++ b/src/pages/Projects/Projects.tsx @@ -1,6 +1,7 @@ import React, {useEffect, useState} from "react"; import ProjectCard from "../../ui/ProjectCard/ProjectCard"; import './Projects.scss'; +import Loading from "../../ui/Loading/Loading"; type ProjectsState = { done: ProjectType[] @@ -18,10 +19,12 @@ const Projects = () => { .then(_ => setLoading(false)); }, []); - if(loading) return
Грузится, бля...
+ if(loading) return ; return (
-

Завершенные и в разработке

+
Проекты
+ + Завершенные и в разработке
{projects.done.map(project => ( { ))}
-

Замороженные и брошенные

+ Замороженные и брошенные
{projects.dropped.map(project => ( { + +} + +export default StarRailDownloads; \ No newline at end of file diff --git a/src/ui/Loading/Loading.tsx b/src/ui/Loading/Loading.tsx index 858fb46..0f63219 100644 --- a/src/ui/Loading/Loading.tsx +++ b/src/ui/Loading/Loading.tsx @@ -1,5 +1,5 @@ const Loading = () => ( -
Грузится бля!
+
Загрузка...
); export default Loading; \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectLinkBadge.sass b/src/ui/ProjectBadge/ProjectLinkBadge.sass deleted file mode 100644 index 122f49b..0000000 --- a/src/ui/ProjectBadge/ProjectLinkBadge.sass +++ /dev/null @@ -1,3 +0,0 @@ -.ProjectLinkBadge - &:not(:last-child) - margin-right: 8px \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectLinkBadge.scss b/src/ui/ProjectBadge/ProjectLinkBadge.scss new file mode 100644 index 0000000..5d53dd9 --- /dev/null +++ b/src/ui/ProjectBadge/ProjectLinkBadge.scss @@ -0,0 +1,5 @@ +.ProjectLinkBadge { + &:not(:last-child) { + margin-right: 8px; + } +} \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectLinkBadge.tsx b/src/ui/ProjectBadge/ProjectLinkBadge.tsx index f760abb..1a729aa 100644 --- a/src/ui/ProjectBadge/ProjectLinkBadge.tsx +++ b/src/ui/ProjectBadge/ProjectLinkBadge.tsx @@ -1,4 +1,4 @@ -import './ProjectLinkBadge.sass'; +import './ProjectLinkBadge.scss'; type Props = { linkImage: ProjectLink diff --git a/src/ui/ProjectBadge/ProjectStackBadge.sass b/src/ui/ProjectBadge/ProjectStackBadge.sass deleted file mode 100644 index 45a38ce..0000000 --- a/src/ui/ProjectBadge/ProjectStackBadge.sass +++ /dev/null @@ -1,3 +0,0 @@ -.ProjectStackBadge - &:not(:last-child) - margin-right: 8px \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectStackBadge.scss b/src/ui/ProjectBadge/ProjectStackBadge.scss new file mode 100644 index 0000000..6c3a259 --- /dev/null +++ b/src/ui/ProjectBadge/ProjectStackBadge.scss @@ -0,0 +1,5 @@ +.ProjectStackBadge { + &:not(:last-child) { + margin-right: 8px + } +} \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectStackBadge.tsx b/src/ui/ProjectBadge/ProjectStackBadge.tsx index c516822..b239f05 100644 --- a/src/ui/ProjectBadge/ProjectStackBadge.tsx +++ b/src/ui/ProjectBadge/ProjectStackBadge.tsx @@ -1,4 +1,4 @@ -import './ProjectStackBadge.sass'; +import './ProjectStackBadge.scss'; type Props = { stack: ProjectStack diff --git a/src/ui/ProjectBadge/ProjectStatusBadge.sass b/src/ui/ProjectBadge/ProjectStatusBadge.sass deleted file mode 100644 index 56645f2..0000000 --- a/src/ui/ProjectBadge/ProjectStatusBadge.sass +++ /dev/null @@ -1,17 +0,0 @@ -.ProjectStatus - font-size: 16px - font-weight: 300 - height: fit-content - padding: 2px 6px - - &__Development - background-color: #ff9c1b - - &__Release - background-color: #ab1bff - - &__Freeze - background-color: #19b3a6 - - &__Dropped - background-color: #ff1b1b \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectStatusBadge.scss b/src/ui/ProjectBadge/ProjectStatusBadge.scss new file mode 100644 index 0000000..bb2e236 --- /dev/null +++ b/src/ui/ProjectBadge/ProjectStatusBadge.scss @@ -0,0 +1,19 @@ +.ProjectStatus { + font-size: 16px; + font-weight: 300; + height: fit-content; + padding: 2px 6px; + + &__Development { + background-color: #ff9c1b; + } + &__Release { + background-color: #ab1bff; + } + &__Freeze { + background-color: #19b3a6; + } + &__Dropped { + background-color: #ff1b1b; + } +} \ No newline at end of file diff --git a/src/ui/ProjectBadge/ProjectStatusBadge.tsx b/src/ui/ProjectBadge/ProjectStatusBadge.tsx index 477afde..be9e2af 100644 --- a/src/ui/ProjectBadge/ProjectStatusBadge.tsx +++ b/src/ui/ProjectBadge/ProjectStatusBadge.tsx @@ -1,5 +1,5 @@ import { capitalize } from "../../utils"; -import './ProjectStatusBadge.sass'; +import './ProjectStatusBadge.scss'; type Props = { status: ProjectStatus diff --git a/src/ui/ProjectCard/ProjectCard.sass b/src/ui/ProjectCard/ProjectCard.sass deleted file mode 100644 index 81100e6..0000000 --- a/src/ui/ProjectCard/ProjectCard.sass +++ /dev/null @@ -1,23 +0,0 @@ -.ProjectCard - background-color: #333 - padding: 8px - margin: 0 8px 8px 0 - box-sizing: border-box - border: 2px solid var(--accent-color) - - &__Title - display: flex - justify-content: space-between - margin-bottom: 4px - - &__Content, &__Links, &__Stack - border-top: 1px solid #d8858d - padding-top: 4px - - &__Content, &__Stack - margin-bottom: 4px - - &__Links - font-weight: 500 - &_Link:not(:first-child) - margin-left: 4px \ No newline at end of file diff --git a/src/ui/ProjectCard/ProjectCard.scss b/src/ui/ProjectCard/ProjectCard.scss new file mode 100644 index 0000000..b6739dd --- /dev/null +++ b/src/ui/ProjectCard/ProjectCard.scss @@ -0,0 +1,30 @@ +.ProjectCard { + background-color: #333; + padding: 8px; + box-sizing: border-box; + border: 2px solid var(--accent-color); + margin-bottom: 8px; + + &__Title { + display: flex; + justify-content: space-between; + margin-bottom: 4px; + } + + &__Content, &__Links, &__Stack { + border-top: 1px solid #d8858d; + padding-top: 4px; + } + + &__Content, &__Stack { + margin-bottom: 4px; + } + + &__Links { + font-weight: 500; + + &_Link:not(:first-child) { + margin-left: 4px; + } + } +} \ No newline at end of file diff --git a/src/ui/ProjectCard/ProjectCard.tsx b/src/ui/ProjectCard/ProjectCard.tsx index 018a50e..4ef08f2 100644 --- a/src/ui/ProjectCard/ProjectCard.tsx +++ b/src/ui/ProjectCard/ProjectCard.tsx @@ -2,7 +2,7 @@ import React from "react"; import ProjectLinkBadge from "../ProjectBadge/ProjectLinkBadge"; import ProjectStackBadge from "../ProjectBadge/ProjectStackBadge"; import ProjectStatusBadge from "../ProjectBadge/ProjectStatusBadge"; -import './ProjectCard.sass'; +import './ProjectCard.scss'; type Props = { title: string