Skip to content

Commit 13b4259

Browse files
authored
Merge pull request #151 from daithihearn/daithihearn-relative-paths
Removing relative paths
2 parents 6a1874c + 89dcaa0 commit 13b4259

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+225
-233
lines changed

.github/workflows/publish-to-dockerhub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ jobs:
6666
if: steps.cpr.outputs.pull-request-operation == 'created'
6767
uses: peter-evans/enable-pull-request-automerge@v2
6868
with:
69-
token: ${{ secrets.PAT }}
69+
token: ${{ secrets.PAT_PR }}
7070
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
7171
merge-method: squash

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "frontend",
3-
"version": "5.5.4",
3+
"version": "5.5.5",
44
"description": "React frontend for the Cards 110",
55
"author": "Daithi Hearn",
66
"license": "MIT",
@@ -12,8 +12,8 @@
1212
"@coreui/react": "^4.6.0",
1313
"@emotion/react": "^11.10.6",
1414
"@emotion/styled": "^11.10.6",
15-
"@mui/icons-material": "^5.11.9",
16-
"@mui/material": "^5.11.10",
15+
"@mui/icons-material": "^5.11.11",
16+
"@mui/material": "^5.11.11",
1717
"@popperjs/core": "^2.5.4",
1818
"@reduxjs/toolkit": "^1.9.3",
1919
"@types/jest": "^29.4.0",
@@ -41,9 +41,9 @@
4141
"react-data-table-component": "7.5.3",
4242
"react-dom": "18.2.0",
4343
"react-redux": "^8.0.5",
44-
"react-router": "^6.8.1",
44+
"react-router": "^6.8.2",
4545
"react-router-config": "^5.1.1",
46-
"react-router-dom": "^6.8.1",
46+
"react-router-dom": "^6.8.2",
4747
"react-simple-pull-to-refresh": "^1.3.3",
4848
"react-stomp-hooks": "2.1.0",
4949
"react-viewer": "^3.2.2",

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"short_name": "Cards 110",
33
"name": "Cards 110",
4-
"version": "5.5.4",
4+
"version": "5.5.5",
55
"icons": [
66
{
77
"src": "./assets/favicon.png",

src/caches/AutoPlaySlice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
2-
import { Card } from "../model/Cards"
2+
import { Card } from "model/Cards"
33
import { RootState } from "./caches"
44

55
export interface AutoPlayState {

src/caches/GameSlice.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit"
22

3-
import { GameState, GameStatus, PlayedCard } from "../model/Game"
4-
import { Player } from "../model/Player"
5-
import { RoundStatus } from "../model/Round"
3+
import { GameState, GameStatus, PlayedCard } from "model/Game"
4+
import { Player } from "model/Player"
5+
import { RoundStatus } from "model/Round"
66
import { RootState } from "./caches"
77

88
const initialState: GameState = {

src/caches/MyCardsSlice.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit"
2-
import { BLANK_CARD, SelectableCard } from "../model/Cards"
3-
import { processOrderedCardsAfterGameUpdate } from "../utils/GameUtils"
2+
import { BLANK_CARD, SelectableCard } from "model/Cards"
3+
import { processOrderedCardsAfterGameUpdate } from "utils/GameUtils"
44
import { RootState } from "./caches"
55

66
export interface MyCardsState {

src/caches/MyGamesSlice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
2-
import { Game } from "../model/Game"
2+
import { Game } from "model/Game"
33
import { RootState } from "./caches"
44

55
export interface MyGamesState {

src/caches/MyProfileSlice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit"
2-
import { MyProfile } from "../model/Player"
2+
import { MyProfile } from "model/Player"
33
import { RootState } from "./caches"
44

55
const initialProfileState: MyProfile = {

src/caches/PlayerProfilesSlice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
2-
import { PlayerProfile } from "../model/Player"
2+
import { PlayerProfile } from "model/Player"
33
import { RootState } from "./caches"
44

55
export interface PlayersState {

src/components/Avatar/ProfilePictureEditor.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import {
1313
Input,
1414
ButtonGroup,
1515
} from "reactstrap"
16-
import { useAppDispatch, useAppSelector } from "../../caches/hooks"
17-
import { getMyProfile } from "../../caches/MyProfileSlice"
18-
import ProfileService from "../../services/ProfileService"
16+
import { useAppDispatch, useAppSelector } from "caches/hooks"
17+
import { getMyProfile } from "caches/MyProfileSlice"
18+
import ProfileService from "services/ProfileService"
1919
import AvatarEditor from "react-avatar-editor"
20-
import parseError from "../../utils/ErrorUtils"
20+
import parseError from "utils/ErrorUtils"
2121

2222
interface InputsI {
2323
show: boolean

0 commit comments

Comments
 (0)