nodejs-quickstart-structure 2.1.2 → 2.2.0

package/templates/common/views/pug/signup.pug.ejs

@@ -176,6 +176,63 @@ html(lang="en")
                 font-size: 12px;
                 opacity: 0.5;
             }
+
+            .divider {
+                display: flex;
+                align-items: center;
+                text-align: center;
+                margin: 24px 0;
+                color: var(--text-muted);
+                font-size: 13px;
+            }
+
+            .divider::before,
+            .divider::after {
+                content: '';
+                flex: 1;
+                border-bottom: 1px solid var(--card-border);
+            }
+
+            .divider:not(:empty)::before {
+                margin-right: .5em;
+            }
+
+            .divider:not(:empty)::after {
+                margin-left: .5em;
+            }
+
+            .social-login {
+                display: grid;
+                grid-template-columns: 1fr 1fr;
+                gap: 12px;
+            }
+
+            .btn-social {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                gap: 8px;
+                background: rgba(255, 255, 255, 0.05);
+                border: 1px solid var(--card-border);
+                border-radius: 12px;
+                padding: 12px;
+                color: #fff;
+                font-size: 14px;
+                font-weight: 500;
+                cursor: pointer;
+                transition: all 0.3s ease;
+                text-decoration: none;
+            }
+
+            .btn-social:hover {
+                background: rgba(255, 255, 255, 0.08);
+                border-color: var(--text-muted);
+                transform: translateY(-1px);
+            }
+            
+            .social-full {
+                grid-column: span 2;
+            }
     body
         div.background-blobs
             div.blob.blob-1
@@ -194,6 +251,27 @@ html(lang="en")
                     label(for="password") Choose Password
                     input(type="password" id="password" name="password" placeholder="••••••••" required)
                 button.btn-primary(type="submit") Create Account
+            
+            <% if (socialAuth && socialAuth.filter(a => a !== 'None').length > 0) { %>
+            div.divider Or join with
+            div.social-login
+                <% if (socialAuth.includes('Google')) { %>
+                a.btn-social(href="/api/auth/google" class="<%= socialAuth.includes('GitHub') ? '' : 'social-full' %>")
+                    svg(width="20" height="20" viewBox="0 0 24 24" fill="currentColor")
+                        path(d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" fill="#4285F4")
+                        path(d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853")
+                        path(d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05")
+                        path(d="M12 5.38c1.62 0 3.06.56 4.21 1.66l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335")
+                    | Google
+                <% } %>
+                <% if (socialAuth.includes('GitHub')) { %>
+                a.btn-social(href="/api/auth/github" class="<%= socialAuth.includes('Google') ? '' : 'social-full' %>")
+                    svg(width="20" height="20" viewBox="0 0 24 24" fill="currentColor")
+                        path(d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12")
+                    | GitHub
+                <% } %>
+            <% } %>
+
             div.footer
                 p Already have an account? 
                     a(href="/login") Sign in

package/templates/db/mysql/V1__Initial_Setup.sql.ejs

@@ -2,7 +2,9 @@ CREATE TABLE users (
     id INT AUTO_INCREMENT PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL UNIQUE,
-    <% if (auth.includes('JWT')) { %>password VARCHAR(255) NOT NULL, <% } %>
+    <% if (auth.includes('JWT')) { %>password VARCHAR(255) NULL, <% } %>
+    <% if (socialAuth && socialAuth.includes('Google')) { %>google_id VARCHAR(255) NULL UNIQUE, <% } %>
+    <% if (socialAuth && socialAuth.includes('GitHub')) { %>github_id VARCHAR(255) NULL UNIQUE, <% } %>
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP NULL

package/templates/db/postgres/V1__Initial_Setup.sql.ejs

@@ -2,7 +2,9 @@ CREATE TABLE users (
     id SERIAL PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL UNIQUE,
-    <% if (auth.includes('JWT')) { %>password VARCHAR(255) NOT NULL, <% } %>
+    <% if (auth.includes('JWT')) { %>password VARCHAR(255) NULL, <% } %>
+    <% if (socialAuth && socialAuth.includes('Google')) { %>google_id VARCHAR(255) NULL UNIQUE, <% } %>
+    <% if (socialAuth && socialAuth.includes('GitHub')) { %>github_id VARCHAR(255) NULL UNIQUE, <% } %>
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP NULL

package/templates/mvc/js/src/config/env.js.ejs

@@ -29,12 +29,22 @@ const envSchema = z.object({
   REDIS_PORT: z.string().transform(Number),
   REDIS_PASSWORD: z.string().optional(),
 <%_ } -%>
-<%_ if (auth.includes('JWT')) { -%>
+<%_ if (auth.includes('JWT')) { _%>
   JWT_SECRET: z.string(),
   JWT_EXPIRES_IN: z.string().default('15m'),
   JWT_REFRESH_SECRET: z.string().default('your-secret-refresh-key'),
   JWT_REFRESH_EXPIRES_IN: z.string().default('7d'),
-<%_ } -%>
+<%_ if (socialAuth && socialAuth.includes('Google')) { _%>
+  GOOGLE_CLIENT_ID: z.string(),
+  GOOGLE_CLIENT_SECRET: z.string(),
+  GOOGLE_CALLBACK_URL: z.string().optional(),
+<%_ } _%>
+<%_ if (socialAuth && socialAuth.includes('GitHub')) { _%>
+  GITHUB_CLIENT_ID: z.string(),
+  GITHUB_CLIENT_SECRET: z.string(),
+  GITHUB_CALLBACK_URL: z.string().optional(),
+<%_ } _%>
+<%_ } _%>
 <%_ if (communication === 'Kafka') { -%>
   KAFKA_BROKER: z.string(),
 <%_ } -%>

package/templates/mvc/js/src/controllers/userController.js.ejs

@@ -266,5 +266,5 @@ const deleteUser = async (req, res, next) => {
   }
 };
 
-module.exports = { getUsers, createUser, updateUser, deleteUser };
+module.exports = { getUsers, createUser, updateUser, deleteUser, model: User };
 <% } -%>

package/templates/mvc/js/src/graphql/resolvers/user.resolvers.js.ejs

@@ -17,11 +17,12 @@ const userResolvers = {
       <% if (auth.includes('JWT')) { %>if (!user) throw new Error('Unauthorized');<% } %>
       return await userController.updateUser(id, { name, email });
     },
-    deleteUser: async (_, { id }, <% if (auth.includes('JWT')) { %>{ user }<% } else { %>_context<% } %>) => {
-      <% if (auth.includes('JWT')) { %>if (!user) throw new Error('Unauthorized');<% } %>
+    deleteUser: async (_, { id }, <% if (auth.includes('JWT')) { %>{ user: authUser }<% } else { %>_context<% } %>) => {
+      <% if (auth.includes('JWT')) { %>if (!authUser) throw new Error('Unauthorized');<% } %>
       return await userController.deleteUser(id);
     }
-  }<%_ if (database === 'MongoDB') { -%>,
+  }<%_ if (database === 'MongoDB') { -%>
+,
   User: {
     id: (parent) => parent.id || parent._id
   }<%_ } %>

package/templates/mvc/ts/src/config/env.ts.ejs

@@ -33,12 +33,22 @@ const envSchema = z.object({
 <%_ if (communication === 'Kafka') { -%>
   KAFKA_BROKER: z.string(),
 <%_ } -%>
-<%_ if (auth.includes('JWT')) { -%>
+<%_ if (auth.includes('JWT')) { _%>
   JWT_SECRET: z.string(),
   JWT_EXPIRES_IN: z.string().default('15m'),
   JWT_REFRESH_SECRET: z.string().default('your-secret-refresh-key'),
   JWT_REFRESH_EXPIRES_IN: z.string().default('7d'),
-<%_ } -%>
+<%_ if (socialAuth && socialAuth.includes('Google')) { _%>
+  GOOGLE_CLIENT_ID: z.string(),
+  GOOGLE_CLIENT_SECRET: z.string(),
+  GOOGLE_CALLBACK_URL: z.string().optional(),
+<%_ } _%>
+<%_ if (socialAuth && socialAuth.includes('GitHub')) { _%>
+  GITHUB_CLIENT_ID: z.string(),
+  GITHUB_CLIENT_SECRET: z.string(),
+  GITHUB_CALLBACK_URL: z.string().optional(),
+<%_ } _%>
+<%_ } _%>
 });
 
 const _env = envSchema.safeParse(process.env);

package/templates/mvc/ts/src/controllers/userController.ts.ejs

@@ -17,6 +17,7 @@ import bcrypt from 'bcryptjs';
 <%_ } -%>
 
 export class UserController {
+    static model = User;
 <% if (communication === 'GraphQL') { -%>
     async getUsers() {
         try {

package/templates/mvc/ts/src/graphql/resolvers/user.resolvers.ts.ejs

@@ -25,15 +25,15 @@ export const userResolvers = {
       const user = await userController.updateUser(id, { name, email });
       return user;
     },
-    deleteUser: async (_: unknown, { id }: { id: string }, <% if (auth.includes('JWT')) { %>context<% } else { %>_context<% } %>: MyContext) => {
-      <%_ if (auth.includes('JWT')) { -%>
+    deleteUser: async (_: unknown, { id }: { id: string }, <%_ if (auth.includes('JWT')) { _%>context<%_ } else { _%>_context<%_ } _%>: MyContext) => {
+      <%_ if (auth.includes('JWT')) { _%>
       if (!context.user) throw new Error('Unauthorized');
-      <%_ } -%>
+      <%_ } _%>
       const result = await userController.deleteUser(id);
       return result;
     }
-  }<%_ if (database === 'MongoDB') { -%>,
+  }<%_ if (database === 'MongoDB') { _%>,
   User: {
     id: (parent: { id?: string; _id?: unknown }) => parent.id || parent._id
-  }<%_ } %>
+  }<%_ } _%>
 };

package/templates/mvc/ts/src/index.ts.ejs

@@ -66,7 +66,8 @@ app.set('view engine', '<%= viewEngine.toLowerCase() %>');
 app.use(express.static(path.join(__dirname, '../public')));<%_ } %>
 <%_ if (communication === 'REST APIs' || communication === 'Kafka') { -%>
 app.use('/api', apiRoutes);
-<%_ } -%><%_ if (auth.includes('JWT')) { -%>
+<%_ } -%>
+<%_ if (auth.includes('JWT')) { -%>
 app.use('/api/auth', authRoutes);
 <%_ } -%>
 

package/templates/clean-architecture/ts/src/domain/user.ts

@@ -1,9 +0,0 @@
-export class User {
-    constructor(
-        public id: number | string | null,
-        public name: string,
-        public email: string,
-        public password?: string
-    ) { }
-
-}