From 88b9a552ee9f2a9a83ff7ed91becdb566e4ab5f2 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 2 Apr 2021 11:11:35 +0200 Subject: [PATCH 01/30] Added files with common css styles --- .../static/css/commons/font/fontello.eot | Bin 0 -> 5964 bytes .../static/css/commons/font/fontello.svg | 14 + .../static/css/commons/font/fontello.ttf | Bin 0 -> 5796 bytes .../static/css/commons/font/fontello.woff | Bin 0 -> 3256 bytes .../static/css/commons/font/fontello.woff2 | Bin 0 -> 2584 bytes .../resources/static/css/commons/fontello.css | 59 +++ .../resources/static/css/commons/main.css | 3 + .../resources/static/css/commons/r11form.css | 344 ++++++++++++++++++ src/main/resources/static/css/form.css | 7 + src/main/resources/static/js/datatransfer.js | 2 +- target/classes/static/css/form.css | 7 + target/classes/static/js/datatransfer.js | 2 +- 12 files changed, 436 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/static/css/commons/font/fontello.eot create mode 100644 src/main/resources/static/css/commons/font/fontello.svg create mode 100644 src/main/resources/static/css/commons/font/fontello.ttf create mode 100644 src/main/resources/static/css/commons/font/fontello.woff create mode 100644 src/main/resources/static/css/commons/font/fontello.woff2 create mode 100644 src/main/resources/static/css/commons/fontello.css create mode 100644 src/main/resources/static/css/commons/main.css create mode 100644 src/main/resources/static/css/commons/r11form.css create mode 100644 src/main/resources/static/css/form.css create mode 100644 target/classes/static/css/form.css diff --git a/src/main/resources/static/css/commons/font/fontello.eot b/src/main/resources/static/css/commons/font/fontello.eot new file mode 100644 index 0000000000000000000000000000000000000000..8eb876254bf40f2702d4398804dd26ede72d892c GIT binary patch literal 5964 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/static/css/commons/font/fontello.svg b/src/main/resources/static/css/commons/font/fontello.svg new file mode 100644 index 0000000..66886e8 --- /dev/null +++ b/src/main/resources/static/css/commons/font/fontello.svg @@ -0,0 +1,14 @@ + + + +Copyright (C) 2021 by original authors @ fontello.com + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/css/commons/font/fontello.ttf b/src/main/resources/static/css/commons/font/fontello.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a6a2ea27f9d30977bf801ed88595d942b038ac12 GIT binary patch literal 5796 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 Lp2IJ)0Kk6$Wj?nB literal 0 HcmV?d00001 diff --git a/src/main/resources/static/css/commons/font/fontello.woff2 b/src/main/resources/static/css/commons/font/fontello.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..b1c349be122e72d99908b59525af47d16d8a31b3 GIT binary patch literal 2584 zcmV+z3g`8APew8T0RR91016lY4*&oF02ZVG013hX0RR9100000000000000000000 z0000SR0dW6f_?}N37iZO2nvEEf+7nD00A}vBm)ctAO(d@2R96X92=1pQIu>}n(XI+ z?KJH`cXgqw55nMd%w;L1qU>${|K~LC`~ORpiR6S8Aof`D06Ku|$pF&XmnbRmiq`EC zm!9IP%hm}H-~j)Rwth-ci3PdgA(p{xu&kkypc!`9qW(oaU3D_JS+bU3R+(iclly^ogg^6>sJy6>{vxJAU8v;^*LZP}kiEKmi5=BOl zkC1UL!pF({gtzbAAk-<3Z6Dwt2?Ah2xmL{BeXt9TrSa$rk_Z3*K!9;PEzQr4Ls2Ra z5CA16V;1E7bRQDHPO{Gd+)lnf{f3Gdz#wtBGe%~@Q}{YYF~&RMKNv8xc)Gh109j!p z6q5*14@gEZ9x3e{mR5o6HUSaDSUesv3V|Sq{o|1gx6X!!e2NW`?Enoi23!LF-QTf| zVu9{7%hHp7aI`-`KL41gULyattTc4rz@q!Fh=R$beRtl2exTcQ1VJw`KtQXj0E2n+ z0S@&)`Sk9!IKfMm5-XdY#G2Eu!}xYv*c`@5*CS50N7l#m63KW!=wY0Uj+yn)LBVKo z^s0AKqJc>Ikw;b8-bftA6F-x<4V4q(`#SaF>k~xzIOeNepDky|o5{l?zy6dM4|PMI z5jm;Lppl|J+gpE|RUznl@&%`2(pb4F=c2C<(n`b4mXk%6C8gn&C1bTzTPQiR%>fH+ zT!M}S4k*%BBTisxho|j#|6H=9F7i*3iJbc`Lz#2qDSt#%TFe0nnh6nIFHC%yFnL7r z=)BKR4aj|Mij=#n=_QIF+UmPw7f}I>X#vu@C%iv3X#d-qwR|uKQC_9;(si$Mvh1@6 zo+nYcA#sjlqJRmQd3FRFV^Wsf?9l|WVh4L!L9bB7v>q@+nh6J&|Ab5kL=wT8$>}m} z=yVp0<|*j2c*ai}vR*ogeA^Bdr!=4=qG&c`HT6B6Lh@)FKwBc%TLpMf{pt4a#=dTn z>$FRTKcEF1#uhNq@E0WG@+`FO=6`skvh$osG zY7uv4pu-|orwG@~(5wj_FHlx9}Z}SU9lEgELMpa6uSznUT7h z@td~-UYkM$ts^NJOXkN~1q;7Tcsy!`!y|SFV^QUA!u&eiYdhCsjGZUnhd{0RMvAzV zOGk4+MTP%tAb?5Q_%yuH#f`tL5q#3eUFj zs93L(`e*4v?x0`QH&;)uR6|!A-Bp7%xWne*o(*L)T-=;ce*plDyLO{itG}E5QVX?O zG`#?He&K_OV%&ifXYNYu0{)x6=CscxVh~M>y*AbpCON9y^?>|nLs0e zO28u`5WzBYwMhso&;A%nU22E=#YURaYLxv#_Q*M-7&}QKc$$6++o8E=p0Xn;$7sSr z4O!fMw0S}1S#@s_l-Ecj2$tTE*!4=dl~(FK=fC?U!bu#h}*E=4ao%=R2;9)`6fA(eu)H&$1-q_NNN^|QMcMMTdwJ*3W>?Mq+B#^=y&Y_TrW`aw%&!L=>e&uK zWyre6kqZ->oeyT#-@*3_!88@v96??$x@*F?|5-jY;@lnCiL0qy-<`Fao<}L>N(f9SJ&^s!lrgur2}AT}Of*rib?8CjebS zA1CUsC&2($8f*gyL!4;1o&+OY)#%|6W@8AmafI0f!fH~$UN$8Jnyw?k3{!8mNig^v z3_cHoFTmi7F!&M-z6^t}z&NmqissSt)+$MYsxb6Vm(1~v9RJm3BuJu;!n{Ug>?+V7leOVdF8U6jCqHSe*n`cLkUs0D! zK)6?(a>A|S5GEM*=>xD~&u9e7&N+qiujX39m9i~2Ur(l$lIX%4dDfMz)?2S7Vx86V zzOKhN)t=DP3xVFyvs?ad`GjP`s1+F>EvoTI?78}1Bt1zyj|F~~7Xzi8v6%X60BU}f zOku==A6EDLbKuGU`2U3$)o^SUK^*ZH+%UQfYWutN@Av;ZO#=YL|6xC}tHE3dF0Oz; zS0&;A?}ZULMj3(QNLE#j|E;rRIi)C=oSEn{2{1ayiGf`q0=9f9KA(`2ia-De_~z9s z*GHYr|0+%%1Aw1yov|3ox<3;mIa&z{7|=n$BOyib7=_}`0Krupo8fN961q5YI96t` zq0pUFJmfKum;o%{ zrG-Ioha}(#ey6%e7^7XjJB1UDvu8FyXGkJ)ILHP6Fbg(_7@f zflZkBz{mKmBkd5~?cb)Gd1tTfz!cg63X=^j&wm2Is+i^+958mW>3VzLcJO*%m8MvJ u=f?`9!(j9$@8l^5eX5)X37*_!*Gl1zyaPw!#}vPUxU<8S4}VXZl3^Gn*vAI| literal 0 HcmV?d00001 diff --git a/src/main/resources/static/css/commons/fontello.css b/src/main/resources/static/css/commons/fontello.css new file mode 100644 index 0000000..28bc34a --- /dev/null +++ b/src/main/resources/static/css/commons/fontello.css @@ -0,0 +1,59 @@ +@font-face { + font-family: 'fontello'; + src: url('font/fontello.eot?49304387'); + src: url('font/fontello.eot?49304387#iefix') format('embedded-opentype'), + url('font/fontello.woff2?49304387') format('woff2'), + url('font/fontello.woff?49304387') format('woff'), + url('font/fontello.ttf?49304387') format('truetype'), + url('font/fontello.svg?49304387#fontello') format('svg'); + font-weight: normal; + font-style: normal; + } + /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ + /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ + /* + @media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fontello'; + src: url('../font/fontello.svg?49304387#fontello') format('svg'); + } + } + */ + + [class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: never; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ + } + + .icon-plus:before { content: '\e801'; } /* '' */ + .icon-cancel:before { content: '\e802'; } /* '' */ \ No newline at end of file diff --git a/src/main/resources/static/css/commons/main.css b/src/main/resources/static/css/commons/main.css new file mode 100644 index 0000000..cc1237d --- /dev/null +++ b/src/main/resources/static/css/commons/main.css @@ -0,0 +1,3 @@ +.container { + +} \ No newline at end of file diff --git a/src/main/resources/static/css/commons/r11form.css b/src/main/resources/static/css/commons/r11form.css new file mode 100644 index 0000000..eea242e --- /dev/null +++ b/src/main/resources/static/css/commons/r11form.css @@ -0,0 +1,344 @@ +@import url('https://fonts.googleapis.com/css2?family=Nunito:wght@300;400;700&display=swap'); +@import url('https://necolas.github.io/normalize.css/8.0.1/normalize.css'); +@import url('fontello.css'); + + +.hyperlink, .hyperlink:visited, .hyperlink:active { + color: rgb(47, 125, 146); + cursor: pointer; +} + +.hyperlink:hover { + filter: brightness(120%); +} + +.tooltip-window { + position: fixed; + right: 0; + background: #8ab8c938; + padding: 15px 30px; + font-family: 'Nunito', sans-serif; + width: 40%; + height: 100%; + overflow: scroll; +} + +.tooltip-window.lite { + width: 30%; +} + +.bordered-field { + border: 2px solid rgba(93, 99, 96, 0.705); + border-radius: 5px; + padding: 8px; + +} + +.bordered-field:focus { + outline: none; + box-shadow: 0 0 5px rgba(81, 203, 238); + border: 2px solid #00000070; +} + +.bordered-field:disabled { + background: #eeeeeed2; +} + +.vertically-resizeable { + resize: vertical; +} + +.container { + font-family: 'Nunito', sans-serif; + display: flex; + justify-content: left; + width: 100%; +} + +.tool { + width: 55%; + display: flex; + justify-content: space-evenly; +} + +.tool.extended { + width: 65%; +} + +.tool .tool-context { + width: 90%; +} + +.tool.extended .tool-context { + width: 75%; +} + +.tool.extended .tool-extention { + width: 20%; + padding-top: 2%; + display: block; +} + +.tool .tool-extention { + display: none; +} + +.deletion-button { + padding: 0; + outline: none; + background: none; + border: none; + font-weight: 300; +} + +.deletion-button.btn-tile:hover { + color: #ca1111; +} + +.deletion-button.btn-hashmap { + font-size: 16px; + color: #00000030; + margin: auto 0 auto 0; +} + +.deletion-button.btn-hashmap:hover { + color: #ca1111; +} + +.deletion-button.btn-tile { + width: 10%; + margin: 20% 0 0 0; + font-size: 14px; + color: #00000020 +} + +.tile { + width: 90%; + padding-top: 40%; + border: 1px solid gray; + border-radius: 3px; + position: relative; + background: #f0f0f095; + margin-bottom: 10px; +} + +.tile:hover { + filter: brightness(110%); +} + +.tile.active { + background: #00000070; + color: white; + filter: none; +} + +.tile .content { + position: absolute; + left: 0; + top: 0; + bottom: 0; + right: 0; + padding: 0 2% 0 7%; + display: flex; +} + +.text-aligned-to-right { + text-align: right; +} + +.centered-vertically { + margin-top: auto; + margin-bottom: auto; +} + +.display-space-between { + width: 100%; + display: flex; + justify-content: space-between; +} + +.content p { + margin: 0; + padding: 0; +} + + +.headline { + display: flex; + justify-content: left; +} + +.version-span { + font-size: 13px; + font-weight: 400; + color: rgba(85,85,85,0.555); +} + +.tool-window { + display: block; +} + +.block-label { + display: block; + margin: 0 0 0 5px; +} + +.tabmenu { + display: flex; + flex-direction: row; + text-align: center; + border-bottom: 1px solid rgba(185, 185, 185, 0.3); +} + +.tabitem { + flex-grow: 1; + cursor: pointer; + padding: 5px 0; +} + +.tabitem:hover { + font-weight: 700; +} + +.tabitem.active { + background: rgba(33, 34, 34, 0.705); + color: white; + font-weight: 700; + cursor:default; + flex-grow: 1; +} + +.action-button.active { + background: #3bc4f1; + border: 1px solid #7ed0eb; + cursor: pointer; +} + +.action-button.active:hover { + filter: brightness(110%); +} + +.action-button { + background: rgba(155, 165, 160, 0.507); + border:1px solid rgba(186, 197, 191, 0.507); + color: white; + padding: 10px 20px; + font-weight: 700; + margin: 3px 0; +} + +.medium-input { + width: 50%; +} + +.small-input { + width: 30%; +} + +.large-input { + width: 100%; +} + +.large-button { + width: 100%; +} + +.small-vertical-margin { + margin-top: 10px; + margin-bottom: 10px; +} + +.medium-vertical-margin { + margin-top: 30px; + margin-bottom: 30px; +} + +.large-vertical-margin { + margin-top: 50px; + margin-bottom: 50px; +} + +.textarea-300 { + height: 300px; +} + +.centered-content { + display: flex; + justify-content: center; +} + +.table-map { + width: 60%; +} + +.table-map input{ + width: 100%; + font-size: 16px; + padding: 7px; + border: 1px solid rgba(145, 146, 146, 0.849); + border-radius: 5px; +} + +.table-map input.key { + background: #f0f0f0; +} + +.table-default { + width: 80%; + border-collapse: collapse; + border-spacing: 0; +} + +.table-default tr { + background: #f0f0f02d; +} + +.table-default tr.bottom-border { + border-bottom: 1px solid black; +} + +.table-default th { + background: #ffffff; +} + +.table-default tr.even { + background: #f0f0f0; +} + +.tip { + display: none; +} + +.tip.active { + display: block; +} + +.collapsible .section-button { + width: 100%; + padding: 15px 0; + font-size: 18px; + background: #00000012; + cursor: pointer; +} + +.collapsible .section-button:hover { + filter: brightness(110%); +} + +.collapsible.active .section-button { + background: #00000030; +} + +.collapsible.active .section { + display: block; +} + +.collapsible .section { + display: none; + background: #ffffff50; +} + +.section .content { + padding: 15px 15px 30px 15px ; + text-align: justify; +} \ No newline at end of file diff --git a/src/main/resources/static/css/form.css b/src/main/resources/static/css/form.css new file mode 100644 index 0000000..47188aa --- /dev/null +++ b/src/main/resources/static/css/form.css @@ -0,0 +1,7 @@ +.r11-form { + display: block; +} + +.r11-form input, textarea { + border: +} \ No newline at end of file diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 7e6465f..ba511eb 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -104,7 +104,7 @@ function refreshData(){ } function setCookie(){ - document.cookie = C_UUID + '=' +clientUUID+';' + document.cookie = C_UUID + '=' +clientUUID; document.cookie = C_ID + '=' + lastId; document.cookie = C_ADV + '=' + advancedVisibility; } diff --git a/target/classes/static/css/form.css b/target/classes/static/css/form.css new file mode 100644 index 0000000..47188aa --- /dev/null +++ b/target/classes/static/css/form.css @@ -0,0 +1,7 @@ +.r11-form { + display: block; +} + +.r11-form input, textarea { + border: +} \ No newline at end of file diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index 7e6465f..ba511eb 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -104,7 +104,7 @@ function refreshData(){ } function setCookie(){ - document.cookie = C_UUID + '=' +clientUUID+';' + document.cookie = C_UUID + '=' +clientUUID; document.cookie = C_ID + '=' + lastId; document.cookie = C_ADV + '=' + advancedVisibility; } From 68d4384d515eab184e1a05bc43ab37c968d55167 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 2 Apr 2021 11:31:38 +0200 Subject: [PATCH 02/30] Added ../ prefix for VSC Live Server --- src/main/resources/static/css/commons/main.css | 3 --- src/main/resources/static/html/mock.html | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 src/main/resources/static/css/commons/main.css diff --git a/src/main/resources/static/css/commons/main.css b/src/main/resources/static/css/commons/main.css deleted file mode 100644 index cc1237d..0000000 --- a/src/main/resources/static/css/commons/main.css +++ /dev/null @@ -1,3 +0,0 @@ -.container { - -} \ No newline at end of file diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index e43a22d..2891961 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -3,12 +3,12 @@ R11 MockedServices - - + + - - - + + + @@ -19,10 +19,10 @@

Mocked Service v0.0.1
Your message
- +
From 0348082f9d0d9f0a6f49d372761787630b130adb Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 2 Apr 2021 15:03:38 +0200 Subject: [PATCH 03/30] Implemented first segment of new styles --- .../resources/static/css/commons/r11form.css | 33 ++- src/main/resources/static/html/mock.html | 201 +++++------------- 2 files changed, 75 insertions(+), 159 deletions(-) diff --git a/src/main/resources/static/css/commons/r11form.css b/src/main/resources/static/css/commons/r11form.css index eea242e..469813e 100644 --- a/src/main/resources/static/css/commons/r11form.css +++ b/src/main/resources/static/css/commons/r11form.css @@ -163,9 +163,10 @@ } -.headline { +.float-left { display: flex; justify-content: left; + width: 100%; } .version-span { @@ -174,7 +175,7 @@ color: rgba(85,85,85,0.555); } -.tool-window { +.block-display { display: block; } @@ -227,20 +228,36 @@ margin: 3px 0; } -.medium-input { +.quater-width { + width: 25%; +} + +.half-width { width: 50%; } -.small-input { - width: 30%; +.half-width.with-padding { + width: 45%; } -.large-input { +.max-width { width: 100%; } -.large-button { - width: 100%; +.max-width.with-padding { + width: 94%; +} + +.max-height { + height: 100%; +} + +.max-height.with-padding { + height: 90%; +} + +.small-margins { + margin: 3%; } .small-vertical-margin { diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index 2891961..bd64b5d 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -3,33 +3,39 @@ R11 MockedServices - - - - + - -
-
Mocked Service v0.0.1
-
-
Your message
- -
- +
- - - - - - - - - - - - - +
TimestampType
2021-01-01T10:57:26Client request
2021-01-01T10:57:26Client request
+ + + + + + + + + + + + + + + +
TimestampType
2021-01-01T10:57:26Client request
2021-01-01T10:57:26Client request
diff --git a/src/main/resources/static/js/historyloader.js b/src/main/resources/static/js/historyloader.js index 3107624..f5437e5 100644 --- a/src/main/resources/static/js/historyloader.js +++ b/src/main/resources/static/js/historyloader.js @@ -56,7 +56,8 @@ function historyToHtml(){ var innerHTML = ''; var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations; for(let i=0; i' + '' + historyJson[i].dateTimeStamp + '' + '' + historyJson[i].interfaceName + '' + ''; diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html index 2bd58d8..be3367d 100644 --- a/target/classes/static/html/mock.html +++ b/target/classes/static/html/mock.html @@ -119,23 +119,27 @@
- +
- - - - - - - - - - - - - +
TimestampType
2021-01-01T10:57:26Client request
2021-01-01T10:57:26Client request
+ + + + + + + + + + + + + + + +
TimestampType
2021-01-01T10:57:26Client request
2021-01-01T10:57:26Client request
diff --git a/target/classes/static/js/historyloader.js b/target/classes/static/js/historyloader.js index 3107624..f5437e5 100644 --- a/target/classes/static/js/historyloader.js +++ b/target/classes/static/js/historyloader.js @@ -56,7 +56,8 @@ function historyToHtml(){ var innerHTML = ''; var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations; for(let i=0; i' + '' + historyJson[i].dateTimeStamp + '' + '' + historyJson[i].interfaceName + '' + ''; From 49106717a16a3239a3b12444ad792d2617ec24f6 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 15 Apr 2021 12:51:34 +0200 Subject: [PATCH 27/30] Minor style change. Modal implementation --- .../resources/static/css/commons/r11form.css | 5 +++- src/main/resources/static/html/mock.html | 23 +++++++++++++++++-- target/classes/static/css/commons/r11form.css | 5 +++- target/classes/static/html/mock.html | 23 +++++++++++++++++-- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/css/commons/r11form.css b/src/main/resources/static/css/commons/r11form.css index 7c4a3c6..1aa6319 100644 --- a/src/main/resources/static/css/commons/r11form.css +++ b/src/main/resources/static/css/commons/r11form.css @@ -56,8 +56,11 @@ resize: vertical; } -.container { +body { font-family: 'Nunito', sans-serif; +} + +.container { display: flex; justify-content: left; width: 100%; diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index be3367d..38cc38b 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -131,14 +131,14 @@ - + @@ -225,6 +225,25 @@ +
+ + diff --git a/target/classes/static/css/commons/r11form.css b/target/classes/static/css/commons/r11form.css index 7c4a3c6..1aa6319 100644 --- a/target/classes/static/css/commons/r11form.css +++ b/target/classes/static/css/commons/r11form.css @@ -56,8 +56,11 @@ resize: vertical; } -.container { +body { font-family: 'Nunito', sans-serif; +} + +.container { display: flex; justify-content: left; width: 100%; diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html index be3367d..38cc38b 100644 --- a/target/classes/static/html/mock.html +++ b/target/classes/static/html/mock.html @@ -131,14 +131,14 @@ - + @@ -225,6 +225,25 @@ +
+ + From 679c805c3627509dc4c56cadeb0d9d75beb361f9 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 15 Apr 2021 14:34:18 +0200 Subject: [PATCH 28/30] Warning displayed if trying to change unsaved message --- src/main/resources/static/js/datatransfer.js | 2 +- target/classes/static/js/datatransfer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index f6fdb0d..815cdc3 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -286,7 +286,7 @@ function fillMessageList(){ $("#listItems").append(innerHTML); $('.tile').click(function() { console.log(this); - loadMessage(parseInt($(this).attr('tileid'))); + callLoadMessage(parseInt($(this).attr('tileid'))); }); $('.btn-tile').click(function(){ console.log(this); diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index f6fdb0d..815cdc3 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -286,7 +286,7 @@ function fillMessageList(){ $("#listItems").append(innerHTML); $('.tile').click(function() { console.log(this); - loadMessage(parseInt($(this).attr('tileid'))); + callLoadMessage(parseInt($(this).attr('tileid'))); }); $('.btn-tile').click(function(){ console.log(this); From e94f5335547627790f43c92030630b9211bb78be Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 15 Apr 2021 16:22:50 +0200 Subject: [PATCH 29/30] Message correctly deleted. Pop-up displayed --- src/main/resources/static/js/datatransfer.js | 15 ++++++++++----- target/classes/static/js/datatransfer.js | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 815cdc3..94c41f0 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -284,13 +284,18 @@ function fillMessageList(){ innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType); } $("#listItems").append(innerHTML); - $('.tile').click(function() { - console.log(this); - callLoadMessage(parseInt($(this).attr('tileid'))); + $('.tile').click(function(e) { + var element = $(this); + var button = element.find('.btn-tile').children().get(0); + console.log(button == e.target); + if(!(button == e.target)){ + console.log("Button is not a target. Loading message.") + callLoadMessage(parseInt($(this).attr('tileid'))); + } }); $('.btn-tile').click(function(){ - console.log(this); - removeMessage($(this).closest('.tile').attr('tileId')); + // console.log(this); + callRemoveMessage($(this).closest('.tile').attr('tileId')); }) } diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index 815cdc3..94c41f0 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -284,13 +284,18 @@ function fillMessageList(){ innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType); } $("#listItems").append(innerHTML); - $('.tile').click(function() { - console.log(this); - callLoadMessage(parseInt($(this).attr('tileid'))); + $('.tile').click(function(e) { + var element = $(this); + var button = element.find('.btn-tile').children().get(0); + console.log(button == e.target); + if(!(button == e.target)){ + console.log("Button is not a target. Loading message.") + callLoadMessage(parseInt($(this).attr('tileid'))); + } }); $('.btn-tile').click(function(){ - console.log(this); - removeMessage($(this).closest('.tile').attr('tileId')); + // console.log(this); + callRemoveMessage($(this).closest('.tile').attr('tileId')); }) } From ea19c5bb69b4d6c4b01cc1ee3291467c6f409f3f Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 15 Apr 2021 17:08:00 +0200 Subject: [PATCH 30/30] Header table now triggers modified status --- .../resources/static/css/commons/r11form.css | 4 ++++ src/main/resources/static/html/mock.html | 4 ---- src/main/resources/static/js/datatransfer.js | 24 +++++++++---------- src/main/resources/static/js/modal.js | 1 - target/classes/static/css/commons/r11form.css | 4 ++++ target/classes/static/html/mock.html | 4 ---- target/classes/static/js/datatransfer.js | 24 +++++++++---------- target/classes/static/js/modal.js | 1 - 8 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/main/resources/static/css/commons/r11form.css b/src/main/resources/static/css/commons/r11form.css index 1aa6319..67188b2 100644 --- a/src/main/resources/static/css/commons/r11form.css +++ b/src/main/resources/static/css/commons/r11form.css @@ -187,6 +187,10 @@ body { pointer-events: none; } +.tile.active .btn-tile { + opacity: 0; +} + .tile .content { position: absolute; left: 0; diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index 38cc38b..98e5c9c 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -3,12 +3,8 @@ R11 MockedServices - - - - diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 94c41f0..9fa3c6e 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -1,6 +1,3 @@ -//TODO: Add delete buttons for messages -// TODO: Add function to add row -// TODO: Add remove closest tr function to header rows var clientUUID = ''; var advancedDisplayed = false; var json = {}; @@ -226,10 +223,15 @@ function createLink(uuid, id){ function fillHeaderTable(headers){ var innerHTML = buildHeaderMapHtml(headers); - $('#headerMapTable').html(innerHTML); - $('.tableField').change(function(){setDataModified()}); + refreshHeaderTable(innerHTML); +} + +function refreshHeaderTable(html){ + $('#headerMapTable').html(html); + $('.table-map').change(function(){setDataModified()}); $('.btn-hashmap').click(function(){ $(this).closest('tr').remove(); + setDataModified(); }) } @@ -241,14 +243,11 @@ function buildHeaderMapHtml(headers){ return innerHTML; } -// TODO: Add this click remove closest tr - - function addRow(key, value){ var headerMap = $('#headerMapTable'); var headersMapHtml = headerMap.html(); headersMapHtml += buildRowHtml(key, value); - headerMap.html(headersMapHtml); + refreshHeaderTable(headersMapHtml); } const newRowInput = function(){ @@ -258,6 +257,7 @@ const newRowInput = function(){ addRow(hName.val(), hValue.val()); hName.val(null); hValue.val(null); + setDataModified(); } } @@ -270,8 +270,8 @@ function checkIfInputValid(input){ function buildRowHtml(key, value){ return '' + '' + - '' + - '' + + '' + + '' + '' + ''; } @@ -299,8 +299,6 @@ function fillMessageList(){ }) } - -//TODO: Implement methods where its possible function findJsonById(id){ return json[findJsonIndexById(id)]; } diff --git a/src/main/resources/static/js/modal.js b/src/main/resources/static/js/modal.js index b07de7d..3ea450c 100644 --- a/src/main/resources/static/js/modal.js +++ b/src/main/resources/static/js/modal.js @@ -11,7 +11,6 @@ const dataLossModalYes = dataLossModal.children().eq(2).children().eq(0); const dataLossModalNo = dataLossModal.children().eq(2).children().eq(1); const allModals = $('.modal'); const btnModalClose = $('.modal button'); -//TODO: Implement in datatransfer const closeModals = function() { hideModal(allModals); } diff --git a/target/classes/static/css/commons/r11form.css b/target/classes/static/css/commons/r11form.css index 1aa6319..67188b2 100644 --- a/target/classes/static/css/commons/r11form.css +++ b/target/classes/static/css/commons/r11form.css @@ -187,6 +187,10 @@ body { pointer-events: none; } +.tile.active .btn-tile { + opacity: 0; +} + .tile .content { position: absolute; left: 0; diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html index 38cc38b..98e5c9c 100644 --- a/target/classes/static/html/mock.html +++ b/target/classes/static/html/mock.html @@ -3,12 +3,8 @@ R11 MockedServices - - - - diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index 94c41f0..9fa3c6e 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -1,6 +1,3 @@ -//TODO: Add delete buttons for messages -// TODO: Add function to add row -// TODO: Add remove closest tr function to header rows var clientUUID = ''; var advancedDisplayed = false; var json = {}; @@ -226,10 +223,15 @@ function createLink(uuid, id){ function fillHeaderTable(headers){ var innerHTML = buildHeaderMapHtml(headers); - $('#headerMapTable').html(innerHTML); - $('.tableField').change(function(){setDataModified()}); + refreshHeaderTable(innerHTML); +} + +function refreshHeaderTable(html){ + $('#headerMapTable').html(html); + $('.table-map').change(function(){setDataModified()}); $('.btn-hashmap').click(function(){ $(this).closest('tr').remove(); + setDataModified(); }) } @@ -241,14 +243,11 @@ function buildHeaderMapHtml(headers){ return innerHTML; } -// TODO: Add this click remove closest tr - - function addRow(key, value){ var headerMap = $('#headerMapTable'); var headersMapHtml = headerMap.html(); headersMapHtml += buildRowHtml(key, value); - headerMap.html(headersMapHtml); + refreshHeaderTable(headersMapHtml); } const newRowInput = function(){ @@ -258,6 +257,7 @@ const newRowInput = function(){ addRow(hName.val(), hValue.val()); hName.val(null); hValue.val(null); + setDataModified(); } } @@ -270,8 +270,8 @@ function checkIfInputValid(input){ function buildRowHtml(key, value){ return '' + '' + - '' + - '' + + '' + + '' + '' + ''; } @@ -299,8 +299,6 @@ function fillMessageList(){ }) } - -//TODO: Implement methods where its possible function findJsonById(id){ return json[findJsonIndexById(id)]; } diff --git a/target/classes/static/js/modal.js b/target/classes/static/js/modal.js index b07de7d..3ea450c 100644 --- a/target/classes/static/js/modal.js +++ b/target/classes/static/js/modal.js @@ -11,7 +11,6 @@ const dataLossModalYes = dataLossModal.children().eq(2).children().eq(0); const dataLossModalNo = dataLossModal.children().eq(2).children().eq(1); const allModals = $('.modal'); const btnModalClose = $('.modal button'); -//TODO: Implement in datatransfer const closeModals = function() { hideModal(allModals); }