Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lerna": "^3.14.1"
},
"scripts": {
"db:setup": "lerna run db:setup --scope '*/*-server' --stream",
"db:setup": "lerna run db:setup --scope '*/*-shared' --stream",
"build": "lerna run --stream build",
"build:shared": "yarn run --scope '*/*-shared' build",
"start:app": "lerna run --scope '*/*-app' --stream start",
Expand Down
7 changes: 1 addition & 6 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"start:dev": "yarn db:setup && nodemon --ignore ./build --exec babel-node ./src/index.js",
"knex": "npx babel-node ./node_modules/.bin/knex",
"test": "npx mocha test --recursive --exit --require @babel/register",
"db:setup": "./scripts/db-setup.sh"
"db:setup": "lerna run db:setup --scope '*/*-shared' --stream"
},
"dependencies": {
"@aragon/protocol-backend-shared": "^0.2.21",
Expand All @@ -31,12 +31,7 @@
"express-session": "^1.17.0",
"helmet": "^3.21.2",
"http-status-codes": "^1.4.0",
"jsonwebtoken": "^8.5.1",
"knex": "^0.21.0",
"morgan": "^1.9.1",
"objection": "^2.1.3",
"pg": "^7.18.2",
"pg-hstore": "^2.3.3",
"postmark": "^2.5.3",
"prom-client": "^11.5.3",
"regenerator-runtime": "^0.13.3",
Expand Down
26 changes: 0 additions & 26 deletions packages/server/scripts/db-setup.sh

This file was deleted.

47 changes: 0 additions & 47 deletions packages/server/scripts/notify-appeals-confirm.js

This file was deleted.

60 changes: 0 additions & 60 deletions packages/server/scripts/notify-fee-mechanism-upgrade.js

This file was deleted.

44 changes: 0 additions & 44 deletions packages/server/scripts/notify-unverified-anj-registrations.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/server/src/controllers/AdminsController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Admin } from '../models/objection'
import { Admin } from '@aragon/protocol-backend-shared/build/models/objection'
import HttpError from '../errors/http-error'
import AdminValidator from '../validators/AdminValidator'

Expand Down
8 changes: 4 additions & 4 deletions packages/server/src/controllers/EmailsController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { User } from '../models/objection'
import emailClient from '@aragon/protocol-backend-shared/helpers/email-client'
import sleep from '@aragon/protocol-backend-shared/helpers/sleep'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import emailClient from '@aragon/protocol-backend-shared/build/helpers/email-client'
import sleep from '@aragon/protocol-backend-shared/build/helpers/sleep'

export default {
async send(req, res) {
Expand Down Expand Up @@ -40,7 +40,7 @@ async function sendEmails(users, TemplateModel, res) {
}
}
console.log(`Total emails: ${emails.size}`)
await sleep(0.1) // sleep to make sure Total emails is in the next chunk
await sleep(100) // sleep to make sure Total emails is in the next chunk
res.write(`Total emails: ${emails.size}`)
res.end()
}
2 changes: 1 addition & 1 deletion packages/server/src/controllers/RevealsController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Reveal } from '../models/objection'
import { Reveal } from '@aragon/protocol-backend-shared/build/models/objection'
import HttpError from '../errors/http-error'
import RevealsValidator from '../validators/RevealsValidator'
import { decodeVoteId } from '@aragon/protocol-backend-shared/helpers/voting'
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/controllers/UserEmailController.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import HttpError from '../errors/http-error'
import UsersValidator from '../validators/UsersValidator'
import UserEmailVerificationTokenValidator from '../validators/UserEmailVerificationTokenValidator'
import { User } from '../models/objection'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'

export default {
async get(req, res) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import HttpError from '../errors/http-error'
import { User } from '../models/objection'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'

export default {
async set(req, res) {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/controllers/UserSessionsController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import HttpError from '../errors/http-error'
import UserSessionsValidator from '../validators/UserSessionsValidator'
import { User } from '../models/objection'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'

export default {
async create(req, res) {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/controllers/UsersController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import HttpError from '../errors/http-error'
import UsersValidator from '../validators/UsersValidator'
import { User, UserEmail } from '../models/objection'
import { User, UserEmail } from '@aragon/protocol-backend-shared/build/models/objection'

export default {
async details(req, res) {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading