diff --git a/app.js b/app.js
index 6644915..5ecb512 100644
--- a/app.js
+++ b/app.js
@@ -9,8 +9,6 @@ const loaders = require("./loaders/index.js");
async function startServer() {
await loaders({
expressApp: app,
- dbPass: dbPass,
- secret: cookiesSecret,
});
app.listen(port, (err) => {
if (err) {
diff --git a/config/index.js b/config/index.js
index 943e1cb..68f816f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -8,8 +8,6 @@ exports.dbHost = process.env.DB_HOST;
exports.dbPort = process.env.DB_PORT;
exports.dbName = process.env.DB_NAME;
exports.cookiesSecret = process.env.COOKIES_SECRET;
-exports.jwtSecret = process.env.JWT_SECRET;
-exports.MAIL_PASS = process.env.MAIL_PASS;
exports.s3_key = process.env.S3_KEY;
exports.s3_secret = process.env.S3_SECRET;
-exports.appkey = process.env.APP_KEY
\ No newline at end of file
+exports.appkey = process.env.APP_KEY;
diff --git a/loaders/express.js b/loaders/express.js
index 106d613..80cdd9c 100644
--- a/loaders/express.js
+++ b/loaders/express.js
@@ -8,29 +8,27 @@ const routeUser = require("../routes/routeUser.js");
const routeSearch = require("../routes/routeSearch.js");
const routeImg = require("../routes/routeImg.js");
const routeHealth = require("../routes/routeHealth.js");
-const routeAdmin = require("../routes/routeAdmin.js")
+const routeAdmin = require("../routes/routeAdmin.js");
-const loadExpress = ({ app, secret }) => {
+const loadExpress = ({ app }) => {
const limiter = rateLimiter({
windowMs: 10 * 60 * 1000, //time window
max: 100, //requests = a single IP for a time window
});
- app.use(cors({ exposedHeaders: "x-auth-token", origin: true, credentials: true }));
+ app.use(
+ cors({ exposedHeaders: "x-auth-token", origin: true, credentials: true })
+ );
app.use(helmet());
app.use(limiter);
app.use(bodyParser.json({ limit: "100kb" })); // limit JSON body payload size
app.use(bodyParser.urlencoded({ extended: true }));
- app.use(function (err, req, res, next) {
- if (err) res.sendStatus(422);
- });
app.use("/dish", routeDish);
app.use("/restaurant", routeRestaurant);
app.use("/img", routeImg);
app.use("/user", routeUser);
app.use("/search", routeSearch);
app.use("/healthcheck", routeHealth);
- app.use("/00xc232", routeAdmin)
return app;
};
diff --git a/loaders/index.js b/loaders/index.js
index 62c85a3..dda38ad 100644
--- a/loaders/index.js
+++ b/loaders/index.js
@@ -1,10 +1,10 @@
const expressLoader = require("./express.js");
const mongooseLoader = require("./mongoose.js");
-const loaders = async ({ expressApp, secret }) => {
- const mongoConnection = await mongooseLoader();
- console.log("Mongoose Loaded");
- await expressLoader({ app: expressApp, secret: secret });
+const loaders = async ({ expressApp }) => {
+ await mongooseLoader();
+ console.log("DB Connection Successful");
+ await expressLoader({ app: expressApp });
console.log("Express Initialized");
};
diff --git a/loaders/mongoose.js b/loaders/mongoose.js
index d4b1d85..7ead753 100644
--- a/loaders/mongoose.js
+++ b/loaders/mongoose.js
@@ -1,8 +1,5 @@
const mongoose = require("mongoose");
-const {
- dbPass,
- dbName,
-} = require("../config/index.js");
+const { dbPass, dbName } = require("../config/index.js");
const loadMongoose = async () => {
const connection = await mongoose.connect(
@@ -10,13 +7,16 @@ const loadMongoose = async () => {
{
useNewUrlParser: true,
useUnifiedTopology: true,
- useFindAndModify: false
+ useFindAndModify: false,
},
(err) => {
- if (err) console.log("Unable to connect :(");
- else console.log("Connected To Database");
+ if (err) {
+ console.log("Unable to connect :(");
+ } else {
+ console.log("DB Connected");
+ }
}
);
};
-module.exports = loadMongoose;
\ No newline at end of file
+module.exports = loadMongoose;
diff --git a/models/restaurant.js b/models/restaurant.js
index ab56b56..657a07c 100644
--- a/models/restaurant.js
+++ b/models/restaurant.js
@@ -104,6 +104,8 @@ const restaurantSchema = mongoose.Schema({
maxlength: 24,
},
hidden: Boolean,
+ subscriptionActive: Boolean,
+ subscriptionDue: Date,
indexed: Date,
categories: [String],
dishes: [mongoose.Types.ObjectId],
diff --git a/node_modules/@sindresorhus/is/dist/index.d.ts b/node_modules/@sindresorhus/is/dist/index.d.ts
deleted file mode 100644
index e94d30b..0000000
--- a/node_modules/@sindresorhus/is/dist/index.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-///
-///
-///
-///
-///
-declare type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
-declare type Primitive = null | undefined | string | number | boolean | Symbol;
-export interface ArrayLike {
- length: number;
-}
-export interface Class {
- new (...args: any[]): T;
-}
-declare type DomElement = object & {
- nodeType: 1;
- nodeName: string;
-};
-declare type NodeStream = object & {
- pipe: Function;
-};
-export declare const enum TypeName {
- null = "null",
- boolean = "boolean",
- undefined = "undefined",
- string = "string",
- number = "number",
- symbol = "symbol",
- Function = "Function",
- GeneratorFunction = "GeneratorFunction",
- AsyncFunction = "AsyncFunction",
- Observable = "Observable",
- Array = "Array",
- Buffer = "Buffer",
- Object = "Object",
- RegExp = "RegExp",
- Date = "Date",
- Error = "Error",
- Map = "Map",
- Set = "Set",
- WeakMap = "WeakMap",
- WeakSet = "WeakSet",
- Int8Array = "Int8Array",
- Uint8Array = "Uint8Array",
- Uint8ClampedArray = "Uint8ClampedArray",
- Int16Array = "Int16Array",
- Uint16Array = "Uint16Array",
- Int32Array = "Int32Array",
- Uint32Array = "Uint32Array",
- Float32Array = "Float32Array",
- Float64Array = "Float64Array",
- ArrayBuffer = "ArrayBuffer",
- SharedArrayBuffer = "SharedArrayBuffer",
- DataView = "DataView",
- Promise = "Promise",
- URL = "URL"
-}
-declare function is(value: unknown): TypeName;
-declare namespace is {
- const undefined: (value: unknown) => value is undefined;
- const string: (value: unknown) => value is string;
- const number: (value: unknown) => value is number;
- const function_: (value: unknown) => value is Function;
- const null_: (value: unknown) => value is null;
- const class_: (value: unknown) => value is Class;
- const boolean: (value: unknown) => value is boolean;
- const symbol: (value: unknown) => value is Symbol;
- const numericString: (value: unknown) => boolean;
- const array: (arg: any) => arg is any[];
- const buffer: (input: unknown) => input is Buffer;
- const nullOrUndefined: (value: unknown) => value is null | undefined;
- const object: (value: unknown) => value is object;
- const iterable: (value: unknown) => value is IterableIterator;
- const asyncIterable: (value: unknown) => value is AsyncIterableIterator;
- const generator: (value: unknown) => value is Generator;
- const nativePromise: (value: unknown) => value is Promise;
- const promise: (value: unknown) => value is Promise;
- const generatorFunction: (value: unknown) => value is GeneratorFunction;
- const asyncFunction: (value: unknown) => value is Function;
- const boundFunction: (value: unknown) => value is Function;
- const regExp: (value: unknown) => value is RegExp;
- const date: (value: unknown) => value is Date;
- const error: (value: unknown) => value is Error;
- const map: (value: unknown) => value is Map;
- const set: (value: unknown) => value is Set;
- const weakMap: (value: unknown) => value is WeakMap;
- const weakSet: (value: unknown) => value is WeakSet