logo to webp, docker file and github action updates

Author: sunjay-dev

.github/workflows/ci.yaml

@@ -3,7 +3,8 @@ name: Build Flutter APK
 on:
   push:
     branches:
-      - flutter-app
+      - main
+      - flutter
 
 jobs:
   build:

.github/workflows/docker.yml

@@ -9,6 +9,10 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
 
+    defaults:
+      run:
+        working-directory: backend
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v3

backend/LICENSE LICENSEbackend/LICENSE renamed to LICENSE

@@ -15,7 +15,9 @@ A simple URL shortener built with Node.js and Express.js that stores shortened U
 ![EJS](https://img.shields.io/badge/ejs-%23B4CA65.svg?style=for-the-badge&logo=ejs&logoColor=black) 
 ![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white) 
 ![MongoDB](https://img.shields.io/badge/MongoDB-%234ea94b.svg?style=for-the-badge&logo=mongodb&logoColor=white) 
-![Render](https://img.shields.io/badge/Render-%46E3B7.svg?style=for-the-badge&logo=render&logoColor=white)
+![Docker](https://img.shields.io/badge/Docker-%232496ED.svg?style=for-the-badge&logo=docker&logoColor=white)
+![Flutter](https://img.shields.io/badge/Flutter-%2302569B.svg?style=for-the-badge&logo=flutter&logoColor=white)
+
 - Express + Node.js
 - shortid (For creating short id for url)
 - Mongoose (For Storage)
@@ -41,7 +43,7 @@ Create a `.env` file in the root directory and add the following:
 ```env
 PORT=9000
 JWT_SECRET=JWT_SECRET
-mongoUri=MONGODB_URL
+MONGODB_URI=MONGODB_URL
 GITHUB_CLIENT_ID=GITHUB_CLIENT_ID
 GITHUB_CLIENT_SECRET=GITHUB_CLIENT_SECRET
 GITHUB_CALLBACK_URL=http://localhost:9000/user/auth/github/callback
@@ -87,7 +89,5 @@ The application provides the following routes:
   - If the short ID does not exist, returns a 404 error.
 
 
-
-
 ## Contributing
 Feel free to submit issues or pull requests if you have suggestions for improvements.

backend/README.md README.mdbackend/README.md renamed to README.md

@@ -1,26 +1,38 @@
-# Node modules (don’t copy your host’s node_modules)
-node_modules
-npm-debug.log
+# Include any files or directories that you don't want to be copied to your
+# container here (e.g., local build artifacts, temporary files, etc.).
+#
+# For more help, visit the .dockerignore file reference guide at
+# https://docs.docker.com/go/build-context-dockerignore/
 
-# Environment variables
-.env
-.env.local
-.env.test
-.env.production
-
-# Logs
-logs
-*.log
-
-# OS / Editor junk
-.DS_Store
-.vscode
-.idea
-
-# Git
-.git
-.gitignore
-
-# Docker itself
-Dockerfile
-.dockerignore
+**/.classpath
+**/.dockerignore
+**/.env
+**/.env.example
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.next
+**/.cache
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/charts
+**/docker-compose*
+**/compose.y*ml
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+**/build
+**/dist
+**/src
+LICENSE
+README.md
+**/vercel.json
+**/tailwind.config.js

backend/.dockerignore

@@ -0,0 +1,21 @@
+# ----------------------
+# REQUIRED 
+# ----------------------
+
+MONGODB_URI=MONGODB_URL
+
+
+# ----------------------
+# OPTIONAL 
+# ----------------------
+PORT=9000
+
+JWT_SECRET=JWT_SECRET
+
+GITHUB_CLIENT_ID=GITHUB_CLIENT_ID
+GITHUB_CLIENT_SECRET=GITHUB_CLIENT_SECRET
+GITHUB_CALLBACK_URL=http://localhost:9000/user/auth/github/callback
+
+GOOGLE_CLIENT_ID=GOOGLE_CLIENT_ID
+GOOGLE_CLIENT_SECRET=GOOGLE_CLIENT_SECRET
+GOOGLE_CALLBACK_URL=http://localhost:9000/user/auth/google/callback

backend/.env.example

@@ -1,13 +1,42 @@
-FROM node:20-slim
+# syntax=docker/dockerfile:1
 
-WORKDIR /app
+# Comments are provided throughout this file to help you get started.
+# If you need more help, visit the Dockerfile reference guide at
+# https://docs.docker.com/go/dockerfile-reference/
 
-COPY package*.json ./
+# Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7
 
-RUN npm ci
+ARG NODE_VERSION=22.18.0
+ARG PNPM_VERSION=10.17.1
 
+FROM node:${NODE_VERSION}-alpine
+
+# Use production node environment by default.
+ENV NODE_ENV production
+
+# Install pnpm.
+RUN --mount=type=cache,target=/root/.npm \
+    npm install -g pnpm@${PNPM_VERSION}
+
+WORKDIR /usr/src/app
+
+# Download dependencies as a separate step to take advantage of Docker's caching.
+# Leverage a cache mount to /root/.local/share/pnpm/store to speed up subsequent builds.
+# Leverage a bind mounts to package.json and pnpm-lock.yaml to avoid having to copy them into
+# into this layer.
+RUN --mount=type=bind,source=package.json,target=package.json \
+    --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
+    --mount=type=cache,target=/root/.local/share/pnpm/store \
+    pnpm install --prod --frozen-lockfile
+
+# Run the application as a non-root user.
+USER node
+
+# Copy the rest of the source files into the image.
 COPY . .
 
+# Expose the port that the application listens on.
 EXPOSE 9000
 
-CMD ["node", "app.js"]
+# Run the application.
+CMD pnpm start

backend/Dockerfile

@@ -2,7 +2,7 @@ require('dotenv').config();
 const express = require('express');
 const cookieParser = require('cookie-parser');
 const path = require('path');
-const connectToMongoDB = require('./connection.js');
+const { connectToMongoDB } = require('./connection.js');
 const passport = require('passport');
 
 const app = express();
@@ -13,7 +13,8 @@ app.set('trust proxy', true);
 
 connectToMongoDB(process.env.MONGODB_URI).then(() => {
     console.log('Mongoose connected!')
-})
+});
+
 app.use(passport.initialize());
 
 app.set('view engine', 'ejs');
@@ -25,10 +26,10 @@ const userRoutes = require('./routes/user.routes.js');
 app.use('/', urlRoutes);
 app.use('/user', userRoutes);
 
-app.use(express.static(path.join(__dirname, "public"), { 
+app.use(express.static(path.join(__dirname, "public"), {
     setHeaders: (res, path) => {
         res.status(200);
-        res.setHeader('Cache-Control', 'public, max-age=31536000');
+        res.setHeader('Cache-Control', 'public, max-age=1209600'); // 7 days caching
     }
 }));
 
@@ -38,4 +39,4 @@ app.use((req, res) => {
 
 const PORT = process.env.PORT || 9000;
 
-app.listen(PORT, () => { console.log(`App running on PORT: ${PORT}`); })
+app.listen(PORT, () => { console.log(`App running on PORT: ${PORT}`); });

backend/app.js

@@ -1,7 +1,5 @@
 const mongoose = require('mongoose');
 
-async function connectToMongoDB(url) {
+module.exports.connectToMongoDB = (url) => {
     return mongoose.connect(url);
-}
-
-module.exports = connectToMongoDB;
+}

backend/connection.js

@@ -24,9 +24,9 @@ module.exports.restrictToUserLogin = async (req, res, next) => {
         }
 
         if (req.headers.accept?.includes('text/html')) {
-            return res.redirect('/user/login');
+            res.redirect('/user/login');
         } else {
-            return res.status(401).json({ message: 'Unauthorized' });
+            res.status(401).json({ message: 'Unauthorized' });
         }
     } catch (err) {
         console.error(err);
@@ -42,5 +42,5 @@ module.exports.restrictToLoginedUser = (req, res, next) => {
     if (!user)
         return next();
 
-    return res.redirect('/');
+    res.redirect('/');
 }