Skip to content

Commit fdfb236

Browse files
authored
Merge pull request #179 from IUMusicalFish19/hotfixAUTH
hotfixAUTH
2 parents 92d3b59 + 81b6f9a commit fdfb236

5 files changed

Lines changed: 9 additions & 4 deletions

File tree

UI/src/App.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Main from "./components/pages/mainPage.jsx";
22
import Profile from "./components/pages/profile.jsx";
33
import HelloPage from "./components/pages/hello-page.jsx";
4+
import Auth from "./components/pages/auth.jsx";
5+
import Reg from "./components/pages/register.jsx";
46

57
import "@xyflow/react/dist/style.css";
68

@@ -40,6 +42,8 @@ function App() {
4042
<Route path="/profile" element={<Profile />} />
4143
<Route path="/" element={<Main />} />
4244
<Route path="/main" element={<HelloPage />} />
45+
<Route path="/login" element={<Auth />} />
46+
<Route path="/register" element={<Reg />} />
4347
</Routes>
4448
</div>
4549
</Router>

UI/src/CSS/auth.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
font-family: Montserrat, serif;
118118
margin-top: 4.5rem;
119119
color: var(--main-0);
120+
text-decoration-color: var(--main-0);
120121
}
121122

122123
.register-link {

UI/src/components/pages/auth.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ const Auth = () => {
140140
)}
141141

142142
<div className="register-text"> Have no account? </div>
143-
<Link to="/reg" className="register-link">
143+
<Link to="/register" className="register-link">
144144
<span className="register-link-text">Register</span>
145145
</Link>
146146
</div>

UI/src/components/pages/mainPage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ export default function Main() {
744744
</button>
745745

746746
<Link
747-
to="/auth"
747+
to="/login"
748748
className="login-button"
749749
style={{ textDecoration: "none" }}
750750
>

UI/src/components/pages/register.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useNavigate } from "react-router-dom";
66
const EMAIL_REGEXP =
77
/^(([^<>()[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/iu;
88

9-
const Auth = () => {
9+
const Reg = () => {
1010
const navigate = useNavigate();
1111

1212
// Состояния полей формы
@@ -307,4 +307,4 @@ const Auth = () => {
307307
);
308308
};
309309

310-
export default Auth;
310+
export default Reg;

0 commit comments

Comments
 (0)