nsgm-cli 2.0.7 → 2.0.8

package/client/styled/common.ts

@@ -15,9 +15,37 @@ export const GlobalStyle = createGlobalStyle`
 
 export const Container = styled.div`
   margin: 20px;
+`
+
+export const LoginContainer = styled.div`
+   margin: auto;
+   margin-top: 200px;
+   width: 250px;
+   display: flex;
+   flex-direction: column;
+   justify-content: center;
+   align-items: flex-start;
+   border: 1px solid gray;
+   border-radius: 5px;
+   padding: 20px;
 
-  .user-input {
-    margin-right: 5px;
+  .row {
+    width: 100%;
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+
+    .user-input {
+      width: 210px;
+      margin-bottom: 5px;
+    }
+  }
+
+  .right {
+    margin-top: 10px;
+    justify-content: flex-end;
   }
 `
 
@@ -28,4 +56,5 @@ export const Loading = styled.div`
   justify-content: center;
   align-items: center;
   margin-top: 100px;
-`
+`
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {

package/pages/login.tsx

@@ -1,7 +1,7 @@
 import MarkdownIt from 'markdown-it'
 import _ from 'lodash'
-import { Container } from '../client/styled/common'
-import getConfig from 'next/config'
+import { LoginContainer } from '../client/styled/common'
+// import getConfig from 'next/config'
 import React, { useState } from 'react'
 import { handleXSS } from '../client/utils/common'
 
@@ -11,16 +11,17 @@ const md = new MarkdownIt({
   typographer: true
 })
 
-const nextConfig = getConfig()
-const { publicRuntimeConfig } = nextConfig
-const { env } = publicRuntimeConfig
+// const nextConfig = getConfig()
+// const { publicRuntimeConfig } = nextConfig
+// const { env } = publicRuntimeConfig
 
 const renderArr:any = []
 
-renderArr.push('Login' + env)
+renderArr.push('Login')
 
 const Page = ({ html }) => { 
   const [userName, setUserName] = useState("")
+  const [userPassword, setUserPassword] = useState("")
 
   const createMarkup = () => {
     return {
@@ -32,7 +33,7 @@ const Page = ({ html }) => {
     if(typeof window !== "undefined"){
       let locationHref = window.location.origin + "?ticket=XXX"
       if(userName !== ''){
-        locationHref += "&name=" + handleXSS(userName)
+        locationHref += "&name=" + btoa(handleXSS(userName + "," + userPassword))
         window.location.href = locationHref
       }
     }
@@ -42,12 +43,25 @@ const Page = ({ html }) => {
     setUserName(_.trim(e.target.value))
   }
 
+  const doChangePassword = (e)=>{
+    setUserPassword(_.trim(e.target.value))
+  }
+
   return (
-    <Container>
+    <LoginContainer>
       <div dangerouslySetInnerHTML={createMarkup()} />
-      <input type="text" name="user" className='user-input' onChange={doChangeName} value={userName}></input>
-      <button onClick={doLogin}>login</button>
-    </Container>
+      <input type="text" style={{ opacity:0, position:"absolute", width:0, height:0 }}></input>
+        <input type="password" style={{ opacity:0, position:"absolute", width:0, height:0 }}></input>
+        <div className='row'>
+          <input type="text" name="user-name" className='user-input' autoComplete='off' onChange={doChangeName} value={userName}></input>
+        </div>
+        <div className='row'>
+          <input type="password" name="user-password" className='user-input' autoComplete='off' onChange={doChangePassword} value={userPassword}></input>
+        </div>
+        <div className='row right'>
+          <button onClick={doLogin}>login</button>
+        </div>
+    </LoginContainer>
   )
 }
 

package/server/apis/sso.js

@@ -19,9 +19,9 @@ router.get('/sessionCheck', (req, res) => {
 router.get('/ticketCheck', (req, res) => {
   const { query } = req
   const { ticket, name } = query
-  // console.log('name', name)
+  // console.log('name', name, atob(name))
 
-  if(name === "erishen"){
+  if(atob(name) === "erishen,123456"){
     res.json({ 
       name: 'ticketCheck',
       query,