Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(landing): incorrect paths to files #109

Merged
merged 2 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/pages/catalogue/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CataloguePage } from "./ui/CataloguePage";
import { CataloguePage } from "./ui/Catalogue.page";
import { loader } from "./api/loader";
import { CatalogueLoader } from "./api/loader";

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/catalogue/ui/Catalogue.page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useRef, useState } from "react";
import styles from "./styles/CataloguePage.module.css";
import styles from "./styles/Catalogue.page.module.css";
import { HeaderWidget } from "widgets/header";
import { FooterWidget } from "widgets/footer";
import { useLoaderData } from "react-router-dom";
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/create-instrument/api/action.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ActionFunction } from "react-router-dom";
import Jwt from "domain/model/jwt";
import { CreateInstrumentApi } from "generated/api/create-instrument-api";
import { parseInstrumentDetails } from "shared";
import { parseInstrumentDetails } from "shared/model";

export interface CreateInstrumentAction {
errors: string[] | null;
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/create-instrument/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CreateInstrumentPage } from "./ui/CreateInstrumentPage";
import { CreateInstrumentPage } from "./ui/CreateInstrument.page";

import { action } from "./api/action";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import styles from "./styles/CreateInstrumentPage.module.css";
import styles from "./styles/CreateInstrument.page.module.css";
import { HeaderWidget } from "widgets/header";
import { FooterWidget } from "widgets/footer";
import { Form, useActionData, useLoaderData } from "react-router-dom";
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/edit-instrument/api/action.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ActionFunction } from "react-router-dom";
import Jwt from "domain/model/jwt";
import { parseInstrumentDetails } from "shared";
import { EditInstrumentApi } from "generated/api/edit-instrument-api";
import { parseInstrumentDetails } from "shared/model";

export interface EditInstrumentAction {
errors: string[];
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/edit-instrument/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EditInstrumentPage } from "./ui/EditInstrumentPage";
import { EditInstrumentPage } from "./ui/EditInstrument.page";
import { action } from "./api/action";
import { loader } from "./api/loader";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useRef, useState } from "react";
import formStyles from "./styles/EditInstrumentPage.module.css";
import formStyles from "./styles/EditInstrument.page.module.css";
import styles from "./styles/InstrumentBasicMaterial.field.module.css";
import { BasicMaterial } from "generated/model";

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/favorite/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FavoritePage } from "./ui/FavoritePage";
import { FavoritePage } from "./ui/Favorite.page";
import { loader, FavoriteLoader } from "./api/loader";

export { FavoritePage, loader };
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/home/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { HomePage } from "./ui/HomePage";
import { HomePage } from "./ui/Home.page";

export { HomePage };
3 changes: 2 additions & 1 deletion client/src/pages/home/ui/Home.page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import styles from "./styles/Home.page.module.css";
import "react-slideshow-image/dist/styles.css";
import { HeaderWidget } from "widgets/header";
import { FooterWidget } from "widgets/footer";
import { Slide } from "react-slideshow-image";
Expand Down Expand Up @@ -80,7 +81,7 @@ export function HomePage() {
responsive={trendingInstrumentsResponsiveSettings}
>
{images.map((img) => (
<div key={img.image} className={styles.eachSlide}>
<div key={img.image} className={styles.each_slide}>
<img
src={img.image}
alt={img.caption}
Expand Down
5 changes: 2 additions & 3 deletions client/src/pages/home/ui/styles/Home.page.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "HomePage.queries.css";
@import "react-slideshow-image/dist/styles.css";
@import "Home.page.queries.css";

.home {
display: flex;
Expand Down Expand Up @@ -54,6 +53,6 @@
margin: 0 15px 15px 15px;
}

.each-slide {
.each_slide {
margin: 0 15px;
}
6 changes: 3 additions & 3 deletions client/src/pages/home/ui/styles/Home.page.queries.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@media (max-width: 570px) {
#home-search-bar-form {
.home {
display: flex;
flex-direction: column;
justify-content: center;
Expand All @@ -18,7 +18,7 @@
}
}

#home-reasons-choose {
.reasons {
flex-direction: column;

div {
Expand All @@ -29,7 +29,7 @@
}
}

#trending-instruments {
.trends {
margin: 0 1.5em 1.5em 1.5em !important;
}
}
2 changes: 1 addition & 1 deletion client/src/pages/instrument/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { InstrumentPage } from "./ui/InstrumentPage";
import { InstrumentPage } from "./ui/Instrument.page";
import { loader } from "./api/loader";

export { InstrumentPage, loader };
2 changes: 1 addition & 1 deletion client/src/pages/login/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LoginPage } from "./ui/LoginPage";
import { LoginPage } from "./ui/Login.page";
import { action } from "./api/action";

export { LoginPage, action };
2 changes: 1 addition & 1 deletion client/src/pages/not-found/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { NotFoundPage } from "./ui/NotFoundPage";
import { NotFoundPage } from "./ui/NotFound.page";

export { NotFoundPage };
2 changes: 1 addition & 1 deletion client/src/pages/not-found/ui/NotFound.page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import styles from "./styles/NotFoundPage.module.css";
import styles from "./styles/NotFound.page.module.css";
import { HeaderWidget } from "widgets/header";

export function NotFoundPage() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/profile/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UserProfilePage } from "./ui/UserProfilePage";
import { UserProfilePage } from "./ui/UserProfile.page";
import { loader } from "./api/loader";

export { UserProfilePage, loader };
2 changes: 1 addition & 1 deletion client/src/pages/registration/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RegistrationPage } from "./ui/RegistrationPage";
import { RegistrationPage } from "./ui/Registration.page";

import { action } from "./api/action";

Expand Down
8 changes: 4 additions & 4 deletions client/src/shared/instrument-card-actions/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AddOrRemoveFavoriteButton } from "./ui/AddOrRemoveFavoriteButton";
import { EditInstrumentButton } from "./ui/EditInstrumentButton";
import { RemoveInstrumentButton } from "./ui/RemoveInstrumentButton";
import { GoToInstrumentButton } from "./ui/GoToInstrumentButton";
import { AddOrRemoveFavoriteButton } from "./ui/AddOrRemoveFavorite.button";
import { EditInstrumentButton } from "./ui/EditInstrument.button";
import { RemoveInstrumentButton } from "./ui/RemoveInstrument.button";
import { GoToInstrumentButton } from "./ui/GoToInstrument.button";

export {
AddOrRemoveFavoriteButton,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.instrument_card {
display: flex;
flex-direction: column;
background-color: darkslateblue;
}
2 changes: 1 addition & 1 deletion client/src/widgets/catalogue-filter/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CatalogueFilterWidget } from "./ui/CatalogueFilterWidget";
import { CatalogueFilterWidget } from "./ui/CatalogueFilter.widget";

import type { Filters } from "./model/filter";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import "./styles/CreateInstrumentCardButton.css";
import "./styles/CreateInstrumentCard.button.module.css";
import { Filters } from "widgets/catalogue-filter";
import { Role } from "domain/model/role";
import Jwt from "domain/model/jwt";
Expand Down
2 changes: 1 addition & 1 deletion client/src/widgets/catalogue-navbar/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { NavigationBarWidget } from "./ui/NavigationBarWidget";
import { NavigationBarWidget } from "./ui/NavigationBar.widget";

export { NavigationBarWidget };
2 changes: 1 addition & 1 deletion client/src/widgets/catalogue-serp/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { CatalogueSerpWidget } from "./ui/CatalogueSerpWidget";
import { CatalogueSerpWidget } from "./ui/CatalogueSerp.widget";

export { CatalogueSerpWidget };
2 changes: 1 addition & 1 deletion client/src/widgets/footer/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { FooterWidget } from "./ui/FooterWidget";
export { FooterWidget } from "./ui/Footer.widget";
2 changes: 1 addition & 1 deletion client/src/widgets/header/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { HeaderWidget } from "./ui/HeaderWidget";
export { HeaderWidget } from "./ui/Header.widget";
2 changes: 1 addition & 1 deletion client/src/widgets/modal/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { ModalWidget } from "./ui/ModalWidget";
import { ModalWidget } from "./ui/Modal.widget";

export { ModalWidget };
Loading