From 82928f0167377e1dd2eb5d0a017b04eb5659eecc Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Sun, 3 Mar 2024 08:57:16 +0100 Subject: [PATCH 1/8] fix(marketplace): Rename auction to project (listing internally) and fix page names --- frontend/marketplace/.eslintrc.cjs | 3 +++ .../{AuctionDetails.vue => ListingPage.vue} | 7 ++--- .../{AuctionPage.vue => ListingsPage.vue} | 0 ...CallbackView.vue => LoginCallbackPage.vue} | 0 ...Cancelled.vue => PaymentCancelledPage.vue} | 0 ...ccessful.vue => PaymentSuccessfulPage.vue} | 0 .../{UserProfile.vue => UserProfilePage.vue} | 0 frontend/marketplace/src/router/index.ts | 26 +++++++++---------- 8 files changed, 19 insertions(+), 17 deletions(-) rename frontend/marketplace/src/pages/{AuctionDetails.vue => ListingPage.vue} (97%) rename frontend/marketplace/src/pages/{AuctionPage.vue => ListingsPage.vue} (100%) rename frontend/marketplace/src/pages/{CallbackView.vue => LoginCallbackPage.vue} (100%) rename frontend/marketplace/src/pages/{AuctionPaymentCancelled.vue => PaymentCancelledPage.vue} (100%) rename frontend/marketplace/src/pages/{AuctionPaymentSuccessful.vue => PaymentSuccessfulPage.vue} (100%) rename frontend/marketplace/src/pages/{UserProfile.vue => UserProfilePage.vue} (100%) diff --git a/frontend/marketplace/.eslintrc.cjs b/frontend/marketplace/.eslintrc.cjs index 0b2a030f7..a27c6e32f 100644 --- a/frontend/marketplace/.eslintrc.cjs +++ b/frontend/marketplace/.eslintrc.cjs @@ -15,4 +15,7 @@ module.exports = { parserOptions: { ecmaVersion: "latest", }, + rules: { + "vue/multi-word-component-names": "off", + }, }; diff --git a/frontend/marketplace/src/pages/AuctionDetails.vue b/frontend/marketplace/src/pages/ListingPage.vue similarity index 97% rename from frontend/marketplace/src/pages/AuctionDetails.vue rename to frontend/marketplace/src/pages/ListingPage.vue index e0b8f75c9..60b281591 100644 --- a/frontend/marketplace/src/pages/AuctionDetails.vue +++ b/frontend/marketplace/src/pages/ListingPage.vue @@ -7,7 +7,8 @@ import ImageCarousel from "@/components/ImageCarousel.vue"; import ImageGallery from "@/components/ImageGallery.vue"; import ProjectDetailContent from "@/components/ProjectDetailContent.vue"; import ProjectDetailMaterial from "@/components/ProjectDetailMaterial.vue"; -import { useRoute } from "@/router"; +import { useRoute, RouterLink } from "@/router"; +import { PageNames } from "@/router/pageNames"; import { convertIPFStoHTTPS, uniqueMaterials, @@ -160,8 +161,8 @@ watch(currentId, handlePageLoadAndCollectionIdChange, { immediate: true });

- Auctions/ Auction Details + Projects + / Project details

{{ diff --git a/frontend/marketplace/src/pages/AuctionPage.vue b/frontend/marketplace/src/pages/ListingsPage.vue similarity index 100% rename from frontend/marketplace/src/pages/AuctionPage.vue rename to frontend/marketplace/src/pages/ListingsPage.vue diff --git a/frontend/marketplace/src/pages/CallbackView.vue b/frontend/marketplace/src/pages/LoginCallbackPage.vue similarity index 100% rename from frontend/marketplace/src/pages/CallbackView.vue rename to frontend/marketplace/src/pages/LoginCallbackPage.vue diff --git a/frontend/marketplace/src/pages/AuctionPaymentCancelled.vue b/frontend/marketplace/src/pages/PaymentCancelledPage.vue similarity index 100% rename from frontend/marketplace/src/pages/AuctionPaymentCancelled.vue rename to frontend/marketplace/src/pages/PaymentCancelledPage.vue diff --git a/frontend/marketplace/src/pages/AuctionPaymentSuccessful.vue b/frontend/marketplace/src/pages/PaymentSuccessfulPage.vue similarity index 100% rename from frontend/marketplace/src/pages/AuctionPaymentSuccessful.vue rename to frontend/marketplace/src/pages/PaymentSuccessfulPage.vue diff --git a/frontend/marketplace/src/pages/UserProfile.vue b/frontend/marketplace/src/pages/UserProfilePage.vue similarity index 100% rename from frontend/marketplace/src/pages/UserProfile.vue rename to frontend/marketplace/src/pages/UserProfilePage.vue diff --git a/frontend/marketplace/src/router/index.ts b/frontend/marketplace/src/router/index.ts index 0e14e45c7..fd410a2f4 100644 --- a/frontend/marketplace/src/router/index.ts +++ b/frontend/marketplace/src/router/index.ts @@ -14,14 +14,12 @@ const HomePage = () => import("@/pages/HomePage.vue"); const FAQPage = () => import("@/pages/FAQPage.vue"); const CertificatesAndCreditsPage = () => import("@/pages/CertificatesAndCreditsPage.vue"); -const AuctionPage = () => import("@/pages/AuctionPage.vue"); -const AuctionDetails = () => import("@/pages/AuctionDetails.vue"); -const CallbackView = () => import("@/pages/CallbackView.vue"); -const UserProfile = () => import("@/pages/UserProfile.vue"); -const AuctionPaymentSuccessful = () => - import("@/pages/AuctionPaymentSuccessful.vue"); -const AuctionPaymentCancelled = () => - import("@/pages/AuctionPaymentCancelled.vue"); +const Listings = () => import("@/pages/ListingsPage.vue"); +const Listing = () => import("@/pages/ListingPage.vue"); +const CallbackView = () => import("@/pages/LoginCallbackPage.vue"); +const UserProfile = () => import("@/pages/UserProfilePage.vue"); +const PaymentSuccessful = () => import("@/pages/PaymentSuccessfulPage.vue"); +const PaymentCancelled = () => import("@/pages/PaymentCancelledPage.vue"); const CreditCollectionPage = () => import("@/pages/CreditCollectionPage.vue"); export { PageNames }; @@ -52,14 +50,14 @@ const router = createRouter({ component: FAQPage, }, { - path: "/auction", + path: "/listings", name: PageNames.LISTINGS, - component: AuctionPage, + component: Listings, }, { - path: "/auction/:id", + path: "/listings/:id", name: PageNames.LISTING, - component: AuctionDetails, + component: Listing, meta: { pageViewEvent: (to: RouteLocationNormalized) => { const trackProps = { @@ -85,12 +83,12 @@ const router = createRouter({ { path: "/purchase-successful", name: PageNames.PAYMENT_SUCCESSFUL, - component: AuctionPaymentSuccessful, + component: PaymentSuccessful, }, { path: "/purchase-cancelled", name: PageNames.PAYMENT_CANCELLED, - component: AuctionPaymentCancelled, + component: PaymentCancelled, }, { path: "/registry/:denom", From d9f1c6253380b87a9782e67296616e71ea272489 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Sun, 3 Mar 2024 09:04:11 +0100 Subject: [PATCH 2/8] fix(marketplace): Rename auctionCard.png --- .../{auctionCard.png => defaultListingImage.png} | Bin frontend/marketplace/src/components/AuctionCard.vue | 6 +++--- .../src/components/AuctionResultsCard.vue | 6 +++--- .../marketplace/src/components/CertificateCard.vue | 4 ++-- frontend/marketplace/src/components/CustomImage.vue | 5 ++--- frontend/marketplace/src/components/ListingCard.vue | 4 ++-- .../marketplace/src/components/ListingCardTable.vue | 4 ++-- 7 files changed, 14 insertions(+), 15 deletions(-) rename frontend/marketplace/src/assets/{auctionCard.png => defaultListingImage.png} (100%) diff --git a/frontend/marketplace/src/assets/auctionCard.png b/frontend/marketplace/src/assets/defaultListingImage.png similarity index 100% rename from frontend/marketplace/src/assets/auctionCard.png rename to frontend/marketplace/src/assets/defaultListingImage.png diff --git a/frontend/marketplace/src/components/AuctionCard.vue b/frontend/marketplace/src/components/AuctionCard.vue index 5ffd8039e..78838d91d 100644 --- a/frontend/marketplace/src/components/AuctionCard.vue +++ b/frontend/marketplace/src/components/AuctionCard.vue @@ -1,7 +1,7 @@ diff --git a/frontend/marketplace/src/components/ListingCard.vue b/frontend/marketplace/src/components/ListingCard.vue index b536a0095..6726b28a7 100644 --- a/frontend/marketplace/src/components/ListingCard.vue +++ b/frontend/marketplace/src/components/ListingCard.vue @@ -1,7 +1,7 @@ - diff --git a/frontend/marketplace/src/components/AuctionResultsCard.vue b/frontend/marketplace/src/components/AuctionResultsCard.vue deleted file mode 100644 index 3a0c99628..000000000 --- a/frontend/marketplace/src/components/AuctionResultsCard.vue +++ /dev/null @@ -1,165 +0,0 @@ - - diff --git a/frontend/marketplace/src/components/SearchBar.vue b/frontend/marketplace/src/components/SearchBar.vue index 084a9f147..1052ad913 100644 --- a/frontend/marketplace/src/components/SearchBar.vue +++ b/frontend/marketplace/src/components/SearchBar.vue @@ -65,7 +65,7 @@ const applicantData: any = useQuery(gql` `);