Merge pull request #1 from ghoshnirmalya/feat/add-authentication

Add authentication using urql and NextAuth
ghoshnirmalya · Aug 27, 2020 · 24999cf · 24999cf
2 parents ceb86cf + e907670
commit 24999cf
Show file tree

Hide file tree

Showing 59 changed files with 2,035 additions and 564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,11 @@
 **/.DS_STORE
 node_modules
+**/node_modules
 .next
 **/.env
 out
 **/*.pem
 .vercel
-**/backend/data
+**/.cache
+backend/data
+backend/build
diff --git a/backend/.editorconfig → backend/app/.editorconfig b/backend/.editorconfig → backend/app/.editorconfig
diff --git a/backend/.env.example → backend/app/.env.example b/backend/.env.example → backend/app/.env.example
diff --git a/backend/.eslintignore → backend/app/.eslintignore b/backend/.eslintignore → backend/app/.eslintignore
diff --git a/backend/.eslintrc → backend/app/.eslintrc b/backend/.eslintrc → backend/app/.eslintrc
diff --git a/backend/.gitignore → backend/app/.gitignore b/backend/.gitignore → backend/app/.gitignore
diff --git a/backend/README.md → backend/app/README.md b/backend/README.md → backend/app/README.md
diff --git a/backend/api/.gitkeep → backend/app/api/.gitkeep b/backend/api/.gitkeep → backend/app/api/.gitkeep
diff --git a/backend/api/feed/config/routes.json → backend/app/api/feed/config/routes.json b/backend/api/feed/config/routes.json → backend/app/api/feed/config/routes.json
diff --git a/backend/api/feed/controllers/feed.js → backend/app/api/feed/controllers/feed.js b/backend/api/feed/controllers/feed.js → backend/app/api/feed/controllers/feed.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * Read the documentation (https://strapi.io/documentation/v3.x/concepts/controllers.html#core-controllers)

diff --git a/backend/api/feed/models/feed.js → backend/app/api/feed/models/feed.js b/backend/api/feed/models/feed.js → backend/app/api/feed/models/feed.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * Read the documentation (https://strapi.io/documentation/v3.x/concepts/models.html#lifecycle-hooks)

diff --git a/backend/api/feed/models/feed.settings.json → ...nd/app/api/feed/models/feed.settings.json b/backend/api/feed/models/feed.settings.json → ...nd/app/api/feed/models/feed.settings.json
diff --git a/backend/api/feed/services/feed.js → backend/app/api/feed/services/feed.js b/backend/api/feed/services/feed.js → backend/app/api/feed/services/feed.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * Read the documentation (https://strapi.io/documentation/v3.x/concepts/services.html#core-services)

diff --git a/backend/app/config/database.js b/backend/app/config/database.js
@@ -0,0 +1,18 @@
+module.exports = ({ env }) => ({
+  defaultConnection: "default",
+  connections: {
+    default: {
+      connector: "bookshelf",
+      settings: {
+        client: "postgres",
+        host: env("DATABASE_HOST", "postgres"),
+        port: env.int("DATABASE_PORT", 5432),
+        database: env("DATABASE_NAME", "strapi"),
+        username: env("DATABASE_USERNAME", "strapi"),
+        password: env("DATABASE_PASSWORD", "strapi"),
+        ssl: env.bool("DATABASE_SSL", false),
+      },
+      options: {},
+    },
+  },
+});
diff --git a/backend/config/functions/bootstrap.js → backend/app/config/functions/bootstrap.js b/backend/config/functions/bootstrap.js → backend/app/config/functions/bootstrap.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * An asynchronous bootstrap function that runs before

diff --git a/backend/config/functions/cron.js → backend/app/config/functions/cron.js b/backend/config/functions/cron.js → backend/app/config/functions/cron.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * Cron config that gives you an opportunity

diff --git a/backend/config/functions/responses/404.js → ...end/app/config/functions/responses/404.js b/backend/config/functions/responses/404.js → ...end/app/config/functions/responses/404.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 module.exports = async (/* ctx */) => {
   // return ctx.notFound('My custom message 404');

diff --git a/backend/app/config/server.js b/backend/app/config/server.js
@@ -0,0 +1,9 @@
+module.exports = ({ env }) => ({
+  host: env("HOST", "0.0.0.0"),
+  port: env.int("PORT", 1337),
+  admin: {
+    auth: {
+      secret: env("ADMIN_JWT_SECRET", "f7a5d80a71f9c4960ff623b5f90056a0"),
+    },
+  },
+});
diff --git a/backend/extensions/.gitkeep → backend/app/extensions/.gitkeep b/backend/extensions/.gitkeep → backend/app/extensions/.gitkeep
diff --git a/backend/app/extensions/users-permissions/config/jwt.js b/backend/app/extensions/users-permissions/config/jwt.js
@@ -0,0 +1,3 @@
+module.exports = {
+  jwtSecret: process.env.JWT_SECRET || "aa784526-bc31-4de1-8793-d334f862d2f4",
+};
diff --git a/...ers-permissions/models/User.settings.json → ...ers-permissions/models/User.settings.json b/...ers-permissions/models/User.settings.json → ...ers-permissions/models/User.settings.json
diff --git a/backend/favicon.ico → backend/app/favicon.ico b/backend/favicon.ico → backend/app/favicon.ico
diff --git a/backend/package.json → backend/app/package.json b/backend/package.json → backend/app/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {},
   "dependencies": {
     "knex": "<0.20.0",
-    "sqlite3": "latest",
+    "pg": "latest",
     "strapi": "3.1.4",
     "strapi-admin": "3.1.4",
     "strapi-connector-bookshelf": "3.1.4",
@@ -28,7 +28,7 @@
     "name": "A Strapi developer"
   },
   "strapi": {
-    "uuid": "ced9ba4d-b3cc-4352-9033-da423238fc2e"
+    "uuid": "60e015fd-285b-4506-9ff8-1abb4854f4da"
   },
   "engines": {
     "node": ">=10.0.0",

diff --git a/backend/public/robots.txt → backend/app/public/robots.txt b/backend/public/robots.txt → backend/app/public/robots.txt
diff --git a/backend/public/uploads/.gitkeep → backend/app/public/uploads/.gitkeep b/backend/public/uploads/.gitkeep → backend/app/public/uploads/.gitkeep