2021-1-capstone-design1 / RIT_Project1

Go to a project
Toggle navigation Toggle navigation pinning
박권수
d0feab07 2 parents 2fc943ea 6f4d55c9

Merge branch 'server' into web

Inline Side-by-side
Showing 8 changed files with 452 additions and 277 deletions
...@@ -6,7 +6,6 @@ const bodyparser = require('koa-bodyparser'); ...@@ -6,7 +6,6 @@ const bodyparser = require('koa-bodyparser');
6 6
7 const Mongoose = require('mongoose'); 7 const Mongoose = require('mongoose');
8 const api = require('./src/api'); 8 const api = require('./src/api');
9 -const updateMedicineInfo = require('./src/lib/UpdatingMedicineInfo');
10 const MqttServer = require('./src/util/MqttServer'); 9 const MqttServer = require('./src/util/MqttServer');
11 const BatchSystem = require('./src/util/Batch'); 10 const BatchSystem = require('./src/util/Batch');
12 11
...@@ -25,7 +24,7 @@ Mongoose.connect(MONGO_URL, { ...@@ -25,7 +24,7 @@ Mongoose.connect(MONGO_URL, {
25 useCreateIndex : true 24 useCreateIndex : true
26 }).then(() => { 25 }).then(() => {
27 console.log('\x1b[1;32mMongo DB is connected : ', MONGO_URL, '\x1b[0m'); 26 console.log('\x1b[1;32mMongo DB is connected : ', MONGO_URL, '\x1b[0m');
28 - // updateMedicineInfo.updateMedicineInfo(); 27 + BatchSystem.updateMedicineData();
29 }).catch(e => { 28 }).catch(e => {
30 console.log(e); 29 console.log(e);
31 }); 30 });
......
This diff could not be displayed because it is too large.
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
17 "author": "박권수", 17 "author": "박권수",
18 "license": "ISC", 18 "license": "ISC",
19 "dependencies": { 19 "dependencies": {
20 + "@google-cloud/storage": "^5.14.2",
20 "@koa/cors": "^3.1.0", 21 "@koa/cors": "^3.1.0",
21 - "firebase-admin": "^9.11.1", 22 + "koa-body": "^4.2.0",
22 "moment": "^2.29.1", 23 "moment": "^2.29.1",
23 "moment-timezone": "^0.5.33", 24 "moment-timezone": "^0.5.33",
24 "mqtt": "^4.2.6", 25 "mqtt": "^4.2.6",
......
...@@ -7,6 +7,8 @@ const Joi = require('joi'); ...@@ -7,6 +7,8 @@ const Joi = require('joi');
7 const jwt = require('jsonwebtoken'); 7 const jwt = require('jsonwebtoken');
8 const axios = require('axios'); 8 const axios = require('axios');
9 9
10 +const { Storage } = require('@google-cloud/storage');
11 +const GoogleStorageUrl = 'https://storage.googleapis.com/';
10 12
11 exports.register = async(ctx) => { 13 exports.register = async(ctx) => {
12 const { 14 const {
...@@ -95,17 +97,38 @@ exports.doctorRegister = async ctx => { ...@@ -95,17 +97,38 @@ exports.doctorRegister = async ctx => {
95 userId, 97 userId,
96 password, 98 password,
97 passwordCheck, 99 passwordCheck,
98 - info, 100 +
101 + contact,
102 + hospitalNm,
103 + hospitalAddr,
104 + doctorType,
105 + doctorNm,
99 } = ctx.request.body; 106 } = ctx.request.body;
100 107
108 + const { doctorInfoFile } = ctx.request.files;
109 +
110 + const info = {
111 + contact,
112 + hospitalAddr,
113 + hospitalNm,
114 + doctorType,
115 + doctorNm,
116 + doctorLicense : '',
117 + };
118 +
101 const schema = Joi.object().keys({ 119 const schema = Joi.object().keys({
102 userId : Joi.string().email().max(50).required(), 120 userId : Joi.string().email().max(50).required(),
103 password : Joi.string().required(), 121 password : Joi.string().required(),
104 passwordCheck : Joi.string().required(), 122 passwordCheck : Joi.string().required(),
105 - info : Joi.object().required(), 123 + doctorInfoFile : Joi.object().required(),
106 - }) 124 + });
107 - 125 +
108 - const result = schema.validate(ctx.request.body); 126 + const result = schema.validate({
127 + userId,
128 + password,
129 + passwordCheck,
130 + doctorInfoFile,
131 + });
109 if(result.error || password !== passwordCheck) { 132 if(result.error || password !== passwordCheck) {
110 ctx.status = 400; 133 ctx.status = 400;
111 ctx.body = { 134 ctx.body = {
...@@ -145,19 +168,31 @@ exports.doctorRegister = async ctx => { ...@@ -145,19 +168,31 @@ exports.doctorRegister = async ctx => {
145 }); 168 });
146 169
147 await doctor.setPassword(password); 170 await doctor.setPassword(password);
171 + doctor.save();
148 172
149 - const doctorInfo = new DoctorInfo({
150 - doctorId : userId,
151 - info,
152 - useYn : 'W',
153 - });
154 173
174 + const destination = userId + '_' + doctorInfoFile.name;
175 + const storage = new Storage();
176 + storage.bucket('doctor-info').upload(doctorInfoFile.path, {
177 + destination,
178 + }, (err, file, res) => {
179 + if(err) console.log('Fail to upload Doctor License');
180 + else {
181 + info.doctorLicense = GoogleStorageUrl + `${res.bucket}/${res.name}`;
182 + console.log('Success to Upload Doctor License!');
183 + }
155 184
156 - doctor.save(); 185 + const doctorInfo = new DoctorInfo({
157 - doctorInfo.save(); 186 + doctorId : userId,
187 + info,
188 + useYn : 'W',
189 + });
190 +
191 + doctorInfo.save();
192 + });
158 193
159 ctx.status = 201; 194 ctx.status = 201;
160 - 195 +
161 } 196 }
162 197
163 exports.login = async(ctx) => { 198 exports.login = async(ctx) => {
......
1 const Router = require('koa-router') 1 const Router = require('koa-router')
2 +const KoaBody = require('koa-body')({multipart : true});
2 const authCtrl = require('./auth.ctrl') 3 const authCtrl = require('./auth.ctrl')
3 4
4 const auth = new Router() 5 const auth = new Router()
...@@ -22,10 +23,10 @@ auth.get('/hospital', authCtrl.searchHospital); ...@@ -22,10 +23,10 @@ auth.get('/hospital', authCtrl.searchHospital);
22 /** 23 /**
23 * 회원가입 (email type) : 의사 회원가입 24 * 회원가입 (email type) : 의사 회원가입
24 * url : http://localhost:4000/api/auth/register/doctor 25 * url : http://localhost:4000/api/auth/register/doctor
25 - * request parameter : userId, password, passwordCheck, doctorInfo 26 + * request parameter : userId, password, passwordCheck, doctorInfo(File)
26 * return : null 27 * return : null
27 */ 28 */
28 - auth.post('/register/doctor', authCtrl.doctorRegister) 29 + auth.post('/register/doctor', KoaBody, authCtrl.doctorRegister)
29 30
30 /** 31 /**
31 * 로그인 (email type) 32 * 로그인 (email type)
......
1 const User = require('../../models/user'); 1 const User = require('../../models/user');
2 const DoctorInfo = require('../../models/doctorInfo'); 2 const DoctorInfo = require('../../models/doctorInfo');
3 -const Profile = require('../../models/profile');
4 const jwt = require('jsonwebtoken'); 3 const jwt = require('jsonwebtoken');
5 4
5 +const { Storage } = require('@google-cloud/storage');
6 +
7 +
6 /** 8 /**
7 * 의사 회원가입을 요청한 회원 리스트를 확인한다. 9 * 의사 회원가입을 요청한 회원 리스트를 확인한다.
8 * http methods : get 10 * http methods : get
...@@ -108,9 +110,25 @@ exports.getDoctorRegReqDetail = async ctx => { ...@@ -108,9 +110,25 @@ exports.getDoctorRegReqDetail = async ctx => {
108 return; 110 return;
109 } 111 }
110 112
113 + const fileName = doctorInfo.info.doctorLicense.split('/').pop();
114 + const file = new Storage().bucket('doctor-info').file(fileName);
115 + const option = {
116 + version : 'v4',
117 + expires : Date.now() + 1000 * 60 * 15,
118 + action : 'read',
119 + };
120 +
121 + const [signedUrl] = file ? await file.getSignedUrl(option) : [''];
122 +
111 ctx.status = 200; 123 ctx.status = 200;
112 ctx.body = { 124 ctx.body = {
113 - doctorInfo, 125 + doctorInfo : {
126 + ...doctorInfo._doc,
127 + info : {
128 + ...doctorInfo.info,
129 + doctorLicense : signedUrl,
130 + },
131 + },
114 }; 132 };
115 133
116 } catch (e) { 134 } catch (e) {
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
13 const Hub = require('../models/hub'); 13 const Hub = require('../models/hub');
14 const Bottle = require('../models/bottle'); 14 const Bottle = require('../models/bottle');
15 const BottleMedicine = require('../models/bottleMedicine'); 15 const BottleMedicine = require('../models/bottleMedicine');
16 +
17 +const updateMedicineInfo = require('../lib/UpdatingMedicineInfo');
16 18
17 19
18 // //매년 1월 1일 00시 00분에 1살씩 추가 20 // //매년 1월 1일 00시 00분에 1살씩 추가
...@@ -28,9 +30,16 @@ ...@@ -28,9 +30,16 @@
28 // timezone : 'Asia/Tokyo', 30 // timezone : 'Asia/Tokyo',
29 // }); 31 // });
30 // }; 32 // };
31 - 33 +
32 - //dosage에 따라, Push Notification을 발송한다. 34 +//매월 1일 0시 0분에 약 정보 업데이트
33 - //아침 8시, 점심 12시, 저녁 6시에 한번씩 발송 35 +exports.updateMedicineData = async () => {
36 + cron.schedule('0 0 0 1 * *', () => {
37 + updateMedicineInfo.updateMedicineInfo();
38 + });
39 +};
40 +
41 +//dosage에 따라, Push Notification을 발송한다.
42 +//아침 8시, 점심 12시, 저녁 6시에 한번씩 발송
34 exports.PushNotifyByDosage = async() => { 43 exports.PushNotifyByDosage = async() => {
35 44
36 //매일 아침 8시 : 복용량 상관 없이 보냄 45 //매일 아침 8시 : 복용량 상관 없이 보냄
......
...@@ -38,61 +38,6 @@ ...@@ -38,61 +38,6 @@
38 "minimatch" "^3.0.4" 38 "minimatch" "^3.0.4"
39 "strip-json-comments" "^3.1.1" 39 "strip-json-comments" "^3.1.1"
40 40
41 -"@firebase/app-types@0.6.3":
42 - "integrity" "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw=="
43 - "resolved" "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz"
44 - "version" "0.6.3"
45 -
46 -"@firebase/app-types@0.x":
47 - "integrity" "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="
48 - "resolved" "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz"
49 - "version" "0.7.0"
50 -
51 -"@firebase/auth-interop-types@0.1.6":
52 - "integrity" "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g=="
53 - "resolved" "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz"
54 - "version" "0.1.6"
55 -
56 -"@firebase/component@0.5.5":
57 - "integrity" "sha512-L41SdS/4a164jx2iGfakJgaBUPPBI3DI+RrUlmh3oHSUljTeCwfj/Nhcv3S7e2lyXsGFJtAyepfPUx4IQ05crw=="
58 - "resolved" "https://registry.npmjs.org/@firebase/component/-/component-0.5.5.tgz"
59 - "version" "0.5.5"
60 - dependencies:
61 - "@firebase/util" "1.2.0"
62 - "tslib" "^2.1.0"
63 -
64 -"@firebase/database-types@^0.7.2", "@firebase/database-types@0.7.3":
65 - "integrity" "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A=="
66 - "resolved" "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz"
67 - "version" "0.7.3"
68 - dependencies:
69 - "@firebase/app-types" "0.6.3"
70 -
71 -"@firebase/database@^0.10.0":
72 - "integrity" "sha512-Jxi9SiE4cNOftO9YKlG71ccyWFw4kSM9AG/xYu6vWXUGBr39Uw1TvYougANOcU21Q0TP4J08VPGnOnpXk/FGbQ=="
73 - "resolved" "https://registry.npmjs.org/@firebase/database/-/database-0.10.9.tgz"
74 - "version" "0.10.9"
75 - dependencies:
76 - "@firebase/auth-interop-types" "0.1.6"
77 - "@firebase/component" "0.5.5"
78 - "@firebase/database-types" "0.7.3"
79 - "@firebase/logger" "0.2.6"
80 - "@firebase/util" "1.2.0"
81 - "faye-websocket" "0.11.3"
82 - "tslib" "^2.1.0"
83 -
84 -"@firebase/logger@0.2.6":
85 - "integrity" "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw=="
86 - "resolved" "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz"
87 - "version" "0.2.6"
88 -
89 -"@firebase/util@1.2.0", "@firebase/util@1.x":
90 - "integrity" "sha512-8W9TTGImXr9cu+oyjBJ7yjoEd/IVAv0pBZA4c1uIuKrpGZi2ee38m+8xlZOBRmsAaOU/tR9DXz1WF/oeM6Fb7Q=="
91 - "resolved" "https://registry.npmjs.org/@firebase/util/-/util-1.2.0.tgz"
92 - "version" "1.2.0"
93 - dependencies:
94 - "tslib" "^2.1.0"
95 -
96 "@google-cloud/common@^3.7.0": 41 "@google-cloud/common@^3.7.0":
97 "integrity" "sha512-5Q9f74IbZaY6xAwJSNFy5SrGwbm1j7mpv+6A/r+K2dymjsXBH5UauB0tziaMwWoVVaMq1IQnZF9lgtfqqvxcUg==" 42 "integrity" "sha512-5Q9f74IbZaY6xAwJSNFy5SrGwbm1j7mpv+6A/r+K2dymjsXBH5UauB0tziaMwWoVVaMq1IQnZF9lgtfqqvxcUg=="
98 "resolved" "https://registry.npmjs.org/@google-cloud/common/-/common-3.7.2.tgz" 43 "resolved" "https://registry.npmjs.org/@google-cloud/common/-/common-3.7.2.tgz"
...@@ -108,38 +53,28 @@ ...@@ -108,38 +53,28 @@
108 "retry-request" "^4.2.2" 53 "retry-request" "^4.2.2"
109 "teeny-request" "^7.0.0" 54 "teeny-request" "^7.0.0"
110 55
111 -"@google-cloud/firestore@^4.5.0":
112 - "integrity" "sha512-2PWsCkEF1W02QbghSeRsNdYKN1qavrHBP3m72gPDMHQSYrGULOaTi7fSJquQmAtc4iPVB2/x6h80rdLHTATQtA=="
113 - "resolved" "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.15.1.tgz"
114 - "version" "4.15.1"
115 - dependencies:
116 - "fast-deep-equal" "^3.1.1"
117 - "functional-red-black-tree" "^1.0.1"
118 - "google-gax" "^2.24.1"
119 - "protobufjs" "^6.8.6"
120 -
121 "@google-cloud/paginator@^3.0.0": 56 "@google-cloud/paginator@^3.0.0":
122 - "integrity" "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==" 57 + "integrity" "sha512-XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ=="
123 - "resolved" "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz" 58 + "resolved" "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.6.tgz"
124 - "version" "3.0.5" 59 + "version" "3.0.6"
125 dependencies: 60 dependencies:
126 "arrify" "^2.0.0" 61 "arrify" "^2.0.0"
127 "extend" "^3.0.2" 62 "extend" "^3.0.2"
128 63
129 "@google-cloud/projectify@^2.0.0": 64 "@google-cloud/projectify@^2.0.0":
130 - "integrity" "sha512-qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA==" 65 + "integrity" "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="
131 - "resolved" "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz" 66 + "resolved" "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"
132 - "version" "2.1.0" 67 + "version" "2.1.1"
133 68
134 "@google-cloud/promisify@^2.0.0": 69 "@google-cloud/promisify@^2.0.0":
135 - "integrity" "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==" 70 + "integrity" "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="
136 - "resolved" "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz" 71 + "resolved" "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"
137 - "version" "2.0.3" 72 + "version" "2.0.4"
138 73
139 -"@google-cloud/storage@^5.3.0": 74 +"@google-cloud/storage@^5.14.2":
140 - "integrity" "sha512-tc8IrD1ZfKOm0WoC2r3+YG8K7NdaxsubedM3KYOf0m2QqqD4j9gYuEqIegs+jGoV2fr1XMibb9g/4DLp5Sv5kg==" 75 + "integrity" "sha512-mO2OV2J5eHWtYbjYjqIzOnucZ0wxxVTS6PYU0v1Cfa3iNWRD6oiv+OUvSz6FCifrJHgGuqb9J4kR9N6x72C7nw=="
141 - "resolved" "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.14.0.tgz" 76 + "resolved" "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.14.2.tgz"
142 - "version" "5.14.0" 77 + "version" "5.14.2"
143 dependencies: 78 dependencies:
144 "@google-cloud/common" "^3.7.0" 79 "@google-cloud/common" "^3.7.0"
145 "@google-cloud/paginator" "^3.0.0" 80 "@google-cloud/paginator" "^3.0.0"
...@@ -161,24 +96,6 @@ ...@@ -161,24 +96,6 @@
161 "stream-events" "^1.0.1" 96 "stream-events" "^1.0.1"
162 "xdg-basedir" "^4.0.0" 97 "xdg-basedir" "^4.0.0"
163 98
164 -"@grpc/grpc-js@~1.3.0":
165 - "integrity" "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="
166 - "resolved" "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"
167 - "version" "1.3.7"
168 - dependencies:
169 - "@types/node" ">=12.12.47"
170 -
171 -"@grpc/proto-loader@^0.6.1":
172 - "integrity" "sha512-7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="
173 - "resolved" "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"
174 - "version" "0.6.4"
175 - dependencies:
176 - "@types/long" "^4.0.1"
177 - "lodash.camelcase" "^4.3.0"
178 - "long" "^4.0.0"
179 - "protobufjs" "^6.10.0"
180 - "yargs" "^16.1.1"
181 -
182 "@humanwhocodes/config-array@^0.5.0": 99 "@humanwhocodes/config-array@^0.5.0":
183 "integrity" "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==" 100 "integrity" "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="
184 "resolved" "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz" 101 "resolved" "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
...@@ -200,151 +117,23 @@ ...@@ -200,151 +117,23 @@
200 dependencies: 117 dependencies:
201 "vary" "^1.1.2" 118 "vary" "^1.1.2"
202 119
203 -"@panva/asn1.js@^1.0.0":
204 - "integrity" "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw=="
205 - "resolved" "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz"
206 - "version" "1.0.0"
207 -
208 -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
209 - "integrity" "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
210 - "resolved" "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"
211 - "version" "1.1.2"
212 -
213 -"@protobufjs/base64@^1.1.2":
214 - "integrity" "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
215 - "resolved" "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"
216 - "version" "1.1.2"
217 -
218 -"@protobufjs/codegen@^2.0.4":
219 - "integrity" "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
220 - "resolved" "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"
221 - "version" "2.0.4"
222 -
223 -"@protobufjs/eventemitter@^1.1.0":
224 - "integrity" "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
225 - "resolved" "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"
226 - "version" "1.1.0"
227 -
228 -"@protobufjs/fetch@^1.1.0":
229 - "integrity" "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU="
230 - "resolved" "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"
231 - "version" "1.1.0"
232 - dependencies:
233 - "@protobufjs/aspromise" "^1.1.1"
234 - "@protobufjs/inquire" "^1.1.0"
235 -
236 -"@protobufjs/float@^1.0.2":
237 - "integrity" "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
238 - "resolved" "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"
239 - "version" "1.0.2"
240 -
241 -"@protobufjs/inquire@^1.1.0":
242 - "integrity" "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
243 - "resolved" "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"
244 - "version" "1.1.0"
245 -
246 -"@protobufjs/path@^1.1.2":
247 - "integrity" "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
248 - "resolved" "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"
249 - "version" "1.1.2"
250 -
251 -"@protobufjs/pool@^1.1.0":
252 - "integrity" "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
253 - "resolved" "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"
254 - "version" "1.1.0"
255 -
256 -"@protobufjs/utf8@^1.1.0":
257 - "integrity" "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
258 - "resolved" "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
259 - "version" "1.1.0"
260 -
261 "@tootallnate/once@1": 120 "@tootallnate/once@1":
262 "integrity" "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" 121 "integrity" "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
263 "resolved" "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz" 122 "resolved" "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"
264 "version" "1.1.2" 123 "version" "1.1.2"
265 124
266 -"@types/body-parser@*": 125 +"@types/formidable@^1.0.31":
267 - "integrity" "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==" 126 + "integrity" "sha512-Z+ICLPV/BPYK5pHYDryNKRk26etA9WCicg620XZM0Uqto5gOv6XySMIlXQ3Ae6V3tS7CZNpE8UdHuuxOZxWVfw=="
268 - "resolved" "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz" 127 + "resolved" "https://registry.npmjs.org/@types/formidable/-/formidable-1.2.4.tgz"
269 - "version" "1.19.1"
270 - dependencies:
271 - "@types/connect" "*"
272 - "@types/node" "*"
273 -
274 -"@types/connect@*":
275 - "integrity" "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
276 - "resolved" "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
277 - "version" "3.4.35"
278 - dependencies:
279 - "@types/node" "*"
280 -
281 -"@types/express-jwt@0.0.42":
282 - "integrity" "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="
283 - "resolved" "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"
284 - "version" "0.0.42"
285 - dependencies:
286 - "@types/express" "*"
287 - "@types/express-unless" "*"
288 -
289 -"@types/express-serve-static-core@^4.17.18":
290 - "integrity" "sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="
291 - "resolved" "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"
292 - "version" "4.17.24"
293 - dependencies:
294 - "@types/node" "*"
295 - "@types/qs" "*"
296 - "@types/range-parser" "*"
297 -
298 -"@types/express-unless@*":
299 - "integrity" "sha512-Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ=="
300 - "resolved" "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.2.tgz"
301 - "version" "0.5.2"
302 - dependencies:
303 - "@types/express" "*"
304 -
305 -"@types/express@*":
306 - "integrity" "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="
307 - "resolved" "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"
308 - "version" "4.17.13"
309 - dependencies:
310 - "@types/body-parser" "*"
311 - "@types/express-serve-static-core" "^4.17.18"
312 - "@types/qs" "*"
313 - "@types/serve-static" "*"
314 -
315 -"@types/long@^4.0.0", "@types/long@^4.0.1":
316 - "integrity" "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
317 - "resolved" "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz"
318 - "version" "4.0.1"
319 -
320 -"@types/mime@^1":
321 - "integrity" "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
322 - "resolved" "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"
323 - "version" "1.3.2"
324 -
325 -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
326 - "integrity" "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
327 - "resolved" "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz"
328 - "version" "16.7.13"
329 -
330 -"@types/qs@*":
331 - "integrity" "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
332 - "resolved" "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"
333 - "version" "6.9.7"
334 -
335 -"@types/range-parser@*":
336 - "integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
337 - "resolved" "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"
338 "version" "1.2.4" 128 "version" "1.2.4"
339 -
340 -"@types/serve-static@*":
341 - "integrity" "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="
342 - "resolved" "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"
343 - "version" "1.13.10"
344 dependencies: 129 dependencies:
345 - "@types/mime" "^1"
346 "@types/node" "*" 130 "@types/node" "*"
347 131
132 +"@types/node@*":
133 + "integrity" "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
134 + "resolved" "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz"
135 + "version" "16.9.2"
136 +
348 "abort-controller@^3.0.0": 137 "abort-controller@^3.0.0":
349 "integrity" "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==" 138 "integrity" "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="
350 "resolved" "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" 139 "resolved" "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
...@@ -487,6 +276,19 @@ ...@@ -487,6 +276,19 @@
487 "base64-js" "^1.3.1" 276 "base64-js" "^1.3.1"
488 "ieee754" "^1.1.13" 277 "ieee754" "^1.1.13"
489 278
279 +"bytes@3.1.0":
280 + "integrity" "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
281 + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"
282 + "version" "3.1.0"
283 +
284 +"call-bind@^1.0.0":
285 + "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
286 + "resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
287 + "version" "1.0.2"
288 + dependencies:
289 + "function-bind" "^1.1.1"
290 + "get-intrinsic" "^1.0.2"
291 +
490 "callback-stream@^1.0.2": 292 "callback-stream@^1.0.2":
491 "integrity" "sha1-RwGlEmbwbgbqpx/BcjOCLYdfSQg=" 293 "integrity" "sha1-RwGlEmbwbgbqpx/BcjOCLYdfSQg="
492 "resolved" "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz" 294 "resolved" "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"
...@@ -517,14 +319,15 @@ ...@@ -517,14 +319,15 @@
517 "ansi-styles" "^4.1.0" 319 "ansi-styles" "^4.1.0"
518 "supports-color" "^7.1.0" 320 "supports-color" "^7.1.0"
519 321
520 -"cliui@^7.0.2": 322 +"co-body@^5.1.1":
521 - "integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==" 323 + "integrity" "sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ=="
522 - "resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz" 324 + "resolved" "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz"
523 - "version" "7.0.4" 325 + "version" "5.2.0"
524 dependencies: 326 dependencies:
525 - "string-width" "^4.2.0" 327 + "inflation" "^2.0.0"
526 - "strip-ansi" "^6.0.0" 328 + "qs" "^6.4.0"
527 - "wrap-ansi" "^7.0.0" 329 + "raw-body" "^2.2.0"
330 + "type-is" "^1.6.14"
528 331
529 "color-convert@^1.9.0": 332 "color-convert@^1.9.0":
530 "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" 333 "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
...@@ -616,10 +419,10 @@ ...@@ -616,10 +419,10 @@
616 "resolved" "https://registry.npmjs.org/date-and-time/-/date-and-time-2.0.0.tgz" 419 "resolved" "https://registry.npmjs.org/date-and-time/-/date-and-time-2.0.0.tgz"
617 "version" "2.0.0" 420 "version" "2.0.0"
618 421
619 -"debug@^4.0.1", "debug@^4.1.1", "debug@^4.3.2", "debug@4": 422 +"debug@^4.0.1", "debug@^4.1.1", "debug@4":
620 - "integrity" "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==" 423 + "integrity" "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="
621 - "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz" 424 + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"
622 - "version" "4.3.2" 425 + "version" "4.3.1"
623 dependencies: 426 dependencies:
624 "ms" "2.1.2" 427 "ms" "2.1.2"
625 428
...@@ -628,12 +431,10 @@ ...@@ -628,12 +431,10 @@
628 "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" 431 "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
629 "version" "0.1.3" 432 "version" "0.1.3"
630 433
631 -"dicer@^0.3.0": 434 +"depd@~1.1.2":
632 - "integrity" "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==" 435 + "integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
633 - "resolved" "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz" 436 + "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
634 - "version" "0.3.0" 437 + "version" "1.1.2"
635 - dependencies:
636 - "streamsearch" "0.1.2"
637 438
638 "doctrine@^3.0.0": 439 "doctrine@^3.0.0":
639 "integrity" "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==" 440 "integrity" "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="
...@@ -700,11 +501,6 @@ ...@@ -700,11 +501,6 @@
700 "resolved" "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz" 501 "resolved" "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
701 "version" "2.2.0" 502 "version" "2.2.0"
702 503
703 -"escalade@^3.1.1":
704 - "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
705 - "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
706 - "version" "3.1.1"
707 -
708 "escape-string-regexp@^1.0.5": 504 "escape-string-regexp@^1.0.5":
709 "integrity" "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" 505 "integrity" "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
710 "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" 506 "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
...@@ -754,6 +550,9 @@ ...@@ -754,6 +550,9 @@
754 "@eslint/eslintrc" "^0.4.3" 550 "@eslint/eslintrc" "^0.4.3"
755 "@humanwhocodes/config-array" "^0.5.0" 551 "@humanwhocodes/config-array" "^0.5.0"
756 <<<<<<< HEAD 552 <<<<<<< HEAD
553 +<<<<<<< HEAD
554 +=======
555 +>>>>>>> server
757 "ajv" "^6.10.0" 556 "ajv" "^6.10.0"
758 "chalk" "^4.0.0" 557 "chalk" "^4.0.0"
759 "cross-spawn" "^7.0.2" 558 "cross-spawn" "^7.0.2"
...@@ -865,11 +664,16 @@ ...@@ -865,11 +664,16 @@
865 "resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" 664 "resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
866 "version" "2.0.6" 665 "version" "2.0.6"
867 666
667 +<<<<<<< HEAD
868 "fast-text-encoding@^1.0.0", "fast-text-encoding@^1.0.3": 668 "fast-text-encoding@^1.0.0", "fast-text-encoding@^1.0.3":
669 +=======
670 +"fast-text-encoding@^1.0.0":
671 +>>>>>>> server
869 "integrity" "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==" 672 "integrity" "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
870 "resolved" "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz" 673 "resolved" "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"
871 "version" "1.0.3" 674 "version" "1.0.3"
872 675
676 +<<<<<<< HEAD
873 "faye-websocket@0.11.3": 677 "faye-websocket@0.11.3":
874 "integrity" "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==" 678 "integrity" "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="
875 "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz" 679 "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"
...@@ -877,6 +681,8 @@ ...@@ -877,6 +681,8 @@
877 dependencies: 681 dependencies:
878 "websocket-driver" ">=0.5.1" 682 "websocket-driver" ">=0.5.1"
879 683
684 +=======
685 +>>>>>>> server
880 "file-entry-cache@^6.0.1": 686 "file-entry-cache@^6.0.1":
881 "integrity" "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==" 687 "integrity" "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="
882 "resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" 688 "resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
...@@ -884,6 +690,7 @@ ...@@ -884,6 +690,7 @@
884 dependencies: 690 dependencies:
885 "flat-cache" "^3.0.4" 691 "flat-cache" "^3.0.4"
886 692
693 +<<<<<<< HEAD
887 "firebase-admin@^9.11.1": 694 "firebase-admin@^9.11.1":
888 "integrity" "sha512-Y9fjelljy6MKqwsSbM/UN1k8gBQh5zfm5fCTe0Z6Gch2T3nDUIPsTcf+jfe4o40/MPYuybili9XJjTMmM2e5MQ==" 695 "integrity" "sha512-Y9fjelljy6MKqwsSbM/UN1k8gBQh5zfm5fCTe0Z6Gch2T3nDUIPsTcf+jfe4o40/MPYuybili9XJjTMmM2e5MQ=="
889 "resolved" "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.11.1.tgz" 696 "resolved" "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.11.1.tgz"
...@@ -900,6 +707,8 @@ ...@@ -900,6 +707,8 @@
900 "@google-cloud/firestore" "^4.5.0" 707 "@google-cloud/firestore" "^4.5.0"
901 "@google-cloud/storage" "^5.3.0" 708 "@google-cloud/storage" "^5.3.0"
902 709
710 +=======
711 +>>>>>>> server
903 "flat-cache@^3.0.4": 712 "flat-cache@^3.0.4":
904 "integrity" "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==" 713 "integrity" "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="
905 "resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" 714 "resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
...@@ -913,20 +722,42 @@ ...@@ -913,20 +722,42 @@
913 "resolved" "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz" 722 "resolved" "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"
914 "version" "3.2.2" 723 "version" "3.2.2"
915 724
725 +<<<<<<< HEAD
726 +=======
727 +"formidable@^1.1.1":
728 + "integrity" "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="
729 + "resolved" "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"
730 + "version" "1.2.2"
731 +
732 +>>>>>>> server
916 "fs.realpath@^1.0.0": 733 "fs.realpath@^1.0.0":
917 "integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" 734 "integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
918 "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" 735 "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
919 "version" "1.0.0" 736 "version" "1.0.0"
920 737
738 +<<<<<<< HEAD
739 +=======
740 +"function-bind@^1.1.1":
741 + "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
742 + "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
743 + "version" "1.1.1"
744 +
745 +>>>>>>> server
921 "functional-red-black-tree@^1.0.1": 746 "functional-red-black-tree@^1.0.1":
922 "integrity" "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" 747 "integrity" "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
923 "resolved" "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" 748 "resolved" "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
924 "version" "1.0.1" 749 "version" "1.0.1"
925 750
926 "gaxios@^4.0.0": 751 "gaxios@^4.0.0":
752 +<<<<<<< HEAD
927 "integrity" "sha512-9qXV7yrMCGzTrphl9/YGMVH41oSg0rhn1j3wJWed4Oqk45/hXDD2wBT5J1NjQcqTCcv4g3nFnyQ7reSRHNgBgw==" 753 "integrity" "sha512-9qXV7yrMCGzTrphl9/YGMVH41oSg0rhn1j3wJWed4Oqk45/hXDD2wBT5J1NjQcqTCcv4g3nFnyQ7reSRHNgBgw=="
928 "resolved" "https://registry.npmjs.org/gaxios/-/gaxios-4.3.1.tgz" 754 "resolved" "https://registry.npmjs.org/gaxios/-/gaxios-4.3.1.tgz"
929 "version" "4.3.1" 755 "version" "4.3.1"
756 +=======
757 + "integrity" "sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q=="
758 + "resolved" "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz"
759 + "version" "4.3.2"
760 +>>>>>>> server
930 dependencies: 761 dependencies:
931 "abort-controller" "^3.0.0" 762 "abort-controller" "^3.0.0"
932 "extend" "^3.0.2" 763 "extend" "^3.0.2"
...@@ -955,10 +786,21 @@ ...@@ -955,10 +786,21 @@
955 "pumpify" "^2.0.0" 786 "pumpify" "^2.0.0"
956 "stream-events" "^1.0.4" 787 "stream-events" "^1.0.4"
957 788
789 +<<<<<<< HEAD
958 "get-caller-file@^2.0.5": 790 "get-caller-file@^2.0.5":
959 "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" 791 "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
960 "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" 792 "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
961 "version" "2.0.5" 793 "version" "2.0.5"
794 +=======
795 +"get-intrinsic@^1.0.2":
796 + "integrity" "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="
797 + "resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
798 + "version" "1.1.1"
799 + dependencies:
800 + "function-bind" "^1.1.1"
801 + "has" "^1.0.3"
802 + "has-symbols" "^1.0.1"
803 +>>>>>>> server
962 804
963 "get-stream@^6.0.0": 805 "get-stream@^6.0.0":
964 "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" 806 "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
...@@ -1015,10 +857,17 @@ ...@@ -1015,10 +857,17 @@
1015 dependencies: 857 dependencies:
1016 "type-fest" "^0.20.2" 858 "type-fest" "^0.20.2"
1017 859
860 +<<<<<<< HEAD
1018 "google-auth-library@^7.0.0", "google-auth-library@^7.0.2", "google-auth-library@^7.6.1": 861 "google-auth-library@^7.0.0", "google-auth-library@^7.0.2", "google-auth-library@^7.6.1":
1019 "integrity" "sha512-cWGykH2WBR+UuYPGRnGVZ6Cjq2ftQiEIFjQWNIRIauZH7hUWoYTr/lkKUqLTYt5dex77nlWWVQ8aPV80mhfp5w==" 862 "integrity" "sha512-cWGykH2WBR+UuYPGRnGVZ6Cjq2ftQiEIFjQWNIRIauZH7hUWoYTr/lkKUqLTYt5dex77nlWWVQ8aPV80mhfp5w=="
1020 "resolved" "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.1.tgz" 863 "resolved" "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.1.tgz"
1021 "version" "7.9.1" 864 "version" "7.9.1"
865 +=======
866 +"google-auth-library@^7.0.0", "google-auth-library@^7.0.2":
867 + "integrity" "sha512-HjxbJt660a+YUTYAgYor87JCuBZvjUSNBExk4bXTEaMuCn8IHSDeHmFxKqThuDPrLCiKJp8blk/Ze8f7SI4N6g=="
868 + "resolved" "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.2.tgz"
869 + "version" "7.9.2"
870 +>>>>>>> server
1022 dependencies: 871 dependencies:
1023 "arrify" "^2.0.0" 872 "arrify" "^2.0.0"
1024 "base64-js" "^1.3.0" 873 "base64-js" "^1.3.0"
...@@ -1030,6 +879,7 @@ ...@@ -1030,6 +879,7 @@
1030 "jws" "^4.0.0" 879 "jws" "^4.0.0"
1031 "lru-cache" "^6.0.0" 880 "lru-cache" "^6.0.0"
1032 881
882 +<<<<<<< HEAD
1033 "google-gax@^2.24.1": 883 "google-gax@^2.24.1":
1034 "integrity" "sha512-s2V5UA/M5or7PFMpsp159X1FrWgIJZ2TSp+k57giUsiS+idMTtKoVgZ+LI59+UyOkFuDg7IBLRcBwZ1TgavEBw==" 884 "integrity" "sha512-s2V5UA/M5or7PFMpsp159X1FrWgIJZ2TSp+k57giUsiS+idMTtKoVgZ+LI59+UyOkFuDg7IBLRcBwZ1TgavEBw=="
1035 "resolved" "https://registry.npmjs.org/google-gax/-/google-gax-2.25.0.tgz" 885 "resolved" "https://registry.npmjs.org/google-gax/-/google-gax-2.25.0.tgz"
...@@ -1049,6 +899,8 @@ ...@@ -1049,6 +899,8 @@
1049 "protobufjs" "6.11.2" 899 "protobufjs" "6.11.2"
1050 "retry-request" "^4.0.0" 900 "retry-request" "^4.0.0"
1051 901
902 +=======
903 +>>>>>>> server
1052 "google-p12-pem@^3.0.3": 904 "google-p12-pem@^3.0.3":
1053 "integrity" "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==" 905 "integrity" "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="
1054 "resolved" "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz" 906 "resolved" "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz"
...@@ -1080,6 +932,21 @@ ...@@ -1080,6 +932,21 @@
1080 "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" 932 "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
1081 "version" "4.0.0" 933 "version" "4.0.0"
1082 934
935 +<<<<<<< HEAD
936 +=======
937 +"has-symbols@^1.0.1":
938 + "integrity" "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
939 + "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
940 + "version" "1.0.2"
941 +
942 +"has@^1.0.3":
943 + "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
944 + "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
945 + "version" "1.0.3"
946 + dependencies:
947 + "function-bind" "^1.1.1"
948 +
949 +>>>>>>> server
1083 "hash-stream-validation@^0.2.2": 950 "hash-stream-validation@^0.2.2":
1084 "integrity" "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==" 951 "integrity" "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ=="
1085 "resolved" "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz" 952 "resolved" "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz"
...@@ -1095,10 +962,23 @@ ...@@ -1095,10 +962,23 @@
1095 "through2" "^2.0.1" 962 "through2" "^2.0.1"
1096 "xtend" "^4.0.0" 963 "xtend" "^4.0.0"
1097 964
965 +<<<<<<< HEAD
1098 "http-parser-js@>=0.5.1": 966 "http-parser-js@>=0.5.1":
1099 "integrity" "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" 967 "integrity" "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
1100 "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz" 968 "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"
1101 "version" "0.5.3" 969 "version" "0.5.3"
970 +=======
971 +"http-errors@1.7.3":
972 + "integrity" "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="
973 + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"
974 + "version" "1.7.3"
975 + dependencies:
976 + "depd" "~1.1.2"
977 + "inherits" "2.0.4"
978 + "setprototypeof" "1.1.1"
979 + "statuses" ">= 1.5.0 < 2"
980 + "toidentifier" "1.0.0"
981 +>>>>>>> server
1102 982
1103 "http-proxy-agent@^4.0.0": 983 "http-proxy-agent@^4.0.0":
1104 "integrity" "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==" 984 "integrity" "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="
...@@ -1117,6 +997,16 @@ ...@@ -1117,6 +997,16 @@
1117 "agent-base" "6" 997 "agent-base" "6"
1118 "debug" "4" 998 "debug" "4"
1119 999
1000 +<<<<<<< HEAD
1001 +=======
1002 +"iconv-lite@0.4.24":
1003 + "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
1004 + "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
1005 + "version" "0.4.24"
1006 + dependencies:
1007 + "safer-buffer" ">= 2.1.2 < 3"
1008 +
1009 +>>>>>>> server
1120 "ieee754@^1.1.13": 1010 "ieee754@^1.1.13":
1121 "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" 1011 "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
1122 "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" 1012 "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
...@@ -1140,6 +1030,14 @@ ...@@ -1140,6 +1030,14 @@
1140 "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" 1030 "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
1141 "version" "0.1.4" 1031 "version" "0.1.4"
1142 1032
1033 +<<<<<<< HEAD
1034 +=======
1035 +"inflation@^2.0.0":
1036 + "integrity" "sha1-i0F+R8KPklpFEz2RTKH9OJEH8w8="
1037 + "resolved" "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"
1038 + "version" "2.0.0"
1039 +
1040 +>>>>>>> server
1143 "inflight@^1.0.4": 1041 "inflight@^1.0.4":
1144 "integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" 1042 "integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
1145 "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" 1043 "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
...@@ -1148,7 +1046,11 @@ ...@@ -1148,7 +1046,11 @@
1148 "once" "^1.3.0" 1046 "once" "^1.3.0"
1149 "wrappy" "1" 1047 "wrappy" "1"
1150 1048
1049 +<<<<<<< HEAD
1151 "inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.3", "inherits@2": 1050 "inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.3", "inherits@2":
1051 +=======
1052 +"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4":
1053 +>>>>>>> server
1152 "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" 1054 "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
1153 "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" 1055 "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
1154 "version" "2.0.4" 1056 "version" "2.0.4"
...@@ -1202,11 +1104,14 @@ ...@@ -1202,11 +1104,14 @@
1202 dependencies: 1104 dependencies:
1203 "is-unc-path" "^1.0.0" 1105 "is-unc-path" "^1.0.0"
1204 1106
1107 +<<<<<<< HEAD
1205 "is-stream-ended@^0.1.4": 1108 "is-stream-ended@^0.1.4":
1206 "integrity" "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==" 1109 "integrity" "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="
1207 "resolved" "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz" 1110 "resolved" "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"
1208 "version" "0.1.4" 1111 "version" "0.1.4"
1209 1112
1113 +=======
1114 +>>>>>>> server
1210 "is-stream@^2.0.0": 1115 "is-stream@^2.0.0":
1211 "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" 1116 "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
1212 "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" 1117 "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
...@@ -1239,6 +1144,7 @@ ...@@ -1239,6 +1144,7 @@
1239 "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" 1144 "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
1240 "version" "2.0.0" 1145 "version" "2.0.0"
1241 1146
1147 +<<<<<<< HEAD
1242 "jose@^2.0.5": 1148 "jose@^2.0.5":
1243 "integrity" "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==" 1149 "integrity" "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA=="
1244 "resolved" "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz" 1150 "resolved" "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz"
...@@ -1246,6 +1152,8 @@ ...@@ -1246,6 +1152,8 @@
1246 dependencies: 1152 dependencies:
1247 "@panva/asn1.js" "^1.0.0" 1153 "@panva/asn1.js" "^1.0.0"
1248 1154
1155 +=======
1156 +>>>>>>> server
1249 "js-tokens@^4.0.0": 1157 "js-tokens@^4.0.0":
1250 "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" 1158 "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
1251 "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" 1159 "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
...@@ -1281,6 +1189,7 @@ ...@@ -1281,6 +1189,7 @@
1281 "resolved" "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" 1189 "resolved" "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
1282 "version" "1.0.1" 1190 "version" "1.0.1"
1283 1191
1192 +<<<<<<< HEAD
1284 "jsonwebtoken@^8.5.1": 1193 "jsonwebtoken@^8.5.1":
1285 "integrity" "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==" 1194 "integrity" "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="
1286 "resolved" "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz" 1195 "resolved" "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"
...@@ -1306,6 +1215,8 @@ ...@@ -1306,6 +1215,8 @@
1306 "ecdsa-sig-formatter" "1.0.11" 1215 "ecdsa-sig-formatter" "1.0.11"
1307 "safe-buffer" "^5.0.1" 1216 "safe-buffer" "^5.0.1"
1308 1217
1218 +=======
1219 +>>>>>>> server
1309 "jwa@^2.0.0": 1220 "jwa@^2.0.0":
1310 "integrity" "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==" 1221 "integrity" "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="
1311 "resolved" "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz" 1222 "resolved" "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"
...@@ -1315,6 +1226,7 @@ ...@@ -1315,6 +1226,7 @@
1315 "ecdsa-sig-formatter" "1.0.11" 1226 "ecdsa-sig-formatter" "1.0.11"
1316 "safe-buffer" "^5.0.1" 1227 "safe-buffer" "^5.0.1"
1317 1228
1229 +<<<<<<< HEAD
1318 "jwks-rsa@^2.0.2": 1230 "jwks-rsa@^2.0.2":
1319 "integrity" "sha512-iJqVCECYZZ+3oPmY1qXv3Fq+3ywDtuNEVBvG41pPlaR0zyGxa12nC0beAOBBUhETJmc05puS50mRQN4NkCGhmg==" 1231 "integrity" "sha512-iJqVCECYZZ+3oPmY1qXv3Fq+3ywDtuNEVBvG41pPlaR0zyGxa12nC0beAOBBUhETJmc05puS50mRQN4NkCGhmg=="
1320 "resolved" "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.4.tgz" 1232 "resolved" "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.4.tgz"
...@@ -1334,6 +1246,8 @@ ...@@ -1334,6 +1246,8 @@
1334 "jwa" "^1.4.1" 1246 "jwa" "^1.4.1"
1335 "safe-buffer" "^5.0.1" 1247 "safe-buffer" "^5.0.1"
1336 1248
1249 +=======
1250 +>>>>>>> server
1337 "jws@^4.0.0": 1251 "jws@^4.0.0":
1338 "integrity" "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==" 1252 "integrity" "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="
1339 "resolved" "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz" 1253 "resolved" "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"
...@@ -1342,6 +1256,18 @@ ...@@ -1342,6 +1256,18 @@
1342 "jwa" "^2.0.0" 1256 "jwa" "^2.0.0"
1343 "safe-buffer" "^5.0.1" 1257 "safe-buffer" "^5.0.1"
1344 1258
1259 +<<<<<<< HEAD
1260 +=======
1261 +"koa-body@^4.2.0":
1262 + "integrity" "sha512-wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA=="
1263 + "resolved" "https://registry.npmjs.org/koa-body/-/koa-body-4.2.0.tgz"
1264 + "version" "4.2.0"
1265 + dependencies:
1266 + "@types/formidable" "^1.0.31"
1267 + "co-body" "^5.1.1"
1268 + "formidable" "^1.1.1"
1269 +
1270 +>>>>>>> server
1345 "leven@^2.1.0": 1271 "leven@^2.1.0":
1346 "integrity" "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" 1272 "integrity" "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
1347 "resolved" "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz" 1273 "resolved" "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"
...@@ -1355,6 +1281,7 @@ ...@@ -1355,6 +1281,7 @@
1355 "prelude-ls" "^1.2.1" 1281 "prelude-ls" "^1.2.1"
1356 "type-check" "~0.4.0" 1282 "type-check" "~0.4.0"
1357 1283
1284 +<<<<<<< HEAD
1358 "limiter@^1.1.5": 1285 "limiter@^1.1.5":
1359 "integrity" "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==" 1286 "integrity" "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
1360 "resolved" "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz" 1287 "resolved" "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"
...@@ -1365,11 +1292,14 @@ ...@@ -1365,11 +1292,14 @@
1365 "resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" 1292 "resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
1366 "version" "4.3.0" 1293 "version" "4.3.0"
1367 1294
1295 +=======
1296 +>>>>>>> server
1368 "lodash.clonedeep@^4.5.0": 1297 "lodash.clonedeep@^4.5.0":
1369 "integrity" "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" 1298 "integrity" "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
1370 "resolved" "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" 1299 "resolved" "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
1371 "version" "4.5.0" 1300 "version" "4.5.0"
1372 1301
1302 +<<<<<<< HEAD
1373 "lodash.includes@^4.3.0": 1303 "lodash.includes@^4.3.0":
1374 "integrity" "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" 1304 "integrity" "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
1375 "resolved" "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz" 1305 "resolved" "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"
...@@ -1400,26 +1330,34 @@ ...@@ -1400,26 +1330,34 @@
1400 "resolved" "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz" 1330 "resolved" "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"
1401 "version" "4.0.1" 1331 "version" "4.0.1"
1402 1332
1333 +=======
1334 +>>>>>>> server
1403 "lodash.merge@^4.6.2": 1335 "lodash.merge@^4.6.2":
1404 "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" 1336 "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
1405 "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" 1337 "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
1406 "version" "4.6.2" 1338 "version" "4.6.2"
1407 1339
1340 +<<<<<<< HEAD
1408 "lodash.once@^4.0.0": 1341 "lodash.once@^4.0.0":
1409 "integrity" "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" 1342 "integrity" "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
1410 "resolved" "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz" 1343 "resolved" "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"
1411 "version" "4.1.1" 1344 "version" "4.1.1"
1412 1345
1346 +=======
1347 +>>>>>>> server
1413 "lodash.truncate@^4.4.2": 1348 "lodash.truncate@^4.4.2":
1414 "integrity" "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" 1349 "integrity" "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
1415 "resolved" "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz" 1350 "resolved" "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
1416 "version" "4.4.2" 1351 "version" "4.4.2"
1417 1352
1353 +<<<<<<< HEAD
1418 "long@^4.0.0": 1354 "long@^4.0.0":
1419 "integrity" "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" 1355 "integrity" "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
1420 "resolved" "https://registry.npmjs.org/long/-/long-4.0.0.tgz" 1356 "resolved" "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
1421 "version" "4.0.0" 1357 "version" "4.0.0"
1422 1358
1359 +=======
1360 +>>>>>>> server
1423 "lru-cache@^6.0.0": 1361 "lru-cache@^6.0.0":
1424 "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" 1362 "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
1425 "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" 1363 "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
...@@ -1427,6 +1365,7 @@ ...@@ -1427,6 +1365,7 @@
1427 dependencies: 1365 dependencies:
1428 "yallist" "^4.0.0" 1366 "yallist" "^4.0.0"
1429 1367
1368 +<<<<<<< HEAD
1430 "lru-cache@~4.0.0": 1369 "lru-cache@~4.0.0":
1431 "integrity" "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=" 1370 "integrity" "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4="
1432 "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz" 1371 "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"
...@@ -1443,6 +1382,8 @@ ...@@ -1443,6 +1382,8 @@
1443 "lodash.clonedeep" "^4.5.0" 1382 "lodash.clonedeep" "^4.5.0"
1444 "lru-cache" "~4.0.0" 1383 "lru-cache" "~4.0.0"
1445 1384
1385 +=======
1386 +>>>>>>> server
1446 "make-dir@^3.0.0": 1387 "make-dir@^3.0.0":
1447 "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==" 1388 "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="
1448 "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" 1389 "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
...@@ -1450,12 +1391,24 @@ ...@@ -1450,12 +1391,24 @@
1450 dependencies: 1391 dependencies:
1451 "semver" "^6.0.0" 1392 "semver" "^6.0.0"
1452 1393
1394 +<<<<<<< HEAD
1395 +=======
1396 +"media-typer@0.3.0":
1397 + "integrity" "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
1398 + "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
1399 + "version" "0.3.0"
1400 +
1401 +>>>>>>> server
1453 "mime-db@>= 1.43.0 < 2", "mime-db@1.49.0": 1402 "mime-db@>= 1.43.0 < 2", "mime-db@1.49.0":
1454 "integrity" "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" 1403 "integrity" "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
1455 "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz" 1404 "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"
1456 "version" "1.49.0" 1405 "version" "1.49.0"
1457 1406
1407 +<<<<<<< HEAD
1458 "mime-types@^2.0.8": 1408 "mime-types@^2.0.8":
1409 +=======
1410 +"mime-types@^2.0.8", "mime-types@~2.1.24":
1411 +>>>>>>> server
1459 "integrity" "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==" 1412 "integrity" "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="
1460 "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz" 1413 "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"
1461 "version" "2.1.32" 1414 "version" "2.1.32"
...@@ -1479,7 +1432,18 @@ ...@@ -1479,7 +1432,18 @@
1479 "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" 1432 "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
1480 "version" "1.2.5" 1433 "version" "1.2.5"
1481 1434
1435 +<<<<<<< HEAD
1482 "moment@^2.29.1": 1436 "moment@^2.29.1":
1437 +=======
1438 +"moment-timezone@^0.5.31", "moment-timezone@^0.5.33":
1439 + "integrity" "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="
1440 + "resolved" "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz"
1441 + "version" "0.5.33"
1442 + dependencies:
1443 + "moment" ">= 2.9.0"
1444 +
1445 +"moment@^2.29.1", "moment@>= 2.9.0":
1446 +>>>>>>> server
1483 "integrity" "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" 1447 "integrity" "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
1484 "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz" 1448 "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
1485 "version" "2.29.1" 1449 "version" "2.29.1"
...@@ -1512,7 +1476,11 @@ ...@@ -1512,7 +1476,11 @@
1512 "ws" "^7.3.1" 1476 "ws" "^7.3.1"
1513 "xtend" "^4.0.2" 1477 "xtend" "^4.0.2"
1514 1478
1479 +<<<<<<< HEAD
1515 "ms@^2.1.1", "ms@2.1.2": 1480 "ms@^2.1.1", "ms@2.1.2":
1481 +=======
1482 +"ms@2.1.2":
1483 +>>>>>>> server
1516 "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" 1484 "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
1517 "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" 1485 "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
1518 "version" "2.1.2" 1486 "version" "2.1.2"
...@@ -1522,6 +1490,16 @@ ...@@ -1522,6 +1490,16 @@
1522 "resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" 1490 "resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
1523 "version" "1.4.0" 1491 "version" "1.4.0"
1524 1492
1493 +<<<<<<< HEAD
1494 +=======
1495 +"node-cron@^3.0.0":
1496 + "integrity" "sha512-DDwIvvuCwrNiaU7HEivFDULcaQualDv7KoNlB/UU1wPW0n1tDEmBJKhEIE6DlF2FuoOHcNbLJ8ITL2Iv/3AWmA=="
1497 + "resolved" "https://registry.npmjs.org/node-cron/-/node-cron-3.0.0.tgz"
1498 + "version" "3.0.0"
1499 + dependencies:
1500 + "moment-timezone" "^0.5.31"
1501 +
1502 +>>>>>>> server
1525 "node-fetch@^2.6.1": 1503 "node-fetch@^2.6.1":
1526 "integrity" "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==" 1504 "integrity" "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
1527 "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz" 1505 "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz"
...@@ -1532,10 +1510,17 @@ ...@@ -1532,10 +1510,17 @@
1532 "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz" 1510 "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
1533 "version" "0.10.0" 1511 "version" "0.10.0"
1534 1512
1513 +<<<<<<< HEAD
1535 "object-hash@^2.1.1": 1514 "object-hash@^2.1.1":
1536 "integrity" "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==" 1515 "integrity" "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
1537 "resolved" "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz" 1516 "resolved" "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
1538 "version" "2.2.0" 1517 "version" "2.2.0"
1518 +=======
1519 +"object-inspect@^1.9.0":
1520 + "integrity" "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
1521 + "resolved" "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"
1522 + "version" "1.11.0"
1523 +>>>>>>> server
1539 1524
1540 "once@^1.3.0", "once@^1.3.1", "once@^1.4.0": 1525 "once@^1.3.0", "once@^1.3.1", "once@^1.4.0":
1541 "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" 1526 "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
...@@ -1607,6 +1592,7 @@ ...@@ -1607,6 +1592,7 @@
1607 "resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz" 1592 "resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
1608 "version" "2.0.3" 1593 "version" "2.0.3"
1609 1594
1595 +<<<<<<< HEAD
1610 "proto3-json-serializer@^0.1.1": 1596 "proto3-json-serializer@^0.1.1":
1611 "integrity" "sha512-X0DAtxCBsy1NDn84huVFGOFgBslT2gBmM+85nY6/5SOAaCon1jzVNdvi74foIyFvs5CjtSbQsepsM5TsyNhqQw==" 1597 "integrity" "sha512-X0DAtxCBsy1NDn84huVFGOFgBslT2gBmM+85nY6/5SOAaCon1jzVNdvi74foIyFvs5CjtSbQsepsM5TsyNhqQw=="
1612 "resolved" "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.3.tgz" 1598 "resolved" "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.3.tgz"
...@@ -1636,6 +1622,8 @@ ...@@ -1636,6 +1622,8 @@
1636 "resolved" "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" 1622 "resolved" "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
1637 "version" "1.0.2" 1623 "version" "1.0.2"
1638 1624
1625 +=======
1626 +>>>>>>> server
1639 "pump@^2.0.0": 1627 "pump@^2.0.0":
1640 "integrity" "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==" 1628 "integrity" "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="
1641 "resolved" "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz" 1629 "resolved" "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
...@@ -1675,6 +1663,26 @@ ...@@ -1675,6 +1663,26 @@
1675 "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" 1663 "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
1676 "version" "2.1.1" 1664 "version" "2.1.1"
1677 1665
1666 +<<<<<<< HEAD
1667 +=======
1668 +"qs@^6.4.0":
1669 + "integrity" "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="
1670 + "resolved" "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"
1671 + "version" "6.10.1"
1672 + dependencies:
1673 + "side-channel" "^1.0.4"
1674 +
1675 +"raw-body@^2.2.0":
1676 + "integrity" "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="
1677 + "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"
1678 + "version" "2.4.1"
1679 + dependencies:
1680 + "bytes" "3.1.0"
1681 + "http-errors" "1.7.3"
1682 + "iconv-lite" "0.4.24"
1683 + "unpipe" "1.0.0"
1684 +
1685 +>>>>>>> server
1678 "readable-stream@^2.0.0": 1686 "readable-stream@^2.0.0":
1679 "integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==" 1687 "integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="
1680 "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" 1688 "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
...@@ -1764,11 +1772,14 @@ ...@@ -1764,11 +1772,14 @@
1764 "resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz" 1772 "resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
1765 "version" "1.1.0" 1773 "version" "1.1.0"
1766 1774
1775 +<<<<<<< HEAD
1767 "require-directory@^2.1.1": 1776 "require-directory@^2.1.1":
1768 "integrity" "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" 1777 "integrity" "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
1769 "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" 1778 "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
1770 "version" "2.1.1" 1779 "version" "2.1.1"
1771 1780
1781 +=======
1782 +>>>>>>> server
1772 "require-from-string@^2.0.2": 1783 "require-from-string@^2.0.2":
1773 "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" 1784 "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
1774 "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" 1785 "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
...@@ -1779,7 +1790,11 @@ ...@@ -1779,7 +1790,11 @@
1779 "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" 1790 "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
1780 "version" "4.0.0" 1791 "version" "4.0.0"
1781 1792
1793 +<<<<<<< HEAD
1782 "retry-request@^4.0.0", "retry-request@^4.2.2": 1794 "retry-request@^4.0.0", "retry-request@^4.2.2":
1795 +=======
1796 +"retry-request@^4.2.2":
1797 +>>>>>>> server
1783 "integrity" "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==" 1798 "integrity" "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="
1784 "resolved" "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz" 1799 "resolved" "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"
1785 "version" "4.2.2" 1800 "version" "4.2.2"
...@@ -1799,7 +1814,11 @@ ...@@ -1799,7 +1814,11 @@
1799 dependencies: 1814 dependencies:
1800 "glob" "^7.1.3" 1815 "glob" "^7.1.3"
1801 1816
1817 +<<<<<<< HEAD
1802 "safe-buffer@^5.0.1", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0": 1818 "safe-buffer@^5.0.1", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0":
1819 +=======
1820 +"safe-buffer@^5.0.1", "safe-buffer@~5.2.0":
1821 +>>>>>>> server
1803 "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" 1822 "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
1804 "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" 1823 "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
1805 "version" "5.2.1" 1824 "version" "5.2.1"
...@@ -1809,10 +1828,17 @@ ...@@ -1809,10 +1828,17 @@
1809 "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" 1828 "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
1810 "version" "5.1.2" 1829 "version" "5.1.2"
1811 1830
1831 +<<<<<<< HEAD
1812 "semver@^5.6.0": 1832 "semver@^5.6.0":
1813 "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" 1833 "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
1814 "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" 1834 "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
1815 "version" "5.7.1" 1835 "version" "5.7.1"
1836 +=======
1837 +"safer-buffer@>= 2.1.2 < 3":
1838 + "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
1839 + "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
1840 + "version" "2.1.2"
1841 +>>>>>>> server
1816 1842
1817 "semver@^6.0.0": 1843 "semver@^6.0.0":
1818 "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" 1844 "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
...@@ -1826,6 +1852,14 @@ ...@@ -1826,6 +1852,14 @@
1826 dependencies: 1852 dependencies:
1827 "lru-cache" "^6.0.0" 1853 "lru-cache" "^6.0.0"
1828 1854
1855 +<<<<<<< HEAD
1856 +=======
1857 +"setprototypeof@1.1.1":
1858 + "integrity" "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
1859 + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"
1860 + "version" "1.1.1"
1861 +
1862 +>>>>>>> server
1829 "shebang-command@^2.0.0": 1863 "shebang-command@^2.0.0":
1830 "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" 1864 "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
1831 "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" 1865 "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
...@@ -1838,10 +1872,26 @@ ...@@ -1838,10 +1872,26 @@
1838 "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" 1872 "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
1839 "version" "3.0.0" 1873 "version" "3.0.0"
1840 1874
1875 +<<<<<<< HEAD
1841 "signal-exit@^3.0.2": 1876 "signal-exit@^3.0.2":
1842 "integrity" "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" 1877 "integrity" "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
1843 "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" 1878 "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
1844 "version" "3.0.3" 1879 "version" "3.0.3"
1880 +=======
1881 +"side-channel@^1.0.4":
1882 + "integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
1883 + "resolved" "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
1884 + "version" "1.0.4"
1885 + dependencies:
1886 + "call-bind" "^1.0.0"
1887 + "get-intrinsic" "^1.0.2"
1888 + "object-inspect" "^1.9.0"
1889 +
1890 +"signal-exit@^3.0.2":
1891 + "integrity" "sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="
1892 + "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"
1893 + "version" "3.0.4"
1894 +>>>>>>> server
1845 1895
1846 "slice-ansi@^4.0.0": 1896 "slice-ansi@^4.0.0":
1847 "integrity" "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==" 1897 "integrity" "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="
...@@ -1869,6 +1919,14 @@ ...@@ -1869,6 +1919,14 @@
1869 "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" 1919 "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
1870 "version" "1.0.3" 1920 "version" "1.0.3"
1871 1921
1922 +<<<<<<< HEAD
1923 +=======
1924 +"statuses@>= 1.5.0 < 2":
1925 + "integrity" "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
1926 + "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
1927 + "version" "1.5.0"
1928 +
1929 +>>>>>>> server
1872 "stream-events@^1.0.1", "stream-events@^1.0.4", "stream-events@^1.0.5": 1930 "stream-events@^1.0.1", "stream-events@^1.0.4", "stream-events@^1.0.5":
1873 "integrity" "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==" 1931 "integrity" "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg=="
1874 "resolved" "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz" 1932 "resolved" "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz"
...@@ -1881,11 +1939,14 @@ ...@@ -1881,11 +1939,14 @@
1881 "resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz" 1939 "resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
1882 "version" "1.0.1" 1940 "version" "1.0.1"
1883 1941
1942 +<<<<<<< HEAD
1884 "streamsearch@0.1.2": 1943 "streamsearch@0.1.2":
1885 "integrity" "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" 1944 "integrity" "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
1886 "resolved" "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz" 1945 "resolved" "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"
1887 "version" "0.1.2" 1946 "version" "0.1.2"
1888 1947
1948 +=======
1949 +>>>>>>> server
1889 "string_decoder@^1.1.1": 1950 "string_decoder@^1.1.1":
1890 "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==" 1951 "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
1891 "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" 1952 "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
...@@ -1900,7 +1961,11 @@ ...@@ -1900,7 +1961,11 @@
1900 dependencies: 1961 dependencies:
1901 "safe-buffer" "~5.1.0" 1962 "safe-buffer" "~5.1.0"
1902 1963
1964 +<<<<<<< HEAD
1903 "string-width@^4.1.0", "string-width@^4.2.0": 1965 "string-width@^4.1.0", "string-width@^4.2.0":
1966 +=======
1967 +"string-width@^4.2.0":
1968 +>>>>>>> server
1904 "integrity" "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==" 1969 "integrity" "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="
1905 "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz" 1970 "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"
1906 "version" "4.2.2" 1971 "version" "4.2.2"
...@@ -1953,9 +2018,15 @@ ...@@ -1953,9 +2018,15 @@
1953 "strip-ansi" "^6.0.0" 2018 "strip-ansi" "^6.0.0"
1954 2019
1955 "teeny-request@^7.0.0": 2020 "teeny-request@^7.0.0":
2021 +<<<<<<< HEAD
1956 "integrity" "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg==" 2022 "integrity" "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg=="
1957 "resolved" "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz" 2023 "resolved" "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz"
1958 "version" "7.1.1" 2024 "version" "7.1.1"
2025 +=======
2026 + "integrity" "sha512-Mr4NYZuniKDpgcLxdBkDE1CcWy98Aw1ennn6oNofen+XWUvDs+ZZzBAujy6XOAVwwLLZMwEQSfdljUI+ebs4Ww=="
2027 + "resolved" "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.2.tgz"
2028 + "version" "7.1.2"
2029 +>>>>>>> server
1959 dependencies: 2030 dependencies:
1960 "http-proxy-agent" "^4.0.0" 2031 "http-proxy-agent" "^4.0.0"
1961 "https-proxy-agent" "^5.0.0" 2032 "https-proxy-agent" "^5.0.0"
...@@ -1992,10 +2063,17 @@ ...@@ -1992,10 +2063,17 @@
1992 "is-absolute" "^1.0.0" 2063 "is-absolute" "^1.0.0"
1993 "is-negated-glob" "^1.0.0" 2064 "is-negated-glob" "^1.0.0"
1994 2065
2066 +<<<<<<< HEAD
1995 "tslib@^2.1.0": 2067 "tslib@^2.1.0":
1996 "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" 2068 "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
1997 "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" 2069 "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
1998 "version" "2.3.1" 2070 "version" "2.3.1"
2071 +=======
2072 +"toidentifier@1.0.0":
2073 + "integrity" "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
2074 + "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"
2075 + "version" "1.0.0"
2076 +>>>>>>> server
1999 2077
2000 "type-check@^0.4.0", "type-check@~0.4.0": 2078 "type-check@^0.4.0", "type-check@~0.4.0":
2001 "integrity" "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==" 2079 "integrity" "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="
...@@ -2009,6 +2087,17 @@ ...@@ -2009,6 +2087,17 @@
2009 "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" 2087 "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
2010 "version" "0.20.2" 2088 "version" "0.20.2"
2011 2089
2090 +<<<<<<< HEAD
2091 +=======
2092 +"type-is@^1.6.14":
2093 + "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
2094 + "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
2095 + "version" "1.6.18"
2096 + dependencies:
2097 + "media-typer" "0.3.0"
2098 + "mime-types" "~2.1.24"
2099 +
2100 +>>>>>>> server
2012 "typedarray-to-buffer@^3.1.5": 2101 "typedarray-to-buffer@^3.1.5":
2013 "integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==" 2102 "integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="
2014 "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" 2103 "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
...@@ -2041,6 +2130,14 @@ ...@@ -2041,6 +2130,14 @@
2041 dependencies: 2130 dependencies:
2042 "crypto-random-string" "^2.0.0" 2131 "crypto-random-string" "^2.0.0"
2043 2132
2133 +<<<<<<< HEAD
2134 +=======
2135 +"unpipe@1.0.0":
2136 + "integrity" "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
2137 + "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
2138 + "version" "1.0.0"
2139 +
2140 +>>>>>>> server
2044 "uri-js@^4.2.2": 2141 "uri-js@^4.2.2":
2045 "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" 2142 "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
2046 "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" 2143 "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
...@@ -2068,6 +2165,7 @@ ...@@ -2068,6 +2165,7 @@
2068 "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" 2165 "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
2069 "version" "1.1.2" 2166 "version" "1.1.2"
2070 2167
2168 +<<<<<<< HEAD
2071 "websocket-driver@>=0.5.1": 2169 "websocket-driver@>=0.5.1":
2072 "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==" 2170 "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
2073 "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz" 2171 "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
...@@ -2082,6 +2180,8 @@ ...@@ -2082,6 +2180,8 @@
2082 "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz" 2180 "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
2083 "version" "0.1.4" 2181 "version" "0.1.4"
2084 2182
2183 +=======
2184 +>>>>>>> server
2085 "which@^2.0.1": 2185 "which@^2.0.1":
2086 "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" 2186 "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
2087 "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz" 2187 "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
...@@ -2094,6 +2194,7 @@ ...@@ -2094,6 +2194,7 @@
2094 "resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" 2194 "resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
2095 "version" "1.2.3" 2195 "version" "1.2.3"
2096 2196
2197 +<<<<<<< HEAD
2097 "wrap-ansi@^7.0.0": 2198 "wrap-ansi@^7.0.0":
2098 "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" 2199 "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
2099 "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" 2200 "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
...@@ -2103,6 +2204,8 @@ ...@@ -2103,6 +2204,8 @@
2103 "string-width" "^4.1.0" 2204 "string-width" "^4.1.0"
2104 "strip-ansi" "^6.0.0" 2205 "strip-ansi" "^6.0.0"
2105 2206
2207 +=======
2208 +>>>>>>> server
2106 "wrappy@1": 2209 "wrappy@1":
2107 "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" 2210 "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
2108 "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" 2211 "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
...@@ -2133,6 +2236,7 @@ ...@@ -2133,6 +2236,7 @@
2133 "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" 2236 "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
2134 "version" "4.0.2" 2237 "version" "4.0.2"
2135 2238
2239 +<<<<<<< HEAD
2136 "y18n@^5.0.5": 2240 "y18n@^5.0.5":
2137 "integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" 2241 "integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
2138 "resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz" 2242 "resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
...@@ -2143,11 +2247,14 @@ ...@@ -2143,11 +2247,14 @@
2143 "resolved" "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz" 2247 "resolved" "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
2144 "version" "2.1.2" 2248 "version" "2.1.2"
2145 2249
2250 +=======
2251 +>>>>>>> server
2146 "yallist@^4.0.0": 2252 "yallist@^4.0.0":
2147 "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" 2253 "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
2148 "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" 2254 "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
2149 "version" "4.0.0" 2255 "version" "4.0.0"
2150 2256
2257 +<<<<<<< HEAD
2151 "yargs-parser@^20.2.2": 2258 "yargs-parser@^20.2.2":
2152 "integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" 2259 "integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
2153 "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" 2260 "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
...@@ -2166,10 +2273,13 @@ ...@@ -2166,10 +2273,13 @@
2166 "y18n" "^5.0.5" 2273 "y18n" "^5.0.5"
2167 "yargs-parser" "^20.2.2" 2274 "yargs-parser" "^20.2.2"
2168 2275
2276 +=======
2277 +>>>>>>> server
2169 "yocto-queue@^0.1.0": 2278 "yocto-queue@^0.1.0":
2170 "integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" 2279 "integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
2171 "resolved" "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" 2280 "resolved" "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
2172 "version" "0.1.0" 2281 "version" "0.1.0"
2282 +<<<<<<< HEAD
2173 ======= 2283 =======
2174 ajv "^6.10.0" 2284 ajv "^6.10.0"
2175 chalk "^4.0.0" 2285 chalk "^4.0.0"
...@@ -2982,3 +3092,5 @@ yallist@^4.0.0: ...@@ -2982,3 +3092,5 @@ yallist@^4.0.0:
2982 resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" 3092 resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
2983 integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== 3093 integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
2984 >>>>>>> server 3094 >>>>>>> server
3095 +=======
3096 +>>>>>>> server
......