resolved conflicts

ssitvit · Jul 26, 2023 · fffddb1 · fffddb1
2 parents 72acc87 + 45ebaf2
commit fffddb1
Show file tree

Hide file tree

Showing 48 changed files with 30,498 additions and 8,429 deletions.
diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml
@@ -2,12 +2,10 @@ name: Auto Comment
 on:
   issues:
     types:
-      - opened
       - closed
-      - assigned
+
   pull_request:
     types:
-      - opened
       - closed
 
 jobs:

diff --git a/README.md b/README.md
@@ -212,3 +212,4 @@ git push -u origin <your_branch_name>
 <a href="https://gssoc.girlscript.tech/"><img src="https://repository-images.githubusercontent.com/331823142/9764a900-5c8e-11eb-9f94-da2a01385e83" width="10%"/></a>
 </div>
 <h2 align="center">Happy Contributing!🎉</h2>
+<h2 align="center">Thank you</h2>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,16 +3,17 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@babel/preset-env": "^7.22.7",
+    "@babel/preset-env": "^7.22.9",
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/standalone": "^7.22.5",
+    "@fortawesome/fontawesome-free": "^6.4.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/chess.js": "^0.13.4",
     "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@types/react-dom": "^18.2.7",
     "@types/redux": "^3.6.0",
     "axios": "^1.4.0",
     "bootstrap": "^5.3.0",
@@ -33,7 +34,7 @@
     "react-spinners": "^0.13.8",
     "react-tooltip": "^5.18.0",
     "reactstrap": "^9.2.0",
-    "styled-components": "^6.0.3",
+    "styled-components": "^6.0.5",
     "web-vitals": "^3.3.2",
     "webfontloader": "^1.6.28"
   },
@@ -65,6 +66,6 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "html-loader": "^4.2.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.63.4"
+    "sass": "^1.64.1"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -53,6 +53,11 @@
    content="Step into The Nostalgia Gaming Collection and embark on a captivating journey back to the 90s. Relive the excitement and joy of timeless classics such as Tic Tac Toe, Pacman, and more. Let nostalgia be your guide as you are transported to a magical era, reminding you to pause, unwind, and savor the simple pleasures of life. Rediscover the enchantment of gaming's golden age with our carefully curated collection."
   />
   <meta property="twitter:image" content="" />
+  <link
+  rel="stylesheet"
+  href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
+/>
+
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>