Detry322 · Sep 14, 2019 · Nov 4, 2019 · Jan 12, 2023
Showing with 99 additions and 14 deletions.

+4 −0 .dockerignore

+1 −1 .gitignore

+31 −0 Dockerfile

+2 −4 README.md

+24 −8 app.js

+10 −0 controllers/admin/FrontendController.js

+0 −1 package.json

+7 −0 routes/list.js

+20 −0 views/admin/list.jade
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+Dockerfile
+.dockerignore
+node_modules
+.git
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ pids
 node_modules
 
 # Env vars
-.env
+.env*
 
 # Redis database
 *.rdb

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,31 @@
+# syntax=docker/dockerfile:1
+
+# Using node 16
+FROM node:16-slim
+
+#######################################################################
+
+RUN mkdir /app
+WORKDIR /app
+
+# NPM will not install any package listed in "devDependencies" when NODE_ENV is set to "production",
+# to install all modules: "npm install --production=false".
+# Ref: https://docs.npmjs.com/cli/v9/commands/npm-install#description
+
+ENV NODE_ENV production
+
+COPY . .
+COPY .env.prod .env
+
+RUN npm install
+
+LABEL fly_launch_runtime="nodejs"
+
+# COPY --from=builder /root/.volta /root/.volta
+# COPY --from=builder /app /app
+
+# WORKDIR /app
+# ENV NODE_ENV production
+# ENV PATH /root/.volta/bin:$PATH
+
+CMD [ "npm", "run", "start" ]
diff --git a/README.md b/README.md
@@ -50,11 +50,9 @@ To stop the server, `Ctrl+C`, and then:
 
 - `npm run stop-redis`
 
-## Deploy the app to heroku
+## Deploy the app to fly.io
 
-To deploy this to heroku, click this fancy button :)
-
-[<img src="https://www.herokucdn.com/deploy/button.png">](https://www.heroku.com/deploy/?template=https://github.com/Detry322/redisred)
+Ensure .env prod files are present in root directory, then run `fly deploy`
 
 ## Environment variables.
 

diff --git a/app.js b/app.js
@@ -27,35 +27,51 @@ var redis = new Redis(redisUrl);
 
 //Initialize the app
 var app = express();
-var redisSessionStore = new RedisStore({client: redis});
+var redisSessionStore = new RedisStore({ client: redis });
 app.set('views', './views');
 app.set('view engine', 'jade');
 app.use(favicon('./public/assets/favicon.png'));
 app.use(cookieParser());
-app.use(expressSession({ store: redisSessionStore, secret: sessionSecret, resave: true, saveUninitialized: true }));
+app.use(
+  expressSession({
+    store: redisSessionStore,
+    secret: sessionSecret,
+    resave: true,
+    saveUninitialized: true,
+  }),
+);
 app.use(passport.initialize());
 app.use(passport.session());
 
 //Initialize controllers
-var frontendController = require('./controllers/admin/FrontendController')(redis, passport);
-var apiController = require('./controllers/admin/APIController')(redis, apiToken);
+var frontendController = require('./controllers/admin/FrontendController')(
+  redis,
+  passport,
+);
+var apiController = require('./controllers/admin/APIController')(
+  redis,
+  apiToken,
+);
 var redirectController = require('./controllers/RedirectController')(redis);
 
 //Initialize routes
 var admin = require('./routes/admin.js')(frontendController, apiController);
 app.use('/admin', admin);
+var list = require('./routes/list.js')(frontendController, apiController);
+app.use('/list', list);
 var main = require('./routes/main.js')(rootRedirect, redirectController);
 app.use('/', main);
-app.use(function(req, res, next) {
+app.use(function (req, res, next) {
   res.status(404).render('404');
 });
 
 // Start the server
-console.log('Connecting to redis...');
-redis.ping(function(err){
+console.log(`Connecting to redis for admin ${adminUsername}...`);
+redis.ping(function (err) {
   if (!err) {
     console.log('Connection successful. Server listening on port ' + port);
     app.listen(port);
+  } else {
+    console.error(`Redis connection failed: ${err}`);
   }
 });
-
diff --git a/controllers/admin/FrontendController.js b/controllers/admin/FrontendController.js
@@ -40,6 +40,16 @@ module.exports = function(redis, passport) {
     });
   };
 
+  FrontendController.list = function(req, res) {
+    Redirect.getAll(function(err, redirects) {
+      if (err)
+        res.status(500).send(err);
+      else {
+        res.status(200).render('admin/list', { redirects: redirects });
+      }
+    });
+  };
+
   FrontendController.createRedirect = function(req, res) {
     var key = req.body.key;
     var url = req.body.url;

diff --git a/package.json b/package.json
@@ -32,7 +32,6 @@
     "dotenv": "^1.2.0",
     "express": "^4.13.1",
     "express-session": "^1.11.3",
-    "hiredis": "^0.4.0",
     "ioredis": "^4.11.2",
     "jade": "^1.11.0",
     "morgan": "^1.6.1",

diff --git a/routes/list.js b/routes/list.js
@@ -0,0 +1,7 @@
+var express = require('express');
+
+module.exports = function(frontend, api) {
+  var router = express.Router();
+  router.get('/', frontend.list);
+  return router;
+};
diff --git a/views/admin/list.jade b/views/admin/list.jade
@@ -0,0 +1,20 @@
+html
+  head
+    title redisred list
+    link(rel="stylesheet", href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css")
+    meta(name="viewport",content="width=device-width, initial-scale=1")
+  body
+    div.container-fluid(style="max-width: 1000px;")
+      h1 redisred list
+      table.table.table-striped(style="table-layout: fixed;")
+        tr
+          th.col-sm-2 Key
+          th.col-sm-8 URL
+          th.col-sm-2 Clicks
+        each redirect in redirects
+          tr
+            td.col-sm-2(style="overflow: hidden; text-overflow: ellipsis; word-break: keep-all;")
+              a(href=("/"+redirect.key))=redirect.key
+            td.col-sm-8(style="overflow: hidden; text-overflow: ellipsis; word-break: keep-all;")
+              a(href=redirect.url)= redirect.url
+            td.col-sm-2= redirect.clicks