Skip to content

Commit aac76e0

Browse files
committed
💄 🐛 ui fixes removed bootstrap, addressed major issues
1 parent d913c0e commit aac76e0

27 files changed

+277
-5423
lines changed

client/.eslintrc.json

+14-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"es2021": true
5-
},
6-
"extends": [
7-
"plugin:react/recommended",
8-
"airbnb"
9-
],
10-
"overrides": [
11-
],
12-
"parserOptions": {
13-
"ecmaVersion": "latest",
14-
"sourceType": "module"
15-
},
16-
"plugins": [
17-
"react"
18-
],
19-
"rules": {
20-
"quotes": [2, "double", { "avoidEscape": true }],
21-
"comma-dangle": 0,
22-
"react/function-component-definition": [
23-
2,
24-
{
25-
"namedComponents": "arrow-function",
26-
"unnamedComponents": "arrow-function"
27-
}
28-
],
29-
"react/prop-types": 0,
30-
"no-underscore-dangle": 0,
31-
"react/jsx-one-expression-per-line": 0,
32-
"object-curly-newline": 0
33-
// "prefer-function-component":0
34-
}
2+
"env": {
3+
"browser": true,
4+
"es2021": true
5+
},
6+
"extends": ["eslint:recommended", "plugin:react/recommended"],
7+
"overrides": [],
8+
"parserOptions": {
9+
"ecmaVersion": "latest",
10+
"sourceType": "module"
11+
},
12+
"plugins": ["react"],
13+
"rules": {
14+
"react/prop-types": 0
15+
}
3516
}

client/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ package-lock.json
2323
*.njsproj
2424
*.sln
2525
*.sw?
26+
27+
.env

client/package.json

+23-22
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,36 @@
1010
"lint": "eslint . --ext .js,.jsx"
1111
},
1212
"dependencies": {
13-
"@emotion/react": "^11.10.5",
14-
"@emotion/styled": "^11.10.5",
15-
"@fontsource/poppins": "^4.5.10",
16-
"@mui/material": "^5.11.0",
17-
"axios": "^1.1.2",
18-
"html-react-parser": "^3.0.4",
13+
"@emotion/react": "^11.11.4",
14+
"@emotion/styled": "^11.11.5",
15+
"@fontsource/poppins": "^5.0.14",
16+
"@mui/material": "^5.15.15",
17+
"@tinymce/tinymce-react": "^5.0.1",
18+
"axios": "^1.6.8",
19+
"html-react-parser": "^3.0.16",
1920
"lodash.merge": "^4.6.2",
2021
"react": "^18.2.0",
2122
"react-dom": "^18.2.0",
22-
"react-hot-toast": "^2.4.0",
23-
"react-icons": "^4.4.0",
24-
"react-loader-spinner": "^5.1.5",
25-
"react-redux": "^8.0.4",
26-
"react-router-dom": "^6.4.2",
23+
"react-hot-toast": "^2.4.1",
24+
"react-icons": "^4.12.0",
25+
"react-loader-spinner": "^5.4.5",
26+
"react-redux": "^8.1.3",
27+
"react-router-dom": "^6.22.3",
2728
"react-web-share": "^2.0.2",
28-
"redux": "^4.1.2",
29-
"suneditor": "^2.44.3",
30-
"suneditor-react": "^3.4.1"
29+
"redux": "^4.2.1",
30+
"suneditor": "^2.46.0",
31+
"suneditor-react": "^3.6.1"
3132
},
3233
"devDependencies": {
33-
"@types/react": "^18.0.26",
34-
"@types/react-dom": "^18.0.9",
35-
"@vitejs/plugin-react": "^3.0.0",
36-
"eslint": "^8.32.0",
34+
"@types/react": "^18.2.79",
35+
"@types/react-dom": "^18.2.25",
36+
"@vitejs/plugin-react": "^3.1.0",
37+
"eslint": "^8.57.0",
3738
"eslint-config-airbnb": "^19.0.4",
38-
"eslint-plugin-import": "^2.27.5",
39-
"eslint-plugin-jsx-a11y": "^6.7.1",
40-
"eslint-plugin-react": "^7.32.1",
39+
"eslint-plugin-import": "^2.29.1",
40+
"eslint-plugin-jsx-a11y": "^6.8.0",
41+
"eslint-plugin-react": "^7.34.1",
4142
"eslint-plugin-react-hooks": "^4.6.0",
42-
"vite": "^4.0.0"
43+
"vite": "^4.5.3"
4344
}
4445
}

client/src/App.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import { Toaster } from "react-hot-toast";
33
import { useRoutes } from "react-router-dom";
44
import { StyledEngineProvider } from "@mui/material/styles";
55
import { CssBaseline, ThemeProvider } from "@mui/material";
6-
// eslint-disable-next-line import/no-named-as-default, import/no-named-as-default-member
76
import routes from "./routes";
87
import { customTheme } from "./theme";
9-
import "./styles/bootstrap/bootstrap-utils.css";
108
import "./styles/style.css";
119

1210
const App = () => {
@@ -22,7 +20,6 @@ const App = () => {
2220
const appTheme = customTheme({
2321
theme: "dark",
2422
direction: "ltr",
25-
// responsiveFontSizes: settings.responsiveFontSizes
2623
}); // toaster options
2724

2825
return (

client/src/common/Add.jsx

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ const Adds = () => {
55
return (
66
<React.Fragment>
77
<Box
8-
style={{
9-
// height: "86vh",
10-
overflowY: "auto",
8+
sx={{
119
wordWrap: "wrap",
1210
}}
1311
>
@@ -17,7 +15,7 @@ const Adds = () => {
1715
<img
1816
src="https://socialify.git.ci/shelcia/Socialgram/image?font=Rokkitt&forks=1&issues=1&language=1&owner=1&pattern=Floating%20Cogs&pulls=1&stargazers=1&theme=Dark"
1917
alt="Socialgram"
20-
className="w-100 mb-4"
18+
style={{ width: "100%", marginBottom: 2 }}
2119
/>
2220
<Link
2321
href="https://github.com/shelcia/Socialgram"
@@ -37,7 +35,7 @@ const Adds = () => {
3735
href="https://github.com/shelcia/Socialgram/issues"
3836
target="_blank"
3937
rel="noopener noreferrer"
40-
className="px-2"
38+
sx={{ paddingX: 1 }}
4139
>
4240
Issues
4341
</Link>
@@ -57,7 +55,7 @@ const Adds = () => {
5755
href="https://github.com/shelcia/CRM/blob/master/CODE_OF_CONDUCT.md"
5856
target="_blank"
5957
rel="noopener noreferrer"
60-
className="px-2"
58+
sx={{ paddingX: 1 }}
6159
>
6260
Code of Conduct
6361
</Link>

client/src/common/Navbar.jsx

-199
This file was deleted.

client/src/common/SideNav.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ const SideNav = () => {
6969
</ListItemButton>
7070
</ListItem>
7171
</List>
72-
<Alert severity="info">Please keep this safe and welcome!</Alert>
72+
<Alert severity="info">
73+
Please keep this safe and welcoming!. Content is moderated.
74+
</Alert>
7375
<LogoutModal open={open} setOpen={setOpen} />
7476
</React.Fragment>
7577
);

client/src/components/CustomLoading.jsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ import { Rings } from "react-loader-spinner";
44
const Loading = ({ children }) => {
55
return (
66
<div
7-
className="w-100 h-100 d-flex"
8-
style={{ alignItems: "center", justifyContent: "center" }}
7+
style={{
8+
alignItems: "center",
9+
justifyContent: "center",
10+
width: "100%",
11+
height: "100%",
12+
display: "flex",
13+
}}
914
>
1015
<Rings type="TailSpin" color="#7F00FF" height={150} width={150} />
1116
{children}

0 commit comments

Comments
 (0)