From 513b3f069735ae0bd01bc61457c6d0b36ef7ced4 Mon Sep 17 00:00:00 2001 From: Liam Arbuckle Date: Sun, 30 Oct 2022 14:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=8E=F0=9F=AA=90=20=E2=86=A3=20[STA-13?= =?UTF-8?q?=20HDASH-5]=20Attempting=20to=20fix=20inheritance=20issues=20wi?= =?UTF-8?q?th=20layouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/.DS_Store | Bin 12292 -> 12292 bytes client/.eslintcache | 2 +- client/src/App.jsx | 6 +++++- client/src/components/.DS_Store | Bin 8196 -> 6148 bytes client/src/components/Home.js | 3 +++ client/src/components/db-layout.js | 13 +++++++++++++ client/src/components/profile.js | 2 ++ 7 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 client/src/components/db-layout.js diff --git a/client/.DS_Store b/client/.DS_Store index a1c23bb8da8a7342032cffba2d26ac229fa6d62e..a4e8ee5273311d74ea33c78be52118a6a28a3a9f 100644 GIT binary patch delta 168 zcmZokXi3<>CeFBRGP`)8s#tZkfsTTSxp}RQLbZj736O1MTwBY@A*!rz9TcCPlbe^{ kF?oTwJY(nP1LEEsn>iE;*h$ef`GC0BW_FE2QZ=~)0M{chlK=n! delta 111 zcmZokXi3<>CeFBXGP`&ok7RYVxuLm^f}x?2+2lrXX~yo!bH(Kudp7SC_vYBlt&q!( RQ_1AL;x3z6G)nNR000NFAPoQj diff --git a/client/.eslintcache b/client/.eslintcache index 7ee2b12a3..fb6c754ee 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"/Users/liamarbuckle/theclub/client/src/index.jsx":"1","/Users/liamarbuckle/theclub/client/src/App.jsx":"2","/Users/liamarbuckle/theclub/client/src/lib/LifetimeContext.js":"3","/Users/liamarbuckle/theclub/client/src/components/premium-content.js":"4","/Users/liamarbuckle/theclub/client/src/components/signup.js":"5","/Users/liamarbuckle/theclub/client/src/components/payment.js":"6","/Users/liamarbuckle/theclub/client/src/components/payment-form.js":"7","/Users/liamarbuckle/theclub/client/src/components/layout.js":"8","/Users/liamarbuckle/theclub/client/src/lib/UserContext.js":"9","/Users/liamarbuckle/theclub/client/src/components/profile.js":"10","/Users/liamarbuckle/theclub/client/src/lib/magic.js":"11","/Users/liamarbuckle/theclub/client/src/lib/LifetimeAccessRequestStatusContext.js":"12","/Users/liamarbuckle/theclub/client/src/components/login.js":"13","/Users/liamarbuckle/theclub/client/src/components/loading.js":"14","/Users/liamarbuckle/theclub/client/src/components/signup-form.js":"15","/Users/liamarbuckle/theclub/client/src/components/header.js":"16","/Users/liamarbuckle/theclub/client/src/components/login-form.js":"17","/Users/liamarbuckle/theclub/client/src/components/Home.js":"18","/Users/liamarbuckle/theclub/client/src/pages/Dashboard.js":"19","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Body.jsx":"20","/Users/liamarbuckle/theclub/client/src/pages/SideBar Section/Sidebar.jsx":"21","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Activity Section/Activity.jsx":"22","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Listing Section/Listing.jsx":"23","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Top Section/Top.jsx":"24"},{"size":1153,"mtime":1667054816903,"results":"25","hashOfConfig":"26"},{"size":3410,"mtime":1667055700811,"results":"27","hashOfConfig":"26"},{"size":87,"mtime":1667026296437,"results":"28","hashOfConfig":"26"},{"size":3304,"mtime":1667026296437,"results":"29","hashOfConfig":"26"},{"size":2178,"mtime":1667026296437,"results":"30","hashOfConfig":"26"},{"size":1206,"mtime":1667026296436,"results":"31","hashOfConfig":"26"},{"size":7461,"mtime":1667026296436,"results":"32","hashOfConfig":"26"},{"size":408,"mtime":1667055708688,"results":"33","hashOfConfig":"26"},{"size":88,"mtime":1667026296437,"results":"34","hashOfConfig":"26"},{"size":1645,"mtime":1667055537423,"results":"35","hashOfConfig":"26"},{"size":113,"mtime":1667026296437,"results":"36","hashOfConfig":"26"},{"size":106,"mtime":1667026296437,"results":"37","hashOfConfig":"26"},{"size":2034,"mtime":1667026296436,"results":"38","hashOfConfig":"26"},{"size":198,"mtime":1667026296436,"results":"39","hashOfConfig":"26"},{"size":1301,"mtime":1667026296437,"results":"40","hashOfConfig":"26"},{"size":2882,"mtime":1667055821198,"results":"41","hashOfConfig":"26"},{"size":1297,"mtime":1667026296436,"results":"42","hashOfConfig":"26"},{"size":834,"mtime":1667026296420,"results":"43","hashOfConfig":"26"},{"size":1793,"mtime":1667055773245,"results":"44","hashOfConfig":"26"},{"size":439,"mtime":1666917766065,"results":"45","hashOfConfig":"26"},{"size":3532,"mtime":1666774651646,"results":"46","hashOfConfig":"26"},{"size":3284,"mtime":1666880075665,"results":"47","hashOfConfig":"26"},{"size":3389,"mtime":1666874260905,"results":"48","hashOfConfig":"26"},{"size":3452,"mtime":1666917352790,"results":"49","hashOfConfig":"26"},{"filePath":"50","messages":"51","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},"1ri4kat",{"filePath":"53","messages":"54","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"57","messages":"58","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"59","messages":"60","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"61","messages":"62","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"63","messages":"64","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"65","messages":"66","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"69","messages":"70","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"71","messages":"72","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"73","messages":"74","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"75","messages":"76","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"77","messages":"78","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"79","messages":"80","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"81","messages":"82","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"83","messages":"84","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"85","messages":"86","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"87","messages":"88","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"89","messages":"90","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"91","messages":"92","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"93","messages":"94","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"95","messages":"96","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},{"filePath":"97","messages":"98","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"52"},"/Users/liamarbuckle/theclub/client/src/index.jsx",[],[],"/Users/liamarbuckle/theclub/client/src/App.jsx",[],"/Users/liamarbuckle/theclub/client/src/lib/LifetimeContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/premium-content.js",[],"/Users/liamarbuckle/theclub/client/src/components/signup.js",[],"/Users/liamarbuckle/theclub/client/src/components/payment.js",[],"/Users/liamarbuckle/theclub/client/src/components/payment-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/layout.js",[],"/Users/liamarbuckle/theclub/client/src/lib/UserContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/profile.js",[],"/Users/liamarbuckle/theclub/client/src/lib/magic.js",[],"/Users/liamarbuckle/theclub/client/src/lib/LifetimeAccessRequestStatusContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/login.js",[],"/Users/liamarbuckle/theclub/client/src/components/loading.js",[],"/Users/liamarbuckle/theclub/client/src/components/signup-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/header.js",[],"/Users/liamarbuckle/theclub/client/src/components/login-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/Home.js",[],"/Users/liamarbuckle/theclub/client/src/pages/Dashboard.js",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Body.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/SideBar Section/Sidebar.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Activity Section/Activity.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Listing Section/Listing.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Top Section/Top.jsx",[]] \ No newline at end of file +[{"/Users/liamarbuckle/theclub/client/src/index.jsx":"1","/Users/liamarbuckle/theclub/client/src/App.jsx":"2","/Users/liamarbuckle/theclub/client/src/lib/LifetimeContext.js":"3","/Users/liamarbuckle/theclub/client/src/components/premium-content.js":"4","/Users/liamarbuckle/theclub/client/src/components/signup.js":"5","/Users/liamarbuckle/theclub/client/src/components/payment.js":"6","/Users/liamarbuckle/theclub/client/src/components/payment-form.js":"7","/Users/liamarbuckle/theclub/client/src/components/layout.js":"8","/Users/liamarbuckle/theclub/client/src/lib/UserContext.js":"9","/Users/liamarbuckle/theclub/client/src/components/profile.js":"10","/Users/liamarbuckle/theclub/client/src/lib/magic.js":"11","/Users/liamarbuckle/theclub/client/src/lib/LifetimeAccessRequestStatusContext.js":"12","/Users/liamarbuckle/theclub/client/src/components/login.js":"13","/Users/liamarbuckle/theclub/client/src/components/loading.js":"14","/Users/liamarbuckle/theclub/client/src/components/signup-form.js":"15","/Users/liamarbuckle/theclub/client/src/components/header.js":"16","/Users/liamarbuckle/theclub/client/src/components/login-form.js":"17","/Users/liamarbuckle/theclub/client/src/components/Home.js":"18","/Users/liamarbuckle/theclub/client/src/pages/Dashboard.js":"19","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Body.jsx":"20","/Users/liamarbuckle/theclub/client/src/pages/SideBar Section/Sidebar.jsx":"21","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Activity Section/Activity.jsx":"22","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Listing Section/Listing.jsx":"23","/Users/liamarbuckle/theclub/client/src/pages/Body Section/Top Section/Top.jsx":"24","/Users/liamarbuckle/theclub/client/src/components/db-layout.js":"25"},{"size":1153,"mtime":1667054816903,"results":"26","hashOfConfig":"27"},{"size":3518,"mtime":1667104453883,"results":"28","hashOfConfig":"27"},{"size":87,"mtime":1667026296437,"results":"29","hashOfConfig":"27"},{"size":3304,"mtime":1667026296437,"results":"30","hashOfConfig":"27"},{"size":2178,"mtime":1667026296437,"results":"31","hashOfConfig":"27"},{"size":1206,"mtime":1667026296436,"results":"32","hashOfConfig":"27"},{"size":7461,"mtime":1667026296436,"results":"33","hashOfConfig":"27"},{"size":408,"mtime":1667105367152,"results":"34","hashOfConfig":"27"},{"size":88,"mtime":1667026296437,"results":"35","hashOfConfig":"27"},{"size":1699,"mtime":1667104005762,"results":"36","hashOfConfig":"27"},{"size":113,"mtime":1667026296437,"results":"37","hashOfConfig":"27"},{"size":106,"mtime":1667026296437,"results":"38","hashOfConfig":"27"},{"size":2034,"mtime":1667026296436,"results":"39","hashOfConfig":"27"},{"size":198,"mtime":1667026296436,"results":"40","hashOfConfig":"27"},{"size":1301,"mtime":1667026296437,"results":"41","hashOfConfig":"27"},{"size":2882,"mtime":1667055821198,"results":"42","hashOfConfig":"27"},{"size":1297,"mtime":1667026296436,"results":"43","hashOfConfig":"27"},{"size":873,"mtime":1667104089341,"results":"44","hashOfConfig":"27"},{"size":1793,"mtime":1667104439693,"results":"45","hashOfConfig":"27"},{"size":439,"mtime":1666917766065,"results":"46","hashOfConfig":"27"},{"size":3532,"mtime":1666774651646,"results":"47","hashOfConfig":"27"},{"size":3284,"mtime":1666880075665,"results":"48","hashOfConfig":"27"},{"size":3389,"mtime":1666874260905,"results":"49","hashOfConfig":"27"},{"size":3452,"mtime":1666917352790,"results":"50","hashOfConfig":"27"},{"size":201,"mtime":1667103845774,"results":"51","hashOfConfig":"27"},{"filePath":"52","messages":"53","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},"1ri4kat",{"filePath":"55","messages":"56","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"57","messages":"58","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"59","messages":"60","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"61","messages":"62","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"63","messages":"64","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"65","messages":"66","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"67","messages":"68","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"71","messages":"72","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"75","messages":"76","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"77","messages":"78","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"79","messages":"80","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"81","messages":"82","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"83","messages":"84","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"85","messages":"86","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"87","messages":"88","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"89","messages":"90","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"91","messages":"92","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"93","messages":"94","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"95","messages":"96","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"97","messages":"98","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"99","messages":"100","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"101","messages":"102","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/liamarbuckle/theclub/client/src/index.jsx",[],[],"/Users/liamarbuckle/theclub/client/src/App.jsx",[],"/Users/liamarbuckle/theclub/client/src/lib/LifetimeContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/premium-content.js",[],"/Users/liamarbuckle/theclub/client/src/components/signup.js",[],"/Users/liamarbuckle/theclub/client/src/components/payment.js",[],"/Users/liamarbuckle/theclub/client/src/components/payment-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/layout.js",[],"/Users/liamarbuckle/theclub/client/src/lib/UserContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/profile.js",[],"/Users/liamarbuckle/theclub/client/src/lib/magic.js",[],"/Users/liamarbuckle/theclub/client/src/lib/LifetimeAccessRequestStatusContext.js",[],"/Users/liamarbuckle/theclub/client/src/components/login.js",[],"/Users/liamarbuckle/theclub/client/src/components/loading.js",[],"/Users/liamarbuckle/theclub/client/src/components/signup-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/header.js",[],"/Users/liamarbuckle/theclub/client/src/components/login-form.js",[],"/Users/liamarbuckle/theclub/client/src/components/Home.js",[],"/Users/liamarbuckle/theclub/client/src/pages/Dashboard.js",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Body.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/SideBar Section/Sidebar.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Activity Section/Activity.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Listing Section/Listing.jsx",[],"/Users/liamarbuckle/theclub/client/src/pages/Body Section/Top Section/Top.jsx",[],"/Users/liamarbuckle/theclub/client/src/components/db-layout.js",[]] \ No newline at end of file diff --git a/client/src/App.jsx b/client/src/App.jsx index 1318b9a05..78071bf87 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { Switch, Route, BrowserRouter as Router } from "react-router-dom"; +import { Switch, Route, BrowserRouter as Router, BrowserRouter } from "react-router-dom"; import { UserContext } from "./lib/UserContext"; import { LifetimeContext } from "./lib/LifetimeContext"; import { LifetimeAccessRequestStatusContext } from "./lib/LifetimeAccessRequestStatusContext"; @@ -15,6 +15,7 @@ import PaymentForm from "./components/payment-form"; import Layout from "./components/layout"; import Dashboard from "./pages/Dashboard"; +import dbLayout from "./components/db-layout"; // Import Magic-related things import { magic } from "./lib/magic"; @@ -51,6 +52,7 @@ function App() { }, []); return ( + @@ -81,6 +83,8 @@ function App() { }} /> +
+
diff --git a/client/src/components/.DS_Store b/client/src/components/.DS_Store index cd195538c78cd6b002aad1bbbc8351748d765648..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100644 GIT binary patch delta 105 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ516q~502;ws^0>w5KPGg_gAhnpCgF}!R pBnTAa1`@77th%xAJM(0I8AV3M$)+;eJWLRCKt?lcj^~-f3;-`E4{!hg literal 8196 zcmeHMTWl0n7(U;$v@>*}1GG|b2R1B3zyfP2Qf|rireJ~AZcDf2vdr#`bYMDDc4pgR zscB4n;iBH$J{$)7|y4hNi?seQdm`v9UhZ*sy+LLK17^>$Y@fj+jH1eS(L9;8DQll!SG% zG$zv-Y31J}%2LIcz9_~d&8~{fQTo#T1A8MGdHx6;zH`_$Y|GiB=N+OMx!R#1cjRoV zE3bR{zMO3qhAbx|&&#Q1u3)OJ-fWsF<3XKd)lM#Nn`W2o7~V4dX;&X}J>3jddcd*s zZmYjo+MxBhm0WQ2Zk-l2M)WpX+NmiC5YpMX3zsfmxu#*`)@1vR-Q82w^1S&ABDIkL z%BJNS4;XsBUv+Z2r5Ve zWR0T*!#yU)MbY0QrYwu>)96gQY|Yz66XkQX4(+}|S*GmuG_84^W-V}7rQ8|maVU6E zR=MHYNFvg6gkT`a4wtNtY*2blHLIJFtnq!CBAb=I5uSfZ?%=|0ky<64vxkN#L`UMX zW~Eg*;BC88b==Nj-SUofk#rQ=JpT->s|lu#FMM}U5XcPmY?W&GQoL? zUT_L)U~OzCJIL~EoSkM*vNP-rc7c7sK4V|8@7Wc06+i_lF&kB=!D1{&JvLw?ny?8i z=tLK~k-|O*qmPMR-O81Lb$q!<1tZT2*p;h@?T{-t z8(p(jq~eqXpN&Kt)=N}^a#_Hx*+?un6WOv=qGFWG19nN0Smra)Xj?lib5R!mE~H;# zm)UphC-xg5eJ&QD4tF3y_-?^=?Di3!LN5*=gM-LI!w@XkI7(PQjtM-3NjywQKSfx7 z43Fa}JdI}v?=Rp*yo6WqDxv)?oX6XE5AWjwJ`8aGC87QYTq!~FuIWg|&!tEnN#!lm zwhocJi2ms=w=`GAPhaQt|Lr&b{(noy7#=>%K$w9)&j8BXQf)0{bF*ih*K5b { return ( <> +

Welcome to the Star Sailors DAO.

Read up on development news
Connect with the team and fellow Star Sailors
diff --git a/client/src/components/db-layout.js b/client/src/components/db-layout.js new file mode 100644 index 000000000..fdc696672 --- /dev/null +++ b/client/src/components/db-layout.js @@ -0,0 +1,13 @@ +import Header from "./header"; +import Dashboard from "../pages/Dashboard"; + +const dbLayout = ({}) => ( + <> +
+
+ +
+ +); + +export default dbLayout; diff --git a/client/src/components/profile.js b/client/src/components/profile.js index 32153b471..b94daf8fc 100644 --- a/client/src/components/profile.js +++ b/client/src/components/profile.js @@ -2,6 +2,7 @@ import { useEffect, useContext } from "react"; import { useHistory } from "react-router-dom"; import { UserContext } from "../lib/UserContext"; import Loading from "./loading"; +import Header from "./header"; const Profile = () => { const history = useHistory(); @@ -19,6 +20,7 @@ const Profile = () => { ) : ( user?.issuer && ( <> +
Email
{user.email}