Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new filters for other collections #70

Merged
merged 46 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7a39881
rebuild filters, so its easier to add new collections
brauliorivas Jul 30, 2024
6d3c844
add a few more filters and work on logic when filtering
brauliorivas Jul 31, 2024
1d9b20a
add filters for vertex
brauliorivas Aug 2, 2024
9e02acb
remove unused files and work on toggles
brauliorivas Aug 2, 2024
de90d65
temporarily disable test for filters
brauliorivas Aug 2, 2024
2bd3a68
filter out objects (missing reconnect)
brauliorivas Aug 3, 2024
378b283
remove bug link reference, approach different way for new connections
brauliorivas Aug 3, 2024
973c9a3
add styling for filters
brauliorivas Aug 3, 2024
f9f9132
add inverted filter option
brauliorivas Aug 3, 2024
ba1b6dd
fix checkbox logic
brauliorivas Aug 3, 2024
eba46b3
recover toggle and move to top left corner together with views menu
brauliorivas Aug 3, 2024
23efbaf
close views menu by default
brauliorivas Aug 3, 2024
f5d4576
fix filters when checkbox and range combined + [WIP] reconnect elements
brauliorivas Aug 4, 2024
8c37e64
find a way to finally save relations so its easier to create new ones
brauliorivas Aug 5, 2024
0dc99b6
move files
brauliorivas Aug 6, 2024
f66d27b
reconnect MCParticle tree correctly
brauliorivas Aug 6, 2024
43ad0d9
remove console log
brauliorivas Aug 6, 2024
c1ebba7
remove filter function from MCParticle class
brauliorivas Aug 6, 2024
bc4d817
apply filters on enter
brauliorivas Aug 6, 2024
414487f
filter out associations
brauliorivas Aug 6, 2024
554de9b
toggle on the right side
brauliorivas Aug 6, 2024
2c5ff66
increase height for mcparticle
brauliorivas Aug 6, 2024
cc5081b
make filters taller to reduce scrollbar size
brauliorivas Aug 6, 2024
3e09028
a bit more
brauliorivas Aug 6, 2024
1c670e4
make a bit wider to support on firefox
brauliorivas Aug 6, 2024
7672bf6
simplify mcparticle x assignment and found out missing to scroll to x, y
brauliorivas Aug 6, 2024
d10abcd
move mcparticles to center if there are few of them
brauliorivas Aug 6, 2024
fa34304
remove annoying shadow in toggle
brauliorivas Aug 6, 2024
2a65349
add scrollbars
brauliorivas Aug 7, 2024
89d046d
allow to scroll by dragging scrollbars
brauliorivas Aug 7, 2024
02a2304
trying to figure out bug when dragging
brauliorivas Aug 7, 2024
acbc515
make view selector longer
brauliorivas Aug 7, 2024
f442080
correctly align toggle switch
brauliorivas Aug 7, 2024
c3f4bb8
display mcparticles images to match full height or full width
brauliorivas Aug 7, 2024
e106df0
remove duplicate logic
brauliorivas Aug 7, 2024
de33805
adaptative scrollbars on window resize
brauliorivas Aug 7, 2024
f439f6a
correct bug when scroll horizontal and then use mouse
brauliorivas Aug 8, 2024
f1eb314
check for object existence to change zindex (fixed dragging thumb for…
brauliorivas Aug 8, 2024
b608d23
redo test suite for filtering (easier and simpler)
brauliorivas Aug 8, 2024
14e6b6f
missing update
brauliorivas Aug 8, 2024
51dcb06
reconnect trees of one single relation
brauliorivas Aug 8, 2024
91ef893
allow to filter by those that aren't associations neither tree
brauliorivas Aug 8, 2024
109b985
taller particleid
brauliorivas Aug 8, 2024
18119d5
add small validation
brauliorivas Aug 8, 2024
f5380e2
switch order between checkbox and text
brauliorivas Aug 9, 2024
3e4e4d2
add filter for particle id
brauliorivas Aug 9, 2024
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
82 changes: 82 additions & 0 deletions css/clean-switch.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
#toggles {
margin-bottom: 10px;
}
.toggle {
display: flex;
justify-content: space-between;
max-width: 100%;
padding-right: 12px;
}

/*
https://miladd3.github.io/clean-switch/
MIT License
*/
.cl-switch input[type="checkbox"] {
display: none;
visibility: hidden;
}
.switcher {
display: inline-block;
border-radius: 100px;
width: 35px;
height: 15px;
background-color: #ccc;
position: relative;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
vertical-align: middle;
}
.switcher {
cursor: pointer;
}
.switcher:before {
content: "";
display: block;
width: 20px;
height: 20px;
background-color: #fff;
border-radius: 50%;
margin-top: -2.5px;
position: absolute;
top: 0;
left: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
margin-right: 0;
-webkit-transition: all 0.2s;
-moz-transition: all 0.2s;
-ms-transition: all 0.2s;
-o-transition: all 0.2s;
transition: all 0.2s;
}
.switcher:active:before {
transition: all, 0.1s;
}
.toggle-label {
font-family: sans-serif;
font-size: 16px;
vertical-align: middle;
}
.cl-switch input[type="checkbox"]:checked + .switcher {
background-color: #8591d5;
}
.cl-switch input[type="checkbox"]:checked + .switcher:before {
left: 100%;
margin-left: -20px;
background-color: #3f51b5;
}
.cl-switch [disabled]:not([disabled="false"]) + .switcher {
background: #ccc !important;
}
.cl-switch [disabled]:not([disabled="false"]) + .switcher:before {
background-color: #e2e2e2 !important;
}
.cl-switch.cl-switch-black input[type="checkbox"]:checked + .switcher {
background-color: #676767;
}
.cl-switch.cl-switch-black input[type="checkbox"]:checked + .switcher:before {
background-color: #343434;
}
1 change: 1 addition & 0 deletions css/event.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
transform: translateX(-50%);
background-color: #e1e1e1;
padding: 5px 10px;
border: 1px solid #000;
border-radius: 5px;
}

Expand Down
139 changes: 125 additions & 14 deletions css/filter.css
Original file line number Diff line number Diff line change
@@ -1,49 +1,160 @@
#filter {
min-width: 100px;
#filters {
display: none;
position: fixed;
flex-direction: column;
background-color: #e1e1e1;
border-radius: 5px;
border: 1px solid #000;
padding: 10px;
top: 10px;
right: 10px;
z-index: 1;
width: 300px;
max-height: 65vh;
padding: 10px;
background-color: #e1e1e1;
border-radius: 5px;
border: 1px solid #000;
}

#filter-header {
#filters-header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
max-height: 5vh;
}

#filters-title {
font-weight: bold;
}

#filter-button {
#filters-content {
width: 100%;
}

#filter-menu-handler {
cursor: pointer;
width: 20px;
height: 20px;
}

#close-filter {
display: none;
}

#filter-content {
#filters-body {
display: none;
flex-direction: column;
align-items: center;
margin-top: 10px;
overflow-y: auto;
max-height: 60vh;
padding-right: 5px;
}

#filters {
#filters-body::-webkit-scrollbar {
width: 7px;
}

#filters-body::-webkit-scrollbar-track {
background: #e1e1e1;
border-radius: 5px;
}

#filters-body::-webkit-scrollbar-thumb {
background: #afafaf;
border-radius: 5px;
}

#filters-body::-webkit-scrollbar-thumb:hover {
background: #858585;
}

#invert-filters-section {
font-style: italic;
display: flex;
flex-direction: column;
padding: 10px 0;
flex-direction: row;
}

#filters-buttons {
margin-top: 10px;
width: fit-content;
}

.filter-action {
font-weight: 500;
padding: 5px;
margin: 0 5px;
border-radius: 5px;
font-weight: 500;
border: 1px solid #000;
}

.filter-action:hover {
background-color: #c5c5c5;
}

.filter-collection-title {
font-weight: bold;
text-align: center;
margin: 5px 0;
}

.filter-collection-subtitle {
font-weight: 500;
}

.range-input {
width: 45px;
margin: 0 5px;
padding: 4px;
border-radius: 3px;
border: 1px solid #000;
text-align: center;
}

.range-input:focus-visible {
outline: none;
}

.filter-collection-container {
width: 100%;
display: flex;
flex-direction: column;
margin-bottom: 10px;
}

.range-filter {
margin: 4px 0;
display: grid;
align-items: center;
grid-template-columns: 1fr 140px 40px;
}

.range-inputs {
display: flex;
flex-direction: row;
justify-content: space-between;
}

.range-unit {
text-align: right;
}

.filter-sub-container {
padding: 5px 0;
}

.filter-checkbox-container {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}

.checkbox-title-container {
display: flex;
flex-direction: row;
padding: 2px;
background-color: #c5c5c5;
border-radius: 5px;
margin: 2px;
}

.filter-checkbox {
margin: 2px;
}
8 changes: 4 additions & 4 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ body {
font-size: 16px;
}

.manipulation-tool {
display: none;
}

input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button {
-webkit-appearance: none;
Expand All @@ -30,3 +26,7 @@ button {
background: none;
padding: 0;
}

#input-file {
cursor: pointer;
}
73 changes: 0 additions & 73 deletions css/toggle.css

This file was deleted.

Loading
Loading