Skip to content

Commit

Permalink
Merge branch 'main' into new-resources-page-build
Browse files Browse the repository at this point in the history
  • Loading branch information
Ase020 authored Feb 23, 2024
2 parents 905de7b + 1c1e173 commit 1260842
Show file tree
Hide file tree
Showing 77 changed files with 1,970 additions and 1,219 deletions.
34 changes: 31 additions & 3 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ module.exports = {
es2021: true,
node: true,
},
extends: "airbnb",
plugins: ["prettier"],
extends: [
"airbnb",
"airbnb/hooks",
"eslint:recommended",
// "plugin:prettier/recommended",
"plugin:react/recommended",
],
plugins: ["react", "prettier"],
overrides: [
{
env: {
Expand All @@ -24,8 +30,30 @@ module.exports = {
rules: {
semi: 0,
"comma-dangle": 0,
"prettier/prettier": "error",
"react/jsx-filename-extension": [1, { extensions: [".js", ".jsx"] }],
quotes: ["error", "double"],
"linebreak-style": ["error", "unix"],
"no-console": "error",
"react/react-in-jsx-scope": 0,
"import/order": [
"error",
{
groups: [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index",
],
alphabetize: { order: "asc", caseInsensitive: true },
},
],
"prettier/prettier": [
"error",
{
endOfLine: "auto",
},
],
},
};
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
Binary file not shown.
Binary file added .vs/SYT-Web-Redesign/v17/.wsuo
Binary file not shown.
6 changes: 6 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ExpandedNodes": [
""
],
"PreviewInSolutionExplorer": false
}
Binary file added .vs/slnx.sqlite
Binary file not shown.
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"start": "react-scripts start",
"test": "react-scripts test",
"eject": "react-scripts eject",
"pretty": "prettier --write ."
"pretty": "prettier --write .",
"knip": "knip"
},
"dependencies": {
"@emailjs/browser": "^3.11.0",
Expand All @@ -32,7 +33,6 @@
"react-fast-marquee": "^1.6.2",
"react-hook-form": "^7.48.2",
"react-photo-album": "^2.3.0",
"react-query": "^3.39.3",
"react-router-dom": "^6.11.2",
"react-simple-wysiwyg": "^2.2.5",
"tailwind-scrollbar-hide": "^1.1.7",
Expand All @@ -51,13 +51,12 @@
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.3.4",
"husky": "^8.0.0",
"lint-staged": "^13.2.2",
"knip": "^4.3.1",
"postcss": "^8.4.23",
"prettier": "^2.8.8",
"tailwindcss": "^3.3.2",
"vite": "^4.3.2"
"vite": "^4.5.1"
},
"lint-staged": {
"**/*.{js,jsx}": [
Expand Down
17 changes: 0 additions & 17 deletions src/ADMIN/index.js

This file was deleted.

164 changes: 0 additions & 164 deletions src/ADMIN/pages/chapters/AddChapterPage.jsx

This file was deleted.

9 changes: 4 additions & 5 deletions src/APP/components/Footer2.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ function Footer2() {
<Link to="/community">Community</Link>
</li>
<li>
<a href="/products">Products</a>
<Link to="/products">Products</Link>
</li>
<li>
<Link to="/shop">Shop</Link>
</li>
</ul>
</div>
Expand Down Expand Up @@ -128,7 +131,6 @@ function Footer2() {
Gallery
</a>
</li>

</ul>
</div>

Expand Down Expand Up @@ -160,7 +162,6 @@ function Footer2() {
special offers
</p>


<form className="flex items-center">
<input
type="email"
Expand All @@ -170,15 +171,13 @@ function Footer2() {
<button
type="submit"
className="rounded-r-lg px-2 md:px-4 py-3 flex-auto font-semibold text-white transition-all duration-200 bg-primary border border-transparent hover:bg-gray-700 focus:ring-2 focus:ring-offset-2 focus:ring-gray-900"

>
Subscribe
</button>
</form>
</div>
</div>
</div>

</div>

<div className="sm:mt-14 mt-10">
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable react/react-in-jsx-scope */
import { Link } from "react-router-dom";
import logo from "../../assets/images/sytLogo.png";
import bell from "../../assets/images/icons/bell-icon.svg";
import profile from "../../assets/images/adminPage/profile-pic.png";
import logo from "../../../assets/images/sytLogo.png";
import bell from "../../../assets/images/icons/bell-icon.svg";
import profile from "../../../assets/images/adminPage/profile-pic.png";

function AdminHeader() {
return (
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from "react";
import SearchIcon from "../../../assets/images/icons/search-icon.svg";
import SearchIcon from "../../../../assets/images/icons/search-icon.svg";

const initialData = [
{
Expand Down
Loading

0 comments on commit 1260842

Please sign in to comment.