updated

felix-digitalkarma · Jan 3, 2024 · da28bc6 · da28bc6
1 parent fc3840f
commit da28bc6
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 88 deletions.
diff --git a/config/default.json b/config/default.json
@@ -1,7 +1,7 @@
 {
-  "PRO_MONGO":"mongodb+srv://dbAdmin:[email protected]/twelve",
-  "DEV_MONGO":"mongodb+srv://dbAdmin:[email protected]/test",
-  "LOCAL_MONGO":"mongodb://127.0.0.1:27017/twelve",
-  "jwtSecret":"lucky3114",
+  "PRO_MONGO": "mongodb+srv://dbAdmin:[email protected]/twelve",
+  "DEV_MONGO": "mongodb+srv://dbAdmin:[email protected]/test",
+  "LOCAL_MONGO": "mongodb://127.0.0.1:27017/twelve",
+  "jwtSecret": "lucky3114",
   "expiresIn": 3600
-}
+}
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -26,7 +26,7 @@
 
     <title>Twelve.Community</title>
   </head>
-  <body class="blue-diag">
+  <body class="dark-radial">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script>

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -31,6 +31,7 @@ const App = () => {
             content="Spiritual,based,social,platform,Anonymity, designing principle,Recovery, purpose,Connection , modern technology"
           />
         </Helmet>
+        <Navbar />
         <Router>
           <Landing path="/" />
           <Login path="login" />

diff --git a/frontend/src/assets/paypal_qrcode.png b/frontend/src/assets/paypal_qrcode.png
diff --git a/frontend/src/assets/venmo_qrcode.png b/frontend/src/assets/venmo_qrcode.png
diff --git a/frontend/src/components/Card.js b/frontend/src/components/Card.js
@@ -52,7 +52,7 @@ export default function UserStoryCard(props) {
       <CardHeader
         avatar={
           <Avatar aria-label="recipe" className={classes.avatar}>
-            {props.user.firstName}
+            {props.user.lastInitial}
           </Avatar>
         }
         title={props.title}

diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.js
@@ -27,15 +27,15 @@ export const Navbar = () => {
             </a>
           </h3>
           <nav className="nav nav-masthead justify-content-center">
+            {/* <a className="nav-link" href="/register">
+              Register
+            </a>
             <a className="nav-link" href="/login">
               Login
             </a>
             <a className="nav-link" href="/stories">
               Stories
-            </a>
-            <a className="nav-link" href="/register">
-              Sign Up
-            </a>
+            </a>*/}
           </nav>
         </div>
       </StyledHeader>

diff --git a/frontend/src/contexts/auth.js b/frontend/src/contexts/auth.js
@@ -52,7 +52,7 @@ const actions = {
         setAuthToken(res.data.token);
         localStorage.setItem("token", res.data.token);
       } catch (error) {
-        setState({ error, loading: false });
+        setState({ error: error.msg, loading: false });
       }
     },
   logout:

diff --git a/frontend/src/hooks/landing.js b/frontend/src/hooks/landing.js
@@ -3,9 +3,8 @@ import { Helmet } from "react-helmet-async";
 import styled from "styled-components";
 
 import Avatar from "../components/Avatar";
-import python_logo from "../assets/python_logo.png";
-import circuit_logo from "../assets/circuit.png";
-import ai_logo from "../assets/ai_logo.png";
+import paypal from "../assets/paypal_qrcode.png";
+import venmo from "../assets/venmo_qrcode.png";
 
 const ImageIcons = styled(Avatar)`
   margin-left: 10px;
@@ -18,8 +17,8 @@ const ImageContainer = styled.div`
   flex-direction: row;
   justify-content: center;
   img {
-    margin-left: 20px;
-    margin-right: 20px;
+    margin-left: 10px;
+    margin-right: 10px;
   }
 `;
 
@@ -39,80 +38,27 @@ const Landing = () => {
         />
       </Helmet>
       <main role="main" className="inner cover">
-        <div className="jumbotron ">
-          <ImageContainer>
-            <ImageIcons image={python_logo} height={"100px"} width={"100px"} />
-            <ImageIcons image={circuit_logo} height={"100px"} width={"100px"} />
-            <ImageIcons image={ai_logo} height={"100px"} width={"100px"} />
-          </ImageContainer>
-        </div>
         <h1 className="cover-heading">Story Driven Recovery</h1>
-        <p className="lead">
-          Twelve Community is a non-profit Spiritually-based social platform
-          with a mission to create a safe and secure platform for all to share
-          personal stories of recovery, become involved with our communities
-          through service, guiding others through sponsorship, and supporting
-          our local and global communities through charitable donation.
+        <p>
+          Twelve Community is a donation-friendly Spiritually-based social
+          platform with a mission to deliver high-quality audio recordings that
+          focus on recovery in various programs such as Alcoholics Anonymous,
+          Codependents Anonymous and Adult Children of Alcoholic and
+          Dysfunctional homes.
         </p>
-        <p className="lead">
-          User stories are submitted and analyzed through machine-learning with
-          help of artificial intelligence (using Python, DeepMind), then used to
-          make recommendations for recovery tools, meetings, etc
+        <p>
+          Recordings are available in easy to digest formats with links for free
+          publications.
         </p>
-        <p className="lead">
-          Through machine-learning, artificial intelligence and the sharing of
-          our own stories we can become involved with our communities through
-          service, sponsorship, and support for our local and global
-          communities.
-        </p>
-        <div className="mailchimp">
-          <div id="mc_embed_signup">
-            <form
-              action="https://community.us17.list-manage.com/subscribe/post?u=a254665802cbb1a49a2513c1a&amp;id=b4cf8b1c8e"
-              method="post"
-              id="mc-embedded-subscribe-form"
-              name="mc-embedded-subscribe-form"
-              className="validate"
-              target="_blank"
-              noValidate
-            >
-              <div id="mc_embed_signup_scroll">
-                <label htmlFor="mce-EMAIL">
-                  Subscribe to hear about project updates.
-                </label>
-
-                <input
-                  type="email"
-                  name="EMAIL"
-                  className="email form-control"
-                  id="mce-EMAIL"
-                  placeholder="email address"
-                  required
-                />
 
-                <div
-                  style={{ position: "absolute", left: "-5000px" }}
-                  aria-hidden="true"
-                >
-                  <input
-                    type="text"
-                    name="b_a254665802cbb1a49a2513c1a_b4cf8b1c8e"
-                    tabIndex="-1"
-                  />
-                </div>
-                <div className="clear">
-                  <StyledInput
-                    type="submit"
-                    value="Subscribe"
-                    name="subscribe"
-                    id="mc-embedded-subscribe"
-                    className="btn btn-success"
-                  />
-                </div>
-              </div>
-            </form>
-          </div>
-        </div>
+        <p>
+          If you would like to support through donations, you can donate through
+          paypal or venmo.
+        </p>
+        <ImageContainer>
+          <ImageIcons image={paypal} height="200px" />
+          <ImageIcons image={venmo} width="320px" />
+        </ImageContainer>
       </main>
     </div>
   );

diff --git a/frontend/src/hooks/login.js b/frontend/src/hooks/login.js
@@ -31,7 +31,7 @@ export const Login = () => {
 
   return (
     <Wrapper>
-      <h1>Login Form {test}</h1>
+      <h1>Login Form</h1>
       <p>Currently Authenticated: {`${state.isAuthenticated}`}</p>
       <form onSubmit={(e) => handleSubmit(e)}>
         <input

diff --git a/frontend/src/styles/gradients.css b/frontend/src/styles/gradients.css
@@ -26,4 +26,11 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6daded', endColorstr='#4096ee', GradientType=1);
   /* IE6-9 fallback on horizontal gradient */
 
+}
+
+.dark-radial {
+  color: white;
+  /* Permalink - use to edit and share this gradient: https://colorzilla.com/gradient-editor/#3f4c6b+0,3f4c6b+100;Blue+Grey+Flat */
+background: radial-gradient(ellipse at center,  #3f4c6b 0%,#3f4c6b 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+
 }