Merge branch 'master' of http://khuhub.khu.ac.kr/2019102198/Tunnel into server
Showing
16 changed files
with
694 additions
and
219 deletions
... | @@ -1193,6 +1193,308 @@ | ... | @@ -1193,6 +1193,308 @@ |
1193 | "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", | 1193 | "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", |
1194 | "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" | 1194 | "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" |
1195 | }, | 1195 | }, |
1196 | + "@ckeditor/ckeditor5-adapter-ckfinder": { | ||
1197 | + "version": "31.0.0", | ||
1198 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-31.0.0.tgz", | ||
1199 | + "integrity": "sha512-jWoQT8n8Ufg8hswRa0YU0yg387YpT65+PT7zuPbhgIRHkgyTzLFyDrVopD0uj11leDXPklzMk1lg4N5bHHIVew==", | ||
1200 | + "requires": { | ||
1201 | + "ckeditor5": "^31.0.0" | ||
1202 | + } | ||
1203 | + }, | ||
1204 | + "@ckeditor/ckeditor5-autoformat": { | ||
1205 | + "version": "31.0.0", | ||
1206 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-31.0.0.tgz", | ||
1207 | + "integrity": "sha512-G6+tstX6NX09Rh0JRLnZyyEyabqxlSAnixn7UTBGblXeKsZnNSVc8MbAD1cH0IesqHki/Yo8Z2cpFcTCQSl47Q==", | ||
1208 | + "requires": { | ||
1209 | + "ckeditor5": "^31.0.0" | ||
1210 | + } | ||
1211 | + }, | ||
1212 | + "@ckeditor/ckeditor5-basic-styles": { | ||
1213 | + "version": "31.0.0", | ||
1214 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-31.0.0.tgz", | ||
1215 | + "integrity": "sha512-1QXryQRj3uQ0Qmef6yMk5V0xjfk3T8fXESi1pHIsy/A3zgSUCUg+/xXJmIOBLp6LLRiL+bju/grbjerbHXEIHg==", | ||
1216 | + "requires": { | ||
1217 | + "ckeditor5": "^31.0.0" | ||
1218 | + } | ||
1219 | + }, | ||
1220 | + "@ckeditor/ckeditor5-block-quote": { | ||
1221 | + "version": "31.0.0", | ||
1222 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-31.0.0.tgz", | ||
1223 | + "integrity": "sha512-T9NPuCWVtNF4EGXn4q8YSyJI1Ry9jJ0PZUv2exKsQAh5DloVXA3ufdAqqi7W/h7S4e5ffF+VAhrgNa0js3BcnA==", | ||
1224 | + "requires": { | ||
1225 | + "ckeditor5": "^31.0.0" | ||
1226 | + } | ||
1227 | + }, | ||
1228 | + "@ckeditor/ckeditor5-build-classic": { | ||
1229 | + "version": "31.0.0", | ||
1230 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-classic/-/ckeditor5-build-classic-31.0.0.tgz", | ||
1231 | + "integrity": "sha512-H5HwmnXgLMztY7cEFSnl66I5QF9gkTXgibKlJ4bNsurfChYjvrpCzVQjuECmnbQPJ0ZW53qH332WibwcKAQhuw==", | ||
1232 | + "requires": { | ||
1233 | + "@ckeditor/ckeditor5-adapter-ckfinder": "^31.0.0", | ||
1234 | + "@ckeditor/ckeditor5-autoformat": "^31.0.0", | ||
1235 | + "@ckeditor/ckeditor5-basic-styles": "^31.0.0", | ||
1236 | + "@ckeditor/ckeditor5-block-quote": "^31.0.0", | ||
1237 | + "@ckeditor/ckeditor5-ckfinder": "^31.0.0", | ||
1238 | + "@ckeditor/ckeditor5-cloud-services": "^31.0.0", | ||
1239 | + "@ckeditor/ckeditor5-easy-image": "^31.0.0", | ||
1240 | + "@ckeditor/ckeditor5-editor-classic": "^31.0.0", | ||
1241 | + "@ckeditor/ckeditor5-essentials": "^31.0.0", | ||
1242 | + "@ckeditor/ckeditor5-heading": "^31.0.0", | ||
1243 | + "@ckeditor/ckeditor5-image": "^31.0.0", | ||
1244 | + "@ckeditor/ckeditor5-indent": "^31.0.0", | ||
1245 | + "@ckeditor/ckeditor5-link": "^31.0.0", | ||
1246 | + "@ckeditor/ckeditor5-list": "^31.0.0", | ||
1247 | + "@ckeditor/ckeditor5-media-embed": "^31.0.0", | ||
1248 | + "@ckeditor/ckeditor5-paragraph": "^31.0.0", | ||
1249 | + "@ckeditor/ckeditor5-paste-from-office": "^31.0.0", | ||
1250 | + "@ckeditor/ckeditor5-table": "^31.0.0", | ||
1251 | + "@ckeditor/ckeditor5-typing": "^31.0.0" | ||
1252 | + } | ||
1253 | + }, | ||
1254 | + "@ckeditor/ckeditor5-ckfinder": { | ||
1255 | + "version": "31.0.0", | ||
1256 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-31.0.0.tgz", | ||
1257 | + "integrity": "sha512-/YR1nwCeNkfdQuxbWmQmxMzJcqsW0mFUKuoAK6U9f7gd36AQq0gSvTmISzQgFZ66lrZd1IWGbEjC+Gtg5/OBOA==", | ||
1258 | + "requires": { | ||
1259 | + "ckeditor5": "^31.0.0" | ||
1260 | + } | ||
1261 | + }, | ||
1262 | + "@ckeditor/ckeditor5-clipboard": { | ||
1263 | + "version": "31.0.0", | ||
1264 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-31.0.0.tgz", | ||
1265 | + "integrity": "sha512-wmdYd/bNp3zYA9ERo2ednl+ivf2xYq91iTnUDybxgexRHrMc8mjYTTzevrF4aXY56kpQR8c7dhU+Mzy68F7dTg==", | ||
1266 | + "requires": { | ||
1267 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1268 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1269 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1270 | + "@ckeditor/ckeditor5-widget": "^31.0.0", | ||
1271 | + "lodash-es": "^4.17.11" | ||
1272 | + } | ||
1273 | + }, | ||
1274 | + "@ckeditor/ckeditor5-cloud-services": { | ||
1275 | + "version": "31.0.0", | ||
1276 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-31.0.0.tgz", | ||
1277 | + "integrity": "sha512-wUmBDQUdtZbQUWgVV8uR9Vqi+0jaMtg6ZUQCqgnq/IOcZrcmzemE7y51fbzThI3AbmxGsuCHiD8yzUC9cOVUbw==", | ||
1278 | + "requires": { | ||
1279 | + "ckeditor5": "^31.0.0" | ||
1280 | + } | ||
1281 | + }, | ||
1282 | + "@ckeditor/ckeditor5-core": { | ||
1283 | + "version": "31.0.0", | ||
1284 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-31.0.0.tgz", | ||
1285 | + "integrity": "sha512-8AvolCaFC/iTDJViNAQk2uJr2LLRieCEc0Kda5OUT0xgeoUF+/B5DYSU3ie8cJOghBSjZmEoZFUApqGaDm0QIA==", | ||
1286 | + "requires": { | ||
1287 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1288 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1289 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1290 | + "lodash-es": "^4.17.15" | ||
1291 | + } | ||
1292 | + }, | ||
1293 | + "@ckeditor/ckeditor5-easy-image": { | ||
1294 | + "version": "31.0.0", | ||
1295 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-31.0.0.tgz", | ||
1296 | + "integrity": "sha512-YKJxmrfHKdudR5q28U+0iiDbUUryj3/nJaZULTItxX6lTgYGbPp5+lqErIF4E1MrLMQmRQj3Ej+D8iM84B2qpw==", | ||
1297 | + "requires": { | ||
1298 | + "ckeditor5": "^31.0.0" | ||
1299 | + } | ||
1300 | + }, | ||
1301 | + "@ckeditor/ckeditor5-editor-classic": { | ||
1302 | + "version": "31.0.0", | ||
1303 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-31.0.0.tgz", | ||
1304 | + "integrity": "sha512-73uctgAl8cX6//KlW1CUMQFXEK3USw6DfpUJrKXucMrdRksNXllu1WcZbADwcXgQk006byr8DKA51wNI00+daQ==", | ||
1305 | + "requires": { | ||
1306 | + "ckeditor5": "^31.0.0", | ||
1307 | + "lodash-es": "^4.17.15" | ||
1308 | + } | ||
1309 | + }, | ||
1310 | + "@ckeditor/ckeditor5-engine": { | ||
1311 | + "version": "31.0.0", | ||
1312 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-31.0.0.tgz", | ||
1313 | + "integrity": "sha512-RVsGWx2R9T0cgDZtEo6O5GihvKB3PHoM7SJ/qbmDDWKuhJ/89KZDrWuFrgdNyfZsZwdgNplwnvX8gDvSHpRqkw==", | ||
1314 | + "requires": { | ||
1315 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1316 | + "lodash-es": "^4.17.15" | ||
1317 | + } | ||
1318 | + }, | ||
1319 | + "@ckeditor/ckeditor5-enter": { | ||
1320 | + "version": "31.0.0", | ||
1321 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-31.0.0.tgz", | ||
1322 | + "integrity": "sha512-FCv890nP1CoBLpZ8gOWmgWhmtNhSzIYODmbogI42pVhtQXbu/wMdlA5PsJF81cdrDL1MlL7Tnmor7+Yk1Ej1QQ==", | ||
1323 | + "requires": { | ||
1324 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1325 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1326 | + "@ckeditor/ckeditor5-utils": "^31.0.0" | ||
1327 | + } | ||
1328 | + }, | ||
1329 | + "@ckeditor/ckeditor5-essentials": { | ||
1330 | + "version": "31.0.0", | ||
1331 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-31.0.0.tgz", | ||
1332 | + "integrity": "sha512-S14B/cyushn4n4ANz8H4TjjbxaeH94OG+EDwKL4bXAYn/B1S/I5Cm+MRi7Q8Z3A8A6fjzGhNPUyDx0GnpmKZHQ==", | ||
1333 | + "requires": { | ||
1334 | + "ckeditor5": "^31.0.0" | ||
1335 | + } | ||
1336 | + }, | ||
1337 | + "@ckeditor/ckeditor5-heading": { | ||
1338 | + "version": "31.0.0", | ||
1339 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-31.0.0.tgz", | ||
1340 | + "integrity": "sha512-bAcNG2K7sZWxvTJTriof/lsR81o4QGbpaFcwj62QfTjYP+To5jlD4YhUIcCbg1YpiwlbJr8tv6PuWH6MkNh/5g==", | ||
1341 | + "requires": { | ||
1342 | + "ckeditor5": "^31.0.0" | ||
1343 | + } | ||
1344 | + }, | ||
1345 | + "@ckeditor/ckeditor5-image": { | ||
1346 | + "version": "31.0.0", | ||
1347 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-31.0.0.tgz", | ||
1348 | + "integrity": "sha512-t7eYiRx4fLbSrBuSV7DoRC8zmTyzUQyind5gWQNWWDq/nF+bEaMkijOmbvak/gKQIl/C15Eo3jV6dPbzDdwgbg==", | ||
1349 | + "requires": { | ||
1350 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1351 | + "ckeditor5": "^31.0.0", | ||
1352 | + "lodash-es": "^4.17.15" | ||
1353 | + } | ||
1354 | + }, | ||
1355 | + "@ckeditor/ckeditor5-indent": { | ||
1356 | + "version": "31.0.0", | ||
1357 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-31.0.0.tgz", | ||
1358 | + "integrity": "sha512-3WuQFMvbxTzGJkAlNhmXaCqwyrSb0k/8HpTw3M9ef7nu0J0eutwT09bJQrfdyeyZ9I7thOXKjh00wTOAni8y2Q==", | ||
1359 | + "requires": { | ||
1360 | + "ckeditor5": "^31.0.0" | ||
1361 | + } | ||
1362 | + }, | ||
1363 | + "@ckeditor/ckeditor5-link": { | ||
1364 | + "version": "31.0.0", | ||
1365 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-31.0.0.tgz", | ||
1366 | + "integrity": "sha512-CeX05fQIR1p3/aD512vuLedq2OVHJE/toEg3ewZOlWfKan71L3/6wiuuSHO7KkCbp1d/1I/pGOz9G9pBfLUtvg==", | ||
1367 | + "requires": { | ||
1368 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1369 | + "ckeditor5": "^31.0.0", | ||
1370 | + "lodash-es": "^4.17.15" | ||
1371 | + } | ||
1372 | + }, | ||
1373 | + "@ckeditor/ckeditor5-list": { | ||
1374 | + "version": "31.0.0", | ||
1375 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-31.0.0.tgz", | ||
1376 | + "integrity": "sha512-lSGobEoHdS94ueyhJ+N7XJmZ6CafCobVy+5cNCOymSVoHAY3GI5xOdkWO9slOxV+i8+/yiHT5NDWuCxTzj3WxQ==", | ||
1377 | + "requires": { | ||
1378 | + "ckeditor5": "^31.0.0" | ||
1379 | + } | ||
1380 | + }, | ||
1381 | + "@ckeditor/ckeditor5-media-embed": { | ||
1382 | + "version": "31.0.0", | ||
1383 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-31.0.0.tgz", | ||
1384 | + "integrity": "sha512-2Dy7+qsOz+jDOMggehR6Fe/imhGfeVIe82PBHTQs2MfI+gbhSY6ftbvEInkff3T/eTDUc6fg05VGQJsRMWQaiA==", | ||
1385 | + "requires": { | ||
1386 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1387 | + "ckeditor5": "^31.0.0" | ||
1388 | + } | ||
1389 | + }, | ||
1390 | + "@ckeditor/ckeditor5-paragraph": { | ||
1391 | + "version": "31.0.0", | ||
1392 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-31.0.0.tgz", | ||
1393 | + "integrity": "sha512-v6zSihnX6/C2eQ1P0Q2V1po/u/vkiPqUKYBSagCvW6jexUhUWiAUiBfyc1mS2VUFdyr9Anw6eHaMjbauwnTmFw==", | ||
1394 | + "requires": { | ||
1395 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1396 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1397 | + "@ckeditor/ckeditor5-utils": "^31.0.0" | ||
1398 | + } | ||
1399 | + }, | ||
1400 | + "@ckeditor/ckeditor5-paste-from-office": { | ||
1401 | + "version": "31.0.0", | ||
1402 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-31.0.0.tgz", | ||
1403 | + "integrity": "sha512-ACdbjBOm9SjQGYkA43bX6e+SfCMcyIxnHX7yl2iEXLSZO5kk70xqpKv0tWlg8N5jlcsYPEXR9dHJheWRPehNsg==", | ||
1404 | + "requires": { | ||
1405 | + "ckeditor5": "^31.0.0" | ||
1406 | + } | ||
1407 | + }, | ||
1408 | + "@ckeditor/ckeditor5-react": { | ||
1409 | + "version": "3.0.3", | ||
1410 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-react/-/ckeditor5-react-3.0.3.tgz", | ||
1411 | + "integrity": "sha512-Zaazd9Brg64v1Q2qQNtbfryWeVLzXWlNbswLsOYwNgvHlxroa8+F7ZE33M2O8zxcL6sQHZ1vCNkQOPRUBG8pqA==", | ||
1412 | + "requires": { | ||
1413 | + "prop-types": "^15.7.2" | ||
1414 | + } | ||
1415 | + }, | ||
1416 | + "@ckeditor/ckeditor5-select-all": { | ||
1417 | + "version": "31.0.0", | ||
1418 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-31.0.0.tgz", | ||
1419 | + "integrity": "sha512-+n3LvYx9Kdr+A0AUr012FT8O+5/A7GdkSRMI/L0gAuy1IHXYmPYzbymO+qFLY8lyrAfJvZX6rqFLcnaqtLUL6A==", | ||
1420 | + "requires": { | ||
1421 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1422 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1423 | + "@ckeditor/ckeditor5-utils": "^31.0.0" | ||
1424 | + } | ||
1425 | + }, | ||
1426 | + "@ckeditor/ckeditor5-table": { | ||
1427 | + "version": "31.0.0", | ||
1428 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-31.0.0.tgz", | ||
1429 | + "integrity": "sha512-KdotVXhRlJBuYUPkTo/VDvCSoPm4dZSeZDwV0PWTMiAutmxkpdHHG0FGnAJphCPA1BLO0eLj84DkSyMdw3WlsQ==", | ||
1430 | + "requires": { | ||
1431 | + "ckeditor5": "^31.0.0", | ||
1432 | + "lodash-es": "^4.17.15" | ||
1433 | + } | ||
1434 | + }, | ||
1435 | + "@ckeditor/ckeditor5-typing": { | ||
1436 | + "version": "31.0.0", | ||
1437 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-31.0.0.tgz", | ||
1438 | + "integrity": "sha512-7lILwGNhynpUcXKqzzAmPsL57myxqFcv0K1OPb+2jkzEruaYkAINJ3fMYNBwwAxtg2wZDP598ufwonplcSNsJA==", | ||
1439 | + "requires": { | ||
1440 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1441 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1442 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1443 | + "lodash-es": "^4.17.15" | ||
1444 | + } | ||
1445 | + }, | ||
1446 | + "@ckeditor/ckeditor5-ui": { | ||
1447 | + "version": "31.0.0", | ||
1448 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-31.0.0.tgz", | ||
1449 | + "integrity": "sha512-WDEwToA8FOPi/AeYqdF6isdTM7hJp26WzxDhDNGWC8aYu/zA146Z07qTbYuBOebG9TWqjsZOQYDXbH/4phmyDg==", | ||
1450 | + "requires": { | ||
1451 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1452 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1453 | + "lodash-es": "^4.17.15" | ||
1454 | + } | ||
1455 | + }, | ||
1456 | + "@ckeditor/ckeditor5-undo": { | ||
1457 | + "version": "31.0.0", | ||
1458 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-31.0.0.tgz", | ||
1459 | + "integrity": "sha512-mTSjiMJ/sSTP485djBiMQ4yD7M0qDIcqDlTV6op34M1eXLY63ZwQUnd9NiOqOLrBiwaBBmnRYlSeZCQjoCuk0A==", | ||
1460 | + "requires": { | ||
1461 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1462 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1463 | + "@ckeditor/ckeditor5-ui": "^31.0.0" | ||
1464 | + } | ||
1465 | + }, | ||
1466 | + "@ckeditor/ckeditor5-upload": { | ||
1467 | + "version": "31.0.0", | ||
1468 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-31.0.0.tgz", | ||
1469 | + "integrity": "sha512-ChtGU66fdqwTaOazXtRXcOi6tOzAiTPC5UUv+LycxwSB6MKbqJANg8ny9RoTGWDpHUabb6UHyX8bwlfkXKIqbQ==", | ||
1470 | + "requires": { | ||
1471 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1472 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1473 | + "@ckeditor/ckeditor5-utils": "^31.0.0" | ||
1474 | + } | ||
1475 | + }, | ||
1476 | + "@ckeditor/ckeditor5-utils": { | ||
1477 | + "version": "31.0.0", | ||
1478 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-31.0.0.tgz", | ||
1479 | + "integrity": "sha512-T9S2x0AUBnhN8BJ7Pg4E8okEUccYBKyu5hp4nH2kMUSmfqeJ0JWC9CD5dA1nDOXvU10J6Rw8VoqkbRx/4MuYEw==", | ||
1480 | + "requires": { | ||
1481 | + "lodash-es": "^4.17.15" | ||
1482 | + } | ||
1483 | + }, | ||
1484 | + "@ckeditor/ckeditor5-widget": { | ||
1485 | + "version": "31.0.0", | ||
1486 | + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-31.0.0.tgz", | ||
1487 | + "integrity": "sha512-MCpBdT2sD/nRgC825aIaI1Tu7T6OQYvNxc6Q4D+gNkdRbLLZrGoWKHNZdgmQg9Di1WgVO1cPo+h45HO2KYHAMA==", | ||
1488 | + "requires": { | ||
1489 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
1490 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
1491 | + "@ckeditor/ckeditor5-enter": "^31.0.0", | ||
1492 | + "@ckeditor/ckeditor5-typing": "^31.0.0", | ||
1493 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
1494 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
1495 | + "lodash-es": "^4.17.15" | ||
1496 | + } | ||
1497 | + }, | ||
1196 | "@cnakazawa/watch": { | 1498 | "@cnakazawa/watch": { |
1197 | "version": "1.0.4", | 1499 | "version": "1.0.4", |
1198 | "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", | 1500 | "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", |
... | @@ -1891,9 +2193,9 @@ | ... | @@ -1891,9 +2193,9 @@ |
1891 | } | 2193 | } |
1892 | }, | 2194 | }, |
1893 | "@popperjs/core": { | 2195 | "@popperjs/core": { |
1894 | - "version": "2.10.2", | 2196 | + "version": "2.11.0", |
1895 | - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz", | 2197 | + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", |
1896 | - "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==" | 2198 | + "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==" |
1897 | }, | 2199 | }, |
1898 | "@rollup/plugin-node-resolve": { | 2200 | "@rollup/plugin-node-resolve": { |
1899 | "version": "7.1.3", | 2201 | "version": "7.1.3", |
... | @@ -2316,11 +2618,28 @@ | ... | @@ -2316,11 +2618,28 @@ |
2316 | "@types/node": "*" | 2618 | "@types/node": "*" |
2317 | } | 2619 | } |
2318 | }, | 2620 | }, |
2621 | + "@types/hoist-non-react-statics": { | ||
2622 | + "version": "3.3.1", | ||
2623 | + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", | ||
2624 | + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", | ||
2625 | + "requires": { | ||
2626 | + "@types/react": "*", | ||
2627 | + "hoist-non-react-statics": "^3.3.0" | ||
2628 | + } | ||
2629 | + }, | ||
2319 | "@types/html-minifier-terser": { | 2630 | "@types/html-minifier-terser": { |
2320 | "version": "5.1.2", | 2631 | "version": "5.1.2", |
2321 | "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", | 2632 | "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", |
2322 | "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" | 2633 | "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" |
2323 | }, | 2634 | }, |
2635 | + "@types/http-proxy": { | ||
2636 | + "version": "1.17.7", | ||
2637 | + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz", | ||
2638 | + "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==", | ||
2639 | + "requires": { | ||
2640 | + "@types/node": "*" | ||
2641 | + } | ||
2642 | + }, | ||
2324 | "@types/istanbul-lib-coverage": { | 2643 | "@types/istanbul-lib-coverage": { |
2325 | "version": "2.0.3", | 2644 | "version": "2.0.3", |
2326 | "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", | 2645 | "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", |
... | @@ -2500,11 +2819,37 @@ | ... | @@ -2500,11 +2819,37 @@ |
2500 | "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz", | 2819 | "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz", |
2501 | "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==" | 2820 | "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==" |
2502 | }, | 2821 | }, |
2822 | + "@types/prop-types": { | ||
2823 | + "version": "15.7.4", | ||
2824 | + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz", | ||
2825 | + "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==" | ||
2826 | + }, | ||
2503 | "@types/q": { | 2827 | "@types/q": { |
2504 | "version": "1.5.5", | 2828 | "version": "1.5.5", |
2505 | "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz", | 2829 | "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz", |
2506 | "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" | 2830 | "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" |
2507 | }, | 2831 | }, |
2832 | + "@types/react": { | ||
2833 | + "version": "17.0.37", | ||
2834 | + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.37.tgz", | ||
2835 | + "integrity": "sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==", | ||
2836 | + "requires": { | ||
2837 | + "@types/prop-types": "*", | ||
2838 | + "@types/scheduler": "*", | ||
2839 | + "csstype": "^3.0.2" | ||
2840 | + } | ||
2841 | + }, | ||
2842 | + "@types/react-redux": { | ||
2843 | + "version": "7.1.20", | ||
2844 | + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.20.tgz", | ||
2845 | + "integrity": "sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==", | ||
2846 | + "requires": { | ||
2847 | + "@types/hoist-non-react-statics": "^3.3.0", | ||
2848 | + "@types/react": "*", | ||
2849 | + "hoist-non-react-statics": "^3.3.0", | ||
2850 | + "redux": "^4.0.0" | ||
2851 | + } | ||
2852 | + }, | ||
2508 | "@types/resolve": { | 2853 | "@types/resolve": { |
2509 | "version": "0.0.8", | 2854 | "version": "0.0.8", |
2510 | "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", | 2855 | "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", |
... | @@ -2513,6 +2858,11 @@ | ... | @@ -2513,6 +2858,11 @@ |
2513 | "@types/node": "*" | 2858 | "@types/node": "*" |
2514 | } | 2859 | } |
2515 | }, | 2860 | }, |
2861 | + "@types/scheduler": { | ||
2862 | + "version": "0.16.2", | ||
2863 | + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", | ||
2864 | + "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" | ||
2865 | + }, | ||
2516 | "@types/source-list-map": { | 2866 | "@types/source-list-map": { |
2517 | "version": "0.1.2", | 2867 | "version": "0.1.2", |
2518 | "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", | 2868 | "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", |
... | @@ -3273,6 +3623,14 @@ | ... | @@ -3273,6 +3623,14 @@ |
3273 | "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz", | 3623 | "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz", |
3274 | "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==" | 3624 | "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==" |
3275 | }, | 3625 | }, |
3626 | + "axios": { | ||
3627 | + "version": "0.24.0", | ||
3628 | + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", | ||
3629 | + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", | ||
3630 | + "requires": { | ||
3631 | + "follow-redirects": "^1.14.4" | ||
3632 | + } | ||
3633 | + }, | ||
3276 | "axobject-query": { | 3634 | "axobject-query": { |
3277 | "version": "2.2.0", | 3635 | "version": "2.2.0", |
3278 | "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", | 3636 | "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", |
... | @@ -4287,6 +4645,25 @@ | ... | @@ -4287,6 +4645,25 @@ |
4287 | "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz", | 4645 | "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz", |
4288 | "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==" | 4646 | "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==" |
4289 | }, | 4647 | }, |
4648 | + "ckeditor5": { | ||
4649 | + "version": "31.0.0", | ||
4650 | + "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-31.0.0.tgz", | ||
4651 | + "integrity": "sha512-6e6RJWn4mk3xKASy4DiwF0wz165wxagYfWsun7nB0oM4/s7Ri8T6Ihr433RVdepwaVLwrEp70yjk5pbY02cU9A==", | ||
4652 | + "requires": { | ||
4653 | + "@ckeditor/ckeditor5-clipboard": "^31.0.0", | ||
4654 | + "@ckeditor/ckeditor5-core": "^31.0.0", | ||
4655 | + "@ckeditor/ckeditor5-engine": "^31.0.0", | ||
4656 | + "@ckeditor/ckeditor5-enter": "^31.0.0", | ||
4657 | + "@ckeditor/ckeditor5-paragraph": "^31.0.0", | ||
4658 | + "@ckeditor/ckeditor5-select-all": "^31.0.0", | ||
4659 | + "@ckeditor/ckeditor5-typing": "^31.0.0", | ||
4660 | + "@ckeditor/ckeditor5-ui": "^31.0.0", | ||
4661 | + "@ckeditor/ckeditor5-undo": "^31.0.0", | ||
4662 | + "@ckeditor/ckeditor5-upload": "^31.0.0", | ||
4663 | + "@ckeditor/ckeditor5-utils": "^31.0.0", | ||
4664 | + "@ckeditor/ckeditor5-widget": "^31.0.0" | ||
4665 | + } | ||
4666 | + }, | ||
4290 | "class-utils": { | 4667 | "class-utils": { |
4291 | "version": "0.3.6", | 4668 | "version": "0.3.6", |
4292 | "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", | 4669 | "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", |
... | @@ -5008,6 +5385,11 @@ | ... | @@ -5008,6 +5385,11 @@ |
5008 | } | 5385 | } |
5009 | } | 5386 | } |
5010 | }, | 5387 | }, |
5388 | + "csstype": { | ||
5389 | + "version": "3.0.10", | ||
5390 | + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", | ||
5391 | + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" | ||
5392 | + }, | ||
5011 | "cyclist": { | 5393 | "cyclist": { |
5012 | "version": "1.0.1", | 5394 | "version": "1.0.1", |
5013 | "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", | 5395 | "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", |
... | @@ -6852,6 +7234,15 @@ | ... | @@ -6852,6 +7234,15 @@ |
6852 | "readable-stream": "^2.3.6" | 7234 | "readable-stream": "^2.3.6" |
6853 | } | 7235 | } |
6854 | }, | 7236 | }, |
7237 | + "flux-standard-action": { | ||
7238 | + "version": "2.1.2", | ||
7239 | + "resolved": "https://registry.npmjs.org/flux-standard-action/-/flux-standard-action-2.1.2.tgz", | ||
7240 | + "integrity": "sha512-7vdgawlphCjzaMLdpZv8hlGC/FJCXu6sqE3Wuqe3HLZ22KcDiO4IFplxLDePDhEt6hgCrugt45RoUObuzZP6Kg==", | ||
7241 | + "requires": { | ||
7242 | + "lodash.isplainobject": "^4.0.6", | ||
7243 | + "lodash.isstring": "^4.0.1" | ||
7244 | + } | ||
7245 | + }, | ||
6855 | "follow-redirects": { | 7246 | "follow-redirects": { |
6856 | "version": "1.14.5", | 7247 | "version": "1.14.5", |
6857 | "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", | 7248 | "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", |
... | @@ -7485,6 +7876,14 @@ | ... | @@ -7485,6 +7876,14 @@ |
7485 | "minimalistic-crypto-utils": "^1.0.1" | 7876 | "minimalistic-crypto-utils": "^1.0.1" |
7486 | } | 7877 | } |
7487 | }, | 7878 | }, |
7879 | + "hoist-non-react-statics": { | ||
7880 | + "version": "3.3.2", | ||
7881 | + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", | ||
7882 | + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", | ||
7883 | + "requires": { | ||
7884 | + "react-is": "^16.7.0" | ||
7885 | + } | ||
7886 | + }, | ||
7488 | "hoopy": { | 7887 | "hoopy": { |
7489 | "version": "0.1.4", | 7888 | "version": "0.1.4", |
7490 | "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", | 7889 | "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", |
... | @@ -7681,110 +8080,21 @@ | ... | @@ -7681,110 +8080,21 @@ |
7681 | } | 8080 | } |
7682 | }, | 8081 | }, |
7683 | "http-proxy-middleware": { | 8082 | "http-proxy-middleware": { |
7684 | - "version": "0.19.1", | ||
7685 | - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", | ||
7686 | - "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", | ||
7687 | - "requires": { | ||
7688 | - "http-proxy": "^1.17.0", | ||
7689 | - "is-glob": "^4.0.0", | ||
7690 | - "lodash": "^4.17.11", | ||
7691 | - "micromatch": "^3.1.10" | ||
7692 | - }, | ||
7693 | - "dependencies": { | ||
7694 | - "braces": { | ||
7695 | - "version": "2.3.2", | ||
7696 | - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", | ||
7697 | - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", | ||
7698 | - "requires": { | ||
7699 | - "arr-flatten": "^1.1.0", | ||
7700 | - "array-unique": "^0.3.2", | ||
7701 | - "extend-shallow": "^2.0.1", | ||
7702 | - "fill-range": "^4.0.0", | ||
7703 | - "isobject": "^3.0.1", | ||
7704 | - "repeat-element": "^1.1.2", | ||
7705 | - "snapdragon": "^0.8.1", | ||
7706 | - "snapdragon-node": "^2.0.1", | ||
7707 | - "split-string": "^3.0.2", | ||
7708 | - "to-regex": "^3.0.1" | ||
7709 | - }, | ||
7710 | - "dependencies": { | ||
7711 | - "extend-shallow": { | ||
7712 | "version": "2.0.1", | 8083 | "version": "2.0.1", |
7713 | - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", | 8084 | + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", |
7714 | - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", | 8085 | + "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", |
7715 | "requires": { | 8086 | "requires": { |
7716 | - "is-extendable": "^0.1.0" | 8087 | + "@types/http-proxy": "^1.17.5", |
7717 | - } | 8088 | + "http-proxy": "^1.18.1", |
7718 | - } | 8089 | + "is-glob": "^4.0.1", |
7719 | - } | 8090 | + "is-plain-obj": "^3.0.0", |
7720 | - }, | 8091 | + "micromatch": "^4.0.2" |
7721 | - "fill-range": { | ||
7722 | - "version": "4.0.0", | ||
7723 | - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", | ||
7724 | - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", | ||
7725 | - "requires": { | ||
7726 | - "extend-shallow": "^2.0.1", | ||
7727 | - "is-number": "^3.0.0", | ||
7728 | - "repeat-string": "^1.6.1", | ||
7729 | - "to-regex-range": "^2.1.0" | ||
7730 | }, | 8092 | }, |
7731 | "dependencies": { | 8093 | "dependencies": { |
7732 | - "extend-shallow": { | 8094 | + "is-plain-obj": { |
7733 | - "version": "2.0.1", | ||
7734 | - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", | ||
7735 | - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", | ||
7736 | - "requires": { | ||
7737 | - "is-extendable": "^0.1.0" | ||
7738 | - } | ||
7739 | - } | ||
7740 | - } | ||
7741 | - }, | ||
7742 | - "is-number": { | ||
7743 | "version": "3.0.0", | 8095 | "version": "3.0.0", |
7744 | - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", | 8096 | + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", |
7745 | - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", | 8097 | + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==" |
7746 | - "requires": { | ||
7747 | - "kind-of": "^3.0.2" | ||
7748 | - }, | ||
7749 | - "dependencies": { | ||
7750 | - "kind-of": { | ||
7751 | - "version": "3.2.2", | ||
7752 | - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", | ||
7753 | - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||
7754 | - "requires": { | ||
7755 | - "is-buffer": "^1.1.5" | ||
7756 | - } | ||
7757 | - } | ||
7758 | - } | ||
7759 | - }, | ||
7760 | - "micromatch": { | ||
7761 | - "version": "3.1.10", | ||
7762 | - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", | ||
7763 | - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", | ||
7764 | - "requires": { | ||
7765 | - "arr-diff": "^4.0.0", | ||
7766 | - "array-unique": "^0.3.2", | ||
7767 | - "braces": "^2.3.1", | ||
7768 | - "define-property": "^2.0.2", | ||
7769 | - "extend-shallow": "^3.0.2", | ||
7770 | - "extglob": "^2.0.4", | ||
7771 | - "fragment-cache": "^0.2.1", | ||
7772 | - "kind-of": "^6.0.2", | ||
7773 | - "nanomatch": "^1.2.9", | ||
7774 | - "object.pick": "^1.3.0", | ||
7775 | - "regex-not": "^1.0.0", | ||
7776 | - "snapdragon": "^0.8.1", | ||
7777 | - "to-regex": "^3.0.2" | ||
7778 | - } | ||
7779 | - }, | ||
7780 | - "to-regex-range": { | ||
7781 | - "version": "2.1.1", | ||
7782 | - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", | ||
7783 | - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", | ||
7784 | - "requires": { | ||
7785 | - "is-number": "^3.0.0", | ||
7786 | - "repeat-string": "^1.6.1" | ||
7787 | - } | ||
7788 | } | 8098 | } |
7789 | } | 8099 | } |
7790 | }, | 8100 | }, |
... | @@ -8235,6 +8545,11 @@ | ... | @@ -8235,6 +8545,11 @@ |
8235 | "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", | 8545 | "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", |
8236 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" | 8546 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" |
8237 | }, | 8547 | }, |
8548 | + "is-promise": { | ||
8549 | + "version": "2.2.2", | ||
8550 | + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", | ||
8551 | + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" | ||
8552 | + }, | ||
8238 | "is-regex": { | 8553 | "is-regex": { |
8239 | "version": "1.1.4", | 8554 | "version": "1.1.4", |
8240 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", | 8555 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", |
... | @@ -9819,9 +10134,9 @@ | ... | @@ -9819,9 +10134,9 @@ |
9819 | "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" | 10134 | "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" |
9820 | }, | 10135 | }, |
9821 | "json-schema": { | 10136 | "json-schema": { |
9822 | - "version": "0.2.3", | 10137 | + "version": "0.4.0", |
9823 | - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", | 10138 | + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", |
9824 | - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" | 10139 | + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" |
9825 | }, | 10140 | }, |
9826 | "json-schema-traverse": { | 10141 | "json-schema-traverse": { |
9827 | "version": "0.4.1", | 10142 | "version": "0.4.1", |
... | @@ -9861,13 +10176,13 @@ | ... | @@ -9861,13 +10176,13 @@ |
9861 | } | 10176 | } |
9862 | }, | 10177 | }, |
9863 | "jsprim": { | 10178 | "jsprim": { |
9864 | - "version": "1.4.1", | 10179 | + "version": "1.4.2", |
9865 | - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", | 10180 | + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", |
9866 | - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", | 10181 | + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", |
9867 | "requires": { | 10182 | "requires": { |
9868 | "assert-plus": "1.0.0", | 10183 | "assert-plus": "1.0.0", |
9869 | "extsprintf": "1.3.0", | 10184 | "extsprintf": "1.3.0", |
9870 | - "json-schema": "0.2.3", | 10185 | + "json-schema": "0.4.0", |
9871 | "verror": "1.10.0" | 10186 | "verror": "1.10.0" |
9872 | } | 10187 | } |
9873 | }, | 10188 | }, |
... | @@ -9989,6 +10304,16 @@ | ... | @@ -9989,6 +10304,16 @@ |
9989 | "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", | 10304 | "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", |
9990 | "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" | 10305 | "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" |
9991 | }, | 10306 | }, |
10307 | + "lodash.isplainobject": { | ||
10308 | + "version": "4.0.6", | ||
10309 | + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", | ||
10310 | + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" | ||
10311 | + }, | ||
10312 | + "lodash.isstring": { | ||
10313 | + "version": "4.0.1", | ||
10314 | + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", | ||
10315 | + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" | ||
10316 | + }, | ||
9992 | "lodash.memoize": { | 10317 | "lodash.memoize": { |
9993 | "version": "4.1.2", | 10318 | "version": "4.1.2", |
9994 | "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", | 10319 | "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", |
... | @@ -12882,6 +13207,26 @@ | ... | @@ -12882,6 +13207,26 @@ |
12882 | "warning": "^4.0.2" | 13207 | "warning": "^4.0.2" |
12883 | } | 13208 | } |
12884 | }, | 13209 | }, |
13210 | + "react-redux": { | ||
13211 | + "version": "7.2.6", | ||
13212 | + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz", | ||
13213 | + "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==", | ||
13214 | + "requires": { | ||
13215 | + "@babel/runtime": "^7.15.4", | ||
13216 | + "@types/react-redux": "^7.1.20", | ||
13217 | + "hoist-non-react-statics": "^3.3.2", | ||
13218 | + "loose-envify": "^1.4.0", | ||
13219 | + "prop-types": "^15.7.2", | ||
13220 | + "react-is": "^17.0.2" | ||
13221 | + }, | ||
13222 | + "dependencies": { | ||
13223 | + "react-is": { | ||
13224 | + "version": "17.0.2", | ||
13225 | + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", | ||
13226 | + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" | ||
13227 | + } | ||
13228 | + } | ||
13229 | + }, | ||
12885 | "react-refresh": { | 13230 | "react-refresh": { |
12886 | "version": "0.8.3", | 13231 | "version": "0.8.3", |
12887 | "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", | 13232 | "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", |
... | @@ -13045,6 +13390,33 @@ | ... | @@ -13045,6 +13390,33 @@ |
13045 | "strip-indent": "^3.0.0" | 13390 | "strip-indent": "^3.0.0" |
13046 | } | 13391 | } |
13047 | }, | 13392 | }, |
13393 | + "redux": { | ||
13394 | + "version": "4.1.2", | ||
13395 | + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", | ||
13396 | + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", | ||
13397 | + "requires": { | ||
13398 | + "@babel/runtime": "^7.9.2" | ||
13399 | + } | ||
13400 | + }, | ||
13401 | + "redux-promise": { | ||
13402 | + "version": "0.6.0", | ||
13403 | + "resolved": "https://registry.npmjs.org/redux-promise/-/redux-promise-0.6.0.tgz", | ||
13404 | + "integrity": "sha512-R2mGxJbPFgXyCNbFDE6LjTZhCEuACF54g1bxld3nqBhnRMX0OsUyWk77moF7UMGkUdl5WOAwc4BC5jOd1dunqQ==", | ||
13405 | + "requires": { | ||
13406 | + "flux-standard-action": "^2.0.3", | ||
13407 | + "is-promise": "^2.1.0" | ||
13408 | + } | ||
13409 | + }, | ||
13410 | + "redux-promise-middleware": { | ||
13411 | + "version": "6.1.2", | ||
13412 | + "resolved": "https://registry.npmjs.org/redux-promise-middleware/-/redux-promise-middleware-6.1.2.tgz", | ||
13413 | + "integrity": "sha512-ZqZu/nnSzGgwTtNbGoGVontpk7LjTOv0kigtt3CcgXI9gpq+8WlfXTXRZD0WTD5yaohRq0q2nYmJXSTjwXs83Q==" | ||
13414 | + }, | ||
13415 | + "redux-thunk": { | ||
13416 | + "version": "2.4.1", | ||
13417 | + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz", | ||
13418 | + "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==" | ||
13419 | + }, | ||
13048 | "regenerate": { | 13420 | "regenerate": { |
13049 | "version": "1.4.2", | 13421 | "version": "1.4.2", |
13050 | "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", | 13422 | "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", |
... | @@ -16389,6 +16761,17 @@ | ... | @@ -16389,6 +16761,17 @@ |
16389 | } | 16761 | } |
16390 | } | 16762 | } |
16391 | }, | 16763 | }, |
16764 | + "http-proxy-middleware": { | ||
16765 | + "version": "0.19.1", | ||
16766 | + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", | ||
16767 | + "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", | ||
16768 | + "requires": { | ||
16769 | + "http-proxy": "^1.17.0", | ||
16770 | + "is-glob": "^4.0.0", | ||
16771 | + "lodash": "^4.17.11", | ||
16772 | + "micromatch": "^3.1.10" | ||
16773 | + } | ||
16774 | + }, | ||
16392 | "import-local": { | 16775 | "import-local": { |
16393 | "version": "2.0.0", | 16776 | "version": "2.0.0", |
16394 | "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", | 16777 | "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", | ... | ... |
... | @@ -3,14 +3,23 @@ | ... | @@ -3,14 +3,23 @@ |
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | 4 | "private": true, |
5 | "dependencies": { | 5 | "dependencies": { |
6 | + "@ckeditor/ckeditor5-build-classic": "^31.0.0", | ||
7 | + "@ckeditor/ckeditor5-react": "^3.0.3", | ||
6 | "@testing-library/jest-dom": "^5.15.0", | 8 | "@testing-library/jest-dom": "^5.15.0", |
7 | "@testing-library/react": "^11.2.7", | 9 | "@testing-library/react": "^11.2.7", |
8 | "@testing-library/user-event": "^12.8.3", | 10 | "@testing-library/user-event": "^12.8.3", |
11 | + "axios": "^0.24.0", | ||
12 | + "http-proxy-middleware": "^2.0.1", | ||
9 | "node-sass": "^6.0.1", | 13 | "node-sass": "^6.0.1", |
10 | "react": "^17.0.2", | 14 | "react": "^17.0.2", |
11 | "react-dom": "^17.0.2", | 15 | "react-dom": "^17.0.2", |
16 | + "react-redux": "^7.2.6", | ||
12 | "react-router-dom": "^6.0.2", | 17 | "react-router-dom": "^6.0.2", |
13 | "react-scripts": "4.0.3", | 18 | "react-scripts": "4.0.3", |
19 | + "redux": "^4.1.2", | ||
20 | + "redux-promise": "^0.6.0", | ||
21 | + "redux-promise-middleware": "^6.1.2", | ||
22 | + "redux-thunk": "^2.4.1", | ||
14 | "semantic-ui-css": "^2.4.1", | 23 | "semantic-ui-css": "^2.4.1", |
15 | "semantic-ui-react": "^2.0.4", | 24 | "semantic-ui-react": "^2.0.4", |
16 | "web-vitals": "^1.1.2" | 25 | "web-vitals": "^1.1.2" | ... | ... |
... | @@ -9,21 +9,6 @@ | ... | @@ -9,21 +9,6 @@ |
9 | name="description" | 9 | name="description" |
10 | content="Web site created using create-react-app" | 10 | content="Web site created using create-react-app" |
11 | /> | 11 | /> |
12 | - <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> | ||
13 | - <!-- | ||
14 | - manifest.json provides metadata used when your web app is installed on a | ||
15 | - user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ | ||
16 | - --> | ||
17 | - <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> | ||
18 | - <!-- | ||
19 | - Notice the use of %PUBLIC_URL% in the tags above. | ||
20 | - It will be replaced with the URL of the `public` folder during the build. | ||
21 | - Only files inside the `public` folder can be referenced from the HTML. | ||
22 | - | ||
23 | - Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will | ||
24 | - work correctly both with client-side routing and a non-root public URL. | ||
25 | - Learn how to configure a non-root public URL by running `npm run build`. | ||
26 | - --> | ||
27 | <title>React App</title> | 12 | <title>React App</title> |
28 | </head> | 13 | </head> |
29 | <body> | 14 | <body> | ... | ... |
turnel_FE/public/manifest.json
deleted
100644 → 0
1 | -{ | ||
2 | - "short_name": "React App", | ||
3 | - "name": "Create React App Sample", | ||
4 | - "icons": [ | ||
5 | - { | ||
6 | - "src": "favicon.ico", | ||
7 | - "sizes": "64x64 32x32 24x24 16x16", | ||
8 | - "type": "image/x-icon" | ||
9 | - }, | ||
10 | - { | ||
11 | - "src": "logo192.png", | ||
12 | - "type": "image/png", | ||
13 | - "sizes": "192x192" | ||
14 | - }, | ||
15 | - { | ||
16 | - "src": "logo512.png", | ||
17 | - "type": "image/png", | ||
18 | - "sizes": "512x512" | ||
19 | - } | ||
20 | - ], | ||
21 | - "start_url": ".", | ||
22 | - "display": "standalone", | ||
23 | - "theme_color": "#000000", | ||
24 | - "background_color": "#ffffff" | ||
25 | -} |
1 | -//import React, {useState} from "react"; | 1 | +import {BrowserRouter as Router, Route, Routes} from "react-router-dom"; |
2 | -import {BrowserRouter as Router, Route, Routes, Link} from "react-router-dom"; | 2 | +import MainPage from "./component/views/MainPage/MainPage"; |
3 | -import MainPage from "./component/views/LandingPage/MainPage"; | ||
4 | import LoginPage from "./component/views/LoginPage/LoginPage"; | 3 | import LoginPage from "./component/views/LoginPage/LoginPage"; |
5 | import RegisterPage from "./component/views/RegisterPage/RegisterPage"; | 4 | import RegisterPage from "./component/views/RegisterPage/RegisterPage"; |
6 | import "./static/fonts/font.css"; | 5 | import "./static/fonts/font.css"; |
6 | +import LandingPage from "./component/views/LandingPage/LandingPage"; | ||
7 | + | ||
7 | function App () { | 8 | function App () { |
8 | return ( | 9 | return ( |
9 | <Router> | 10 | <Router> |
10 | <div> | 11 | <div> |
11 | - {} | ||
12 | <Routes> | 12 | <Routes> |
13 | - <Route exact path = "/main" element={<MainPage/>}/> | 13 | + <Route exact path = "/" element={<LandingPage/>}/> |
14 | <Route exact path = "/login" element={<LoginPage/>}/> | 14 | <Route exact path = "/login" element={<LoginPage/>}/> |
15 | + <Route exact path = "/main" element={<MainPage/>}/> | ||
15 | <Route exact path = "/register" element={<RegisterPage/>}/> | 16 | <Route exact path = "/register" element={<RegisterPage/>}/> |
16 | </Routes> | 17 | </Routes> |
17 | </div> | 18 | </div> | ... | ... |
turnel_FE/src/_actions/types.js
0 → 100644
turnel_FE/src/_actions/user_action.js
0 → 100644
1 | +import Axios from 'axios'; | ||
2 | +import { LOGIN_USER, REGISTER_USER } from './types'; | ||
3 | + | ||
4 | +export function loginUser(dataToSubmit) { | ||
5 | + | ||
6 | + const request = Axios.post('/api/users/login', dataToSubmit) | ||
7 | + .then( response => response.data ) | ||
8 | + return { | ||
9 | + type: LOGIN_USER, | ||
10 | + payload: request | ||
11 | + } | ||
12 | +} | ||
13 | + | ||
14 | +export function registerUser(dataToSubmit) { | ||
15 | + | ||
16 | + const request = Axios.post('/api/users/register', dataToSubmit) | ||
17 | + .then( response => response.data ) | ||
18 | + return { | ||
19 | + type: REGISTER_USER, | ||
20 | + payload: request | ||
21 | + } | ||
22 | +} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
turnel_FE/src/_reducers/index.js
0 → 100644
turnel_FE/src/_reducers/user_reducer.js
0 → 100644
1 | +import { | ||
2 | + LOGIN_USER, REGISTER_USER | ||
3 | +} from '../_actions/types'; | ||
4 | + | ||
5 | +export default function (state = {}, action) { | ||
6 | + switch (action.type) { | ||
7 | + case LOGIN_USER: | ||
8 | + return { ...state, loginSuccess: action.payload } | ||
9 | + break; | ||
10 | + case REGISTER_USER: | ||
11 | + return {...state, registerSuccess: action.payload} | ||
12 | + break; | ||
13 | + default: | ||
14 | + return state; | ||
15 | + } | ||
16 | +} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +import React from 'react' | ||
2 | +//import axios from 'axios' | ||
3 | +// import { response } from 'express' | ||
4 | + | ||
5 | +function LandingPage() { | ||
6 | + | ||
7 | + // useEffect(() => { | ||
8 | + // axios.get('/api/hello') | ||
9 | + // .then(response => console.log(response.data)) | ||
10 | + // }, []) | ||
11 | + | ||
12 | + return ( | ||
13 | + <div> | ||
14 | + LandingPage | ||
15 | + </div> | ||
16 | + ) | ||
17 | +} | ||
18 | + | ||
19 | +export default LandingPage | ||
20 | + |
1 | -import React, { useState } from "react"; | 1 | +import React, {useState} from "react"; |
2 | import "../style/LoginPage.scss"; | 2 | import "../style/LoginPage.scss"; |
3 | import { Icon, Input } from "semantic-ui-react" | 3 | import { Icon, Input } from "semantic-ui-react" |
4 | import { useNavigate } from "react-router-dom"; | 4 | import { useNavigate } from "react-router-dom"; |
5 | +import {useDispatch} from "react-redux"; | ||
6 | +import { loginUser } from '../../../_actions/user_action' | ||
5 | 7 | ||
6 | -function LoginPage() { | 8 | +function LoginPage(props) { |
9 | + const dispatch = useDispatch(); | ||
7 | const navigate = useNavigate(); | 10 | const navigate = useNavigate(); |
8 | 11 | ||
9 | - const [Email, setEmail] = useState(""); | 12 | + const [Id, setId] = useState(""); |
10 | const [Password, setPassword] = useState(""); | 13 | const [Password, setPassword] = useState(""); |
11 | 14 | ||
12 | const onIdHandler = (event) => { | 15 | const onIdHandler = (event) => { |
13 | - setEmail(event.currentTarget.value); | 16 | + setId(event.currentTarget.value); |
14 | }; | 17 | }; |
15 | const onPasswordHandler = (event) => { | 18 | const onPasswordHandler = (event) => { |
16 | setPassword(event.currentTarget.value); | 19 | setPassword(event.currentTarget.value); |
17 | }; | 20 | }; |
18 | const onSubmitHandler = (event) => { | 21 | const onSubmitHandler = (event) => { |
19 | event.preventDefault(); | 22 | event.preventDefault(); |
20 | - console.log("Email", Email); | 23 | + console.log("ID", Id); |
21 | console.log("Password", Password); | 24 | console.log("Password", Password); |
25 | + let body = { | ||
26 | + email: Id, | ||
27 | + password: Password | ||
28 | + } | ||
29 | + dispatch(loginUser(body)) | ||
30 | + .then(response => { | ||
31 | + if (response.payload.loginSuccess) { | ||
32 | + props.history.push('/main') | ||
33 | + } | ||
34 | + else{ | ||
35 | + alert('Error') | ||
36 | + } | ||
37 | + }) | ||
38 | + | ||
22 | }; | 39 | }; |
23 | 40 | ||
24 | const goToRegister = () => { | 41 | const goToRegister = () => { |
25 | navigate('/register'); | 42 | navigate('/register'); |
26 | } | 43 | } |
27 | - | ||
28 | return ( | 44 | return ( |
29 | <div id="body"> | 45 | <div id="body"> |
30 | <div className="login-form"> | 46 | <div className="login-form"> |
... | @@ -34,9 +50,9 @@ function LoginPage() { | ... | @@ -34,9 +50,9 @@ function LoginPage() { |
34 | <Input | 50 | <Input |
35 | icon={<Icon name='at'/>} | 51 | icon={<Icon name='at'/>} |
36 | iconPosition='left' | 52 | iconPosition='left' |
37 | - placeholder="Email" | 53 | + placeholder="ID" |
38 | type="text" | 54 | type="text" |
39 | - value={Email} | 55 | + value={Id} |
40 | autoComplete="off" | 56 | autoComplete="off" |
41 | onChange={onIdHandler}/> | 57 | onChange={onIdHandler}/> |
42 | </div> | 58 | </div> | ... | ... |
1 | -import {Button, Grid, Image, Segment} from "semantic-ui-react" | 1 | +import {Button} from "semantic-ui-react" |
2 | import "../style/MainPage.scss"; | 2 | import "../style/MainPage.scss"; |
3 | +import { useNavigate } from "react-router-dom"; | ||
4 | +import { CKEditor } from '@ckeditor/ckeditor5-react'; | ||
5 | +import ClassicEditor from '@ckeditor/ckeditor5-build-classic'; | ||
6 | + | ||
3 | function MainPage() { | 7 | function MainPage() { |
8 | + const navigate = useNavigate(); | ||
9 | + const goToLogin = () =>{ | ||
10 | + navigate('/login'); | ||
11 | + } | ||
4 | return ( | 12 | return ( |
5 | <div id="Main"> | 13 | <div id="Main"> |
6 | <div className="Main-header"> | 14 | <div className="Main-header"> |
... | @@ -8,7 +16,7 @@ function MainPage() { | ... | @@ -8,7 +16,7 @@ function MainPage() { |
8 | <h1>Tunnel</h1> | 16 | <h1>Tunnel</h1> |
9 | </div> | 17 | </div> |
10 | <div className="None-title"> | 18 | <div className="None-title"> |
11 | - <Button className="ui right floated button"> | 19 | + <Button className="ui right floated button" onClick={()=>goToLogin()}> |
12 | Logout | 20 | Logout |
13 | </Button> | 21 | </Button> |
14 | </div> | 22 | </div> |
... | @@ -26,7 +34,24 @@ function MainPage() { | ... | @@ -26,7 +34,24 @@ function MainPage() { |
26 | </div> | 34 | </div> |
27 | <div className="contents"> | 35 | <div className="contents"> |
28 | <div className="ui segment"> | 36 | <div className="ui segment"> |
29 | - <p>a</p> | 37 | + <CKEditor |
38 | + editor={ClassicEditor} | ||
39 | + data="<p>Hello from CKEditor 5!</p>" | ||
40 | + onReady={editor => { | ||
41 | + // You can store the "editor" and use when it is needed. | ||
42 | + console.log('Editor is ready to use!', editor); | ||
43 | + }} | ||
44 | + onChange={(event, editor) => { | ||
45 | + const data = editor.getData(); | ||
46 | + console.log({ event, editor, data }); | ||
47 | + }} | ||
48 | + onBlur={(event, editor) => { | ||
49 | + console.log('Blur.', editor); | ||
50 | + }} | ||
51 | + onFocus={(event, editor) => { | ||
52 | + console.log('Focus.', editor); | ||
53 | + }} | ||
54 | + /> | ||
30 | </div> | 55 | </div> |
31 | <div className="ui segment"> | 56 | <div className="ui segment"> |
32 | <p>a</p> | 57 | <p>a</p> |
... | @@ -45,7 +70,7 @@ function MainPage() { | ... | @@ -45,7 +70,7 @@ function MainPage() { |
45 | tabIndex="0"> | 70 | tabIndex="0"> |
46 | <div className="visible content">도착한 글</div> | 71 | <div className="visible content">도착한 글</div> |
47 | <div className="hidden content"> | 72 | <div className="hidden content"> |
48 | - <i className="pencil alternate icon"></i> | 73 | + <i className="paper plane ic on"></i> |
49 | </div> | 74 | </div> |
50 | </Button> | 75 | </Button> |
51 | </div> | 76 | </div> | ... | ... |
1 | -import React, {useCallback, useState} from "react"; | 1 | +import React, {useState} from "react"; |
2 | import "../style/RegisterPage.scss"; | 2 | import "../style/RegisterPage.scss"; |
3 | -import { Form, Message, Button, Icon, Input } from "semantic-ui-react"; | 3 | +import { Button, Icon, Input } from "semantic-ui-react"; |
4 | -import backgroundImg from "../images/register_background.png"; | 4 | +import {useDispatch} from "react-redux"; |
5 | +import { registerUser } from '../../../_actions/user_action' | ||
5 | 6 | ||
6 | -function RegisterPage() { | 7 | +function RegisterPage(props) { |
7 | - const [Email, setEmail] = useState(""); | 8 | + const dispatch = useDispatch(); |
9 | + const [Id, setId] = useState(""); | ||
8 | const [Password, setPassword] = useState(""); | 10 | const [Password, setPassword] = useState(""); |
9 | const [PasswordCheck,setPasswordCheck] = useState(""); | 11 | const [PasswordCheck,setPasswordCheck] = useState(""); |
10 | const [Personality, setPersonality] = useState(""); | 12 | const [Personality, setPersonality] = useState(""); |
11 | - const [PasswordError,setPasswordError] = useState(false); | ||
12 | 13 | ||
13 | const onIdHandler = (event) => { | 14 | const onIdHandler = (event) => { |
14 | - setEmail(event.currentTarget.value); | 15 | + setId(event.currentTarget.value); |
15 | }; | 16 | }; |
16 | const onPasswordHandler = (event) => { | 17 | const onPasswordHandler = (event) => { |
17 | setPassword(event.currentTarget.value); | 18 | setPassword(event.currentTarget.value); |
... | @@ -19,22 +20,32 @@ function RegisterPage() { | ... | @@ -19,22 +20,32 @@ function RegisterPage() { |
19 | const onPersonalityHandler = (event) => { | 20 | const onPersonalityHandler = (event) => { |
20 | setPersonality(event.currentTarget.value); | 21 | setPersonality(event.currentTarget.value); |
21 | }; | 22 | }; |
22 | - const onPasswordChkHandler = useCallback((event) => { | 23 | + const onPasswordChkHandler = (event) => { |
23 | //비밀번호를 입력할때마다 password 를 검증하는 함수 | 24 | //비밀번호를 입력할때마다 password 를 검증하는 함수 |
24 | setPasswordCheck(event.currentTarget.value); | 25 | setPasswordCheck(event.currentTarget.value); |
25 | - },[PasswordCheck]); | 26 | + }; |
26 | - const onSubmitHandler = useCallback((event) => { | 27 | + const onSubmitHandler = (event) => { |
27 | event.preventDefault(); | 28 | event.preventDefault(); |
28 | - if(Password !== PasswordCheck){ | 29 | + console.log("ID", Id); |
29 | - return setPasswordError(true); | 30 | + console.log("Password", Password); |
31 | + console.log("MBTI", Personality); | ||
32 | + if (Password !== PasswordCheck) { | ||
33 | + return alert('비밀번호가 일치하지 않습니다.') | ||
30 | } | 34 | } |
31 | - else{ | 35 | + let body = { |
32 | - return setPasswordError(false); | 36 | + id: Id, |
37 | + password: Password, | ||
38 | + personality: Personality | ||
39 | + } | ||
40 | + dispatch(registerUser(body)) | ||
41 | + .then(response => { | ||
42 | + if (response.payload.registerSuccess) { | ||
43 | + props.history.push('/login') | ||
44 | + } else { | ||
45 | + alert('Failed to sign up') | ||
46 | + } | ||
47 | + }) | ||
33 | } | 48 | } |
34 | - console.log("Email",Email); | ||
35 | - console.log("Password", Password); | ||
36 | - },[Password,PasswordCheck]); | ||
37 | - | ||
38 | return ( | 49 | return ( |
39 | <div id="Register"> | 50 | <div id="Register"> |
40 | <div className="register-form"> | 51 | <div className="register-form"> |
... | @@ -42,34 +53,33 @@ function RegisterPage() { | ... | @@ -42,34 +53,33 @@ function RegisterPage() { |
42 | <h1>Tunnel</h1> | 53 | <h1>Tunnel</h1> |
43 | <div className="input-area"> | 54 | <div className="input-area"> |
44 | <Input | 55 | <Input |
45 | - icon={<Icon name='at'/>} | 56 | + icon={<Icon name="id badge"/>} |
46 | iconPosition='left' | 57 | iconPosition='left' |
47 | - placeholder="Email" | 58 | + placeholder="ID" |
48 | type="text" | 59 | type="text" |
49 | - value={Email} | 60 | + value={Id} |
50 | autoComplete="off" | 61 | autoComplete="off" |
51 | required onChange={onIdHandler}/> | 62 | required onChange={onIdHandler}/> |
52 | </div> | 63 | </div> |
53 | <div className="input-area"> | 64 | <div className="input-area"> |
54 | <Input | 65 | <Input |
66 | + icon={<Icon name='heart'/>} | ||
67 | + iconPosition='left' | ||
68 | + placeholder="Your MBTI" | ||
69 | + type="text" | ||
70 | + value={Personality} | ||
71 | + autoComplete="off" | ||
72 | + onChange={onPersonalityHandler}/> | ||
73 | + </div> | ||
74 | + <div className="input-area"> | ||
75 | + <Input | ||
55 | icon={<Icon name='lock'/>} | 76 | icon={<Icon name='lock'/>} |
56 | iconPosition='left' | 77 | iconPosition='left' |
57 | placeholder="Password" | 78 | placeholder="Password" |
58 | type="password" | 79 | type="password" |
59 | value={Password} | 80 | value={Password} |
60 | autoComplete="off" | 81 | autoComplete="off" |
61 | - onChange={onPasswordHandler} | 82 | + onChange={onPasswordHandler}/> |
62 | - onFocus={()=>setPasswordError(false)}/> | ||
63 | - {PasswordError && | ||
64 | - <Form error> | ||
65 | - <Message | ||
66 | - error | ||
67 | - header='Action Forbidden' | ||
68 | - content='You can only sign up for an account once with a given e-mail address.' | ||
69 | - /> | ||
70 | - <Button>Submit</Button> | ||
71 | - </Form> | ||
72 | - } | ||
73 | </div> | 83 | </div> |
74 | <div className="input-area"> | 84 | <div className="input-area"> |
75 | <Input | 85 | <Input |
... | @@ -79,32 +89,17 @@ function RegisterPage() { | ... | @@ -79,32 +89,17 @@ function RegisterPage() { |
79 | type="password" | 89 | type="password" |
80 | value={PasswordCheck} | 90 | value={PasswordCheck} |
81 | autoComplete="off" | 91 | autoComplete="off" |
82 | - onChange={onPasswordChkHandler} | 92 | + onChange={onPasswordChkHandler}/> |
83 | - onFocus={()=>setPasswordError(false)}/> | ||
84 | - | ||
85 | - </div> | ||
86 | - <div className="input-area"> | ||
87 | - <Input | ||
88 | - icon={<Icon name='heart'/>} | ||
89 | - iconPosition='left' | ||
90 | - placeholder="Your MBTI" | ||
91 | - type="text" | ||
92 | - value={Personality} | ||
93 | - autoComplete="off" | ||
94 | - onChange={onPersonalityHandler}/> | ||
95 | </div> | 93 | </div> |
96 | <div className="btn-area" > | 94 | <div className="btn-area" > |
97 | <Button className='register-btn' | 95 | <Button className='register-btn' |
98 | content='Sign up' | 96 | content='Sign up' |
99 | icon='signup' | 97 | icon='signup' |
100 | - size='small' | 98 | + size='small'/> |
101 | - iconPosition='left'/> | ||
102 | </div> | 99 | </div> |
103 | </form> | 100 | </form> |
104 | </div> | 101 | </div> |
105 | - | ||
106 | </div> | 102 | </div> |
107 | ); | 103 | ); |
108 | } | 104 | } |
109 | - | ||
110 | export default RegisterPage; | 105 | export default RegisterPage; | ... | ... |
1 | import React from 'react'; | 1 | import React from 'react'; |
2 | import ReactDOM from 'react-dom'; | 2 | import ReactDOM from 'react-dom'; |
3 | +import {Provider} from "react-redux"; | ||
3 | import './index.css'; | 4 | import './index.css'; |
4 | import App from './App'; | 5 | import App from './App'; |
5 | import 'semantic-ui-css/semantic.min.css' | 6 | import 'semantic-ui-css/semantic.min.css' |
7 | +import {applyMiddleware, createStore} from "redux"; | ||
8 | +import promiseMiddleware from 'redux-promise-middleware' | ||
9 | +import ReduxThunk from 'redux-thunk' | ||
10 | +import Reducer from './_reducers'; | ||
6 | 11 | ||
12 | +const createStoreWithMiddleWare = applyMiddleware(promiseMiddleware, ReduxThunk)(createStore) | ||
7 | ReactDOM.render( | 13 | ReactDOM.render( |
8 | - <React.StrictMode> | 14 | + <Provider store={createStoreWithMiddleWare(Reducer, |
15 | + window.__REDUX_DEVTOOLS_EXTENSION__ && | ||
16 | + window.__REDUX_DEVTOOLS_EXTENSION__() | ||
17 | + )}> | ||
9 | <App /> | 18 | <App /> |
10 | - </React.StrictMode>, | 19 | + </Provider>, |
11 | document.getElementById('root') | 20 | document.getElementById('root') |
12 | ); | 21 | ); |
13 | 22 | ... | ... |
turnel_FE/src/logo.svg
deleted
100644 → 0
1 | -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
turnel_FE/src/setupProxy.js
0 → 100644
1 | +const { createProxyMiddleware } = require('http-proxy-middleware'); | ||
2 | +module.exports = function(app) { | ||
3 | + app.use( | ||
4 | + '/api', | ||
5 | + createProxyMiddleware({ | ||
6 | + target: 'http://localhost:3000', | ||
7 | + changeOrigin: true, | ||
8 | + }) | ||
9 | + ); | ||
10 | +}; | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
-
Please register or login to post a comment