[#71] made singular notations for all boards

Ido-Barnea · Nov 29, 2023 · ba72af8 · ba72af8
1 parent bc90357
commit ba72af8
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 41 deletions.
diff --git a/development/src/board.ts b/development/src/board.ts
@@ -36,19 +36,6 @@ export class ChessBoard implements ChessBoardType {
       }
     }
 
-    const leftNotationsContainer = document.createElement('div');
-    leftNotationsContainer.id = 'left-notations-container';
-
-    const bottomNotationsContainer = document.createElement('div');
-    bottomNotationsContainer.id = 'bottom-notations-container';
-
-    this.boardElement.appendChild(leftNotationsContainer);
-    this.boardElement.appendChild(bottomNotationsContainer);
-
-    for (let index = 0; index < BOARD_WIDTH; index++) {
-      this.createNotation(NOTATIONS_NUMBERS[index]);
-      this.createNotation(NOTATIONS_LETTERS[index]);
-    }
 
     const isCollapsed = this.boardElement.classList.contains('collapsed');
     if (!isCollapsed) {
@@ -73,25 +60,6 @@ export class ChessBoard implements ChessBoardType {
     this.boardElement.appendChild(squareElement);
   }
 
-  createNotation(notation: string) {
-    const notationElement = document.createElement('p');
-    notationElement.classList.add('notation');
-    notationElement.innerHTML = notation;
-
-    if (NOTATIONS_LETTERS.includes(notation)) {
-      notationElement.classList.add('letter');
-      const bottomBoardContainer = this.boardElement.querySelector(
-        '#bottom-notations-container',
-      );
-      bottomBoardContainer?.appendChild(notationElement);
-    } else {
-      notationElement.classList.add('number');
-      const leftBoardContainer = this.boardElement.querySelector(
-        '#left-notations-container',
-      );
-      leftBoardContainer?.appendChild(notationElement);
-    }
-  }
 
   getBackgroundColor(position: [number, number]) {
     const isEvenColumn = position[0] % 2 === 0;

diff --git a/development/src/boards.ts b/development/src/boards.ts
@@ -1,4 +1,4 @@
-import { ChessBoard } from './board';
+import { BOARD_WIDTH, ChessBoard } from './board';
 import { Item } from './items';
 import { Piece, Square } from './pieces';
 
@@ -9,15 +9,27 @@ let heaven: ChessBoard;
 export const OVERWORLD_BOARD_ID = 'board-overworld';
 export const HELL_BOARD_ID = 'board-hell';
 export const HEAVEN_BOARD_ID = 'board-heaven';
+export const BOTTOM_NOTATION_ID = 'bottom-notations';
+export const LEFT_NOTATION_ID = 'left-notations';
+
+export const NOTATIONS_LETTERS = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
+export const NOTATIONS_NUMBERS = ['8', '7', '6', '5', '4', '3', '2', '1'];
 
 export const OVERWORLD_BOARD = document.getElementById(
   OVERWORLD_BOARD_ID,
 ) as HTMLElement;
-export const HELL_BOARD = document.getElementById(HELL_BOARD_ID) as HTMLElement;
+export const HELL_BOARD = document.getElementById(
+  HELL_BOARD_ID,
+) as HTMLElement;
 export const HEAVEN_BOARD = document.getElementById(
   HEAVEN_BOARD_ID,
 ) as HTMLElement;
-
+export const BOTTOM_NOTATION_CONTAINER = document.getElementById(
+  BOTTOM_NOTATION_ID,
+) as HTMLElement;
+export const LEFT_NOTATION_CONTAINER = document.getElementById(
+  LEFT_NOTATION_ID,
+) as HTMLElement;
 const HELL_BOARD_BUTTON = document.getElementById(
   'board-hell-button',
 ) as HTMLElement;
@@ -44,6 +56,28 @@ export function initializeBoards() {
     lightHeavenSquareColor,
     darkHeavenSquareColor,
   );
+  generateNotations();
+}
+
+export function generateNotations(){
+  for (let index = 0; index < BOARD_WIDTH; index++) {
+    createNotationGraphics(NOTATIONS_NUMBERS[index]);
+    createNotationGraphics(NOTATIONS_LETTERS[index]);
+  }
+}
+
+
+export function createNotationGraphics(notation: string) {
+  const notationElement = document.createElement('p');
+  notationElement.classList.add('notation');
+  notationElement.innerHTML = notation;
+  if (NOTATIONS_LETTERS.includes(notation)) {
+    notationElement.classList.add('letter');
+    BOTTOM_NOTATION_CONTAINER.appendChild(notationElement);
+  } else {
+    notationElement.classList.add('number');
+    LEFT_NOTATION_CONTAINER.appendChild(notationElement);
+  }
 }
 
 export function movePieceOnBoard(draggedPiece: Piece, targetSquare: Square) {
@@ -69,7 +103,6 @@ export function destroyPieceOnBoard(targetPiece: Piece) {
       break;
     case HEAVEN_BOARD_ID:
       heaven.destroyPieceOnBoard(targetPiece);
-      break;
   }
 }
 
@@ -83,7 +116,6 @@ export function destroyItemOnBoard(targetItem: Item) {
       break;
     case HEAVEN_BOARD_ID:
       heaven.destroyItemOnBoard(targetItem);
-      break;
   }
 }
 
@@ -130,3 +162,5 @@ export function highlightSquare(target: HTMLElement, shouldHighlight: boolean) {
     }
   }
 }
+
+
diff --git a/development/styles/styles.css b/development/styles/styles.css
@@ -27,17 +27,17 @@ body {
   flex-wrap: wrap;
 }
 
-#bottom-notations-container {
+.bottom-notations-container {
   margin-top: calc(
-    var(--square-size) * var(--board-squares-per-side) - var(--square-size) / 4
+    var(--square-size) * var(--board-squares-per-side) - var(--square-size) / 3.5
   );
   display: flex;
   flex-direction: row;
   position: absolute;
   z-index: 1;
 }
 
-#left-notations-container {
+.left-notations-container {
   width: calc(var(--square-size) / 4);
   display: flex;
   flex-direction: column;
@@ -77,7 +77,7 @@ body {
 
 .notation.letter {
   width: calc(var(--square-size) - 4px);
-  margin-right: 4px;
+  margin-right: 4.3px;
   text-align: end;
 }
 

diff --git a/development/views/index.html b/development/views/index.html
@@ -7,6 +7,8 @@
   </head>
   <body>
     <div id="boards-container">
+      <div class="bottom-notations-container" id="bottom-notations"></div>
+      <div class="left-notations-container" id="left-notations"></div>
       <div class="board" id="board-overworld"></div>
       <div class="board collapsed" id="board-hell"></div>
       <div class="board collapsed" id="board-heaven"></div>