Consolidated branch

.gitignore

@@ -58,3 +58,9 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+react-ystemandchess/package-lock.json
+chessClient/package-lock.json
+middleware/package-lock.json
+middlewareNode/package-lock.json
+stockfishServer/package-lock.json
+chessServer/package-lock.json

react-ystemandchess/src/AppRoutes.js

@@ -57,8 +57,16 @@ const AppRoutes = () => {
       />
       <Route path="/student" element={<Student/>} />
       <Route path="/mentor-profile" element={<MentorProfile />} />
+     {/* <Route path="/student-profile" element={<UserProfile />} />
+      <Route path="/learnings" element={<LessonOverlay />} /> 
+      <Route path="/student-profile" element={<StudentProfile />} /> */}
+
       <Route path="/student-profile" element={<UserProfile />} />
-      {/* <Route path="/learnings" element={<LessonOverlay />} /> */}
+      {/* <Route path="/learnings" element={<LessonOverlay />} /> 
+
+      <Route path="/student-profile" element={<StudentProfile />} /> */}
+      <Route path="/learnings" element={<LessonOverlay />} />
+      <Route path="/play-nolog" element={<ChessFreePlay />} />
     </Routes>
   );
 };

react-ystemandchess/src/components/badges/Badges.jsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import './Badges.scss';
+import Images from '../../images/imageImporter'
+
+const BadgeKnight = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.badgeKnight} alt="YSC Knight Badge" />
+        </div>
+    )
+}
+const BadgeKing = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.badgeKing} alt="YSC King Badge" />
+        </div>
+    )
+}
+const BadgeQueen = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.badgeQueen} alt="YSC Queen Badge" />
+        </div>
+    )
+}
+const BadgeRook = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.badgeRook} alt="YSC Rook Badge" />
+        </div>
+    )
+}
+const BadgePawn = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.badgePawn} alt="YSC Pawn Badge" />
+        </div>
+    )
+}
+const BadgeBishop = ({}) => {
+    return (
+        <div className="badge">
+            <img src={Images.BadgeBishop} alt="YSC Bishop Badge" />
+        </div>
+    )
+}
+
+export default Badges = {
+    BadgeKnight,
+    BadgeKing,
+    BadgeQueen,
+    BadgeRook,
+    BadgePawn,
+    BadgeBishop
+} 

react-ystemandchess/src/images/imageImporter.jsx

@@ -24,12 +24,27 @@ import playComputerIcon from "./StudentInventoryIcons/play-computer-icon.svg";
 import recordingsIcon from "./StudentInventoryIcons/recordings-icon.svg";
 import backpackIcon from "./StudentInventoryIcons/backpack-icon.svg";
 
+<<<<<<< HEAD
 // Chess Benefit Page
 import mathComputerImg from "./mathArticle/computer.png";
 import mathChampImg from "./mathArticle/Junechamp 2.png";
+=======
+// Chess Benefits Page
+import mathComputerImg from "./mathArticle/computer.png"
+import mathChampImg from "./mathArticle/Junechamp 2.png"
+>>>>>>> origin/feature/add-static-badge-elements
+
+// Badges
+import badgeKnight from "./badges/badge-knight.png";
+import badgeQueen from "./badges/badge-knight.png";
+import badgeRook from "./badges/badge-knight.png";
+import badgeKing from "./badges/badge-knight.png";
+import badgePawn from "./badges/badge-knight.png";
+import badgeBishop from "./badges/badge-knight.png";
 
 // Global image object. Don't forget to place images here.
 const images = {
+<<<<<<< HEAD
   // Home
   LogoLineBr,
   TreesGroup,
@@ -55,6 +70,40 @@ const images = {
   playComputerIcon,
   recordingsIcon,
   backpackIcon,
+=======
+    // Home
+    LogoLineBr,
+    TreesGroup,
+    Heart,
+    Gem,
+    LargeInfo,
+    ChessGroup,
+    Book1,
+    Book2,
+    BuyNow,
+    // Chess Benefit Page
+    mathComputerImg,
+    mathChampImg,
+    // Student Inventory
+    userPortraitCamera,
+    lineGraphPlaceholder,
+    activityIcon,
+    mentorIcon,
+    learningIcon,
+    chessLessonsIcon,
+    gamesIcon,
+    puzzlesIcon,
+    playComputerIcon,
+    recordingsIcon,
+    backpackIcon,
+    // Badges
+    badgeKnight,
+    badgeQueen,
+    badgeRook,
+    badgeKing,
+    badgePawn,
+    badgeBishop
+>>>>>>> origin/feature/add-static-badge-elements
 };
 
 export default images;

scripts/docker-compose.yml

@@ -4,18 +4,16 @@ networks:
   ysc-net:
     external:
       name: ysc-net
+
 services:
   nginx:
     image: nginx:1.19.2-alpine
     container_name: reverse-proxy-server
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
       - /home/azureuser/ysc-2/app.ystemandchess.com/YStemAndChess/dist_new/YStemAndChess:/var/www/html
-      - /etc/letsencrypt/live/ystemandchess.com/fullchain.pem:/etc/ysc-certs/ysc-cert.pem
-      - /etc/letsencrypt/live/ystemandchess.com/privkey.pem:/etc/ysc-certs/ysc-key.pem
-      - /etc/letsencrypt/options-ssl-nginx.conf:/etc/ysc-certs/options-ssl-nginx.conf
-      - /etc/letsencrypt/ssl-dhparams.pem:/etc/ysc-certs/ysc-dhparam.pem
-      - /etc/letsencrypt/live/ystemandchess.com/chain.pem:/etc/ysc-certs/ysc-chain.pem
+      - ./data/certbot/conf:/etc/letsencrypt
+      - ./data/certbot/www:/var/www/certbot
     networks:
       - ysc-net
     ports:
@@ -27,6 +25,16 @@ services:
       - stockfishserver
       - chessclient
       - ystemandchess
+
+  certbot:
+    image: certbot/certbot
+    volumes:
+      - ./data/certbot/conf:/etc/letsencrypt
+      - ./data/certbot/www:/var/www/certbot
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
+    depends_on:
+      - nginx
+
   chessserver:
     image: chessserver:${TAG}
     container_name: chessserver
@@ -36,6 +44,7 @@ services:
       - ysc-net
     expose:
       - "3000"
+
   chessclient:
     image: chessclient:${TAG}
     container_name: chessclient
@@ -45,6 +54,7 @@ services:
       - ysc-net
     expose:
       - "80"
+
   stockfishserver:
     image: stockfishserver:${TAG}
     container_name: stockfishserver
@@ -54,6 +64,7 @@ services:
       - ysc-net
     expose:
       - "8080"
+
   middleware:
     image: middlewarenode
     container_name: middleware
@@ -82,6 +93,7 @@ services:
       - '8000'
     volumes:
       - ../middleware:/var/www/html
+
   ystemandchess:
     image: ystemandchess:${TAG}
     container_name: ystemandchess
@@ -101,4 +113,4 @@ services:
       - chessclient
       - chessserver
     volumes:
-      - ../YStemAndChess:/usr/src/app
+      - ../YStemAndChess:/usr/src/app