Skip to content
This repository has been archived by the owner on Sep 23, 2021. It is now read-only.

WIP Fast animation #1123

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cde1381
docs: add Contributor Covenant Code of Conduct
Sep 18, 2018
894d630
refactor(search-engine): split the item type selector
Gianfranco97 Sep 25, 2018
09f6bae
refactor(search-engine): split the results display
Gianfranco97 Sep 25, 2018
68846ff
refactor(search-engine): pass actions to pure functions
Gianfranco97 Sep 26, 2018
4f575e5
refactor(search-engine): split the search area
Gianfranco97 Sep 26, 2018
75f62dc
refactor(search-engine): reorganize and simplify functions
Gianfranco97 Sep 26, 2018
2b1180d
refactor(forms): add a new parameter to the 'Selects'
Gianfranco97 Sep 28, 2018
09ad228
refactor(search-engine): remove 'react-querybuilder' library
Gianfranco97 Sep 28, 2018
413d5ca
feat(search-engine): search with criteria
Gianfranco97 Oct 1, 2018
5f9f1a1
feat(search-engine): add a rule by default
Gianfranco97 Oct 1, 2018
5261ff5
refactor(search-engine): validate the existence of a criteria
Gianfranco97 Oct 1, 2018
93a6d25
feat(search-engine): search with metacriteria
Gianfranco97 Oct 1, 2018
517730f
refactor(search-engine): improve rule styles
Gianfranco97 Oct 1, 2018
031fd98
refactor(search-engine): remove the warning of the rules
Gianfranco97 Oct 1, 2018
9f5fc10
docs(seach-engine): add documentation to the new components
Gianfranco97 Oct 2, 2018
0bf9199
test(seach-engine): fix automatic screenshots
Gianfranco97 Oct 2, 2018
f235188
fix(package): update react-markdown to version 4.0.0
greenkeeper[bot] Oct 2, 2018
e3fd17e
chore(package): update lockfile yarn.lock
greenkeeper[bot] Oct 2, 2018
507ac87
build(dashboard): update react scripts
Gianfranco97 Oct 2, 2018
a5b06ac
test(dashboard): fix integration with new react scripts
Gianfranco97 Oct 2, 2018
63d9f46
refactor(dashboard): fix 'jsx-a11y/anchor-is-valid' warnings
Gianfranco97 Oct 3, 2018
b6722b2
build(dashboard): use sass with react scripts
Gianfranco97 Oct 3, 2018
05ef770
refactor(dashboard): use react fragment syntax
Gianfranco97 Oct 3, 2018
8504dfc
refactor(search-engine): add support for multilanguage
Gianfranco97 Oct 3, 2018
e9d2edf
fix(package): update @microsoft/fast-animation to version 3.0.0
greenkeeper[bot] Oct 6, 2018
f05900a
chore(package): update lockfile yarn.lock
greenkeeper[bot] Oct 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 41 additions & 6 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,46 @@
# Code of Conduct
# Contributor Covenant Code of Conduct

As contributors and maintainers of the Flyve MDM projects, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
## Our Pledge

Communication through any of our channels (GitHub, Telegram, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Flyve MDM projects to do the same.
## Our Standards

If any member of the community violates this code of conduct, the maintainers of the Flyve MDM projects may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
Examples of behavior that contributes to creating a positive environment include:

If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at ml-flyvemdm@teclib.com
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@teclib.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
16 changes: 8 additions & 8 deletions cypress/integration/Search.spec.js

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,40 @@
"license": "GPL-3.0",
"homepage": "https://dev.flyve.org/dashboard",
"scripts": {
"prestart": "yarn sass && yarn test:watch -u &",
"start": "NODE_PATH=./src react-scripts start",
"start:only": "yarn sass:build && NODE_PATH=./src react-scripts start",
"build": "yarn sass:build && yarn lint && NODE_PATH=./src react-scripts build && node ./ci/scripts/create_htaccess.js",
"start:only": "NODE_PATH=./src react-scripts start",
"build": "yarn lint && NODE_PATH=./src react-scripts build && node ./ci/scripts/create_htaccess.js",
"release": "yarn standard-version",
"docs": "yarn jsdoc src -r -d docs -t ./jsdoc_theme",
"gh-pages-screenshots": "yarn gh-pages --dist cypress/screenshots --dest screenshots",
"gh-pages-docs": "yarn gh-pages --dist docs",
"gh-pages-coverage": "yarn gh-pages --dist coverage",
"gh-pages-reports": "yarn gh-pages --dist reports --dest reports",
"gh-pages-changelog": "yarn gh-pages --dist ./ --src '{./C*.md,CHANGELOG.md}' --dest ./ --add",
"test": "NODE_PATH=./src yarn jest --config ./config/jest/jest.config.json",
"test": "NODE_PATH=./src yarn react-scripts test",
"test:watch": "NODE_PATH=./src yarn test --watch",
"test:cypress": "yarn cypress run",
"test:webhint": "node node_modules/hint/dist/src/bin/hint.js http://localhost:3000/",
"coverage": "NODE_PATH=./src yarn test --coverage",
"eject": "react-scripts eject",
"sass": "sass --watch src/assets/styles/scss:src/assets/styles/css",
"sass:build": "sass src/assets/styles/scss:src/assets/styles/css",
"lint": "yarn eslint src --fix"
},
"dependencies": {
"@glpi-project/javascript-library-glpi": ">=0.1.0-beta <=1.0.0",
"@microsoft/fast-animation": "^0.0.12-beta.0",
"@microsoft/fast-animation": "^3.0.0",
"bugsnag-js": "^4.7.3",
"bugsnag-react": "^1.1.1",
"cypress": "^3.1.0",
"history": "^4.7.2",
"leaflet": "^1.3.4",
"node-polyglot": "^2.3.0",
"node-sass": "^4.9.3",
"react": "^16.5.2",
"react-content-loader": "^3.1.2",
"react-dom": "^16.5.2",
"react-markdown": "^3.6.0",
"react-querybuilder": "^1.4.3",
"react-markdown": "^4.0.0",
"react-router-dom": "^4.3.1",
"react-scripts": "^1.1.5",
"react-scripts": "^2.0.3",
"react-winjs": "git+https://github.com/TECLIB/react-winjs.git#develop",
"victory": "^30.3.1",
"web-animations-js": "^2.3.1",
Expand All @@ -71,8 +68,13 @@
"jsdoc": "^3.5.5",
"node-github-release": "^0.2.1",
"react-test-renderer": "^16.5.2",
"sass": "^1.14.0",
"sinon": "^6.3.4",
"standard-version": "^4.4.0"
}
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ $splitview-color-fonts-hover: $font-color-primary;
// Colors dropdown

$dropdown-color: #FFFFFF;
$dropdown-color-hover: rgba(0,0,0,.1);
$dropdown-color-hover: rgba(0, 0, 0, .1);
6 changes: 6 additions & 0 deletions src/assets/styles/architecture/4_level_elements/_a.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
a,
.btn-link {
cursor: pointer;
color: $color-1-primary;
text-decoration: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.item-info {
padding: 0 20px;
padding: 0 20px;
vertical-align: middle;
}

Expand All @@ -38,7 +38,7 @@
}

.list-pane {

.list-pane__content {

.win-groupheadercontainer {
Expand Down Expand Up @@ -67,4 +67,4 @@
width: 80%;
}
}
}
}
18 changes: 18 additions & 0 deletions src/assets/styles/architecture/5_level_components/_froms.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.froms {
.froms__row {
display: flex;
flex-wrap: wrap;
}

.froms__col {
margin-right: 10px;
}

.froms__row--icon {
margin: 40px 10px 5px;

span {
font-size: 25px;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
.search-engine {
h3 {
margin-left: 5px;
}

.search-engine__rule {
padding: 10px 5px;

&:nth-child(even) {
background: #eaeaea;
}

.deleteIcon {
margin: 10px;
font-size: 18px;
cursor: pointer;
}
}

.search-engine__selector {
margin-left: 5px;
}

.search-engine__add-buttons {
margin-bottom: 20px;

button {
margin-left: 5px;
}
}

.search-engine__seach-area {
margin: 5px;
}
}










.searchList {
padding: 10px 0 0 0;
border: 1px solid $color-2-primary;
width: 100%; display:table
}
.searchListHeader {
border: 1px solid $color-2-primary;
background-color: $color-1-primary;
color: white;
font-weight: bold; display:table-row
}
.cellHeader {
border-right: 1px solid white;
display: table-cell;
width:12%;
padding: 1px;
text-align: center;
}
.rowContent {
border: 1px solid $color-2-primary;
background-color: white;
display:table-row
}
.cellContent {
border-right: 1px solid white;
display: table-cell;
width:10%;
padding-right: 4px;
text-align: center;
border-bottom: none;
}

.cellContentTwo {
background-color: rgba(0, 0, 0, 0.1);
}
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
}
@font-face {
font-family: "Symbols";
src: url("../../fonts/SegMDL2.ttf") format("truetype");
src: url("../fonts/SegMDL2.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -407,36 +407,36 @@
font-family: "Segoe UI";
font-weight: 200;
src: local("Segoe UI Light");
src: url("../../fonts/selawkl.eot");
src: url("../../fonts/selawkl.ttf") format("truetype");
src: url("../fonts/selawkl.eot");
src: url("../fonts/selawkl.ttf") format("truetype");
}
@font-face {
font-family: "Segoe UI";
font-weight: 300;
src: local("Segoe UI Semilight");
src: url("../../fonts/selawksl.eot");
src: url("../../fonts/selawksl.ttf") format("truetype");
src: url("../fonts/selawksl.eot");
src: url("../fonts/selawksl.ttf") format("truetype");
}
@font-face {
font-family: "Segoe UI";
font-weight: 400;
src: local("Segoe UI");
src: url("../../fonts/selawk.eot");
src: url("../../fonts/selawk.ttf") format("truetype");
src: url("../fonts/selawk.eot");
src: url("../fonts/selawk.ttf") format("truetype");
}
@font-face {
font-family: "Segoe UI";
font-weight: bold;
src: local("Segoe UI Semibold");
src: url("../../fonts/selawksb.eot");
src: url("../../fonts/selawksb.ttf") format("truetype");
src: url("../fonts/selawksb.eot");
src: url("../fonts/selawksb.ttf") format("truetype");
}
@font-face {
font-family: "Segoe UI";
font-weight: 600;
src: local("Segoe UI Bold");
src: url("../../fonts/selawkb.eot");
src: url("../../fonts/selawkb.ttf") format("truetype");
src: url("../fonts/selawkb.eot");
src: url("../fonts/selawkb.ttf") format("truetype");
}

@font-face {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
'./architecture/5_level_components/fleets',
'./architecture/5_level_components/invitations',
'./architecture/5_level_components/loading',
'./architecture/5_level_components/search_engine',
'./architecture/5_level_components/settings',
'./architecture/5_level_components/users',
'./architecture/5_level_components/search-engine',
'./architecture/5_level_components/froms',
'./architecture/5_level_components/file_upload',
'./architecture/5_level_components/empty_message',
Expand Down
5 changes: 0 additions & 5 deletions src/assets/styles/scss/architecture/4_level_elements/_a.scss

This file was deleted.

19 changes: 0 additions & 19 deletions src/assets/styles/scss/architecture/5_level_components/_froms.scss

This file was deleted.

Loading