[LRP2] Hydra-ize local play and server deploys.

.github/workflows/python-test.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.8]
 
     steps:
       - uses: actions/checkout@v2

deploy/web/build.sh

@@ -12,7 +12,7 @@ GAME_DIR="${WEBDIR}/gameapp/"
 LANDING_DIR="${WEBDIR}/landingapp/"
 SERVER_FILE="${WEBDIR}/server/run_server.py"
 
-CONF_FN="./configs/"$1"/config.js"
+CONF_FN="./configs/"$1".js"
 
 if [ -z "$1" ];
 then
@@ -23,6 +23,7 @@ then
 fi
 
 cp $CONF_FN $BUILDER_DIR"src/config.js"
+cp $CONF_FN $LANDING_DIR"src/config.js"
 cp $CONF_FN $GAME_DIR"src/config.js"
 
 mkdir build

deploy/web/configs/dev/config.js → deploy/web/configs/dev.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "https://dev.light-rpg.ai",
   hostname: "dev.light-rpg.ai",
   port: "80",
+  login: "pass",
 };
 
 export default DEV;

deploy/web/configs/devfair/config.js → deploy/web/configs/devfair.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "http://localhost",
   hostname: "localhost",
   port: "35496",
+  login: "pass",
 };
 
 export default DEV;

deploy/web/configs/devfair-no-models/config.js → deploy/web/configs/devfair_no_models.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "http://localhost",
   hostname: "localhost",
   port: "35496",
+  login: "pass",
 };
 
 export default DEV;

deploy/web/configs/local/config.js → deploy/web/configs/local.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "http://localhost",
   hostname: "localhost",
   port: "35494",
+  login: "pass",
 };
 
 export default DEV;

deploy/web/configs/local-no-models/config.js → deploy/web/configs/local_no_models.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "http://localhost",
   hostname: "localhost",
   port: "35494",
+  login: "pass",
 };
 
 export default DEV;

deploy/web/configs/prod/config.js → deploy/web/configs/prod.js

@@ -8,6 +8,7 @@ const DEV = {
   host: "https://www.light-rpg.ai",
   hostname: "www.light-rpg.ai",
   port: "80",
+  login: "fb",
 };
 
 export default DEV;

deploy/web/deploy.sh

@@ -24,6 +24,4 @@ then
   exit 1
 fi
 
-CONF_FN=$WEBDIR"/configs/"$1"/config"
-
-cat $CONF_FN | python $SERVER_FILE `xargs -0`
+python $SERVER_FILE deploy=$1

deploy/web/landingapp/src/AppRouter.js

@@ -6,18 +6,22 @@
 
 import React from "react";
 import { HashRouter, Route, Redirect, Switch } from "react-router-dom";
+/* CONFIG */
+import CONFIG from "./config.js";
 
 import AboutPage from "./pages/AboutPage";
 import LandingPage from "./pages/LandingPage";
 import TermsPage from "./pages/TermsPage";
 import TutorialPage from "./pages/TutorialPage";
-import LoginPage from "./pages/LoginPage";
+import DevLoginPage from "./pages/DevLoginPage";
+import ProdLoginPage from "./pages/ProdLoginPage";
 import LogoutPage from "./pages/LogoutPage";
 import ErrorPage from "./pages/ErrorPage";
 
 import "./styles.css";
 
 const AppRouter = () => {
+  const use_page = CONFIG.login == "fb" ? ProdLoginPage : DevLoginPage;
   return (
     <div className="app-container">
       <HashRouter>
@@ -26,7 +30,7 @@ const AppRouter = () => {
           <Route path="/tutorial" component={TutorialPage} exact />
           <Route path="/about" component={AboutPage} exact />
           <Route path="/terms" component={TermsPage} exact />
-          <Route path="/login" component={LoginPage} exact />
+          <Route path="/login" component={use_page} exact />
           <Route path="/bye" component={LogoutPage} exact />
           <Route path="/error" component={ErrorPage} exact />
           <Route component={ErrorPage} />

deploy/web/landingapp/src/pages/LoginPage/index.js → deploy/web/landingapp/src/pages/DevLoginPage/index.js

@@ -8,7 +8,7 @@ import React from "react";
 
 import "./styles.css";
 
-const LoginPage = (props) => {
+const DevLoginPage = (props) => {
   return (
     <div className="loginpage-container">
       <div className="login-form__container">
@@ -33,21 +33,9 @@ const LoginPage = (props) => {
             />
           </div>
         </form>
-        <div
-          className="login-form__field"
-          style={{ justifyContent: "center", marginTop: "8px" }}
-        >
-          <form action="/auth/fblogin?next={{next}}" method="get">
-            <input
-              className="login-form__submit"
-              type="submit"
-              value="Sign In With Facebook"
-            />
-          </form>
-        </div>
       </div>
     </div>
   );
 };
 
-export default LoginPage;
+export default DevLoginPage;

deploy/web/landingapp/src/pages/ProdLoginPage/index.js

@@ -0,0 +1,39 @@
+/*****
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from "react";
+
+import "./styles.css";
+
+const ProdLoginPage = (props) => {
+  return (
+    <div className="loginpage-container">
+      <div className="login-form__container">
+        <h1 style={{ color: "white" }}>Login</h1>
+        <p>
+          We use Facebook Login as an identity provider, however we do not store
+          any information about you or your Facebook account. By logging in you
+          agree to our <a href="/#/terms">terms</a> and you accept our use of
+          cookies to mark you as logged in as you navigate the site.
+        </p>
+        <div
+          className="login-form__field"
+          style={{ justifyContent: "center", marginTop: "8px" }}
+        >
+          <form action="/auth/fblogin?next={{next}}" method="get">
+            <input
+              className="login-form__submit"
+              type="submit"
+              value="Sign In With Facebook"
+            />
+          </form>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ProdLoginPage;