diff --git a/package-lock.json b/package-lock.json index 09270d6..1cd2ee0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,19 @@ { - "name": "website", - "version": "0.1.0", + "name": "jolshylar", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "website", - "version": "0.1.0", + "name": "jolshylar", + "version": "2.0.0", "dependencies": { "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-icons": "^4.4.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" } @@ -13768,6 +13769,14 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "node_modules/react-icons": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", + "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -26250,6 +26259,12 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "react-icons": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", + "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "requires": {} + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index 0971fab..2006da5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jolshylar", - "version": "2.0.0", + "version": "3.0.0", "private": true, "dependencies": { "@testing-library/jest-dom": "^5.16.4", @@ -8,6 +8,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-icons": "^4.4.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" }, diff --git a/src/components/About.jsx b/src/components/About.jsx index 2ecd09a..0215dcf 100644 --- a/src/components/About.jsx +++ b/src/components/About.jsx @@ -1,15 +1,23 @@ import "../styles/About.css"; +import { AiFillInstagram } from "react-icons/ai"; function About() { + const styles = { + width: "16px", + height: "16px", + }; + return (

About Us

Jolshylar is a set of people dedicated to beat closed-source software.

-

As of today, we have 10 people (2 working actually)

+

As of today, we have 10 people (3 working actually)

- +
); diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index c25bf29..0615df6 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -1,4 +1,6 @@ import "../styles/Footer.css"; +import { FaTelegram, FaDiscord } from "react-icons/fa"; +import { AiTwotoneMail, AiFillInstagram } from "react-icons/ai"; function Footer() { return ( @@ -7,9 +9,11 @@ function Footer() {

Contact Us

@@ -18,9 +22,11 @@ function Footer() {

We on Social Media

diff --git a/src/components/Member.jsx b/src/components/Member.jsx index debfa75..1a7e727 100644 --- a/src/components/Member.jsx +++ b/src/components/Member.jsx @@ -1,4 +1,6 @@ import "../styles/Member.css"; +import { AiTwotoneMail } from "react-icons/ai"; +import { FaSuitcase } from "react-icons/fa"; function Member({ member }) { const photo = require(`../images/members/${member.element}.jpeg`); @@ -11,11 +13,15 @@ function Member({ member }) {

{member.role}

{member.portfolio && ( - + )} - +

{member.quote}

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 447a16b..102d39e 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -1,14 +1,31 @@ import logo from "../images/logo.png"; import "../styles/Navbar.css"; +import { AiFillGithub, AiFillInstagram } from "react-icons/ai"; +import { FaDiscord } from "react-icons/fa"; function Navbar() { + const styles = { + width: "36px", + height: "36px", + }; + return ( ); } diff --git a/src/components/Project.jsx b/src/components/Project.jsx index c361fd5..5ce881a 100644 --- a/src/components/Project.jsx +++ b/src/components/Project.jsx @@ -1,4 +1,5 @@ import "../styles/Project.css"; +import { BiLinkExternal } from "react-icons/bi"; function Project({ project }) { const preview = require(`../images/previews/${project.fileName}`); @@ -9,7 +10,9 @@ function Project({ project }) {

{project.name}

- +

{project.description}

diff --git a/src/data/members.js b/src/data/members.js index 4621faf..e695526 100644 --- a/src/data/members.js +++ b/src/data/members.js @@ -5,7 +5,7 @@ const data = [ role: "Frontend Developer", portfolio: null, email: "bekslambek22@gmail.com", - quote: "Underidoderidoderiododeridoo idoderiododeridoo government", + quote: "Underidoderidoderiododeridoo idoderiododeridoo government.", interests: [], }, { @@ -41,7 +41,7 @@ const data = [ role: "Discord Server Owner", portfolio: null, email: "kabyletad@gmail.com", - quote: "Be nice. Be bald", + quote: "The ideal cannot be achieved, but it can be strived for.", interests: [], }, { @@ -49,8 +49,9 @@ const data = [ name: "Imanali Koksal", role: "Game Developer", portfolio: null, - email: "a.kabylet@gmail.com", - quote: "Live every day as productive as someone who gets 250k at Hackathons", + email: "imashkoksal@gmail.com", + quote: + "Live every day as productive as someone who gets 250k at Hackathons.", interests: [], }, { @@ -59,7 +60,7 @@ const data = [ role: "SMM Management", portfolio: null, email: "7770504@inbox.ru", - quote: "Visual jasaimyn", + quote: "Do not give up, the beginning is always the hardest.", interests: [], }, { @@ -72,14 +73,15 @@ const data = [ interests: [], }, { - element: "water", + element: "food", name: "Yerassyl Abilkassym", role: "Android/iOS Developer", portfolio: null, - email: "a.kabylet@gmail.com", - quote: "I pee'd on project, but still member", + email: "yerassyl.abylkassym@gmail.com", + quote: + "Enthusiastic student interested in engineering, machine learning and computer science.", interests: [], - } + }, ]; export default data; diff --git a/src/index.css b/src/index.css index ad2d8f7..503b50f 100644 --- a/src/index.css +++ b/src/index.css @@ -14,6 +14,10 @@ a { font-weight: 700; } +button { + cursor: pointer; +} + h1 { font-size: 48px; text-decoration: underline; diff --git a/src/styles/About.css b/src/styles/About.css index a7fc829..7e3a5fa 100644 --- a/src/styles/About.css +++ b/src/styles/About.css @@ -1,19 +1,29 @@ .about { - background-image: url('../images/bg.jpeg'); - background-size: 100%; + background-image: url("../images/bg.png"); background-repeat: no-repeat; padding: 20px; height: 600px; + background-size: 100% 650px; text-align: center; } +@media (max-width: 700px) { + .about { + height: max-content; + background-size: auto; + } +} + .more-btn { + margin-top: 40px; + font-size: 24px; background-color: transparent; - border-radius: 30px; + border-radius: 20px; border: 2px #ffff solid; color: white; - width: 15%; - height: 30px; + width: 150px; + height: 50px; + align-items: center; } .more-btn:hover { @@ -21,3 +31,12 @@ color: #282d35; transition: 0.5s; } + +.about a { + text-decoration: none; +} + +.about p { + margin: 0; + font-size: 24px; +} diff --git a/src/styles/Footer.css b/src/styles/Footer.css index 0e94f9e..d3b8e8a 100644 --- a/src/styles/Footer.css +++ b/src/styles/Footer.css @@ -1,7 +1,7 @@ footer { /* Sticking to the Bottom */ padding: 1rem; - background-color: #21222A; + background-color: #21222a; bottom: 0; left: 0; /* Displaying Content */ @@ -10,16 +10,24 @@ footer { justify-content: center; } -footer .footer--section { +.footer--section { padding: 0 20px; } -footer .footer--section > h3 { - color: #61DAFB; +.footer--section > h3 { + color: #61dafb; } -footer .footer--section > ul { +.footer--section > ul { list-style: none; padding: 0; text-align: center; } + +.footer--section li a { + margin-left: 4px; +} + +.footer--section li svg { + padding-top: 6px; +} diff --git a/src/styles/MemberList.css b/src/styles/MemberList.css index c79b6ed..de961ea 100644 --- a/src/styles/MemberList.css +++ b/src/styles/MemberList.css @@ -9,6 +9,14 @@ grid-template-columns: repeat(3, 1fr); } +@media (max-width: 480px) { + .members-list { + overflow-x: scroll; + display: flex; + flex-wrap: nowrap; + } +} + .members--title { text-align: center; } diff --git a/src/styles/Navbar.css b/src/styles/Navbar.css index b43ac4c..8f42795 100644 --- a/src/styles/Navbar.css +++ b/src/styles/Navbar.css @@ -1,5 +1,5 @@ nav { - background-color: #21222A; + background-color: #21222a; display: flex; align-items: center; justify-content: space-between; @@ -18,11 +18,16 @@ nav .logo { nav h1 { margin: 0; padding: 1rem; - color: #61DAFB; + color: #61dafb; font-size: 2rem; text-decoration: none; } nav h3 { - color: #DEEBF8; + color: #deebf8; +} + +.links { + display: flex; + gap: 1rem; } diff --git a/src/styles/ProjectList.css b/src/styles/ProjectList.css index b562fcc..b3cb7ad 100644 --- a/src/styles/ProjectList.css +++ b/src/styles/ProjectList.css @@ -1,11 +1,12 @@ .projects { - background-color: #FFFFFF; + background-color: #ffffff; padding: 20px; margin: 0; } -.projects h1, .projects a { - color: #282D35; +.projects h1, +.projects a { + color: #282d35; } .project-container { @@ -19,6 +20,14 @@ grid-template-columns: repeat(3, 1fr); } +@media (max-width: 480px) { + .project-list { + overflow-x: scroll; + display: flex; + flex-wrap: nowrap; + } +} + .project--title { text-align: center; }