Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
301 commits
Select commit Hold shift + click to select a range
03526de
updated with breakout pricing modal
roychowd Sep 12, 2023
27f4e53
sidebar box
roychowd Sep 12, 2023
e5b19a7
updating delete breakout
roychowd Sep 12, 2023
e0cd90c
fix a big
roychowd Sep 12, 2023
a433d34
breakout prciing fix
roychowd Sep 12, 2023
26cf61d
update code
roychowd Sep 23, 2023
fcca5c2
update for region viewing
roychowd Oct 2, 2023
c461a1b
Merge pull request #12 from Xkey-AiEstimation/breakout-pricing-modal
JacHammer Oct 2, 2023
40bc42a
updated with visible switch
roychowd Oct 4, 2023
1ce6974
Merge pull request #13 from Xkey-AiEstimation/breakout-pricing-modal
JacHammer Oct 12, 2023
ff86e08
change colors
roychowd Oct 17, 2023
7a92866
update with styles
roychowd Oct 17, 2023
6f61b22
fix autofocus
roychowd Oct 17, 2023
0ca45a9
update with whtie text
roychowd Oct 17, 2023
999080a
Merge pull request #14 from Xkey-AiEstimation/breakout-pricing-modal
JacHammer Oct 17, 2023
de6d566
fix
roychowd Oct 20, 2023
97e5f17
Merge pull request #15 from Xkey-AiEstimation/breakout-pricing-modal
JacHammer Oct 20, 2023
839c8eb
change position of title
roychowd Oct 24, 2023
3cb38f3
Merge pull request #16 from Xkey-AiEstimation/change-title
JacHammer Oct 24, 2023
16cf32e
Fix extra device shown as "1" in estimation template when scale is ad…
JacHammer Oct 26, 2023
5825a16
added relative length calculations
roychowd Oct 27, 2023
8bbb7bc
update with code for valeus on the regionlabel
roychowd Oct 27, 2023
ffdfc4f
update with region label changes
roychowd Oct 27, 2023
fd3f25f
update wiht legnth_Ft
roychowd Oct 27, 2023
96ce370
update wiht legnth_Ft
roychowd Oct 27, 2023
ca8982c
update
roychowd Oct 27, 2023
09f58c5
Merge pull request #17 from Xkey-AiEstimation/relative-line-length
JacHammer Oct 27, 2023
a54048a
fix region tags breaking on breakouts
roychowd Oct 31, 2023
e94bba8
Merge pull request #18 from Xkey-AiEstimation/fix-region-tags
JacHammer Oct 31, 2023
d22a122
update line range
roychowd Oct 31, 2023
dc1ac43
Tweaks on scale limits and textfield visual
JacHammer Oct 31, 2023
a7e4063
Merge pull request #19 from Xkey-AiEstimation/line-range
JacHammer Oct 31, 2023
caebba7
update breakouts to systems
roychowd Nov 1, 2023
7d219c9
fix bug on toggle switches for breakouts
roychowd Nov 2, 2023
3b15fed
update
roychowd Nov 2, 2023
a1fb30f
remove console.log:
roychowd Nov 2, 2023
58fb00a
update
roychowd Nov 7, 2023
756d6e3
update 2
roychowd Nov 9, 2023
3b028f3
updaet
roychowd Nov 9, 2023
5d5f66b
disable tags
roychowd Nov 9, 2023
2ecd5fa
Merge pull request #21 from Xkey-AiEstimation/update-auto-add
JacHammer Nov 9, 2023
97e5f99
update
roychowd Nov 9, 2023
6817564
reset button
roychowd Nov 9, 2023
ea4b5bb
Merge pull request #22 from Xkey-AiEstimation/update-with-zoom
roychowd Nov 9, 2023
b7b62ad
update
roychowd Nov 10, 2023
1cc8a5f
Merge pull request #23 from Xkey-AiEstimation/prevent-system-to-overw…
roychowd Nov 10, 2023
6a45b00
set hidesettings to true
roychowd Nov 13, 2023
ab7e615
Merge pull request #24 from Xkey-AiEstimation/hide-settings
roychowd Nov 13, 2023
256748b
update
roychowd Nov 14, 2023
6ea37da
Merge pull request #25 from Xkey-AiEstimation/fix-breakout-with-ocr
roychowd Nov 14, 2023
9ba7644
update
roychowd Nov 14, 2023
faad4c3
update
roychowd Nov 14, 2023
098c326
Merge pull request #26 from Xkey-AiEstimation/edit-exceptions
roychowd Nov 14, 2023
8842973
update git region labels show all
roychowd Nov 16, 2023
c7cb6ca
Merge pull request #27 from Xkey-AiEstimation/update-region-labels
roychowd Nov 16, 2023
5981087
update
roychowd Nov 16, 2023
f8d479c
text change
roychowd Nov 16, 2023
77dd421
Merge pull request #28 from Xkey-AiEstimation/update-region-labels
roychowd Nov 16, 2023
4e64a5a
update
roychowd Nov 21, 2023
f5b2af5
Merge pull request #29 from Xkey-AiEstimation/misc-fixes
roychowd Nov 21, 2023
f3d95c5
update scales
roychowd Nov 24, 2023
d3f8e50
Merge pull request #30 from Xkey-AiEstimation/misc-fixes
roychowd Nov 24, 2023
ce545d7
Increase OCR threshold for low res images
JacHammer Feb 12, 2024
eebc428
updae
roychowd Feb 21, 2024
c0021c2
Merge pull request #31 from Xkey-AiEstimation/update-color-on-check
roychowd Feb 21, 2024
4bf56f0
add all
roychowd Mar 7, 2024
5a27b77
update comments
roychowd Mar 7, 2024
d72e285
Merge pull request #32 from Xkey-AiEstimation/select-auto-add
roychowd Mar 7, 2024
cb45acd
upate
roychowd Apr 16, 2024
4ff599e
add count
roychowd Apr 16, 2024
4ba8159
update counts
roychowd Apr 16, 2024
732f0a5
Merge pull request #33 from Xkey-AiEstimation/update-count
roychowd Apr 16, 2024
1ad29e1
redo toggle logic later
roychowd Apr 17, 2024
78564c1
update
roychowd Apr 17, 2024
7b662bb
Merge pull request #34 from Xkey-AiEstimation/update-count
roychowd Apr 17, 2024
0459124
update
roychowd Apr 17, 2024
87198ed
Merge pull request #35 from Xkey-AiEstimation/update-count
roychowd Apr 17, 2024
1f8d4ef
update
roychowd Apr 17, 2024
a401ad6
Merge pull request #36 from Xkey-AiEstimation/update-count
roychowd Apr 17, 2024
55e1983
changes
roychowd Apr 19, 2024
a28e0f8
update
roychowd Apr 19, 2024
6ea37a7
Merge pull request #37 from Xkey-AiEstimation/update-count
roychowd Apr 19, 2024
dd12568
uodate
roychowd May 2, 2024
d96763a
Merge pull request #38 from Xkey-AiEstimation/delete-devices
roychowd May 2, 2024
b6a5ef4
update delete region
roychowd May 3, 2024
dc1895e
Merge pull request #39 from Xkey-AiEstimation/delete-devices
roychowd May 3, 2024
956b90e
added a border
roychowd May 3, 2024
b58407a
Merge pull request #40 from Xkey-AiEstimation/delete-devices
roychowd May 3, 2024
ee63c69
update history and remove lenght 0
roychowd May 3, 2024
4150f6c
Merge pull request #41 from Xkey-AiEstimation/delete-devices
roychowd May 3, 2024
16410ba
removed console
roychowd May 3, 2024
264d6a6
Merge pull request #42 from Xkey-AiEstimation/delete-devices
roychowd May 3, 2024
8bf4d00
remove console
roychowd May 5, 2024
8b429d3
Merge pull request #43 from Xkey-AiEstimation/delete-devices
roychowd May 5, 2024
4bf03a2
update
roychowd May 31, 2024
98d8fa4
rfs
roychowd May 31, 2024
76d32b5
added new device functionality
roychowd Jun 3, 2024
f200c55
annotator
roychowd Jun 3, 2024
6dc3173
Merge pull request #44 from Xkey-AiEstimation/new-device-2
roychowd Jun 3, 2024
f7aac49
update npm
roychowd Jun 4, 2024
aac5ac3
Merge pull request #45 from Xkey-AiEstimation/new-device-2
roychowd Jun 4, 2024
b32bbea
ne
roychowd Jun 4, 2024
848a630
Merge pull request #46 from Xkey-AiEstimation/new-device-2
roychowd Jun 4, 2024
4fe1d2d
delete npmrc
roychowd Jun 4, 2024
498b129
Merge pull request #47 from Xkey-AiEstimation/new-device-2
roychowd Jun 4, 2024
19278bc
Fix npm dep
JacHammer Jun 4, 2024
adb68bc
update
roychowd Jun 4, 2024
60099be
Merge pull request #48 from Xkey-AiEstimation/user-defined-and-tags
roychowd Jun 4, 2024
d37b608
update
roychowd Jun 5, 2024
52543b7
Merge pull request #49 from Xkey-AiEstimation/user-defined-and-tags
roychowd Jun 5, 2024
d14cd03
new changes
roychowd Jun 5, 2024
de5adf7
Merge pull request #50 from Xkey-AiEstimation/user-defined-and-tags
roychowd Jun 5, 2024
f320b16
test
roychowd Jun 6, 2024
b512692
update
roychowd Jun 7, 2024
2364a3b
Merge pull request #51 from Xkey-AiEstimation/user-defined-and-tags
roychowd Jun 7, 2024
1e4af0e
update
roychowd Jun 11, 2024
481427f
Merge pull request #52 from Xkey-AiEstimation/fix-save
roychowd Jun 11, 2024
50adaf2
save
roychowd Jun 11, 2024
dc64a6f
update region label g
roychowd Jun 11, 2024
b6a534a
update
roychowd Jun 11, 2024
c839d5a
Merge pull request #53 from Xkey-AiEstimation/fix-save
roychowd Jun 11, 2024
8778543
Fix
roychowd Jun 11, 2024
e0691b0
remofe console
roychowd Jun 11, 2024
5ca9dc6
Merge pull request #54 from Xkey-AiEstimation/fix-save
roychowd Jun 11, 2024
3596dec
update
roychowd Jun 11, 2024
f3596a5
Merge pull request #55 from Xkey-AiEstimation/fix-save
roychowd Jun 11, 2024
c71fa6d
update
roychowd Jun 11, 2024
ccf74f2
Merge pull request #56 from Xkey-AiEstimation/fix-save
roychowd Jun 11, 2024
3049114
update with identifer
roychowd Jun 14, 2024
5325dfd
Merge pull request #57 from Xkey-AiEstimation/fix-save
roychowd Jun 14, 2024
ec3dc06
update
roychowd Jun 14, 2024
541580e
name change
roychowd Jun 14, 2024
d3d94a9
Merge pull request #58 from Xkey-AiEstimation/fix-save
roychowd Jun 14, 2024
de53dee
update
roychowd Jul 16, 2024
632209c
Merge pull request #59 from Xkey-AiEstimation/update-ocr-name
roychowd Jul 16, 2024
73dac14
Implement multi-page OCR feature
JacHammer Jul 19, 2024
3f6aa5f
update
roychowd Jul 22, 2024
b909cc2
Merge pull request #60 from Xkey-AiEstimation/update-ocr-style
roychowd Jul 22, 2024
b4512c6
update
roychowd Jul 22, 2024
11a9c02
Merge pull request #61 from Xkey-AiEstimation/update-ocr-style
roychowd Jul 22, 2024
b0a2d06
update
roychowd Jul 22, 2024
6e16e17
Merge pull request #62 from Xkey-AiEstimation/update-ocr-style
roychowd Jul 22, 2024
3b0a743
update theme
roychowd Jul 22, 2024
b507a61
Merge pull request #63 from Xkey-AiEstimation/update-ocr-style
roychowd Jul 22, 2024
11397a1
ipdate line
roychowd Aug 8, 2024
e077fd7
Merge pull request #64 from Xkey-AiEstimation/update-line-color
roychowd Aug 8, 2024
c487050
k
roychowd Aug 8, 2024
36fbc9a
Merge pull request #65 from Xkey-AiEstimation/uodate-babel
roychowd Aug 8, 2024
a24c860
Update babel ES2020 dev dependencies
JacHammer Aug 8, 2024
35f57ec
Syncc babel plugin versions with frontend
JacHammer Aug 9, 2024
f37578a
update zoom speed
roychowd Aug 14, 2024
ed756b9
Merge pull request #66 from Xkey-AiEstimation/zoom-speed
roychowd Aug 14, 2024
37db8b5
Fine-tune overlap detection
JacHammer Aug 14, 2024
78491b0
update toggle
roychowd Aug 20, 2024
aebd6cf
Merge pull request #67 from Xkey-AiEstimation/update-toggle
roychowd Aug 20, 2024
69a7bf6
update
roychowd Aug 22, 2024
262546f
Merge pull request #68 from Xkey-AiEstimation/update-toggle
roychowd Aug 22, 2024
e35b4b6
update
roychowd Oct 7, 2024
e93e23e
Merge pull request #69 from Xkey-AiEstimation/update-with-subtype
roychowd Oct 7, 2024
459c5f5
update
roychowd Oct 7, 2024
27327a6
Merge pull request #70 from Xkey-AiEstimation/update-with-subtype
roychowd Oct 7, 2024
344ca1d
disable breaksours for sse
roychowd Nov 21, 2024
94fbaaa
fix breakouts on toggle sidebar box
roychowd Nov 22, 2024
5457814
ypadate
roychowd Nov 26, 2024
8483e74
update
roychowd Nov 26, 2024
49b1097
update
roychowd Nov 27, 2024
a249e0a
Merge pull request #71 from Xkey-AiEstimation/fix-categories
roychowd Nov 27, 2024
425092b
update
roychowd Nov 28, 2024
6154c23
Merge pull request #72 from Xkey-AiEstimation/fix-categories
roychowd Nov 28, 2024
d7497b0
update
roychowd Nov 28, 2024
21d5c5b
update status
roychowd Nov 29, 2024
fb8ded7
Merge pull request #73 from Xkey-AiEstimation/fix-categories
roychowd Nov 29, 2024
bfc5c6e
fix
roychowd Dec 2, 2024
ec2b043
Merge pull request #74 from Xkey-AiEstimation/fix-categories
roychowd Dec 2, 2024
a4f2e85
update
roychowd Dec 9, 2024
8b97f73
update
roychowd Dec 10, 2024
1a69be7
Merge pull request #75 from Xkey-AiEstimation/fix-categories
roychowd Dec 10, 2024
53c6edc
pushing fix
roychowd Dec 18, 2024
059f520
update
roychowd Dec 18, 2024
9986d94
Merge pull request #76 from Xkey-AiEstimation/fix-categories
roychowd Dec 18, 2024
2c439ac
update
roychowd Dec 19, 2024
f78cb2a
Merge pull request #77 from Xkey-AiEstimation/fix-categories
roychowd Dec 19, 2024
aa8edee
update
roychowd Dec 27, 2024
046a938
Merge pull request #78 from Xkey-AiEstimation/fix-categories
roychowd Dec 27, 2024
6498470
update with close icon
roychowd Dec 31, 2024
f92684b
Merge pull request #79 from Xkey-AiEstimation/update-color-switcher
roychowd Jan 1, 2025
88ed668
update
roychowd Jan 1, 2025
1133716
Merge pull request #80 from Xkey-AiEstimation/update-color-switcher
roychowd Jan 1, 2025
e800a3e
update
roychowd Jan 2, 2025
4619d37
Merge pull request #81 from Xkey-AiEstimation/update-color-switcher
roychowd Jan 2, 2025
1095286
eraser tool
roychowd Dec 31, 2024
26ca2c4
eraser function
roychowd Jan 2, 2025
7b5d05c
Merge pull request #82 from Xkey-AiEstimation/fix-categories
roychowd Jan 2, 2025
375c860
uipdate
roychowd Jan 2, 2025
9972f3f
Merge pull request #83 from Xkey-AiEstimation/reorder
roychowd Jan 2, 2025
cc34807
ipdte
roychowd Jan 3, 2025
dd53a01
update
roychowd Jan 3, 2025
0ae27b3
Merge pull request #84 from Xkey-AiEstimation/system-categroy
roychowd Jan 3, 2025
a2ccbdf
update
roychowd Jan 4, 2025
8ff5cf4
Merge pull request #85 from Xkey-AiEstimation/ocr-fixes
roychowd Jan 4, 2025
a76c74b
update
roychowd Jan 31, 2025
17fdec4
Merge pull request #86 from Xkey-AiEstimation/fix-point
roychowd Jan 31, 2025
d98be00
update
roychowd Feb 25, 2025
05a11e4
Merge pull request #87 from Xkey-AiEstimation/fix-doubling-counts
roychowd Feb 25, 2025
9bed59d
updategit add --all
roychowd Feb 28, 2025
cfab60d
iupdate
roychowd Feb 28, 2025
0e3c50d
update
roychowd Feb 28, 2025
61bd988
update
roychowd Feb 28, 2025
a4d889c
update
roychowd Feb 28, 2025
9ce6835
update
roychowd Feb 28, 2025
0810bff
Merge pull request #88 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Feb 28, 2025
4412aed
update
roychowd Mar 3, 2025
f900adc
update
roychowd Mar 3, 2025
9b414da
Merge pull request #89 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 3, 2025
f13fb9d
fix edit
roychowd Mar 4, 2025
81ecf74
update
roychowd Mar 4, 2025
a4eba3c
update
roychowd Mar 4, 2025
3f99113
Merge pull request #90 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 4, 2025
0c88864
update
roychowd Mar 4, 2025
2576daa
Merge pull request #91 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 4, 2025
eaa2447
fix scales
roychowd Mar 4, 2025
47befac
remove console
roychowd Mar 4, 2025
f233156
Merge pull request #92 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 4, 2025
552fc90
update
roychowd Mar 5, 2025
d17fb40
update
roychowd Mar 5, 2025
8c67094
update
roychowd Mar 5, 2025
dc5beee
Merge pull request #93 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 5, 2025
d55019e
update
roychowd Mar 5, 2025
1bf54d8
Merge pull request #94 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 5, 2025
1d4cca5
udpate
roychowd Mar 5, 2025
4637d75
Merge pull request #95 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 5, 2025
59fe711
update
roychowd Mar 5, 2025
c8a3d8c
Merge pull request #96 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 5, 2025
d5bd9b0
locate scale
roychowd Mar 6, 2025
43a45ea
update
roychowd Mar 6, 2025
1f0ea69
update
roychowd Mar 6, 2025
3512b60
Merge pull request #97 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 6, 2025
cd95b46
update
roychowd Mar 6, 2025
7368fa0
Merge pull request #98 from Xkey-AiEstimation/fix-devices-sidebarbox
roychowd Mar 6, 2025
d3a87c1
Fix incorrect conduit length
JacHammer Mar 7, 2025
ca1d306
fix-lenghts
roychowd Mar 7, 2025
63e7a32
updaet
roychowd Mar 8, 2025
82d4a75
update
roychowd Mar 8, 2025
50e75af
update
roychowd Mar 8, 2025
6d4c89e
fix lenghts
roychowd Mar 9, 2025
352a83c
update
roychowd Mar 9, 2025
7b5574c
update
roychowd Mar 10, 2025
15d7a69
update
roychowd Mar 10, 2025
f1e97c4
fix colors
roychowd Mar 10, 2025
dbfc02d
update toggle box
roychowd Mar 10, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"presets": [
[ "react-app", { "absoluteRuntime": false } ]
],
"plugins": ["@babel/plugin-proposal-optional-chaining"]
"plugins": ["@babel/plugin-proposal-optional-chaining", "@babel/plugin-proposal-nullish-coalescing-operator"]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ dist
secret.*
secret.story.*
*.secret.*
package-lock.json
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@xkey-aiestimation:registry=https://npm.pkg.github.com
3 changes: 3 additions & 0 deletions ___eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "react-app"
}
30 changes: 24 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@
"@fortawesome/fontawesome-svg-core": "^1.2.12",
"@fortawesome/free-solid-svg-icons": "^5.6.3",
"@fortawesome/react-fontawesome": "^0.1.3",
"@material-ui/core": "^4.6.0",
"@material-ui/icons": "^4.9.1",
"@semantic-release/git": "^9.0.0",
"@xkey-aiestimation/react-material-workspace-layout": "^1.0.9",
"autoseg": "^0.0.12",
"clamp": "^1.0.1",
"color-alpha": "^1.0.4",
"get-image-data": "^3.0.1",
"material-survey": "^1.0.34",
"material-ui-color": "^1.2.0",
"material-ui-color-picker": "^3.5.1",
"mmgc1-cpp": "^1.0.50",
"moment": "^2.23.0",
"react-color": "^2.19.3",
"react-full-screen": "^0.3.1",
"react-hotkeys": "^2.0.0",
"react-json-view": "^1.19.1",
"react-markdown": "^4.0.6",
"react-material-workspace-layout": "^1.0.9",
"react-monaco-editor": "^0.25.1",
"react-remove-scroll": "^2.0.4",
"react-select": "^3.0.8",
Expand All @@ -35,8 +36,13 @@
"use-key-hook": "^1.3.0"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@material-ui/core": "^4.6.0",
"react": "16.13.1",
"react-dom": "16.13.1"
},
"resolutions": {
"**/react": "../Material-Ui-Pro/node_modules/react",
"**/react-dom": "../Material-Ui-Pro/node_modules/react-dom"
},
"homepage": "/react-image-annotate",
"repository": {
Expand All @@ -58,7 +64,18 @@
"prettier:test": "prettier --check \"src/**/*.js\""
},
"eslintConfig": {
"extends": "react-app"
"extends": "react-app",
"parser": "jsx",
"parserOptions": {
"babelOptions": {
"presets": [
[
"babel-preset-react-app",
false
]
]
}
}
},
"browserslist": [
">0.2%",
Expand All @@ -69,6 +86,7 @@
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@storybook/addon-actions": "^5.3.14",
"@storybook/addon-links": "^5.3.14",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React Image Annotation</title>
<title>Xkey Annotator</title>
<link rel="icon" type="image/x-icon" href="/public/favicon.png">
</head>
<body>
<noscript>
Expand Down
Loading