Skip to content

Commit

Permalink
powerButton in 90% need to fix bug with route change
Browse files Browse the repository at this point in the history
  • Loading branch information
RylandAdams committed Jun 30, 2023
1 parent fd32ecf commit 91d7b33
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import AnimatedRoutes from './components/animatedRoutes';
import hand from './assets/imgs/HAND.jpg';
import phone from './assets/imgs/Iphone.png';
import HomeButton from './components/homeButton/homeButton';
import PowerButton from './components/powerButton/powerButton';

import TopBar from './components/topBar/topBar';

Expand All @@ -23,6 +24,7 @@ function App() {
<div className='App'>
<div className='Frame'>
<Router>
<PowerButton />
<HomeButton />
<div className='wallpaper'></div>
<div className='iphoneContent'>
Expand Down
13 changes: 9 additions & 4 deletions src/components/animatedRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {

import LockScreen from './LockScreen/lockScreen';
import HomeScreen from './homeScreen/homeScreen';
import OffScreen from './offScreen/offScreen';

// MAIN APPS
import Calender from '../pages/calender/calender';
Expand Down Expand Up @@ -41,16 +42,20 @@ const AnimatedRoutes = () => {
location={location}
key={location.pathname}
>
<Route
path={'*'}
element={<HomeScreen />}
/>
<Route
path='/'
element={<LockScreen />}
></Route>
<Route
path='/homeScreen'
element={<HomeScreen />}
/>
path='/off'
element={<OffScreen />}
></Route>
<Route
path={'*'}
path='/homeScreen'
element={<HomeScreen />}
/>
<Route
Expand Down
1 change: 0 additions & 1 deletion src/components/homeButton/homeButton.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
bottom: 7.5%;
left: 50.2%;
transform: translateX(-50%);
opacity: 0;
}

.bttn {
Expand Down
9 changes: 9 additions & 0 deletions src/components/offScreen/offScreen.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.phoneScreenOff {
position: absolute;
z-index: 10;
width: 102%;
height: 102%;

top: 0%;
background-color: rgb(11, 11, 11);
}
8 changes: 8 additions & 0 deletions src/components/offScreen/offScreen.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import './offScreen.css';

const offScreen = () => {
return <div className='phoneScreenOff'></div>;
};

export default offScreen;
15 changes: 15 additions & 0 deletions src/components/powerButton/powerButton.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.powerBttn {
position: absolute;
z-index: 10;
top: -0.5%;
left: 75.2%;
transform: translateX(-50%);

opacity: 0;
}

.bttn {
font-size: large;
transform: scaleY(1.5);
display: inline-block;
}
35 changes: 35 additions & 0 deletions src/components/powerButton/powerButton.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { useLocation, useNavigate } from 'react-router-dom';

import './powerButton.css';

const PowerButton = () => {
let location = useLocation();
let navigate = useNavigate();

console.log(location.pathname);

const phonePowerToggle = () => {
if (location.pathname === '/off') {
console.log('SCREEN ON');
navigate('/lockScreen');
} else {
navigate('/off');
console.log('SCREEN OFF');
}
};

return (
<div className='powerBttn'>
<Link
className='bttn'
onClick={phonePowerToggle}
>
POWER
</Link>
</div>
);
};

export default PowerButton;

0 comments on commit 91d7b33

Please sign in to comment.