Remove Sign Up button and let users use username instead of email. Update Dockerfile

Author: Katie Harris

Dockerfile

@@ -72,9 +72,22 @@ COPY --from=build /sqlpad/docker-entrypoint /
 COPY --from=build /sqlpad/server .
 
 ENV NODE_ENV production
-ENV SQLPAD_DB_PATH /var/lib/sqlpad
-ENV SQLPAD_PORT 3000
-EXPOSE 3000
+ENV SQLPAD_DB_PATH=/var/lib/sqlpad
+ENV SQLPAD_PORT=3030
+ENV SQLPAD_ADMIN=${SQLPAD_USER}
+ENV SQLPAD_ADMIN_PASSWORD=${SQLPAD_PASSWORD}
+ENV SQLPAD_TRUST_PROXY="true"
+ENV SQLPAD_BASE_URL="/dbadmin"
+ENV SQLPAD_PASSPHRASE=${SQLPAD_PASSWORD}-${SQLPAD_USER}-passphrase
+ENV SQLPAD_CONNECTIONS__postgres__name="Connected PostgreSQL DB"
+ENV SQLPAD_CONNECTIONS__postgres__driver=postgres
+ENV SQLPAD_CONNECTIONS__postgres__port="5432"
+ENV SQLPAD_CONNECTIONS__postgres__host=${POSTGRES_HOST}
+ENV SQLPAD_CONNECTIONS__postgres__database=${POSTGRES_DB}
+ENV SQLPAD_CONNECTIONS__postgres__username=${POSTGRES_USER}
+ENV SQLPAD_CONNECTIONS__postgres__password=${POSTGRES_PASSWORD}
+
+EXPOSE 3030
 ENTRYPOINT ["/docker-entrypoint"]
 
 # Things to think about for future docker builds

client/src/pages/SignIn.tsx

@@ -11,7 +11,7 @@ import { api } from '../utilities/api';
 import useAppContext from '../utilities/use-app-context';
 
 function SignIn() {
-  const [email, setEmail] = useState('');
+  const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
   const history = useHistory();
   const { config } = useAppContext();
@@ -23,7 +23,7 @@ function SignIn() {
   const signIn = async (e: React.FormEvent) => {
     e.preventDefault();
 
-    const json = await api.post('/api/signin', { email, password });
+    const json = await api.post('/api/signin', { username, password });
     if (json.error) {
       return message.error('Username or password incorrect');
     }
@@ -37,21 +37,21 @@ function SignIn() {
 
   let placeholderText = '';
   if (config.ldapConfigured && config.localAuthConfigured) {
-    placeholderText = 'username or email address';
+    placeholderText = 'username';
   } else if (config.ldapConfigured) {
     placeholderText = 'username';
   } else if (config.localAuthConfigured) {
-    placeholderText = 'email address';
+    placeholderText = 'username';
   }
 
   const localLdapForm = (
     <form onSubmit={signIn}>
       <Input
-        name="email"
-        type="email"
+        name="username"
+        type="text"
         placeholder={placeholderText}
         onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-          setEmail(e.target.value)
+          setUsername(e.target.value)
         }
         required
       />
@@ -76,7 +76,7 @@ function SignIn() {
       </Button>
       <Spacer />
 
-      {config.localAuthConfigured && (
+      {/* {config.localAuthConfigured && (
         <Link
           style={{
             display: 'inline-block',
@@ -87,7 +87,7 @@ function SignIn() {
         >
           Sign Up
         </Link>
-      )}
+      )} */}
     </form>
   );