mirror of
https://github.com/usatiuk/writer.git
synced 2025-10-29 00:17:48 +01:00
Compare commits
20 Commits
c0772d000c
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54dd7a139f | ||
|
|
42f51274a0 | ||
|
|
f35e1344b3 | ||
|
|
74655ac753 | ||
|
|
eb0dd1f8a5 | ||
|
|
dc483d00a7 | ||
|
|
4a1906bda2 | ||
|
|
28cb3e27b5 | ||
|
|
8ea9e94694 | ||
|
|
ffb15db043 | ||
|
|
1c7fe9e3dd | ||
|
|
8a3e04c745 | ||
| 6292c24a83 | |||
| a93fa3ad68 | |||
| 92dd230557 | |||
| 3340a1d88e | |||
| 0371626b4a | |||
| 96d8211cb5 | |||
| fdfed6e6a0 | |||
| c3b13fbd9b |
@@ -2,8 +2,8 @@ version: 2
|
||||
jobs:
|
||||
test-backend:
|
||||
docker:
|
||||
- image: circleci/node:14
|
||||
- image: circleci/mariadb:latest
|
||||
- image: cimg/node:14.20
|
||||
- image: cimg/mariadb:10.8
|
||||
environment:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
|
||||
MYSQL_DATABASE: writer_test
|
||||
@@ -35,7 +35,7 @@ jobs:
|
||||
|
||||
test-frontend:
|
||||
docker:
|
||||
- image: circleci/node:12
|
||||
- image: cimg/node:14.20
|
||||
|
||||
working_directory: ~/writer/frontend
|
||||
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
|
||||
test-frontend-build:
|
||||
docker:
|
||||
- image: circleci/node:12
|
||||
- image: cimg/node:14.20
|
||||
|
||||
working_directory: ~/writer/frontend
|
||||
|
||||
@@ -112,9 +112,10 @@ jobs:
|
||||
command: cd frontend && npm run build
|
||||
build:
|
||||
machine:
|
||||
image: ubuntu-2004:202107-01
|
||||
image: ubuntu-2004:current
|
||||
working_directory: ~/writer
|
||||
|
||||
resource_class: large
|
||||
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
@@ -131,8 +132,33 @@ jobs:
|
||||
|
||||
- run:
|
||||
name: build and push to docker hub
|
||||
#command: docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag stepanusatiuk/writer:latest .
|
||||
command: docker buildx build --push --platform linux/amd64 --tag stepanusatiuk/writer:$CIRCLE_BRANCH .
|
||||
command: docker buildx build --push --platform linux/arm64,linux/amd64 --tag stepanusatiuk/writer:$CIRCLE_BRANCH .
|
||||
#command: docker buildx build --push --platform linux/amd64 --tag stepanusatiuk/writer:$CIRCLE_BRANCH .
|
||||
|
||||
# build-arm:
|
||||
# machine:
|
||||
# image: ubuntu-2004:current
|
||||
# resource_class: arm.medium
|
||||
# working_directory: ~/writer
|
||||
#
|
||||
# steps:
|
||||
# - checkout
|
||||
# - run:
|
||||
# name: log in to docker hub
|
||||
# command: echo "$DOCKER_PASSWORD" | docker login --username $DOCKER_USERNAME --password-stdin
|
||||
#
|
||||
# - run:
|
||||
# name: install emulators
|
||||
# command: docker run --privileged --rm tonistiigi/binfmt --install all
|
||||
#
|
||||
# - run:
|
||||
# name: create docker builder
|
||||
# command: docker buildx create --use
|
||||
#
|
||||
# - run:
|
||||
# name: build and push to docker hub
|
||||
# #command: docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag stepanusatiuk/writer:latest .
|
||||
# command: docker buildx build --push --platform linux/arm64 --tag stepanusatiuk/writer:$CIRCLE_BRANCH .
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
@@ -148,3 +174,8 @@ workflows:
|
||||
- test-backend
|
||||
- test-frontend
|
||||
- test-frontend-build
|
||||
# - build-arm:
|
||||
# requires:
|
||||
# - test-backend
|
||||
# - test-frontend
|
||||
# - test-frontend-build
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
A simple web/markdown-based note taking app
|
||||
|
||||
You can take a look at the hosted version on heroku: https://ustk-writer.herokuapp.com
|
||||
|
||||

|
||||
|
||||
This is a notebook app written in typescript using koa for the backend and react+redux for the frontend.
|
||||
|
||||
67
frontend/package-lock.json
generated
67
frontend/package-lock.json
generated
@@ -1570,9 +1570,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"ansi-regex": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
|
||||
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
|
||||
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
|
||||
},
|
||||
"strip-ansi": {
|
||||
"version": "4.0.0",
|
||||
@@ -2259,9 +2259,9 @@
|
||||
}
|
||||
},
|
||||
"ansi-regex": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
|
||||
"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
|
||||
},
|
||||
"ansi-styles": {
|
||||
"version": "3.2.1",
|
||||
@@ -3881,7 +3881,7 @@
|
||||
"ansi-regex": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
|
||||
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
|
||||
"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
|
||||
},
|
||||
"ansi-styles": {
|
||||
"version": "2.2.1",
|
||||
@@ -4207,9 +4207,9 @@
|
||||
"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
|
||||
},
|
||||
"decode-uri-component": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
|
||||
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
|
||||
"version": "0.2.2",
|
||||
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
|
||||
"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
|
||||
},
|
||||
"dedent": {
|
||||
"version": "0.7.0",
|
||||
@@ -5637,7 +5637,7 @@
|
||||
"ansi-regex": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
|
||||
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
|
||||
"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -7704,12 +7704,9 @@
|
||||
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
|
||||
},
|
||||
"json5": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
|
||||
"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
|
||||
"requires": {
|
||||
"minimist": "^1.2.5"
|
||||
}
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
|
||||
"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
|
||||
},
|
||||
"jsprim": {
|
||||
"version": "1.4.1",
|
||||
@@ -7790,9 +7787,9 @@
|
||||
}
|
||||
},
|
||||
"loader-utils": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
|
||||
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
|
||||
"version": "1.4.2",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
|
||||
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
|
||||
"requires": {
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^3.0.0",
|
||||
@@ -7800,9 +7797,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"json5": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
|
||||
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
|
||||
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
|
||||
"requires": {
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
@@ -8077,9 +8074,9 @@
|
||||
"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
|
||||
},
|
||||
"minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
|
||||
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
||||
"requires": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
}
|
||||
@@ -8590,9 +8587,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"ansi-regex": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
|
||||
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
|
||||
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
|
||||
},
|
||||
"strip-ansi": {
|
||||
"version": "4.0.0",
|
||||
@@ -8773,9 +8770,9 @@
|
||||
}
|
||||
},
|
||||
"json5": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
|
||||
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
|
||||
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
|
||||
"requires": {
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
@@ -10065,9 +10062,9 @@
|
||||
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
|
||||
},
|
||||
"qs": {
|
||||
"version": "6.5.2",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
|
||||
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
|
||||
"version": "6.5.3",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
|
||||
"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
|
||||
},
|
||||
"querystring": {
|
||||
"version": "0.2.0",
|
||||
|
||||
1590
package-lock.json
generated
1590
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@@ -27,11 +27,11 @@
|
||||
"eslint-config-airbnb": "^18.2.1",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-import-resolver-typescript": "^2.4.0",
|
||||
"eslint-plugin-import": "^2.23.4",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-mocha": "^9.0.0",
|
||||
"eslint-plugin-prettier": "^3.4.0",
|
||||
"husky": "^7.0.1",
|
||||
"mocha": "^9.0.3",
|
||||
"mocha": "^9.2.2",
|
||||
"prettier": "^2.3.2",
|
||||
"supertest": "^6.1.4",
|
||||
"ts-node-dev": "^1.1.8"
|
||||
@@ -39,12 +39,12 @@
|
||||
"dependencies": {
|
||||
"@koa/cors": "^3.1.0",
|
||||
"bcrypt": "^5.0.1",
|
||||
"concurrently": "^6.2.0",
|
||||
"concurrently": "^6.5.1",
|
||||
"cross-env": "^7.0.3",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"jsonwebtoken": "^9.0.0",
|
||||
"koa": "^2.13.1",
|
||||
"koa-body": "^4.2.0",
|
||||
"koa-jwt": "^4.0.1",
|
||||
"koa-jwt": "^4.0.4",
|
||||
"koa-logger": "^3.2.1",
|
||||
"koa-router": "^10.0.0",
|
||||
"koa-send": "^5.0.1",
|
||||
|
||||
Reference in New Issue
Block a user