stepus53/writer
1
0
Fork 0
mirror of https://github.com/usatiuk/writer.git synced 2025-10-29 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

update stuff, format sccs

Browse Source
This commit is contained in:
Stepan Usatiuk
2019-06-26 20:13:28 +03:00
parent 12c42d759d
commit 5f5bd3da96
8 changed files with 442 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
frontend/package-lock.json generated
View File

@@ -907,9 +907,9 @@
}
},
"@blueprintjs/core": {
"version": "3.15.1",
"resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.15.1.tgz",
"integrity": "sha512-M8ltbqqlMZuZ6SEuqo/3Fr59ZcUfd8Er7ocbm7EACVfRW7dRhOCd/TKkf2kfICNtCDwznwXk0iAePLXZhUGtQg==",
"version": "3.16.2",
"resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.16.2.tgz",
"integrity": "sha512-u+mSITWaNDwbdaPrbKx9XyxGsF4725SCAidWjd367ysX7AxCo4PK4SsFQVfXNylXpVWHQhJZekuo7+hdksc9lA==",
"requires": {
"@blueprintjs/icons": "^3.8.0",
"@types/dom4": "^2.0.1",
@@ -1198,9 +1198,9 @@
}
},
"@redux-saga/core": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.0.2.tgz",
"integrity": "sha512-AsJYcpuYfM1cmxJvfhXs9HAFSZVEG17TMsLPlXH7+Hq5a5ZP4GqcbtijEmS2AC7NR5lLJHy8csxpqz22PeW5dw==",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.0.3.tgz",
"integrity": "sha512-zf8h5N0oTzaNeSMxOWH9GJMB9IRSM8JubDsrZVsvVltXjzFFSR8DNt7tbPoRJUK0hFfQB1it+bL+dEMWpD7wXA==",
"requires": {
"@babel/runtime": "^7.0.0",
"@redux-saga/deferred": "^1.0.1",
@@ -1316,9 +1316,9 @@
"integrity": "sha512-kSkVAvWmMZiCYtvqjqQEwOmvKwcH+V4uiv3qPQ8pAh1Xl39xggGEo8gHUqV4waYGHezdFw0rKBR8Jt0CrQSDZA=="
},
"@types/enzyme": {
"version": "3.9.3",
"resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.9.3.tgz",
"integrity": "sha512-jDKoZiiMA3lGO3skSO7dfqEHNvmiTLLV+PHD9EBQVlJANJvpY6qq1zzjRI24ZOtG7F+CS7BVWDXKewRmN8PjHQ==",
"version": "3.9.4",
"resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.9.4.tgz",
"integrity": "sha512-bQcwt5gcKnekrbci4hcapfE2J6rkkFbHM1l4VobLtSl4ogOfj0lvSxrdS6FftCakmJqqPBqdQCwb5KnlivL6SQ==",
"dev": true,
"requires": {
"@types/cheerio": "*",
@@ -1392,9 +1392,9 @@
}
},
"@types/jest": {
"version": "24.0.13",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.13.tgz",
"integrity": "sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==",
"version": "24.0.15",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz",
"integrity": "sha512-MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==",
"dev": true,
"requires": {
"@types/jest-diff": "*"
@@ -1449,9 +1449,9 @@
"dev": true
},
"@types/react": {
"version": "16.8.19",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.19.tgz",
"integrity": "sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==",
"version": "16.8.22",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.22.tgz",
"integrity": "sha512-C3O1yVqk4sUXqWyx0wlys76eQfhrQhiDhDlHBrjER76lR2S2Agiid/KpOU9oCqj1dISStscz7xXz1Cg8+sCQeA==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@@ -1468,9 +1468,9 @@
}
},
"@types/react-redux": {
"version": "7.0.9",
"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.0.9.tgz",
"integrity": "sha512-fMVX9SneWWw68d/JoeNUh6hj42kx2G30YhPdCYJTOv3xqbJ1xzIz6tEM/xzi7nBvpNbwZkSa9TMsV06kWOFIIg==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.0.tgz",
"integrity": "sha512-SBJd6oNACDU/taMcDzFfj0mbVa+OI42L8WNvgPsCWiWUNIavPLeX5oA22V64tYIDUc7cGmJjDyLlWeCrqpZu1w==",
"dev": true,
"requires": {
"@types/hoist-non-react-statics": "^3.3.0",
@@ -1480,9 +1480,9 @@
}
},
"@types/react-router": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.0.1.tgz",
"integrity": "sha512-vOyVO0u3Cs0w6G5DzYqNVqcTsurEnDgOmmkJf2s7VwtunWzpPgI6dHsCBX68vXqeICpP6jCfojgJcHkm5BV7hQ==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.0.2.tgz",
"integrity": "sha512-sdMN284GEOcqDEMS/hE/XD06Abw2fws30+xkZf3C9cSRcWopiv/HDTmunYI7DKLYKVRaWFkq1lkuJ6qeYu0E7A==",
"dev": true,
"requires": {
"@types/history": "*",
@@ -1490,9 +1490,9 @@
}
},
"@types/react-router-dom": {
"version": "4.3.3",
"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.3.tgz",
"integrity": "sha512-xj0DmFjgvAqRfh/kJPO7apD5G30yPQe+8slu/dugioQOkdKpyzc4Fgk4hoTelm6CSHz7pI2PPsW5+Y6GRBF2zw==",
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.4.tgz",
"integrity": "sha512-xrwaWHpnxKk/TTRe7pmoGy3E4SyF/ojFqNfFJacw7OLdfLXRvGfk4r/XePVaZNVfeJzL8fcnNilPN7xOdJ/vGw==",
"dev": true,
"requires": {
"@types/history": "*",
@@ -3471,9 +3471,9 @@
}
},
"dom4": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/dom4/-/dom4-2.1.4.tgz",
"integrity": "sha512-7NNKNViuZYu4GaZMUsSbsV6MFsT/ZpYNKP1NT4YIUgAvwPR8ODuvQEZZ7vRC1u5Y4dHwQ7je/UNOlRRWkaCyvw=="
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/dom4/-/dom4-2.1.5.tgz",
"integrity": "sha512-gJbnVGq5zaBUY0lUh0LUEVGYrtN75Ks8ZwpwOYvnVFrKy/qzXK4R/1WuLIFExWj/tBxbRAkTzZUGJHXmqsBNjQ=="
},
"domain-browser": {
"version": "1.2.0",
@@ -8485,9 +8485,9 @@
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-markdown": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-4.0.8.tgz",
"integrity": "sha512-Z6oa648rufvzyO0KwYJ/9p9AsdYGIluqK6OlpJ35ouJ8HPF0Ko1WDNdyymjDSHxNrkb7HDyEcIDJCQs8NlET5A==",
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-4.1.0.tgz",
"integrity": "sha512-EOHsEAN+aoP8UVz7vTHx6Z63GJfhrO9KItKlfsiBtVVS9tmSWtUaBTw73+2SObrWiOiE2Cs9qUBL7ORsvVhOrA==",
"requires": {
"html-to-react": "^1.3.4",
"mdast-add-list-metadata": "1.0.1",
@@ -8524,11 +8524,11 @@
}
},
"react-redux": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.0.3.tgz",
"integrity": "sha512-vYZA7ftOYlDk3NetitsI7fLjryt/widNl1SLXYvFenIpm7vjb4ryK0EeFrgn62usg5fYkyIAWNUPKnwWPevKLg==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.0.tgz",
"integrity": "sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==",
"requires": {
"@babel/runtime": "^7.4.3",
"@babel/runtime": "^7.4.5",
"hoist-non-react-statics": "^3.3.0",
"invariant": "^2.2.4",
"loose-envify": "^1.4.0",
@@ -8536,6 +8536,14 @@
"react-is": "^16.8.6"
},
"dependencies": {
"@babel/runtime": {
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
"integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
"requires": {
"regenerator-runtime": "^0.13.2"
}
},
"prop-types": {
"version": "15.7.2",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -8580,9 +8588,9 @@
}
},
"react-spring": {
"version": "8.0.22",
"resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.22.tgz",
"integrity": "sha512-X2E75K9JvwqUGzTE9v1B3f0po6eOr2LwErXG4MNZ+QXl5LmBsprbH+ZUEgyDj9p8ZRIhdtIlndvhYtmG9Etl6g==",
"version": "8.0.25",
"resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.25.tgz",
"integrity": "sha512-KLSLI9ccpoxvxzCbtTqSOHNHhndxAeEcHsgFZoyybP3GpGh0axmtauUAH8c3XkozIW8r9gScvrCWw3F1EPIcBw==",
"requires": {
"@babel/runtime": "^7.3.1",
"prop-types": "^15.5.8"
@@ -8688,11 +8696,11 @@
"integrity": "sha512-sSJAzNq7zka3qVHKce1hbvqf0Vf5DuTVm7dr4GtsqQVOexnrvbV47RWFiPxQ8fscnyiuWyD2O92DOxPl0tGCRg=="
},
"redux-saga": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.0.2.tgz",
"integrity": "sha512-dHV256by3eF2AnBPx1l3HqazQFkErZ82HDXgh4jSRpT72OrX31wyg8DA1q8+0HvENRfJAyhT/4qT5yH/vVqFfw==",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.0.3.tgz",
"integrity": "sha512-ORo16st4cvrS+tpthMi6mJz1mMIuM//0EKFPAZjKTvDglRDebc7vTOJa0oeqT0iAZeYupusAstprFb0+3YDw/w==",
"requires": {
"@redux-saga/core": "^1.0.2"
"@redux-saga/core": "^1.0.3"
}
},
"reflect.ownkeys": {
@@ -9036,9 +9044,9 @@
}
},
"sass": {
"version": "1.21.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.21.0.tgz",
"integrity": "sha512-67hIIOZZtarbhI2aSgKBPDUgn+VqetduKoD+ZSYeIWg+ksNioTzeX+R2gUdebDoolvKNsQ/GY9NDxctbXluTNA==",
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.22.0.tgz",
"integrity": "sha512-6BEkdLYPP26cKggrMuBjMWpguMFgeayW+35LGnzXqCipm86fUboSVAdRLFKRpk1ClMNzFZums6kKkjgWF00WoA==",
"dev": true,
"requires": {
"chokidar": "^2.0.0"
@@ -10045,9 +10053,9 @@
}
},
"ua-parser-js": {
"version": "0.7.19",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz",
"integrity": "sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ=="
"version": "0.7.20",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
"integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
},
"uglify-js": {
"version": "3.6.0",

24
frontend/package.json
View File

@@ -7,17 +7,17 @@
},
"devDependencies": {
"@types/autoprefixer": "^9.5.0",
"@types/enzyme": "^3.9.3",
"@types/enzyme": "^3.9.4",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/highlight.js": "^9.12.3",
"@types/jest": "^24.0.13",
"@types/jest": "^24.0.15",
"@types/node-sass": "^4.11.0",
"@types/parcel-bundler": "^1.12.0",
"@types/react": "^16.8.19",
"@types/react": "^16.8.22",
"@types/react-dom": "^16.8.4",
"@types/react-redux": "^7.0.9",
"@types/react-router": "^5.0.1",
"@types/react-router-dom": "^4.3.3",
"@types/react-redux": "^7.1.0",
"@types/react-router": "^5.0.2",
"@types/react-router-dom": "^4.3.4",
"@types/sass": "^1.16.0",
"autoprefixer": "^9.6.0",
"enzyme": "^3.10.0",
@@ -26,23 +26,23 @@
"parcel-bundler": "^1.12.3",
"postcss-modules": "^1.4.1",
"redux-devtools-extension": "^2.13.8",
"sass": "^1.21.0",
"sass": "^1.22.0",
"ts-jest": "^24.0.2"
},
"dependencies": {
"@blueprintjs/core": "^3.15.1",
"@blueprintjs/core": "^3.16.2",
"@blueprintjs/icons": "^3.9.0",
"highlight.js": "^9.15.8",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-markdown": "^4.0.8",
"react-redux": "^7.0.3",
"react-markdown": "^4.1.0",
"react-redux": "^7.1.0",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1",
"react-spring": "^8.0.22",
"react-spring": "^8.0.25",
"redux": "^4.0.1",
"redux-persist": "^5.10.0",
"redux-saga": "^1.0.2"
"redux-saga": "^1.0.3"
},
"postcss": {
"plugins": {

7
frontend/src/Auth/Auth.scss
View File

@@ -1,4 +1,5 @@
@import "~@blueprintjs/core/lib/scss/variables";
.AuthForm {
margin: auto;
margin-top: 10rem;
@@ -6,26 +7,32 @@
left: 0;
right: 0;
position: absolute;
form {
display: flex;
flex-direction: column;
h2 {
margin-bottom: 1rem;
}
.header,
.footer {
display: flex;
flex-direction: row;
align-items: baseline;
button.change {
margin-left: auto;
}
}
.footer {
#error {
height: 1rem;
color: $pt-intent-danger;
}
button.submit {
margin-left: auto;
}

41
frontend/src/Documents/Docs.scss
View File

@@ -1,7 +1,9 @@
@import "~@blueprintjs/core/lib/scss/variables";
#overview {
display: flex;
flex-direction: column;
.separator {
transition: 0.3s;
margin: 2rem 0;
@@ -9,14 +11,17 @@
border-bottom: 1px $light-gray1 dashed;
transition: 0.3s;
}
.section {
width: 100%;
}
.list {
display: flex;
flex-shrink: 0;
flex-grow: 0;
flex-wrap: wrap;
.card {
transition: 0.3s;
user-select: none;
@@ -25,6 +30,7 @@
margin: 1rem;
padding: 0rem;
overflow: hidden;
h4 {
transition: 0.3s;
transition: 0.3s;
@@ -33,6 +39,7 @@
border-bottom: 1px $light-gray2 solid;
margin-bottom: 0;
}
.textPreview {
transition: 0.3s;
pointer-events: none;
@@ -41,11 +48,13 @@
padding: 0.5rem;
padding-top: 0.5rem;
color: $dark-gray5;
ul {
padding-left: 1rem;
}
}
}
.card.newDocumentCard {
background-color: $light-gray5;
color: $gray2;
@@ -59,32 +68,43 @@
.document {
height: 100%;
margin-bottom: 1rem;
.documentHeader {
display: flex;
align-content: baseline;
h1 {
margin-left: 0;
margin-right: auto;
flex-shrink: 0;
min-width: 0;
flex-grow: 1;
}
input {
transition: 0.3s;
font-weight: 600;
font-size: 2rem;
height: 3rem;
min-width: 0;
flex-grow: 1;
}
.buttons {
margin-left: auto;
margin-right: 0;
display: flex;
justify-content: end;
flex-shrink: 0;
flex-grow: 0;
button {
width: 3rem;
}
}
margin-bottom: 1rem;
}
textarea,
.documentContents {
transition: 0.3s;
@@ -96,29 +116,34 @@
margin-bottom: 1rem;
min-width: 100%;
resize: none;
code {
transition: 0.3s;
border-radius: 3px;
border: 1px solid $light-gray2;
background-color: $light-gray5;
}
pre {
transition: 0.3s;
border-radius: 3px;
border: 1px solid $light-gray2;
background-color: $light-gray5;
padding: 0.75rem;
code {
padding: 0;
background-color: inherit;
border: none;
}
}
table {
transition: 0.3s;
border-radius: 3px;
border: 1px solid $light-gray2;
border-collapse: collapse;
tr,
td,
th {
@@ -126,12 +151,14 @@
padding: 0.5rem;
border: 1px solid $light-gray2;
}
tr:nth-child(even) {
transition: 0.3s;
background-color: $light-gray5;
}
}
}
.documentContents {
transition: 0.3s;
border: 1px solid $light-gray1;
@@ -145,55 +172,67 @@
transition: 0.3s;
border-bottom: 1px $dark-gray5 dashed;
}
.list {
.card {
transition: 0.3s;
h4 {
transition: 0.3s;
border-bottom: 1px $dark-gray2 solid;
}
.textPreview {
transition: 0.3s;
color: $light-gray1;
}
}
.card.newDocumentCard {
background-color: $dark-gray4;
color: $gray1;
}
}
}
.documentHeader {
input {
transition: 0.3s;
background: $dark-gray4;
}
}
.document {
textarea,
.documentContents {
transition: 0.3s;
background: $dark-gray4;
border-color: $dark-gray1;
code {
transition: 0.3s;
border-color: $dark-gray2;
background-color: $dark-gray3;
}
pre {
transition: 0.3s;
border-color: $dark-gray2;
background-color: $dark-gray3;
}
table {
transition: 0.3s;
border-color: $dark-gray2;
tr,
td,
th {
transition: 0.3s;
border-color: $dark-gray2;
}
tr:nth-child(even) {
transition: 0.3s;
background-color: $dark-gray3;

5
frontend/src/Home/Home.scss
View File

@@ -1,4 +1,5 @@
@import "~@blueprintjs/core/lib/scss/variables";
.viewComponent {
position: absolute;
max-width: 100%;
@@ -15,9 +16,11 @@
#mainContainer {
transition: 0.3s;
#MainScreen {
transition: 0.3s;
}
.bp3-navbar {
transition: 0.3s;
}
@@ -25,10 +28,12 @@
#mainContainer.bp3-dark {
transition: 0.3s;
#MainScreen {
transition: 0.3s;
background: $dark-gray3;
}
.bp3-navbar {
transition: 0.3s;
}