Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings page #107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "1.0.0",
"author": "J Quinn",
"license": "MIT",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.1.2",
"@fortawesome/free-brands-svg-icons": "^6.1.2",
Expand All @@ -12,23 +11,22 @@
"@types/react": "^18.2.12",
"@types/react-dom": "^18.2.5",
"@types/react-responsive": "^8.0.5",
"@types/react-router-dom": "^5.3.3",
"@types/react-transition-group": "^4.4.4",
"@types/react-transition-group": "^4.4.6",
"@types/uuid": "^8.3.1",
"axios": "^1.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.12.1",
"react-scripts": "^5.0.1",
"react-transition-group": "^4.4.2",
"socket.io-client": "^4.3.2",
"ts-node": "^10.4.0",
"react-transition-group": "^4.4.5",
"socket.io-client": "^4.6.2",
"ts-node": "^10.9.1",
"typescript": "^5.1.3",
"uuid": "^8.3.2"
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/node": "^18.7"
"@types/node": "^20.3.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 2 additions & 0 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import Login from "./components/auth/Login";
import Alerts from "./components/layout/Alerts";
import Home from "./components/pages/Home";
import About from "./components/pages/About";
import Settings from "./components/pages/Settings";
import NotFound from "./components/pages/NotFound";
import PrivateRoute from "./components/routing/PrivateRoute";

Expand Down Expand Up @@ -84,6 +85,7 @@ const App: FC = () => (
}
/>
<Route path="/about" element={<About />} />
<Route path="/settings" element={<Settings />} />
<Route path="/register" element={<Register />} />
<Route path="/login" element={<Login />} />
<Route path="*" element={<NotFound />} />
Expand Down
3 changes: 3 additions & 0 deletions client/src/components/layout/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const Navbar: FC<Props> = ({ title, icon }) => {
<li>
<Link to="/">Home</Link>
</li>
<li>
<Link to="/settings">Settings</Link>
</li>
<li>
<Link to="/about">About</Link>
</li>
Expand Down
16 changes: 16 additions & 0 deletions client/src/components/pages/Settings.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { FC } from "react";

const Settings: FC = () => {
return (
<div className="container">
<h1>Settings</h1>
<p className="my-1">
Lorem ipsum dolor sit amet consectetur adipisicing elit. Aut aliquid possimus, eos non,
adipisci pariatur sed dolorum officiis voluptatum maxime recusandae ex, unde eaque rem
cupiditate quos debitis omnis voluptatem?
</p>
</div>
);
};

export default Settings;
23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
"main": "index.ts",
"author": "Quinn",
"license": "MIT",
"private": true,
"dependencies": {
"bcryptjs": "^2.4.3",
"config": "^3.3.6",
"config": "^3.3.9",
"dotenv": "^16.1.4",
"express": "^4.17.1",
"express-validator": "^6.13.0",
"express": "^4.18.2",
"express-validator": "^7.0.1",
"jsonwebtoken": "^9.0.0",
"mongoose": "^7.2.4",
"nodemailer": "^6.7.1",
"nodemailer": "^6.9.3",
"path": "^0.12.7",
"socket.io": "^4.3.2",
"ts-node": "^10.9.1",
Expand All @@ -22,22 +21,22 @@
"devDependencies": {
"@types/bcryptjs": "^2.4.2",
"@types/config": "^3.3.0",
"@types/express": "^4.17.13",
"@types/jsonwebtoken": "^8.5.6",
"@types/node": "^18.7.6",
"@types/express": "^4.17.17",
"@types/jsonwebtoken": "^9.0.2",
"@types/node": "^20.3.1",
"@types/nodemailer": "^6.4.4",
"concurrently": "^7.0.0",
"nodemon": "^2.0.15"
"concurrently": "^8.2.0",
"nodemon": "^2.0.22"
},
"scripts": {
"start": "NODE_ENV=production node build/index.js",
"start": "node build/index.js",
"server": "nodemon index.ts",
"serverBuild": "npx tsc",
"client": "yarn workspace client start",
"clientBuild": "yarn workspace client build",
"dev": "concurrently \"yarn server\" \"yarn client\"",
"devInstall": "yarn",
"devUpgrade": "yarn upgrade && yarn workspace client upgrade",
"devUpgrade": "yarn up && yarn workspace client up",
"devBuild": "yarn serverBuild && yarn clientBuild",
"heroku-postbuild": "yarn devInstall && yarn devBuild",
"format": "npx prettier --write {,*/**/}*.{ts,tsx,js,json}"
Expand Down
Loading