Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump node-fetch from 2.6.0 to 2.6.7 in /frontend #54

Open
wants to merge 88 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
bcd6131
Merge pull request #3 from ATLANTBH/develop
kkenan Sep 2, 2019
d0d7c1c
Merge branch 'deploy' of github.com:ATLANTBH/atlanters-anonymous into…
fvedad Sep 2, 2019
64a54b4
Add https
fvedad Sep 2, 2019
b034ec7
Add current host as link
fvedad Sep 3, 2019
c70329e
Add console output for socket error
fvedad Sep 3, 2019
cfbd4f1
Remove ssl from socket url for testing purposes
fvedad Sep 3, 2019
35d8319
Add more logs, put back ssl
fvedad Sep 3, 2019
a8393c1
Add more logs, put back ssl
fvedad Sep 3, 2019
c581c1b
Enhancing Jenkinsfile to propagate jwt_secret/cookie_s credentials
bjusufbe Sep 4, 2019
13c0efd
small fix for value in deployment.yaml
bjusufbe Sep 4, 2019
3d279a6
Fix chat errors and replace plain text with html in email
fvedad Sep 3, 2019
ceb2723
Merge branch 'develop' of github.com:ATLANTBH/atlanters-anonymous int…
fvedad Sep 4, 2019
c8e3246
Removed passing app creds from Jenkins credentials, using k8s secret …
bjusufbe Sep 4, 2019
11091d9
Fix resolve socket host for different envs
fvedad Sep 6, 2019
e1faf89
Removed passing app creds from Jenkins credentials, using k8s secret …
bjusufbe Sep 4, 2019
6321cf9
Additional space
fvedad Sep 6, 2019
608ead0
Add close ticket option below chat input
fvedad Sep 8, 2019
05274f2
Add token to sign up
fvedad Sep 8, 2019
92ddd5e
Add migrations
fvedad Sep 8, 2019
989bb20
Removed passing app creds from Jenkins credentials, using k8s secret …
bjusufbe Sep 4, 2019
bb8c7d3
Merge
fvedad Sep 9, 2019
fce684a
Level develop ops with deploy ops
fvedad Sep 9, 2019
2d4d792
Add new secrets
dduvnjak Sep 9, 2019
0256580
Merge deployment
fvedad Sep 9, 2019
55d1069
Put SALT_ROUDNS into secrets
dduvnjak Sep 10, 2019
fcd5c98
Add initial user
fvedad Sep 10, 2019
1670085
Protect sign up route, add change password functionality
fvedad Sep 10, 2019
de3b3d1
Secure feedback messages in db
fvedad Sep 11, 2019
77f202a
Put SALT_ROUDNS into secrets
dduvnjak Sep 10, 2019
f2e3cef
Merge branch 'deploy' of github.com:ATLANTBH/atlanters-anonymous into…
fvedad Sep 11, 2019
9aa8b60
Put SALT_ROUDNS into secrets
dduvnjak Sep 10, 2019
5f15f1c
Add public and private key env vars
dduvnjak Sep 11, 2019
e5072ac
Merge
fvedad Sep 11, 2019
f577a55
Change margins
fvedad Sep 11, 2019
0afa867
Change margins
fvedad Sep 11, 2019
12507be
Merge branch 'develop' of github.com:ATLANTBH/atlanters-anonymous int…
fvedad Sep 11, 2019
098868d
Remove link
fvedad Sep 11, 2019
e1e51c8
Change margin
fvedad Sep 11, 2019
7d29206
Remove seen and close ticket functionalities
fvedad Sep 12, 2019
4d7be22
Set default replicas to 2, rolling update conf change
dduvnjak Sep 12, 2019
653ce23
Fix replica count in deploy values
dduvnjak Sep 12, 2019
37c9012
Add ops to dockerignore
dduvnjak Sep 12, 2019
c3dae60
Fix validation error
fvedad Sep 12, 2019
863a02e
Bring back first user create
fvedad Sep 12, 2019
c564136
Remove unnecessary prop
fvedad Oct 22, 2019
885c89e
Fix issues with messages and encryption
fvedad Oct 23, 2019
63dffcd
Change maximum message size allowed
fvedad Oct 24, 2019
99e238e
Change frontend maximum num characters
fvedad Oct 24, 2019
76be908
Delete migrations folder
fvedad Oct 24, 2019
0aee964
Remove migrations folder
fvedad Oct 24, 2019
20644ed
Remove migrations folder
fvedad Oct 24, 2019
d24d5d8
Merge branch 'deploy' of github.com:ATLANTBH/atlanters-anonymous into…
fvedad Oct 24, 2019
883b547
Merge branch 'master' of github.com:ATLANTBH/atlanters-anonymous
fvedad Oct 24, 2019
6460771
Change datatype to text
fvedad Oct 24, 2019
c470d4f
Add base
fvedad Oct 28, 2019
039a773
Revert "Add base"
fvedad Oct 28, 2019
b64ede1
Bump sequelize from 5.10.0 to 5.15.1 in /backend
dependabot[bot] Nov 2, 2019
eabd0bc
Bump handlebars from 4.1.2 to 4.5.3 in /backend
dependabot[bot] Dec 29, 2019
f7539ef
Bump handlebars from 4.1.2 to 4.5.3 in /frontend
dependabot[bot] Dec 29, 2019
75b6b03
Bump acorn from 5.7.3 to 5.7.4 in /frontend
dependabot[bot] Apr 5, 2020
6d6450f
Bump acorn from 5.7.3 to 5.7.4 in /backend
dependabot[bot] Apr 6, 2020
ee11b8a
Add sort by new messages from end user
fvedad May 27, 2020
29a5258
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
fvedad May 27, 2020
5a99989
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
fvedad May 27, 2020
ba251cd
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
fvedad May 27, 2020
dc07f76
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
fvedad May 27, 2020
8196c3f
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
fvedad May 27, 2020
6804e6b
Remove unnecessary log
fvedad May 27, 2020
e25ab30
Add date and time to messages
fvedad May 28, 2020
d5e1aa4
Access this ticket button length fix
fvedad May 28, 2020
e00f478
style fix
fvedad Jun 1, 2020
4442f05
modify packages
fvedad Jun 11, 2020
8288e5a
Modify margins
fvedad Jun 11, 2020
7267aea
small fix
fvedad Jun 11, 2020
87c8b6d
change erase to false in tests
fvedad Jun 11, 2020
ae8617e
Fix admin not seeing messages properly
fvedad Jun 13, 2020
fe863b2
back button fix for admin
fvedad Jun 13, 2020
21717c5
Fix going back from feedback messages
fvedad Jun 13, 2020
136b4e1
fix
fvedad Jun 13, 2020
6946b1d
fix latest message undefined
fvedad Jun 13, 2020
8a335e2
exact routing
fvedad Jun 13, 2020
1f4e90e
Fix routing
fvedad Jun 14, 2020
3090356
Style fix
fvedad Jun 14, 2020
2545da0
Route change
fvedad Jun 14, 2020
b71a76f
feedback ticket style fix
fvedad Jun 14, 2020
53a1f35
url change
fvedad Jun 14, 2020
3ca92ec
add EKS ALB ingress annotations
momerkic Mar 9, 2021
ceedb83
Bump node-fetch from 2.6.0 to 2.6.7 in /frontend
dependabot[bot] Jun 25, 2022
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.git
node_modules
build
ops
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
secrets.yaml
values-*.yaml
19 changes: 19 additions & 0 deletions backend/config/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
require('dotenv').config();

// properties matched with NODE_ENV environment variable
module.exports = {
dev: {
username: process.env.DB_USERNAME,
password: process.env.DB_USER_PASSWORD,
database: process.env.DB_NAME,
host: process.env.DB_HOST,
dialect: 'postgres',
},
production: {
username: process.env.DB_USERNAME,
password: process.env.DB_USER_PASSWORD,
database: process.env.DB_NAME,
host: process.env.DB_HOST,
dialect: 'postgres',
},
};
7 changes: 7 additions & 0 deletions backend/example.env
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@ COOKIE_S=ayQuuuIcXSa7I6HSWK1H
// jwt secret used for auth token generation
JWT_SECRET=godpg75uFXxstUIwp2Ca

// Keys used to store encrypted data
PRIVATE_KEY=
PUBLIC_KEY=

// app modes (development, production)
// development - uses PGDATABASE
// production - uses DATABASE_URL
MODE=development

// environment (dev or production)
NODE_ENV=dev

// properties for feedback destination email
[email protected]
EMAIL_FEEDBACK_PW=password
Expand Down
14 changes: 14 additions & 0 deletions backend/models/answer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const Answer = sequelize.define(
'Answer',
{
content: DataTypes.JSONB,
},
{}
);
Answer.associate = function(models) {
Answer.belongsTo(models.Poll);
};
return Answer;
};
17 changes: 17 additions & 0 deletions backend/models/feedback.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const Feedback = sequelize.define(
'Feedback',
{
id: DataTypes.UUID,
isClosed: DataTypes.BOOLEAN,
anonymLastSeenAt: DataTypes.DATE,
userLastSeenAt: DataTypes.DATE,
},
{}
);
Feedback.associate = function(models) {
Feedback.hasMany(models.Message, { onDelete: 'CASCADE' });
};
return Feedback;
};
37 changes: 37 additions & 0 deletions backend/models/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use strict';

const fs = require('fs');
const path = require('path');
const Sequelize = require('sequelize');
const basename = path.basename(__filename);
const env = process.env.NODE_ENV || 'development';
const config = require(__dirname + '/../config/config.json')[env];
const db = {};

let sequelize;
if (config.use_env_variable) {
sequelize = new Sequelize(process.env[config.use_env_variable], config);
} else {
sequelize = new Sequelize(config.database, config.username, config.password, config);
}

fs
.readdirSync(__dirname)
.filter(file => {
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
})
.forEach(file => {
const model = sequelize['import'](path.join(__dirname, file));
db[model.name] = model;
});

Object.keys(db).forEach(modelName => {
if (db[modelName].associate) {
db[modelName].associate(db);
}
});

db.sequelize = sequelize;
db.Sequelize = Sequelize;

module.exports = db;
14 changes: 14 additions & 0 deletions backend/models/message.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const Message = sequelize.define(
'Message',
{
text: DataTypes.STRING,
},
{}
);
Message.associate = function(models) {
Message.belongsTo(models.User);
};
return Message;
};
20 changes: 20 additions & 0 deletions backend/models/poll.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const Poll = sequelize.define(
'Poll',
{
entity: DataTypes.STRING,
description: DataTypes.TEXT,
locked: DataTypes.BOOLEAN,
maxNumAnswers: DataTypes.INTEGER,
numAnswers: DataTypes.INTEGER,
},
{}
);
Poll.associate = function(models) {
Poll.hasMany(models.Answer, { onDelete: 'CASCADE' });
Poll.belongsTo(models.PollTemplate);
Poll.belongsTo(models.User);
};
return Poll;
};
18 changes: 18 additions & 0 deletions backend/models/polltemplate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const PollTemplate = sequelize.define(
'PollTemplate',
{
title: DataTypes.STRING,
description: DataTypes.STRING,
questions: DataTypes.JSONB,
isDraft: DataTypes.BOOLEAN,
},
{}
);
PollTemplate.associate = function(models) {
PollTemplate.hasMany(models.Poll, { onDelete: 'CASCADE' });
PollTemplate.belongsTo(models.User);
};
return PollTemplate;
};
20 changes: 20 additions & 0 deletions backend/models/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
const User = sequelize.define(
'User',
{
name: DataTypes.STRING,
surname: DataTypes.STRING,
email: DataTypes.STRING,
password: DataTypes.STRING,
tokens: DataTypes.ARRAY,
},
{}
);
User.associate = function(models) {
User.hasMany(models.PollTemplate);
User.hasMany(models.Poll);
User.hasMany(models.Message);
};
return User;
};
Loading