diff --git a/bob_party/src/components/GameComponent.tsx b/bob_party/src/components/GameComponent.tsx index b79305c..6b7b5da 100644 --- a/bob_party/src/components/GameComponent.tsx +++ b/bob_party/src/components/GameComponent.tsx @@ -2,7 +2,7 @@ import { FC, ReactNode, useCallback } from "react" import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle } from "react-native" import React from "react" import { trace } from "console" -import { Game } from "../core/Game" +import { Game } from "../core/game" /* Importing the correct stylesheet diff --git a/bob_party/src/context/gameContext.tsx b/bob_party/src/context/gameContext.tsx index 19490f2..28a88f0 100644 --- a/bob_party/src/context/gameContext.tsx +++ b/bob_party/src/context/gameContext.tsx @@ -2,7 +2,7 @@ import React from "react"; import create from "zustand"; import { MANAGER_USER } from "../../App"; import tabSkinApp from "../constSkin"; -import { Game } from "../core/Game"; +import { Game } from "../core/game"; import { Skin } from "../core/Skin"; import { User } from "../core/User/user"; diff --git a/bob_party/src/core/Game.ts b/bob_party/src/core/Game.ts index 17464c5..a89fad8 100644 --- a/bob_party/src/core/Game.ts +++ b/bob_party/src/core/Game.ts @@ -72,4 +72,4 @@ export abstract class Game{ } abstract coinsCalculator(points: number): number; -} \ No newline at end of file +} diff --git a/bob_party/src/core/Match/match.ts b/bob_party/src/core/Match/match.ts index 3e36fd8..3265e5c 100644 --- a/bob_party/src/core/Match/match.ts +++ b/bob_party/src/core/Match/match.ts @@ -1,5 +1,5 @@ import { ImageSourcePropType } from 'react-native'; -import { Game } from '../Game'; +import { Game } from '../game'; import { User } from "../User/user"; diff --git a/bob_party/src/core/Match/matchCasino.ts b/bob_party/src/core/Match/matchCasino.ts index 97861a4..6376812 100644 --- a/bob_party/src/core/Match/matchCasino.ts +++ b/bob_party/src/core/Match/matchCasino.ts @@ -1,6 +1,6 @@ import { Match } from "./match"; import { User } from "../User/user"; -import { Game } from "../Game"; +import { Game } from "../game"; import { GameCasino } from "../gameCasino"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; diff --git a/bob_party/src/core/Match/matchCreator.ts b/bob_party/src/core/Match/matchCreator.ts index ec58731..5803af0 100644 --- a/bob_party/src/core/Match/matchCreator.ts +++ b/bob_party/src/core/Match/matchCreator.ts @@ -1,6 +1,6 @@ import { MANAGER_MATCH } from "../../../App"; import ManagerMatch from "../../services/matchServices/managerMatch"; -import { Game } from "../Game"; +import { Game } from "../game"; import { User } from "../User/user"; import { Match } from "./match"; diff --git a/bob_party/src/core/Match/matchMulti.ts b/bob_party/src/core/Match/matchMulti.ts index 22cd254..c72ba66 100644 --- a/bob_party/src/core/Match/matchMulti.ts +++ b/bob_party/src/core/Match/matchMulti.ts @@ -1,6 +1,6 @@ import { Match } from "./match"; import { User } from "../User/user"; -import { Game } from "../Game"; +import { Game } from "../game"; import { GameMulti } from "../gameMulti"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; diff --git a/bob_party/src/core/Match/matchSolo.ts b/bob_party/src/core/Match/matchSolo.ts index 45f7a75..fef2170 100644 --- a/bob_party/src/core/Match/matchSolo.ts +++ b/bob_party/src/core/Match/matchSolo.ts @@ -1,7 +1,7 @@ import { Match } from "./match"; import { GameSolo } from "../gameSolo"; import { User } from "../User/user"; -import { Game } from "../Game"; +import { Game } from "../game"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; export default class MatchSolo extends Match{ diff --git a/bob_party/src/core/gameCasino.ts b/bob_party/src/core/gameCasino.ts index b5a0edc..379166d 100644 --- a/bob_party/src/core/gameCasino.ts +++ b/bob_party/src/core/gameCasino.ts @@ -1,4 +1,4 @@ -import { Game } from './Game' +import { Game } from './game' export class GameCasino extends Game{ diff --git a/bob_party/src/core/gameMulti.ts b/bob_party/src/core/gameMulti.ts index 9c92b79..bbaad4f 100644 --- a/bob_party/src/core/gameMulti.ts +++ b/bob_party/src/core/gameMulti.ts @@ -1,4 +1,4 @@ -import { Game } from './Game' +import { Game } from './game' export class GameMulti extends Game{ readonly rankToCoins:Map diff --git a/bob_party/src/core/gameSolo.ts b/bob_party/src/core/gameSolo.ts index 86f6946..b0e1d71 100644 --- a/bob_party/src/core/gameSolo.ts +++ b/bob_party/src/core/gameSolo.ts @@ -1,4 +1,4 @@ -import { Game } from './Game' +import { Game } from './game' export class GameSolo extends Game{ readonly ptsToCoins:Map diff --git a/bob_party/src/screens/GameChoice.tsx b/bob_party/src/screens/GameChoice.tsx index 3270e9b..d87c690 100644 --- a/bob_party/src/screens/GameChoice.tsx +++ b/bob_party/src/screens/GameChoice.tsx @@ -1,7 +1,7 @@ import { StatusBar } from 'expo-status-bar' import { StyleSheet, View, Text, Alert, Pressable, Image, FlatList} from 'react-native' import React from 'react'; -import { Game } from '../core/Game'; +import { Game } from '../core/game'; import { Skin } from '../core/skin'; import { TopBar } from '../components/TopBar'; import { BotBar } from '../components/BotBar'; diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx index 697f9ca..cd7d3da 100644 --- a/bob_party/src/screens/Home.tsx +++ b/bob_party/src/screens/Home.tsx @@ -9,7 +9,7 @@ import { ButtonGameTypeChoice } from '../components/ButtonGameTypeChoice'; import { MANAGER_GAME } from '../../App'; import { useGameStore } from '../context/gameContext'; import { GameSolo } from '../core/gameSolo'; -import { Game } from '../core/Game'; +import { Game } from '../core/game'; import game from '../testGameSolo'; diff --git a/bob_party/src/services/gameService/ILoaderGame.ts b/bob_party/src/services/gameService/ILoaderGame.ts index b8b22c5..17b826d 100644 --- a/bob_party/src/services/gameService/ILoaderGame.ts +++ b/bob_party/src/services/gameService/ILoaderGame.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/Game"; +import { Game } from "../../core/game"; export default interface ILoaderGame{ diff --git a/bob_party/src/services/gameService/loaderGameApi.ts b/bob_party/src/services/gameService/loaderGameApi.ts index 4c811e5..2529784 100644 --- a/bob_party/src/services/gameService/loaderGameApi.ts +++ b/bob_party/src/services/gameService/loaderGameApi.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/Game"; +import { Game } from "../../core/game"; import { GameSolo } from "../../core/gameSolo"; import ILoaderGame from "./ILoaderGame"; diff --git a/bob_party/src/services/gameService/managerGame.ts b/bob_party/src/services/gameService/managerGame.ts index 316122d..bb4bdbc 100644 --- a/bob_party/src/services/gameService/managerGame.ts +++ b/bob_party/src/services/gameService/managerGame.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/Game"; +import { Game } from "../../core/game"; import ILoaderGame from "./ILoaderGame"; export default class ManagerGame{ diff --git a/bob_party/src/services/matchServices/ISaverMatch.ts b/bob_party/src/services/matchServices/ISaverMatch.ts index 4423d74..2786262 100644 --- a/bob_party/src/services/matchServices/ISaverMatch.ts +++ b/bob_party/src/services/matchServices/ISaverMatch.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/Game"; +import { Game } from "../../core/game"; import { Match } from "../../core/Match/match"; import { User } from "../../core/User/user"; diff --git a/bob_party/src/services/matchServices/saverMatchApi.ts b/bob_party/src/services/matchServices/saverMatchApi.ts index 5c1ba29..2b12e60 100644 --- a/bob_party/src/services/matchServices/saverMatchApi.ts +++ b/bob_party/src/services/matchServices/saverMatchApi.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/Game"; +import { Game } from "../../core/game"; import { Match } from "../../core/Match/match"; import { User } from "../../core/User/user"; diff --git a/bob_party/zsh-syntax-highlighting b/bob_party/zsh-syntax-highlighting deleted file mode 160000 index b2c910a..0000000 --- a/bob_party/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b2c910a85ed84cb7e5108e7cb3406a2e825a858f