From e390ad3743ef467b79a75b7ac9b583140f4389b4 Mon Sep 17 00:00:00 2001 From: Tudor Stanciu Date: Tue, 7 Sep 2021 11:18:55 +0300 Subject: [PATCH] serverTechnologies --- package-lock.json | 8 ++ package.json | 1 + public/locales/en/translations.json | 3 +- public/locales/ro/translations.json | 3 +- .../about/components/TechnologiesComponent.js | 112 +++++------------- 5 files changed, 45 insertions(+), 82 deletions(-) diff --git a/package-lock.json b/package-lock.json index a868db6..084c51c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7780,6 +7780,14 @@ "react-dom": "^16.4.1" } }, + "react-skillbars": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/react-skillbars/-/react-skillbars-1.6.1.tgz", + "integrity": "sha512-vfenxvWl3KW4q8Ji6gXLRZFkAL1KFpfrP/8gQMWg5aREd9G1xhv0xnx2NcBHhWNhLf4NbhAOjO7AVQMatpRAqg==", + "requires": { + "lodash.throttle": "4.1.1" + } + }, "react-smooth": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.6.tgz", diff --git a/package.json b/package.json index 05e6b6e..bce2ddd 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "react-redux": "6.0.1", "react-router-dom": "5.2.0", "react-simple-chatbot": "^0.6.1", + "react-skillbars": "^1.6.1", "recharts": "^1.8.5", "redux": "4.0.1", "redux-thunk": "2.3.0", diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json index 8b7fa01..fa6da19 100644 --- a/public/locales/en/translations.json +++ b/public/locales/en/translations.json @@ -138,7 +138,8 @@ "Documentation": "Documentation" }, "Technologies": { - "Title": "Technologies" + "Title": "Technologies", + "Content": "This reverse proxy was built based on several technologies that were brought together as follows:" } } } diff --git a/public/locales/ro/translations.json b/public/locales/ro/translations.json index 5735cdd..4bc2b40 100644 --- a/public/locales/ro/translations.json +++ b/public/locales/ro/translations.json @@ -129,7 +129,8 @@ "Documentation": "Documentație" }, "Technologies": { - "Title": "Tehnologii" + "Title": "Tehnologii", + "Content": "Acest reverse proxy a fost construit pe baza mai multor tehnologii care au fost aduse împreună după cum urmează:" } } } diff --git a/src/features/about/components/TechnologiesComponent.js b/src/features/about/components/TechnologiesComponent.js index 8a56c09..7bb2de5 100644 --- a/src/features/about/components/TechnologiesComponent.js +++ b/src/features/about/components/TechnologiesComponent.js @@ -1,44 +1,44 @@ import React from "react"; import { makeStyles } from "@material-ui/core/styles"; -import clsx from "clsx"; import { Card, CardHeader, CardContent, - CardActions, - Collapse, Avatar, - IconButton, Typography } from "@material-ui/core"; -import FavoriteIcon from "@material-ui/icons/Favorite"; -import ShareIcon from "@material-ui/icons/Share"; -import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; -import MoreVertIcon from "@material-ui/icons/MoreVert"; import styles from "../../../components/common/styles/expandableCardStyles"; import { useTranslation } from "react-i18next"; +import SkillBar from "react-skillbars"; const useStyles = makeStyles(styles); -/* -https://codepen.io/emreavcilar/pen/eYmejLP -https://codepen.io/ajaykarwal/pen/bqwWNy -https://www.npmjs.com/package/react-skills-bars -https://www.npmjs.com/package/react-skillbars -https://kevincastejon.github.io/react-skills/documentation/ +const serverTechnologies = [ + { type: "C#", level: 85 }, + { type: "ProxyKit", level: 30 }, + { type: "Let's_Encrypt", level: 10 }, + { type: "SQL Server", level: 15 }, + { type: "Docker", level: 5 } +]; +const frontendTechnologies = [ + { type: "React", level: 75 }, + { type: "Redux", level: 15 }, + { type: "Javascript", level: 10 }, + { type: "Docker", level: 5 } +]; - -*/ +const colors = { + bar: "#5e8fff", + title: { + text: "#fd7e14", + background: "#3f51b5" + } +}; const TechnologiesComponent = () => { const classes = useStyles(); const { t } = useTranslation(); - const [expanded, setExpanded] = React.useState(false); - - const handleExpandClick = () => { - setExpanded(!expanded); - }; return ( @@ -48,71 +48,23 @@ const TechnologiesComponent = () => { T } - action={ - - - - } title={t("About.Technologies.Title")} - subheader="September 14, 2016" /> - Aici se vor enumera tehnologiile folosite intr-o propozitie, gen: - Pentru construirea acestui sistem a fost utilizata o gama larga de - tehnologii, bla bla bla si enumerate: .NET Core, ProxyKit, SQL Server. + {t("About.Technologies.Content")} +
+ + Server: + + +
+ + Frontend: + + - - - - - - - - - - - - - - Method: - - In zona asta va fi un tabel ca si celelalte cu tehnologiile folosite - si doua trei cuvinte despre ce face fiecare. SQL Server - baza de - date, Windows service - hostat serverul, docker hostat api-ul - - - Heat oil in a (14- to 16-inch) paella pan or a large, deep skillet - over medium-high heat. Add chicken, shrimp and chorizo, and cook, - stirring occasionally until lightly browned, 6 to 8 minutes. - Transfer shrimp to a large plate and set aside, leaving chicken and - chorizo in the pan. Add pimentón, bay leaves, garlic, tomatoes, - onion, salt and pepper, and cook, stirring often until thickened and - fragrant, about 10 minutes. Add saffron broth and remaining 4 1/2 - cups chicken broth; bring to a boil. - - - Add rice and stir very gently to distribute. Top with artichokes and - peppers, and cook without stirring, until most of the liquid is - absorbed, 15 to 18 minutes. Reduce heat to medium-low, add reserved - shrimp and mussels, tucking them down into the rice, and cook again - without stirring, until mussels have opened and rice is just tender, - 5 to 7 minutes more. (Discard any mussels that don’t open.) - - - Set aside off of the heat to let rest for 10 minutes, and then - serve. - - - ); };