Merge pull request #218 from open-source-labs/denton/deploy

Denton/deploy

Author: dentonwong

Dockerfile

@@ -24,7 +24,7 @@ COPY --from=build /app/package*.json ./
 
 RUN npm install --no-install-recommends --only=production --fetch-retry-maxtimeout 500000
 
-COPY --from=build /app/.env .env
+# COPY --from=build /app/.env .env
 COPY --from=build /app/config.js ./config.js
 COPY --from=build /app/server ./server
 COPY --from=build /app/app/dist /app

Dockerrun.aws.json

@@ -15,4 +15,4 @@
       "Value": "Reactypev15-env.eba-mbvivk7k.us-east-1.elasticbeanstalk.com"
     }
   ]
-}
+}

app/src/components/login/SignIn.tsx

@@ -215,7 +215,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
         <Container component="main" maxWidth="xs">
           <CssBaseline />
           <div className={classes.paper}>
-            <Button
+            {/* <Button
               color="primary"
               style={{
                 minWidth: '113.97px',
@@ -227,7 +227,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
               onClick={handleDarkModeToggle}
             >
               {isDarkMode ? `Light Mode` : `Dark Mode`}
-            </Button>
+            </Button> */}
             <Avatar className={classes.avatar} sx={{ marginTop: '10vh' }}>
               <LockOutlinedIcon />
             </Avatar>
@@ -295,7 +295,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
                 <path d="M8.256 14a4.474 4.474 0 0 1-.229-1.004H3c.001-.246.154-.986.832-1.664C4.484 10.68 5.711 10 8 10c.26 0 .507.009.74.025.226-.341.496-.65.804-.918C9.077 9.038 8.564 9 8 9c-5 0-6 3-6 4s1 1 1 1h5.256Z" />
               </svg>
             </Button>
-            <Button
+            {/* <Button
               fullWidth
               id="SignInWithGithub"
               variant="contained"
@@ -344,7 +344,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
               >
                 <path d="M15.545 6.558a9.42 9.42 0 0 1 .139 1.626c0 2.434-.87 4.492-2.384 5.885h.002C11.978 15.292 10.158 16 8 16A8 8 0 1 1 8 0a7.689 7.689 0 0 1 5.352 2.082l-2.284 2.284A4.347 4.347 0 0 0 8 3.166c-2.087 0-3.86 1.408-4.492 3.304a4.792 4.792 0 0 0 0 3.063h.003c.635 1.893 2.405 3.301 4.492 3.301 1.078 0 2.004-.276 2.722-.764h-.003a3.702 3.702 0 0 0 1.599-2.431H8v-3.08h7.545z" />
               </svg>
-            </Button>
+            </Button> */}
             <Button
               fullWidth
               variant="contained"

app/src/components/right/LoginButton.tsx

@@ -10,6 +10,7 @@ const { API_BASE_URL, API_BASE_URL2 } = config;
 export default function LoginButton() {
   const state = useSelector((store:RootState) => store.appState);
   const dispatch = useDispatch();
+
   const handleLogout = () => {
 
     window.localStorage.clear();

app/src/index.tsx

@@ -41,6 +41,7 @@ const PrivateRoute = ({ component: Component, ...rest }) => (
   />
 );
 
+
 ReactDOM.render(
   <ApolloProvider client={client}>
     <Provider store={store}>

server/server.ts

@@ -67,19 +67,18 @@ const passportSetup = require('./routers/passport-setup');
 const session = require('express-session');
 import authRoutes from './routers/auth';
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//I don't believe this portion of the code is being used. It just creates a session cookie, but majority of the controllers right now use mongodb as a sessionController, not passport.
-// app.use(
-//   session({
-//     secret: process.env.SESSION_SECRET,
-//     resave: false,
-//     saveUninitialized: true,
-//     cookie: { maxAge: 24 * 60 * 60 * 1000 }
-//   })
-// );
-// app.use(passport.initialize());
-// app.use(passport.session());
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+app.use(
+  session({
+    secret: process.env.SESSION_SECRET,
+    resave: false,
+    saveUninitialized: true,
+    cookie: { maxAge: 24 * 60 * 60 * 1000 }
+  })
+);
+app.use(passport.initialize());
+app.use(passport.session());
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // go to other files
 // 8080 only for the container