diff --git a/client/certs/192.168.1.164+4-key.pem b/client/certs/192.168.1.164+4-key.pem new file mode 100644 index 0000000..12703eb --- /dev/null +++ b/client/certs/192.168.1.164+4-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9vBYgeFm2nDnj +HJ+Cq4H96adNLrynoFPs0lSxk3YMXG/mP2sXUpqT3P8S7E6QK55IyU0jtiOoYiV1 +bjcTuDrQyZXrtt+Nz0A7vQxtRu8CatXSEG8Vc3y8QrcDT0HfTezHdNkuJXE8cnYv +XSgrZH+cHF996ytOA0lLJWBCHCJH5WIHj5Jziw5dHaLc4mjxSg51xjjqfzLFWQgZ +rOPF6lviAWBFux8RIXXg7nClNvEeyikdraZvVuWFgt89KhN/ePU1Xik/o6++evhT +HxBZqMQHnTp/4h5T25lPGcs0CPPX0afwNSUdPc8yspuSYNcLsWix3oROLMX6cHBa +CTBrtlLzAgMBAAECggEAIBhG7est0dQPfrmCygnVDWyO3mF/jCN0zuStavR0zZZ9 +X0dvCBzzBPwnMb5Dc+PM/KcAo3/V/E/N4lVof690U4kmER94JXbfeLt79KhBGfmU +fdpF0C0e9oGaj7bCf9GgsgS0EDhJNV5vW4e4mc6AP5oVFSnIw4OOzGVgKQ61Rc/e +vaalAEz7xGbsYYh2Y43tFnNA6g/qOzs+H8e2Uv+G9mxx7EID1MG3txJJCBpeUeN5 +JbHQe254IBy4Ko3+i5Tq3ziYL3WyyElCwK5PiRtAP7WNL5AqFT6Fn4L2fULwkTKL +sjPSgGxt7QHomeW+12n9bst1mOEmsz0hTGrAtIf1UQKBgQDu1u7BLdTt9H+zaOFl +XfhOR3GDZnrIs+F6VuEjdjwNEQLKvOYzGhbgDNRArSETK6f03Jvl7ZC9XYwNC836 +J29fHsXVcsMJm8fq69PBSdmMXmOpRfjgALu6DYxK1vBqNQ2ToulCwiWoskKEuPUN +GwVCc/0HcvwZElWZ1UhsB5Xf9wKBgQDLXfMCtsVpfI15w8qEqRCdrCzprHSitcHJ +dCXO72+i9ygMuFtcxo7kgivT0oFUCYmt7Ex+krOlq/xbVLu4sJXWd1FDZ1IeTsIh +cuh4IhSOGJR70S4Q/DzbGUQ08Hu+4hrudaw1Y8Fod0wTERCyOIQiWBfKn3Tab3mk +X29RdGod5QKBgBig5UHaXgijm79+Yy+2vvIjf9sS6DpmAixBZTno6UxXorgRPpOq +bw1vhTueHrkBWXJwhUrycmh0iwqVWwoeoudmHvRhvybwf28EHnPiD6Lf4NsFsiI3 +MSSAXSUigOwSyHGe7PrLVmLM7vsMr4hIbwRpPYBVJRXYxCb2zV8GcTgFAoGBALiV +gWhJNE1We6K1jy9xtF8oU2uU2BiHGGkdPuPgd1dXNca13lcK8c9+RwFv42q/bXOr +MpL/3IbW36qV8fzkalvK2LtxIBvaKGHrxgykAjwnGz520nUgPKww9rOGQwsydndR +3whmjrme7jGwH5NjsKrrgkyrBojs/V+wL32jSF3xAoGAPLmI5gamjEo9K25ojNxO +XjA0fIOxUz/rTPS/qYrxcluXibz8eGXDLq8/D3Q4uWDh18ZQYzWVGoN/x2Qv0srz +SHU4AyJo6+asZAe+viOhAtI81B7uM5V4oyEkPaEASPg6+do/to7SFmdcw/XM/p2v +KYVXalAeFhW0wJ4I4z6DkuU= +-----END PRIVATE KEY----- diff --git a/client/certs/192.168.1.164+4.pem b/client/certs/192.168.1.164+4.pem new file mode 100644 index 0000000..1edf569 --- /dev/null +++ b/client/certs/192.168.1.164+4.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEWTCCAsGgAwIBAgIRAPWg+zwqGDC6qPGon1qGS0cwDQYJKoZIhvcNAQELBQAw +czEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMSQwIgYDVQQLDBttYWJA +bWFydmluIChNYXggR2lhbGFuZWxsYSkxKzApBgNVBAMMIm1rY2VydCBtYWJAbWFy +dmluIChNYXggR2lhbGFuZWxsYSkwHhcNMjIwNjI2MTgxMDE5WhcNMjQwOTI2MTgx +MDE5WjBPMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUx +JDAiBgNVBAsMG21hYkBtYXJ2aW4gKE1heCBHaWFsYW5lbGxhKTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAL28FiB4WbacOeMcn4Krgf3pp00uvKegU+zS +VLGTdgxcb+Y/axdSmpPc/xLsTpArnkjJTSO2I6hiJXVuNxO4OtDJleu2343PQDu9 +DG1G7wJq1dIQbxVzfLxCtwNPQd9N7Md02S4lcTxydi9dKCtkf5wcX33rK04DSUsl +YEIcIkflYgePknOLDl0dotziaPFKDnXGOOp/MsVZCBms48XqW+IBYEW7HxEhdeDu +cKU28R7KKR2tpm9W5YWC3z0qE3949TVeKT+jr756+FMfEFmoxAedOn/iHlPbmU8Z +yzQI89fRp/A1JR09zzKym5Jg1wuxaLHehE4sxfpwcFoJMGu2UvMCAwEAAaOBizCB +iDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgw +FoAUzspSlchxoKIVJLKOhPGrcTFjRyowQAYDVR0RBDkwN4IMbWFydmluLmxvY2Fs +gglsb2NhbGhvc3SHBMCoAaSHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwDQYJKoZI +hvcNAQELBQADggGBAAaTOkCKiVwsapOAuiEt8kG7HS/r4HG+drLzhb2dUFYfqxpz +mfRlRfFA88JN8nyFtOPcpoeOEaTPMi0hxq0rOw9zHPga5kz6LRAUJeADPgA4pw2S +fYT1CEbPMknmHQyhVODKNZN05l3vWC2CL2SDs9lirGVrzmfg7kZ0im8hc81GQgo+ +MsfnC3AT1r1rzMqGLWiBHM8BjeGGwgqjjFZmxoHuGw+0CuV2TZfkZlNoJRtlRtyV +xlkUuRkVDYbLmHLMz7n9+ItOy8epKLToFpIXyhGR+ehAzYyyJeh2SCaboJ71lU+h ++90GQPl20ajWzLtwTsZHEAehHu4l/JLWleNaQh3nVdllHyzvU3IR/C7hhVv6im+q +/KiwDR3W8LqIOGJsemca5iu73EXd1d5UU49alIPm1Ko+Z22X/WMPj74+9CNW65DV +7ebM17NNQgr4tEJdXF3IYwaZ0Epv1/Y7v6bAXT8V2mdjtXfRBwu3HyySl22a9Y4R +h7svqj31cb0ubXEfrA== +-----END CERTIFICATE----- diff --git a/client/src/assets/semantic-helper.css b/client/src/assets/semantic-helper.css index 9f6c823..cebde8e 100644 --- a/client/src/assets/semantic-helper.css +++ b/client/src/assets/semantic-helper.css @@ -290,7 +290,7 @@ i.green.icon.icon.icon.icon { border: none; /*height: calc(100% - 69px);*/ - min-height: 500px; + min-height: 300px; background-color: var(--small_element_bg_color); /*margin-bottom: 15px;*/ @@ -309,6 +309,9 @@ i.green.icon.icon.icon.icon { margin-left: auto; margin-right: auto; max-width: 1100px; + + box-shadow: 0 8px 24px rgba(0,0,0,0.1); + } .squire-box::selection, .squire-box::-moz-selection { @@ -372,8 +375,37 @@ i.green.icon.icon.icon.icon { .squire-box ol, .note-card-text ul, .squire-box ul { - margin: 8px 0 0 0; + margin: 3px 0; + display: block; } + /* Add border 1 indent level */ + .note-card-text > ol > ol, + .squire-box > ol > ol, + .note-card-text > ul > ul, + .squire-box > ul > ul + { + border-left: 1px solid var(--border_color); + } + .note-card-text ol > ol, + .squire-box ol > ol, + .note-card-text ul > ul, + .squire-box ul > ul { + list-style-type: upper-alpha; + } + + +ol { + counter-reset: item; +} +ol li { + display: block; +} +ol li:before { +content: counters(item, ".") "."; +counter-increment: item; +padding-right: 10px; +} + .note-card-text ul > li, .squire-box ul > li { position: relative; @@ -500,10 +532,6 @@ i.green.icon.icon.icon.icon { /* adjust checkboxes for mobile. Make them a little bigger, easier to click */ @media only screen and (max-width: 740px) { - .squire-box { - min-height: calc(100vh - 122px); - } - .ui.button.shrinking { font-size: 0.85714286rem; margin: 0 3px; @@ -940,4 +968,4 @@ i.green.icon.icon.icon.icon { right: 0; background-color: rgba(0,0,0,0.7); z-index: 1000; -} \ No newline at end of file +} diff --git a/client/src/components/GlobalNotificationComponent.vue b/client/src/components/GlobalNotificationComponent.vue index 19f831f..5bc8bd7 100644 --- a/client/src/components/GlobalNotificationComponent.vue +++ b/client/src/components/GlobalNotificationComponent.vue @@ -19,7 +19,7 @@ padding: 1em 5px; cursor: pointer; } - .popup-row > span { + .popup-row > p { /*width: calc(100% - 50px);*/ display: inline-block; text-align: left; @@ -85,6 +85,18 @@ animation: progressBar 3s linear; animation-fill-mode: both; } + .time-display { + display: inline-block; + width: calc(100% - 25px); + /*text-align: right;*/ + color: white; + font-size: 0.7em; + margin: 0 0 0 25px; + } + .text-display { + display: inline-block; + width: 100%; + } @keyframes progressBar { 0% { width: 0; } @@ -101,7 +113,11 @@
+ + {{ item.text }} + {{ item.time }} +
@@ -119,8 +135,8 @@ } }, beforeMount(){ - this.$bus.$on('notification', info => { - this.displayNotification(info) + this.$bus.$on('notification', notificationText => { + this.displayNotification(notificationText) }) }, mounted(){ @@ -131,8 +147,17 @@ }, methods: { - displayNotification(newNotification){ - this.notifications.push(newNotification) + displayNotification(notificationText){ + + const date = new Date() + const time = date.toLocaleTimeString() + + const notification = { + text: notificationText, + time: time + } + + this.notifications.unshift(notification) clearTimeout(this.totalTimeout) this.totalTimeout = setTimeout(() => { this.dismiss() diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue index 54c1937..43e2018 100644 --- a/client/src/components/GlobalSiteMenu.vue +++ b/client/src/components/GlobalSiteMenu.vue @@ -4,6 +4,7 @@ width: 180px; display: block; float: left; + overflow: hidden; } .global-menu { width: 180px; @@ -106,6 +107,7 @@ text-align: center; color: #8c80ae; cursor: pointer; + background-color: var(--menu-background); } .mobile-button { diff --git a/client/src/components/NoteInputPanel.vue b/client/src/components/NoteInputPanel.vue index 81cd542..575f5e2 100644 --- a/client/src/components/NoteInputPanel.vue +++ b/client/src/components/NoteInputPanel.vue @@ -1,133 +1,134 @@ -