From 230e3549a7f49058b95ac2cd999547ba2dad1431 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Mon, 13 Jul 2020 11:13:40 +0700
Subject: [PATCH 1/9] disabled title disappearance
---
src/components/flow/Cell/styles.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/flow/Cell/styles.scss b/src/components/flow/Cell/styles.scss
index afad87d3..8f215692 100644
--- a/src/components/flow/Cell/styles.scss
+++ b/src/components/flow/Cell/styles.scss
@@ -30,8 +30,8 @@
}
.title {
- opacity: 0;
- transform: translate(0, 10px);
+ //opacity: 0;
+ //transform: translate(-3px, 3px);
}
}
@include outer_shadow();
From b35143f8437c5115efa4d1f84522eff9212f6267 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Mon, 13 Jul 2020 11:17:26 +0700
Subject: [PATCH 2/9] fixed youtube link z-index
---
src/components/comment/CommentEmbedBlock/styles.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/comment/CommentEmbedBlock/styles.scss b/src/components/comment/CommentEmbedBlock/styles.scss
index 9503311c..56c0e880 100644
--- a/src/components/comment/CommentEmbedBlock/styles.scss
+++ b/src/components/comment/CommentEmbedBlock/styles.scss
@@ -25,7 +25,7 @@
left: 0;
width: 100%;
height: 100%;
- z-index: 7;
+ z-index: 5;
}
svg {
From bb93c558fcaee49950d6746ddb2b4f7da6be0908 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Mon, 13 Jul 2020 11:20:23 +0700
Subject: [PATCH 3/9] smaller gaps on mobile
---
src/containers/flow/FlowLayout/styles.scss | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/containers/flow/FlowLayout/styles.scss b/src/containers/flow/FlowLayout/styles.scss
index f0f4485c..24835389 100644
--- a/src/containers/flow/FlowLayout/styles.scss
+++ b/src/containers/flow/FlowLayout/styles.scss
@@ -44,14 +44,15 @@ $cols: $content_width / $cell;
grid-template-columns: repeat(2, 1fr);
grid-template-rows: 40vh 50vw;
grid-auto-rows: 50vw;
+ grid-column-gap: $gap / 2;
+ grid-row-gap: $gap / 2;
+ padding: 0 $gap / 2;
}
@media (max-width: $cell * 2) {
grid-template-columns: repeat(2, 1fr);
grid-template-rows: 40vh 50vw;
grid-auto-rows: 50vw;
- grid-column-gap: $gap;
- grid-row-gap: $gap;
}
}
From 02ebc3932ecc23c96e1c25a434a9a195b63afba7 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Mon, 13 Jul 2020 15:11:30 +0700
Subject: [PATCH 4/9] showing ellipsis if no title
---
src/components/flow/Cell/index.tsx | 2 +-
src/components/flow/FlowRecentItem/index.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/flow/Cell/index.tsx b/src/components/flow/Cell/index.tsx
index b52d0b16..07b5a323 100644
--- a/src/components/flow/Cell/index.tsx
+++ b/src/components/flow/Cell/index.tsx
@@ -134,7 +134,7 @@ const Cell: FC<IProps> = ({
<Link className={classNames(styles.face)} to={`/post${id}`}>
<div className={styles.face_content}>
- {title && !text && <div className={styles.title}>{title}</div>}
+ {!text && <div className={styles.title}>{title || '...'}</div>}
{!!text && !!thumbnail && (
<div className={styles.text}>
diff --git a/src/components/flow/FlowRecentItem/index.tsx b/src/components/flow/FlowRecentItem/index.tsx
index f4a17ef1..471718e2 100644
--- a/src/components/flow/FlowRecentItem/index.tsx
+++ b/src/components/flow/FlowRecentItem/index.tsx
@@ -20,7 +20,7 @@ const FlowRecentItem: FC<IProps> = ({ node, has_new }) => {
</div>
<div className={styles.info}>
- <div className={styles.title}>{node.title}</div>
+ <div className={styles.title}>{node.title || '...'}</div>
<div className={styles.comment}>{getPrettyDate(node.created_at)}</div>
</div>
</Link>
From 99c0ee7976ad14521599761a20915197811511af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jul 2020 18:44:19 +0000
Subject: [PATCH 5/9] Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)
Signed-off-by: dependabot[bot] <support@github.com>
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 1eb3a54a..179d2b4a 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
"http-errors": "~1.6.2",
"less": "^3.10.3",
"less-middleware": "~2.2.1",
- "lodash": "^4.17.10",
+ "lodash": "^4.17.19",
"node-sass": "^4.11.0",
"photoswipe": "^4.1.3",
"raleway-cyrillic": "^4.0.2",
diff --git a/yarn.lock b/yarn.lock
index b213a395..55aaefe2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5991,10 +5991,10 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
- version "4.17.15"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
- integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+ version "4.17.19"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+ integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
log-symbols@^2.1.0:
version "2.2.0"
From c56a5275c2018bb9ba66376690be1f5c9dd4108a Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Wed, 22 Jul 2020 18:35:36 +0700
Subject: [PATCH 6/9] updated readme
---
README.md | 24 +++++++++++++-----------
src/constants/api.ts | 1 -
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 555299d7..a4cafcaa 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
-### My empty react project template
+This is [vault48.org](https://vault48.org) frontend.
-Includes:
-* react
-* react-redux
-* react-router
-* connected-react-router
-* redux-saga
-* redux-persist
-* less, sass (modular)
-* reduxsauce
-* typescript
+### Installation
+1. Clone this repo `git clone git@github.com:muerwre/vault-frontend.git`
+2. Run `yarn install`
+3. Copy `.env_example` to `.env`
+4. Set it up. You can use https://staging.vault48.org as playground
+
+### Starting
+`yarn start`
+
+### Building
+1. Run `yarn build`
+2. Copy `./dist/*` somewhere
diff --git a/src/constants/api.ts b/src/constants/api.ts
index b89a13a6..1d0f0270 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -11,7 +11,6 @@ export const API = {
MESSAGE_SEND: (username: string) => `/user/${username}/messages`,
GET_UPDATES: '/user/updates',
REQUEST_CODE: (code?: string) => `/user/restore/${code || ''}`,
-
UPLOAD: (target, type) => `/upload/${target}/${type}`,
},
NODE: {
From 1fc6b250f411e501fde9e576e75b12d891df3557 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:38:39 +0000
Subject: [PATCH 7/9] Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)
Signed-off-by: dependabot[bot] <support@github.com>
---
yarn.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 55aaefe2..52ef08c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10208,9 +10208,9 @@ websocket-driver@>=0.5.1:
websocket-extensions ">=0.1.1"
websocket-extensions@>=0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
- integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+ integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
whet.extend@~0.9.9:
version "0.9.9"
From 0962dbc7fbc54fb711d5304f947455e2ae651cc4 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Thu, 23 Jul 2020 10:54:26 +0700
Subject: [PATCH 8/9] breaking words on boris stats
---
src/components/boris/BorisStatsGitCard/styles.module.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/boris/BorisStatsGitCard/styles.module.scss b/src/components/boris/BorisStatsGitCard/styles.module.scss
index 0aac62af..c1d94c51 100644
--- a/src/components/boris/BorisStatsGitCard/styles.module.scss
+++ b/src/components/boris/BorisStatsGitCard/styles.module.scss
@@ -15,4 +15,5 @@
.subject {
font: $font_14_regular;
+ word-break: break-word;
}
From 3cb10177f7c77fd22fe574bb5df7f464b1e0ff9f Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Thu, 23 Jul 2020 11:08:37 +0700
Subject: [PATCH 9/9] hightlighting todos
---
src/styles/global.scss | 20 ++++++++++++++++++++
src/utils/dom.ts | 2 ++
2 files changed, 22 insertions(+)
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 4b112c1a..98ac2bfa 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -49,9 +49,11 @@ body {
&:global(.double) {
height: $spc * 2;
}
+
&:global(.quadro) {
height: $spc * 4;
}
+
&:global(.sixty) {
height: $spc * 6;
}
@@ -83,6 +85,24 @@ body {
color: #555555;
}
+:global {
+ .todo, .done {
+ color: #333333;
+ border-radius: 3px;
+ padding: 0 2px;
+ font: $font_14_semibold;
+ text-transform: uppercase;
+ }
+
+ .todo {
+ background-color: $red;
+ }
+
+ .done {
+ background-color: $green;
+ }
+}
+
:global(h2) {
font: $font_24_bold;
}
diff --git a/src/utils/dom.ts b/src/utils/dom.ts
index 428b9d79..b8fb3b32 100644
--- a/src/utils/dom.ts
+++ b/src/utils/dom.ts
@@ -94,6 +94,8 @@ export const formatText = (text: string): string =>
)
.replace(/:\/\//gim, ':|--|')
.replace(/(\/\/[^\n]+)/gim, '<span class="grey">$1</span>')
+ .replace(/\/\/\s*(todo|туду):?\s*([^\n]+)/gim, '// <span class="todo">$1</span> $2')
+ .replace(/\/\/\s*(done|сделано|сделал|готово|fixed|пофикшено|фиксед):?\s*([^\n]+)/gim, '// <span class="done">$1</span> $2')
.replace(/(\*\*[\s\S]*?\*\*)/gim, '<b class="bold white">$1</b>')
.replace(/(\_\_[\s\S]*?\_\_)/gim, '<i>$1</i>')
.replace(/(\!\![\s\S]*?(\!\!|\n|$))/gim, '<span class="green">$1</span>')