├── .gitignore
├── client
├── public
│ ├── robots.txt
│ ├── favicon.ico
│ ├── logo192.png
│ ├── logo512.png
│ ├── manifest.json
│ └── index.html
├── src
│ ├── index.js
│ ├── index.css
│ ├── services
│ │ └── taskServices.js
│ ├── App.css
│ ├── Tasks.js
│ └── App.js
└── package.json
└── server
├── models
└── task.js
├── package.json
├── index.js
├── db.js
├── routes
└── tasks.js
└── package-lock.json
/.gitignore:
--------------------------------------------------------------------------------
1 |
2 | client/node_modules
3 | server/node_modules
--------------------------------------------------------------------------------
/client/public/robots.txt:
--------------------------------------------------------------------------------
1 | # https://www.robotstxt.org/robotstxt.html
2 | User-agent: *
3 | Disallow:
4 |
--------------------------------------------------------------------------------
/client/public/favicon.ico:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/sk-Jahangeer/todo-mern-app/HEAD/client/public/favicon.ico
--------------------------------------------------------------------------------
/client/public/logo192.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/sk-Jahangeer/todo-mern-app/HEAD/client/public/logo192.png
--------------------------------------------------------------------------------
/client/public/logo512.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/sk-Jahangeer/todo-mern-app/HEAD/client/public/logo512.png
--------------------------------------------------------------------------------
/client/src/index.js:
--------------------------------------------------------------------------------
1 | import React from "react";
2 | import ReactDOM from "react-dom";
3 | import "./index.css";
4 | import App from "./App";
5 |
6 | ReactDOM.render(
7 |
8 |
9 | ,
10 | document.getElementById("root")
11 | );
12 |
--------------------------------------------------------------------------------
/server/models/task.js:
--------------------------------------------------------------------------------
1 | const mongoose = require("mongoose");
2 | const Schema = mongoose.Schema;
3 |
4 | const taskSchema = new Schema({
5 | task: {
6 | type: String,
7 | required: true,
8 | },
9 | completed: {
10 | type: Boolean,
11 | default: false,
12 | },
13 | });
14 |
15 | module.exports = mongoose.model("task", taskSchema);
16 |
--------------------------------------------------------------------------------
/server/package.json:
--------------------------------------------------------------------------------
1 | {
2 | "name": "server",
3 | "version": "1.0.0",
4 | "description": "",
5 | "main": "index.js",
6 | "scripts": {
7 | "test": "echo \"Error: no test specified\" && exit 1"
8 | },
9 | "keywords": [],
10 | "author": "",
11 | "license": "ISC",
12 | "dependencies": {
13 | "cors": "^2.8.5",
14 | "express": "^4.17.1",
15 | "mongoose": "^5.12.14"
16 | }
17 | }
18 |
--------------------------------------------------------------------------------
/client/src/index.css:
--------------------------------------------------------------------------------
1 | body {
2 | margin: 0;
3 | font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
4 | 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
5 | sans-serif;
6 | -webkit-font-smoothing: antialiased;
7 | -moz-osx-font-smoothing: grayscale;
8 | }
9 |
10 | code {
11 | font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
12 | monospace;
13 | }
14 |
--------------------------------------------------------------------------------
/server/index.js:
--------------------------------------------------------------------------------
1 | const tasks = require("./routes/tasks");
2 | const connection = require("./db");
3 | const cors = require("cors");
4 | const express = require("express");
5 | const app = express();
6 |
7 | connection();
8 |
9 | app.use(express.json());
10 | app.use(cors());
11 |
12 | app.use("/api/tasks", tasks);
13 |
14 | const port = process.env.PORT || 8080;
15 | app.listen(port, () => console.log(`Listening on port ${port}...`));
16 |
--------------------------------------------------------------------------------
/client/src/services/taskServices.js:
--------------------------------------------------------------------------------
1 | import axios from "axios";
2 | const apiUrl = "http://localhost:8080/api/tasks";
3 |
4 | export function getTasks() {
5 | return axios.get(apiUrl);
6 | }
7 |
8 | export function addTask(task) {
9 | return axios.post(apiUrl, task);
10 | }
11 |
12 | export function updateTask(id, task) {
13 | return axios.put(apiUrl + "/" + id, task);
14 | }
15 |
16 | export function deleteTask(id) {
17 | return axios.delete(apiUrl + "/" + id);
18 | }
19 |
--------------------------------------------------------------------------------
/server/db.js:
--------------------------------------------------------------------------------
1 | const mongoose = require("mongoose");
2 |
3 | module.exports = async () => {
4 | try {
5 | const connectionParams = {
6 | useNewUrlParser: true,
7 | useCreateIndex: true,
8 | useUnifiedTopology: true,
9 | };
10 | await mongoose.connect(
11 | "mongodb://localhost/todo-app",
12 | connectionParams
13 | );
14 | console.log("Connected to database.");
15 | } catch (error) {
16 | console.log("Could not connect to database.", error);
17 | }
18 | };
19 |
--------------------------------------------------------------------------------
/client/public/manifest.json:
--------------------------------------------------------------------------------
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 | }
26 |
--------------------------------------------------------------------------------
/client/src/App.css:
--------------------------------------------------------------------------------
1 | .App {
2 | width: 100vw;
3 | height: 100vh;
4 | background: #f5f5f5;
5 | }
6 |
7 | .heading {
8 | font-size: 20px;
9 | font-weight: bold;
10 | text-align: center;
11 | }
12 |
13 | .flex {
14 | display: flex;
15 | justify-content: center;
16 | align-items: center;
17 | }
18 |
19 | .container {
20 | width: 500px;
21 | min-height: 300px;
22 | padding: 10px;
23 | }
24 |
25 | .task_container {
26 | margin: 10px 0;
27 | cursor: pointer;
28 | }
29 |
30 | .task {
31 | flex-grow: 1;
32 | margin-left: 10px;
33 | }
34 |
35 | .line_through {
36 | text-decoration: line-through;
37 | }
38 |
--------------------------------------------------------------------------------
/client/package.json:
--------------------------------------------------------------------------------
1 | {
2 | "name": "client",
3 | "version": "0.1.0",
4 | "private": true,
5 | "dependencies": {
6 | "@material-ui/core": "^4.11.4",
7 | "@testing-library/jest-dom": "^5.14.1",
8 | "@testing-library/react": "^11.2.7",
9 | "@testing-library/user-event": "^12.8.3",
10 | "axios": "^0.21.1",
11 | "react": "^17.0.2",
12 | "react-dom": "^17.0.2",
13 | "react-scripts": "4.0.3",
14 | "web-vitals": "^1.1.2"
15 | },
16 | "scripts": {
17 | "start": "react-scripts start",
18 | "build": "react-scripts build",
19 | "test": "react-scripts test",
20 | "eject": "react-scripts eject"
21 | },
22 | "eslintConfig": {
23 | "extends": [
24 | "react-app",
25 | "react-app/jest"
26 | ]
27 | },
28 | "browserslist": {
29 | "production": [
30 | ">0.2%",
31 | "not dead",
32 | "not op_mini all"
33 | ],
34 | "development": [
35 | "last 1 chrome version",
36 | "last 1 firefox version",
37 | "last 1 safari version"
38 | ]
39 | }
40 | }
41 |
--------------------------------------------------------------------------------
/server/routes/tasks.js:
--------------------------------------------------------------------------------
1 | const Task = require("../models/task");
2 | const express = require("express");
3 | const router = express.Router();
4 |
5 | router.post("/", async (req, res) => {
6 | try {
7 | const task = await new Task(req.body).save();
8 | res.send(task);
9 | } catch (error) {
10 | res.send(error);
11 | }
12 | });
13 |
14 | router.get("/", async (req, res) => {
15 | try {
16 | const tasks = await Task.find();
17 | res.send(tasks);
18 | } catch (error) {
19 | res.send(error);
20 | }
21 | });
22 |
23 | router.put("/:id", async (req, res) => {
24 | try {
25 | const task = await Task.findOneAndUpdate(
26 | { _id: req.params.id },
27 | req.body
28 | );
29 | res.send(task);
30 | } catch (error) {
31 | res.send(error);
32 | }
33 | });
34 |
35 | router.delete("/:id", async (req, res) => {
36 | try {
37 | const task = await Task.findByIdAndDelete(req.params.id);
38 | res.send(task);
39 | } catch (error) {
40 | res.send(error);
41 | }
42 | });
43 |
44 | module.exports = router;
45 |
--------------------------------------------------------------------------------
/client/public/index.html:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
5 |
6 |
7 |
8 |
12 |
13 |
17 |
18 |
27 | TO-DO App
28 |
29 |
30 |
31 |
32 |
42 |
43 |
44 |
--------------------------------------------------------------------------------
/client/src/Tasks.js:
--------------------------------------------------------------------------------
1 | import { Component } from "react";
2 | import {
3 | addTask,
4 | getTasks,
5 | updateTask,
6 | deleteTask,
7 | } from "./services/taskServices";
8 |
9 | class Tasks extends Component {
10 | state = { tasks: [], currentTask: "" };
11 |
12 | async componentDidMount() {
13 | try {
14 | const { data } = await getTasks();
15 | this.setState({ tasks: data });
16 | } catch (error) {
17 | console.log(error);
18 | }
19 | }
20 |
21 | handleChange = ({ currentTarget: input }) => {
22 | this.setState({ currentTask: input.value });
23 | };
24 |
25 | handleSubmit = async (e) => {
26 | e.preventDefault();
27 | const originalTasks = this.state.tasks;
28 | try {
29 | const { data } = await addTask({ task: this.state.currentTask });
30 | const tasks = originalTasks;
31 | tasks.push(data);
32 | this.setState({ tasks, currentTask: "" });
33 | } catch (error) {
34 | console.log(error);
35 | }
36 | };
37 |
38 | handleUpdate = async (currentTask) => {
39 | const originalTasks = this.state.tasks;
40 | try {
41 | const tasks = [...originalTasks];
42 | const index = tasks.findIndex((task) => task._id === currentTask);
43 | tasks[index] = { ...tasks[index] };
44 | tasks[index].completed = !tasks[index].completed;
45 | this.setState({ tasks });
46 | await updateTask(currentTask, {
47 | completed: tasks[index].completed,
48 | });
49 | } catch (error) {
50 | this.setState({ tasks: originalTasks });
51 | console.log(error);
52 | }
53 | };
54 |
55 | handleDelete = async (currentTask) => {
56 | const originalTasks = this.state.tasks;
57 | try {
58 | const tasks = originalTasks.filter(
59 | (task) => task._id !== currentTask
60 | );
61 | this.setState({ tasks });
62 | await deleteTask(currentTask);
63 | } catch (error) {
64 | this.setState({ tasks: originalTasks });
65 | console.log(error);
66 | }
67 | };
68 | }
69 |
70 | export default Tasks;
71 |
--------------------------------------------------------------------------------
/client/src/App.js:
--------------------------------------------------------------------------------
1 | import React from "react";
2 | import Tasks from "./Tasks";
3 | import { Paper, TextField } from "@material-ui/core";
4 | import { Checkbox, Button } from "@material-ui/core";
5 | import "./App.css";
6 |
7 | class App extends Tasks {
8 | state = { tasks: [], currentTask: "" };
9 | render() {
10 | const { tasks } = this.state;
11 | return (
12 |
13 |
14 | TO-DO
15 |
38 |
39 | {tasks.map((task) => (
40 |
44 | this.handleUpdate(task._id)}
47 | color="primary"
48 | />
49 |
56 | {task.task}
57 |
58 |
64 |
65 | ))}
66 |
67 |
68 |
69 | );
70 | }
71 | }
72 |
73 | export default App;
74 |
--------------------------------------------------------------------------------
/server/package-lock.json:
--------------------------------------------------------------------------------
1 | {
2 | "name": "server",
3 | "version": "1.0.0",
4 | "lockfileVersion": 1,
5 | "requires": true,
6 | "dependencies": {
7 | "@types/bson": {
8 | "version": "4.0.3",
9 | "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.3.tgz",
10 | "integrity": "sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==",
11 | "requires": {
12 | "@types/node": "*"
13 | }
14 | },
15 | "@types/mongodb": {
16 | "version": "3.6.18",
17 | "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.18.tgz",
18 | "integrity": "sha512-JSVFt9p0rTfZ4EgzXmVHUB3ue00xe3CRbQho8nXfImzEDDM4O7I3po1bwbWl/EIbLENxUreZxqLOc8lvcnLVPA==",
19 | "requires": {
20 | "@types/bson": "*",
21 | "@types/node": "*"
22 | }
23 | },
24 | "@types/node": {
25 | "version": "15.12.2",
26 | "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
27 | "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="
28 | },
29 | "accepts": {
30 | "version": "1.3.7",
31 | "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
32 | "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
33 | "requires": {
34 | "mime-types": "~2.1.24",
35 | "negotiator": "0.6.2"
36 | }
37 | },
38 | "array-flatten": {
39 | "version": "1.1.1",
40 | "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
41 | "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
42 | },
43 | "bl": {
44 | "version": "2.2.1",
45 | "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
46 | "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
47 | "requires": {
48 | "readable-stream": "^2.3.5",
49 | "safe-buffer": "^5.1.1"
50 | }
51 | },
52 | "bluebird": {
53 | "version": "3.5.1",
54 | "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
55 | "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
56 | },
57 | "body-parser": {
58 | "version": "1.19.0",
59 | "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
60 | "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
61 | "requires": {
62 | "bytes": "3.1.0",
63 | "content-type": "~1.0.4",
64 | "debug": "2.6.9",
65 | "depd": "~1.1.2",
66 | "http-errors": "1.7.2",
67 | "iconv-lite": "0.4.24",
68 | "on-finished": "~2.3.0",
69 | "qs": "6.7.0",
70 | "raw-body": "2.4.0",
71 | "type-is": "~1.6.17"
72 | }
73 | },
74 | "bson": {
75 | "version": "1.1.6",
76 | "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
77 | "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="
78 | },
79 | "bytes": {
80 | "version": "3.1.0",
81 | "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
82 | "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
83 | },
84 | "content-disposition": {
85 | "version": "0.5.3",
86 | "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
87 | "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
88 | "requires": {
89 | "safe-buffer": "5.1.2"
90 | }
91 | },
92 | "content-type": {
93 | "version": "1.0.4",
94 | "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
95 | "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
96 | },
97 | "cookie": {
98 | "version": "0.4.0",
99 | "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
100 | "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
101 | },
102 | "cookie-signature": {
103 | "version": "1.0.6",
104 | "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
105 | "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
106 | },
107 | "core-util-is": {
108 | "version": "1.0.2",
109 | "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
110 | "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
111 | },
112 | "cors": {
113 | "version": "2.8.5",
114 | "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
115 | "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
116 | "requires": {
117 | "object-assign": "^4",
118 | "vary": "^1"
119 | }
120 | },
121 | "debug": {
122 | "version": "2.6.9",
123 | "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
124 | "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
125 | "requires": {
126 | "ms": "2.0.0"
127 | }
128 | },
129 | "denque": {
130 | "version": "1.5.0",
131 | "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz",
132 | "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="
133 | },
134 | "depd": {
135 | "version": "1.1.2",
136 | "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
137 | "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
138 | },
139 | "destroy": {
140 | "version": "1.0.4",
141 | "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
142 | "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
143 | },
144 | "ee-first": {
145 | "version": "1.1.1",
146 | "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
147 | "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
148 | },
149 | "encodeurl": {
150 | "version": "1.0.2",
151 | "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
152 | "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
153 | },
154 | "escape-html": {
155 | "version": "1.0.3",
156 | "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
157 | "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
158 | },
159 | "etag": {
160 | "version": "1.8.1",
161 | "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
162 | "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
163 | },
164 | "express": {
165 | "version": "4.17.1",
166 | "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
167 | "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
168 | "requires": {
169 | "accepts": "~1.3.7",
170 | "array-flatten": "1.1.1",
171 | "body-parser": "1.19.0",
172 | "content-disposition": "0.5.3",
173 | "content-type": "~1.0.4",
174 | "cookie": "0.4.0",
175 | "cookie-signature": "1.0.6",
176 | "debug": "2.6.9",
177 | "depd": "~1.1.2",
178 | "encodeurl": "~1.0.2",
179 | "escape-html": "~1.0.3",
180 | "etag": "~1.8.1",
181 | "finalhandler": "~1.1.2",
182 | "fresh": "0.5.2",
183 | "merge-descriptors": "1.0.1",
184 | "methods": "~1.1.2",
185 | "on-finished": "~2.3.0",
186 | "parseurl": "~1.3.3",
187 | "path-to-regexp": "0.1.7",
188 | "proxy-addr": "~2.0.5",
189 | "qs": "6.7.0",
190 | "range-parser": "~1.2.1",
191 | "safe-buffer": "5.1.2",
192 | "send": "0.17.1",
193 | "serve-static": "1.14.1",
194 | "setprototypeof": "1.1.1",
195 | "statuses": "~1.5.0",
196 | "type-is": "~1.6.18",
197 | "utils-merge": "1.0.1",
198 | "vary": "~1.1.2"
199 | }
200 | },
201 | "finalhandler": {
202 | "version": "1.1.2",
203 | "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
204 | "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
205 | "requires": {
206 | "debug": "2.6.9",
207 | "encodeurl": "~1.0.2",
208 | "escape-html": "~1.0.3",
209 | "on-finished": "~2.3.0",
210 | "parseurl": "~1.3.3",
211 | "statuses": "~1.5.0",
212 | "unpipe": "~1.0.0"
213 | }
214 | },
215 | "forwarded": {
216 | "version": "0.2.0",
217 | "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
218 | "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
219 | },
220 | "fresh": {
221 | "version": "0.5.2",
222 | "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
223 | "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
224 | },
225 | "http-errors": {
226 | "version": "1.7.2",
227 | "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
228 | "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
229 | "requires": {
230 | "depd": "~1.1.2",
231 | "inherits": "2.0.3",
232 | "setprototypeof": "1.1.1",
233 | "statuses": ">= 1.5.0 < 2",
234 | "toidentifier": "1.0.0"
235 | }
236 | },
237 | "iconv-lite": {
238 | "version": "0.4.24",
239 | "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
240 | "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
241 | "requires": {
242 | "safer-buffer": ">= 2.1.2 < 3"
243 | }
244 | },
245 | "inherits": {
246 | "version": "2.0.3",
247 | "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
248 | "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
249 | },
250 | "ipaddr.js": {
251 | "version": "1.9.1",
252 | "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
253 | "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
254 | },
255 | "isarray": {
256 | "version": "1.0.0",
257 | "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
258 | "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
259 | },
260 | "kareem": {
261 | "version": "2.3.2",
262 | "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.2.tgz",
263 | "integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ=="
264 | },
265 | "media-typer": {
266 | "version": "0.3.0",
267 | "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
268 | "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
269 | },
270 | "memory-pager": {
271 | "version": "1.5.0",
272 | "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
273 | "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
274 | "optional": true
275 | },
276 | "merge-descriptors": {
277 | "version": "1.0.1",
278 | "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
279 | "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
280 | },
281 | "methods": {
282 | "version": "1.1.2",
283 | "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
284 | "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
285 | },
286 | "mime": {
287 | "version": "1.6.0",
288 | "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
289 | "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
290 | },
291 | "mime-db": {
292 | "version": "1.48.0",
293 | "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
294 | "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
295 | },
296 | "mime-types": {
297 | "version": "2.1.31",
298 | "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
299 | "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
300 | "requires": {
301 | "mime-db": "1.48.0"
302 | }
303 | },
304 | "mongodb": {
305 | "version": "3.6.8",
306 | "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.8.tgz",
307 | "integrity": "sha512-sDjJvI73WjON1vapcbyBD3Ao9/VN3TKYY8/QX9EPbs22KaCSrQ5rXo5ZZd44tWJ3wl3FlnrFZ+KyUtNH6+1ZPQ==",
308 | "requires": {
309 | "bl": "^2.2.1",
310 | "bson": "^1.1.4",
311 | "denque": "^1.4.1",
312 | "optional-require": "^1.0.3",
313 | "safe-buffer": "^5.1.2",
314 | "saslprep": "^1.0.0"
315 | }
316 | },
317 | "mongoose": {
318 | "version": "5.12.14",
319 | "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.12.14.tgz",
320 | "integrity": "sha512-1lMRY8cfGYFWHqe5DLnVgNQDyD0fEbSoWIQe9Mllt/ZtayZ5XUFQt+o5VKrB44vsT5cLNzgwEFO0NvwTwqLluQ==",
321 | "requires": {
322 | "@types/mongodb": "^3.5.27",
323 | "bson": "^1.1.4",
324 | "kareem": "2.3.2",
325 | "mongodb": "3.6.8",
326 | "mongoose-legacy-pluralize": "1.0.2",
327 | "mpath": "0.8.3",
328 | "mquery": "3.2.5",
329 | "ms": "2.1.2",
330 | "regexp-clone": "1.0.0",
331 | "safe-buffer": "5.2.1",
332 | "sift": "13.5.2",
333 | "sliced": "1.0.1"
334 | },
335 | "dependencies": {
336 | "ms": {
337 | "version": "2.1.2",
338 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
339 | "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
340 | },
341 | "safe-buffer": {
342 | "version": "5.2.1",
343 | "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
344 | "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
345 | }
346 | }
347 | },
348 | "mongoose-legacy-pluralize": {
349 | "version": "1.0.2",
350 | "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
351 | "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
352 | },
353 | "mpath": {
354 | "version": "0.8.3",
355 | "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.3.tgz",
356 | "integrity": "sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA=="
357 | },
358 | "mquery": {
359 | "version": "3.2.5",
360 | "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.5.tgz",
361 | "integrity": "sha512-VjOKHHgU84wij7IUoZzFRU07IAxd5kWJaDmyUzQlbjHjyoeK5TNeeo8ZsFDtTYnSgpW6n/nMNIHvE3u8Lbrf4A==",
362 | "requires": {
363 | "bluebird": "3.5.1",
364 | "debug": "3.1.0",
365 | "regexp-clone": "^1.0.0",
366 | "safe-buffer": "5.1.2",
367 | "sliced": "1.0.1"
368 | },
369 | "dependencies": {
370 | "debug": {
371 | "version": "3.1.0",
372 | "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
373 | "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
374 | "requires": {
375 | "ms": "2.0.0"
376 | }
377 | }
378 | }
379 | },
380 | "ms": {
381 | "version": "2.0.0",
382 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
383 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
384 | },
385 | "negotiator": {
386 | "version": "0.6.2",
387 | "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
388 | "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
389 | },
390 | "object-assign": {
391 | "version": "4.1.1",
392 | "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
393 | "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
394 | },
395 | "on-finished": {
396 | "version": "2.3.0",
397 | "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
398 | "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
399 | "requires": {
400 | "ee-first": "1.1.1"
401 | }
402 | },
403 | "optional-require": {
404 | "version": "1.0.3",
405 | "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz",
406 | "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA=="
407 | },
408 | "parseurl": {
409 | "version": "1.3.3",
410 | "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
411 | "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
412 | },
413 | "path-to-regexp": {
414 | "version": "0.1.7",
415 | "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
416 | "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
417 | },
418 | "process-nextick-args": {
419 | "version": "2.0.1",
420 | "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
421 | "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
422 | },
423 | "proxy-addr": {
424 | "version": "2.0.7",
425 | "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
426 | "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
427 | "requires": {
428 | "forwarded": "0.2.0",
429 | "ipaddr.js": "1.9.1"
430 | }
431 | },
432 | "qs": {
433 | "version": "6.7.0",
434 | "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
435 | "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
436 | },
437 | "range-parser": {
438 | "version": "1.2.1",
439 | "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
440 | "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
441 | },
442 | "raw-body": {
443 | "version": "2.4.0",
444 | "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
445 | "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
446 | "requires": {
447 | "bytes": "3.1.0",
448 | "http-errors": "1.7.2",
449 | "iconv-lite": "0.4.24",
450 | "unpipe": "1.0.0"
451 | }
452 | },
453 | "readable-stream": {
454 | "version": "2.3.7",
455 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
456 | "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
457 | "requires": {
458 | "core-util-is": "~1.0.0",
459 | "inherits": "~2.0.3",
460 | "isarray": "~1.0.0",
461 | "process-nextick-args": "~2.0.0",
462 | "safe-buffer": "~5.1.1",
463 | "string_decoder": "~1.1.1",
464 | "util-deprecate": "~1.0.1"
465 | }
466 | },
467 | "regexp-clone": {
468 | "version": "1.0.0",
469 | "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
470 | "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
471 | },
472 | "safe-buffer": {
473 | "version": "5.1.2",
474 | "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
475 | "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
476 | },
477 | "safer-buffer": {
478 | "version": "2.1.2",
479 | "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
480 | "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
481 | },
482 | "saslprep": {
483 | "version": "1.0.3",
484 | "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
485 | "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
486 | "optional": true,
487 | "requires": {
488 | "sparse-bitfield": "^3.0.3"
489 | }
490 | },
491 | "send": {
492 | "version": "0.17.1",
493 | "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
494 | "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
495 | "requires": {
496 | "debug": "2.6.9",
497 | "depd": "~1.1.2",
498 | "destroy": "~1.0.4",
499 | "encodeurl": "~1.0.2",
500 | "escape-html": "~1.0.3",
501 | "etag": "~1.8.1",
502 | "fresh": "0.5.2",
503 | "http-errors": "~1.7.2",
504 | "mime": "1.6.0",
505 | "ms": "2.1.1",
506 | "on-finished": "~2.3.0",
507 | "range-parser": "~1.2.1",
508 | "statuses": "~1.5.0"
509 | },
510 | "dependencies": {
511 | "ms": {
512 | "version": "2.1.1",
513 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
514 | "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
515 | }
516 | }
517 | },
518 | "serve-static": {
519 | "version": "1.14.1",
520 | "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
521 | "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
522 | "requires": {
523 | "encodeurl": "~1.0.2",
524 | "escape-html": "~1.0.3",
525 | "parseurl": "~1.3.3",
526 | "send": "0.17.1"
527 | }
528 | },
529 | "setprototypeof": {
530 | "version": "1.1.1",
531 | "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
532 | "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
533 | },
534 | "sift": {
535 | "version": "13.5.2",
536 | "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz",
537 | "integrity": "sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA=="
538 | },
539 | "sliced": {
540 | "version": "1.0.1",
541 | "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
542 | "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
543 | },
544 | "sparse-bitfield": {
545 | "version": "3.0.3",
546 | "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
547 | "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
548 | "optional": true,
549 | "requires": {
550 | "memory-pager": "^1.0.2"
551 | }
552 | },
553 | "statuses": {
554 | "version": "1.5.0",
555 | "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
556 | "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
557 | },
558 | "string_decoder": {
559 | "version": "1.1.1",
560 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
561 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
562 | "requires": {
563 | "safe-buffer": "~5.1.0"
564 | }
565 | },
566 | "toidentifier": {
567 | "version": "1.0.0",
568 | "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
569 | "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
570 | },
571 | "type-is": {
572 | "version": "1.6.18",
573 | "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
574 | "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
575 | "requires": {
576 | "media-typer": "0.3.0",
577 | "mime-types": "~2.1.24"
578 | }
579 | },
580 | "unpipe": {
581 | "version": "1.0.0",
582 | "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
583 | "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
584 | },
585 | "util-deprecate": {
586 | "version": "1.0.2",
587 | "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
588 | "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
589 | },
590 | "utils-merge": {
591 | "version": "1.0.1",
592 | "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
593 | "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
594 | },
595 | "vary": {
596 | "version": "1.1.2",
597 | "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
598 | "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
599 | }
600 | }
601 | }
602 |
--------------------------------------------------------------------------------