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.

Sign up for GitHub

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

Rename everything auction to listing or project if its user facing #1209

Merged
merged 7 commits into from
Mar 4, 2024
Merged

Rename everything auction to listing or project if its user facing #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82928f0
fix(marketplace): Rename auction to project (listing internally) and …
jschill Mar 3, 2024
d9f1c62
fix(marketplace): Rename auctionCard.png
jschill Mar 3, 2024
5d7b3bb
fix(marketplace): Rename fixAuctionDetails to fixListingDetails
jschill Mar 3, 2024
b8bf272
fix(marketplace): Delete unused files and update default page title
jschill Mar 3, 2024
da01ce1
fix(marketplace): Byebye auction
jschill Mar 3, 2024
b0aba8d
fix(marketplace): Rename listings url to projects
jschill Mar 3, 2024
37f05cd
chore(marketplace): Update variable names to reflect file names
jschill Mar 4, 2024
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
3 changes: 3 additions & 0 deletions frontend/marketplace/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ module.exports = {
parserOptions: {
ecmaVersion: "latest",
},
rules: {
"vue/multi-word-component-names": "off",
},
};
2 changes: 1 addition & 1 deletion frontend/marketplace/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Empower Market</title>
<title>Plastic credits marketplace - Empower Market</title>
</head>
<body>
<div id="app"></div>
Expand Down
0 ...nd/marketplace/src/assets/auctionCard.png → ...tplace/src/assets/defaultListingImage.png
View file
Open in desktop
File renamed without changes
103 changes: 0 additions & 103 deletions frontend/marketplace/src/components/AuctionCard.vue
View file
Open in desktop

This file was deleted.

165 changes: 0 additions & 165 deletions frontend/marketplace/src/components/AuctionResultsCard.vue
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/marketplace/src/components/CertificateCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { computed, ref } from "vue";
import CustomImage from "@/components/CustomImage.vue";
import { convertIPFStoHTTPS } from "@/utils/utils";
import auctionCard from "@/assets/auctionCard.png";
import defaultListingImage from "@/assets/defaultListingImage.png";
import { useQuery } from "@vue/apollo-composable";
import {
GET_CREDIT_COLLECTIONS,
Expand Down Expand Up @@ -488,7 +488,7 @@ const generateQRCode = async () => {
<CustomImage
v-if="image?.url"
image-class="h-48 w-full rounded-lg max-w-sm"
:src="convertIPFStoHTTPS(image?.url) || auctionCard"
:src="convertIPFStoHTTPS(image?.url) || defaultListingImage"
/>
<!-- Desktop UI-->
<div class="hidden md:grid md:col-span-2">
Expand Down
5 changes: 2 additions & 3 deletions frontend/marketplace/src/components/CustomImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<script setup lang="ts">
import AuctionCard from "../assets/auctionCard.png";
import defaultListingImage from "../assets/defaultListingImage.png";
export interface CustomImageProps {
src: string;
imageClass: string;
fallbackImageSrc?: string;
}

const props = defineProps<CustomImageProps>();
const defaultImage = AuctionCard;

const handleError = (event: Event) => {
const img = event.target as HTMLImageElement;

if (props.fallbackImageSrc) {
img.src = props.fallbackImageSrc;
} else {
img.src = defaultImage;
img.src = defaultListingImage;
}
};
</script>
Expand Down
4 changes: 2 additions & 2 deletions frontend/marketplace/src/components/ListingCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { PageNames } from "@/router";
import { convertIPFStoHTTPS } from "@/utils/utils";
import auctionCard from "@/assets/auctionCard.png";
import defaultListingImage from "@/assets/defaultListingImage.png";
import { onMounted, ref, computed } from "vue";
import CustomImage from "@/components/CustomImage.vue";
import tracking, { TrackEvents } from "@/utils/analytics";
Expand Down Expand Up @@ -69,7 +69,7 @@ const handleClick = () => {
<CustomImage
v-else
image-class="h-[250px] w-full"
:src="convertIPFStoHTTPS(data.ipfsImage) || auctionCard"
:src="convertIPFStoHTTPS(data.ipfsImage) || defaultListingImage"
/>
</figure>
<div class="card-body">
Expand Down
4 changes: 2 additions & 2 deletions frontend/marketplace/src/components/ListingCardTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { PageNames } from "@/router";
import { convertIPFStoHTTPS } from "@/utils/utils";
import auctionCard from "@/assets/auctionCard.png";
import defaultListingImage from "@/assets/defaultListingImage.png";
import { formatDenom } from "@/utils/wallet-utils";
import { onMounted, ref } from "vue";
import CustomImage from "@/components/CustomImage.vue";
Expand Down Expand Up @@ -94,7 +94,7 @@ const handleClick = () => {
<CustomImage
v-else
image-class="max-h-32 max-w-56"
:src="convertIPFStoHTTPS(data.ipfsImage) || auctionCard"
:src="convertIPFStoHTTPS(data.ipfsImage) || defaultListingImage"
/>
</figure>
<div class="card-body flex-row justify-between">
Expand Down
4 changes: 2 additions & 2 deletions frontend/marketplace/src/components/SearchBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const applicantData: any = useQuery(gql`
`);
</script>
<template>
<!-- Search Auction Mobile-->
<!-- Search Listings Mobile-->
<div
class="md:hidden input-group w-full mb-5 bg-white rounded-full !rounded-lg px-1 border-none font-Inter"
>
Expand Down Expand Up @@ -170,7 +170,7 @@ const applicantData: any = useQuery(gql`
<div class="flex flex-row bg-darkGray w-full p-4 rounded-t-sm">
<input
class="w-full rounded-sm bg-darkGray px-3 h-12 text-lightGray text-title24"
placeholder="Search auctions"
placeholder="Search projects"
v-model="filterValues.searchTerm"
/>
<button
Expand Down
Loading
Loading