Skip to content

Commit

Permalink
made changes to accomodate repo name
Browse files Browse the repository at this point in the history
  • Loading branch information
CasLinden committed Jul 26, 2023
1 parent 4cc6b3a commit b71fa22
Show file tree
Hide file tree
Showing 33 changed files with 29 additions and 26 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/Arrows.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useRef } from "react";
import arrows from "/src/assets/arrows.svg";
import arrows from "/src/assets/general-icons/arrows.svg";

function Arrows ({goBackwards, bool}) {
const backwardsRef = useRef(null);
Expand Down
4 changes: 2 additions & 2 deletions src/components/GameInstructions/GameInstructions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import NextSlideBtn from "/src/components/GameInstructions/slide-components/Next
import HideSlideshowBtn from "/src/components/GameInstructions/slide-components/HideSlideshowBtn"
import ClickShield from "/src/components/GameInstructions/ClickShield"
import extraSlideAnimations from "/src/utils/extraSlideAnimations";
import info from "/src/assets/info.svg"
import info from "/src/assets/general-icons/info.svg"
import "/src/css/game-instructions/game-instructions.css";
import "/src/css/game-instructions/override-colors.css"

Expand Down Expand Up @@ -51,7 +51,7 @@ function GameInstructions() {
{instructionsHidden ? (
<div className="instructions-placeholder">
<SlideZero instructionsHidden={true} />
<div onClick={showInstructions}>
<div className="i-container" onClick={showInstructions}>
<img className="show-slideshow" src={info} alt="i for info" />
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import arrowLeft from '/src/assets/arrow-left.svg'
import arrowLeft from '/src/assets/general-icons/arrow-left.svg'

function PrevSlideBtn ({hide}) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import arrowRight from '/src/assets/arrow-right.svg'
import arrowRight from '/src/assets/general-icons/arrow-right.svg'
import hyphenateString from "/src/utils/hyphenateString";

function NextSlideBtn ({slideIn, text}) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import arrowLeft from '/src/assets/arrow-left.svg'
import arrowLeft from '/src/assets/general-icons/arrow-left.svg'

function PrevSlideBtn ({slideIn}) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/GameInstructions/slides/SlideFive.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "/src/css/game-instructions/slide-5.css";
import ticket from '/src/assets/ticket.svg';
import ticket from '/src/assets/general-icons/ticket.svg';



Expand Down
2 changes: 1 addition & 1 deletion src/components/GameInstructions/slides/SlideOne.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import JRStationSign from "/src/components/StationSigns/UniqueSigns/JRStationSig
import JRIcon from "/src/components/StationIcons/UniqueIcons/JRIcon.jsx";
import IconHolder from "/src/components/StationIcons/IconHolder.jsx";
import station from "/src/utils/station.js";
import cursor from "/src/assets/cursor.svg";
import cursor from "/src/assets/general-icons/cursor.svg";
import "/src/css/game-instructions/slide-1.css";

function SlideOne() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/GameInstructions/slides/SlideSix.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function SlideSix({hide}){
<div className="slide-instruction"> Start by picking<br></br> your first station, <br></br> good luck!</div>
</div>
<button className="disable-instructions" onClick={handleButtonClick}>
Don't show slideshow again
Hide Slideshow
</button>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/GameInstructions/slides/SlideThree.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import JRIcon from "/src/components/StationIcons/UniqueIcons/JRIcon.jsx";
import IconHolder from "/src/components/StationIcons/IconHolder.jsx";
import station from "/src/utils/station.js";
import Arrows from "/src/components/Arrows.jsx"
import cursor from "/src/assets/cursor.svg";
import cursor from "/src/assets/general-icons/cursor.svg";
import "/src/css/game-instructions/slide-3.css";

function SlideThree() {
Expand Down
4 changes: 2 additions & 2 deletions src/components/GameStatusHUD.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "/src/css/game-status-hud.css";
import ticket from "/src/assets/ticket.svg";
import resetIcon from "/src/assets/reset.svg";
import ticket from "/src/assets/general-icons/ticket.svg";
import resetIcon from "/src/assets/general-icons/reset.svg";
import useIsMobile from "/src/hooks/useIsMobile";

function GameStatusHud({ earnedTicketParts, reset, consumeTicket }) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/DropDownMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
import { v4 as uuidv4 } from "uuid";
import "/src/css/drop-down-menu.css";
import clearStationSearchInput from "/src/utils/clearStationSearchInput";
import arrowRight from "/src/assets/arrow-right.svg";
import arrowLeft from "/src/assets/arrow-left.svg";
import arrowRight from "/src/assets/general-icons/arrow-right.svg";
import arrowLeft from "/src/assets/general-icons/arrow-left.svg";

export default function DropDownMenu({ activeMenu, setActiveMenu, toggleDropDown }) {
const { currentLine, setCurrentLine } = useContext(CurrentLineContext);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LineNav } from "/src/components/header/LineNav.jsx";
import train from "/src/assets/train.svg";
import train from "/src/assets/general-icons/train.svg";
import "/src/css/header.css";

export default function Header() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/LineNav.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useContext, useState, useEffect } from "react";
import { CurrentLineContext } from "/src/CurrentLineContext";
import DropDownMenu from "/src/components/Header/DropDownMenu";
import caret from "/src/assets/caret.svg";
import caret from "/src/assets/general-icons/caret.svg";

import "/src/css/line-nav.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "/src/css/station-icons/default-station-icon.css";
import stationImageNegative from "/src/assets/station-negative.svg";
import stationImageNegative from "/src/assets/general-icons/station-negative.svg";

function DefaultIcon({ num, abr }) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "/src/css/station-signs/default-station-sign.css";
import stationImage from "/src/assets/station.svg";
import stationImage from "/src/assets/general-icons/station.svg";
import hyphenateString from "/src/utils/hyphenateString";
import { v4 as uuidv4 } from "uuid";

Expand Down
13 changes: 8 additions & 5 deletions src/css/game-instructions/game-instructions.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.game-instructions {
width: 100%;
display: grid;
height: 280px;
align-items: center;
justify-content: center;
font-family: 'Montserrat', sans-serif;
Expand Down Expand Up @@ -84,10 +83,14 @@
}

.instructions-placeholder{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 240px;
display: relative;
}

.i-container{
position: absolute;
bottom: 20px;
left: 50%;
}

.show-slideshow{
Expand Down
2 changes: 1 addition & 1 deletion src/css/playfield.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
}

.available-stations-signs{
max-height: 85vh;
max-height: 83vh;
}

.forwards-arrows,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/railClatterSound.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Howl } from "howler";
import kedeng from '/src/assets/kedeng.mp3'
import kedeng from '/src/assets/sound-effects/kedeng.mp3'

const railClatterSound = new Howl({
src: [kedeng]
Expand Down
2 changes: 1 addition & 1 deletion vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import react from '@vitejs/plugin-react-swc'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
base: '/yamanote-line/',
base: '/line-order/',

})

0 comments on commit b71fa22

Please sign in to comment.