Skip to content

Commit

Permalink
stylelint:fix && prettier:fix
Browse files Browse the repository at this point in the history
  • Loading branch information
razvanMiu committed Dec 15, 2020
1 parent 21dd7c5 commit 4a48811
Show file tree
Hide file tree
Showing 54 changed files with 507 additions and 455 deletions.
6 changes: 4 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
pipeline {
agent any

environment {
GIT_NAME="eprtr_frontend"
NAMESPACE = "@eeacms"
registry = "eeacms/eprtr-frontend"
template = "templates/volto-eprtr"
RANCHER_STACKID = "1st1851"
Expand All @@ -8,8 +12,6 @@ pipeline {
tagName = ''
}

agent any

stages {
stage('Build & Push') {
steps{
Expand Down
30 changes: 26 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
{
"name": "ims-frontend",
"description": "IMS: Volto Frontend",
"license": "MIT",
"name": "@eeacms/eprtr_frontend",
"version": "1.2.0",
"description": "EPRTR: Industrial Emission Portal ",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
"homepage": "https://github.com/eea/eprtr_frontend",
"keywords": [
"volto-addon",
"volto-block",
"volto-grid",
"volto",
"plone",
"react"
],
"license": "MIT",
"private": true,
"workspaces": [
"src/develop/volto-grid-block",
Expand Down Expand Up @@ -36,7 +47,18 @@
"start:prod": "NODE_ENV=production node build/server.js",
"i18n": "NODE_ENV=production node node_modules/@plone/volto/src/i18n.js",
"develop:npx": "npx -p mrs-developer missdev --config=jsconfig.json --output=develop",
"develop": "missdev --config=jsconfig.json --output=develop"
"develop": "missdev --config=jsconfig.json --output=develop",
"release": "release-it",
"bootstrap": "node bootstrap",
"stylelint": "./node_modules/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}'",
"stylelint:overrides": "./node_modules/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'",
"stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
"prettier": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,json,css,less,md}'",
"prettier:fix": "./node_modules/.bin/prettier --single-quote --write 'src/**/*.{js,jsx,json,css,less,md}'",
"lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx}'",
"lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx}'",
"cypress:run": "./node_modules/cypress/bin/cypress run",
"cypress:open": "./node_modules/cypress/bin/cypress open"
},
"jest": {
"modulePathIgnorePatterns": [
Expand Down
38 changes: 19 additions & 19 deletions src/components/manage/Blocks/ArticlesList/articles.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"items": [
{
"id": 0,
"title": "title no 1",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum",
"date": "3.9.2019",
"imgUrl": "https://readreidread.files.wordpress.com/2011/09/yellow_tree1.jpg?w=998&h=624",
"url": "http://google.com"
},
{
"id": 1,
"title": "title no 2",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
"date": "5.10.2019",
"imgUrl": "https://www.mountainphotographer.com/wp-content/uploads/2010/11/201011_freiburgYellowTree.jpg",
"url": "http://google.com"
}
]
}
"items": [
{
"id": 0,
"title": "title no 1",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum",
"date": "3.9.2019",
"imgUrl": "https://readreidread.files.wordpress.com/2011/09/yellow_tree1.jpg?w=998&h=624",
"url": "http://google.com"
},
{
"id": 1,
"title": "title no 2",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
"date": "5.10.2019",
"imgUrl": "https://www.mountainphotographer.com/wp-content/uploads/2010/11/201011_freiburgYellowTree.jpg",
"url": "http://google.com"
}
]
}
62 changes: 36 additions & 26 deletions src/components/manage/Blocks/ArticlesSparql/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,80 +3,90 @@
}

.articles .articles-row {
align-items: center;
z-index: 1;
height: 250px;
align-items: center;
justify-content: center;
z-index: 1;
}

.articles .article {
display: flex;
height: 100%;
flex-direction: column;
justify-content: center;
height: 100%;
}

.articles .articles-row.can-be-half:last-child {
.articles .articles-row.can-be-half:last-child {
position: relative;
z-index: 0;
overflow: hidden;
-webkit-mask-image: -webkit-gradient(
linear,
left top,
left bottom,
from(rgba(0, 0, 0, 1)),
to(rgba(0, 0, 0, 0))
);
transform: translateY(-20%);
z-index: 0;
-webkit-mask-image: -webkit-gradient(linear, left top,
left bottom, from(rgba(0,0,0,1)), to(rgba(0,0,0,0)));
}

.articles .articles-row.can-be-half:last-child .article {
position: relative;
transform: translateY(20%);
overflow: hidden;
-webkit-mask-image: -webkit-gradient(linear, left top,
left bottom, from(rgba(0,0,0,1)), to(rgba(0,0,0,0)));
-webkit-mask-image: -webkit-gradient(
linear,
left top,
left bottom,
from(rgba(0, 0, 0, 1)),
to(rgba(0, 0, 0, 0))
);
transform: translateY(20%);
}

.articles .article.hero {
align-items: center;
}

.articles .article.hero img {
border-radius: 2em;
max-height: 200px;
max-width: -webkit-fill-available;
width: auto;
max-width: -webkit-fill-available;
height: auto;
max-height: 200px;
border-radius: 2em;
}

.articles .article-header,
.articles .article-description {
display: block;
position: relative;
display: block;
}

.articles .article-header h3 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
overflow: hidden;
max-height: 1.5em;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
line-height: 1.5em;
max-height: 1.5em;
text-overflow: ellipsis;
}

.articles .article-description p {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
overflow: hidden;
max-height: 4.5em;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
line-height: 1.5em;
max-height: 4.5em;
text-overflow: ellipsis;
}

.articles-slideshow {
position: absolute;
display: flex;
flex-direction: column;
top: 50%;
right: 1em;
display: flex;
flex-direction: column;
transform: translateY(-50%);
}

Expand All @@ -92,10 +102,10 @@
}

.articles-redirect.relative {
display: inline-block;
position: reltive !important;
left: unset;
bottom: unset;
left: unset;
display: inline-block;
transform: unset;
}

Expand All @@ -112,7 +122,7 @@
}

@media (max-width: 768px) {
.articles .articles-row.can-be-half:last-child {
.articles .articles-row.can-be-half:last-child {
transform: translateY(-10%);
}
}
}
4 changes: 2 additions & 2 deletions src/components/manage/Blocks/ChildrenLinks/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ const Edit = (props) => {
handleChangeBlock('childrenLinks', [...props.childrenLinks]);
}
/* eslint-disable-next-line */
}, [props.childrenLinks])
}, [props.childrenLinks]);

useEffect(() => {
props.dispatch(getParentFolderData(pageLink));
/* eslint-disable-next-line */
}, [pageLink])
}, [pageLink]);

const handleChangeBlock = (id, value) => {
const { data } = props;
Expand Down
17 changes: 9 additions & 8 deletions src/components/manage/Blocks/ChildrenLinks/style.css
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
.children-links-container {
font-family: Roboto, Arial, Helvetica, sans-serif;
}

.children-links-container .ui.grid {
margin-top: 0;
margin-right: 0;
margin-bottom: 0;
margin-left: 0;
margin-right: 0;
}

.children-links-container .children-link-container {
.children-links-container .children-link-container {
display: inline-block;
border: 1px solid #32536B;
box-sizing: border-box;
border-radius: 30px;
padding: 0.7em 1.5em;
border: 1px solid #32536b;
margin: 0.5em 0;
border-radius: 30px;
}

.children-links-container .children-link {
color: #32536B;
font-weight: 300;
.children-links-container .children-link {
color: #32536b;
font-size: 18px;
font-weight: 300;
line-height: 21px;
}

.children-links-container .column {
padding: 2px;
}
}
4 changes: 2 additions & 2 deletions src/components/manage/Blocks/DetailedLink/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Edit = (props) => {
}
}
/* eslint-disable-next-line */
}, [props.pages, pageLink, outsideLink])
}, [props.pages, pageLink, outsideLink]);

useEffect(() => {
setState({ schema: getSchema(props) });
Expand All @@ -52,7 +52,7 @@ const Edit = (props) => {
props.dispatch(getPage(pageLink));
}
/* eslint-disable-next-line */
}, [pageLink])
}, [pageLink]);

const handleChangeBlock = (id, value) => {
const { data } = props;
Expand Down
13 changes: 6 additions & 7 deletions src/components/manage/Blocks/DetailedLink/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@
}

.detailed-link-container .detailed-link-title {
color: #4296B3;
font-weight: 600;
margin-bottom: 1em;
color: #4296b3;
font-size: 1.3em;
font-weight: 600;
line-height: 23px;
margin-bottom: 1em;
}

.detailed-link-container .detailed-link-description {
margin-bottom: 1em;
color: #333;
font-weight: 300;
font-size: 14px;
font-weight: 300;
line-height: 18px;
margin-bottom: 1em;
}

.detailed-link-container .detailed-link-button {
display: inline-block;
}

.detailed-link-container .detailed-link-placeholder {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,7 @@ const View = ({ content, ...props }) => {
setDiscodataValues(props.discodataValues);
}
/* eslint-disable-next-line */
}, [props.search, props.discodata_resources, props.discodataValues])

}, [props.search, props.discodata_resources, props.discodataValues]);

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ const View = ({ content, ...props }) => {
setDiscodataValues(props.discodataValues);
}
/* eslint-disable-next-line */
}, [props.search, props.discodata_resources, props.discodataValues])

}, [props.search, props.discodata_resources, props.discodataValues]);

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

.discodata-list a {
display: inline-block;
margin: 5px
}
margin: 5px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ const Edit = (props) => {
schema,
});
/* eslint-disable-next-line */
}, [
JSON.stringify(discodataValues)
]);
}, [JSON.stringify(discodataValues)]);

return (
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const View = ({ content, ...props }) => {
setDiscodataValues(props.discodataValues);
}
/* eslint-disable-next-line */
}, [props.search, props.discodata_resources, props.discodataValues])
}, [props.search, props.discodata_resources, props.discodataValues]);

return (
<Select
Expand Down
Loading

0 comments on commit 4a48811

Please sign in to comment.