diff --git a/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/CurrencyExchangeTask.java b/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/CurrencyExchangeTask.java deleted file mode 100644 index e6b7e7808..000000000 --- a/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/CurrencyExchangeTask.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the Meeds project (https://meeds.io/). - * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package io.meeds.dapp.scheduling.task; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import io.meeds.dapp.service.ExchangeService; - -@Component -public class CurrencyExchangeTask { - - private static final Logger LOG = LoggerFactory.getLogger(CurrencyExchangeTask.class); - - @Autowired - private ExchangeService exchangeService; - - @Scheduled(cron = "${meeds.currency.exchangeRate.cron:0 0 0/12 * * *}") - public void computeExchangeRate() { - LOG.info("Start Computing EURO exchange rate"); - long start = System.currentTimeMillis(); - try { - exchangeService.computeTodayCurrencyExchangeRate(); - LOG.info("End Computing EURO exchange rate in {}ms", System.currentTimeMillis() - start); - } catch (Exception e) { - LOG.error("An error occurred while computing EURO exchange rates", e); - } - } - -} diff --git a/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/MeedsExchangeTask.java b/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/MeedsExchangeTask.java deleted file mode 100644 index 4bf6066d0..000000000 --- a/deeds-dapp-service/src/main/java/io/meeds/dapp/scheduling/task/MeedsExchangeTask.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the Meeds project (https://meeds.io/). - * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package io.meeds.dapp.scheduling.task; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import io.meeds.dapp.service.ExchangeService; - -@Component -public class MeedsExchangeTask { - - private static final Logger LOG = LoggerFactory.getLogger(MeedsExchangeTask.class); - - @Autowired - private ExchangeService exchangeService; - - @Scheduled(cron = "${meeds.token.exchangeRate.cron:25 9 0/1 * * *}") - public void computeExchangeRate() { - LOG.info("Start Computing MEED exchange rates"); - long start = System.currentTimeMillis(); - try { - exchangeService.computeMeedExchangeRate(); - LOG.info("End Computing MEED exchange rates in {}ms", System.currentTimeMillis() - start); - } catch (Exception e) { - LOG.error("An error occurred while computing Meeds exchange rates", e); - } - } - -} diff --git a/deeds-dapp-service/src/main/java/io/meeds/dapp/service/ExchangeService.java b/deeds-dapp-service/src/main/java/io/meeds/dapp/service/ExchangeService.java index bed09b665..d30aa6c80 100644 --- a/deeds-dapp-service/src/main/java/io/meeds/dapp/service/ExchangeService.java +++ b/deeds-dapp-service/src/main/java/io/meeds/dapp/service/ExchangeService.java @@ -51,7 +51,6 @@ import io.meeds.dapp.storage.CurrencyExchangeRateRepository; import io.meeds.dapp.storage.MeedExchangeRateRepository; -import jakarta.annotation.PostConstruct; import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonReader; @@ -144,6 +143,7 @@ public BigDecimal getExchangeRate(Currency currency) { } else { return meedExchangeRates.stream() .max(Comparator.comparing(MeedExchangeRate::getDate)) + .filter(rate -> rate.getEthUsdPrice() != null && !BigDecimal.ZERO.equals(rate.getEthUsdPrice())) .map(rate -> BigDecimal.ONE.divide(rate.getEthUsdPrice(), 18, RoundingMode.HALF_UP)) .orElse(BigDecimal.ZERO); } @@ -168,16 +168,6 @@ public void computeTodayCurrencyExchangeRate() { computeCurrencyExchangeRateOfDay(LocalDate.now(ZoneOffset.UTC)); } - /** - * Compute and store EURO Currency Exchange rate from first date when MEED - * Contract has been created until today - */ - @PostConstruct - public void computeRates() { - new Thread(this::computeCurrencyExchangeRate).start(); - new Thread(this::computeMeedExchangeRate).start(); - } - /** * Compute and store MEED Token Exchange rates from first date when MEED * Contract has been created until today @@ -444,6 +434,9 @@ private BigDecimal getMeedPriceInCurrency(BigDecimal meedEthPrice, Currency currency, List currencyExchangeRates, LocalDate date) { + if (meedEthPrice == null) { + return BigDecimal.ZERO; + } BigDecimal currencyPrice = meedEthPrice; if (currency == Currency.USD) { currencyPrice = currencyPrice.multiply(ethUsdPrice); diff --git a/deeds-dapp-service/src/main/java/io/meeds/dapp/web/filter/RequestDispatcherFilter.java b/deeds-dapp-service/src/main/java/io/meeds/dapp/web/filter/RequestDispatcherFilter.java index 07069ca7c..995267b34 100644 --- a/deeds-dapp-service/src/main/java/io/meeds/dapp/web/filter/RequestDispatcherFilter.java +++ b/deeds-dapp-service/src/main/java/io/meeds/dapp/web/filter/RequestDispatcherFilter.java @@ -139,7 +139,11 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); return; } - } else if (servletPath.equals("/farm")) { + } else if (servletPath.equals("/farm") + || servletPath.equals("/tokenomics") + || servletPath.equals("/portfolio") + || servletPath.equals("/fr/tokenomics") + || servletPath.equals("/fr/portefeuille")) { response.setHeader("Location", "/"); response.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); return; diff --git a/deeds-dapp-service/src/test/java/io/meeds/dapp/service/ExchangeServiceTest.java b/deeds-dapp-service/src/test/java/io/meeds/dapp/service/ExchangeServiceTest.java index 788ec36e1..9a2e467db 100644 --- a/deeds-dapp-service/src/test/java/io/meeds/dapp/service/ExchangeServiceTest.java +++ b/deeds-dapp-service/src/test/java/io/meeds/dapp/service/ExchangeServiceTest.java @@ -34,14 +34,12 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; import javax.net.ssl.HttpsURLConnection; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.ArgumentMatcher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -100,12 +98,7 @@ void testComputeCurrencyExchangeRate() { exchangeService.computeCurrencyExchangeRate(); Duration between = Duration.between(exchangeService.firstMeedTokenDate().atStartOfDay(), LocalDate.now().atStartOfDay()); verify(currencyExchangeRateRepository, - times((int) between.toDays() + 2)).save(argThat(new ArgumentMatcher() { - @Override - public boolean matches(CurrencyExchangeRate argument) { - return BigDecimal.valueOf(1.8d).equals(argument.getRate()) && argument.getCurrency() == Currency.EUR; - } - })); + times((int) between.toDays() + 2)).save(argThat(rate -> BigDecimal.valueOf(1.8d).equals(rate.getRate()) && rate.getCurrency() == Currency.EUR)); verify(currencyExchangeRateRepository, times(1)).save(new CurrencyExchangeRate(exchangeService.firstMeedTokenDate(), Currency.EUR, BigDecimal.valueOf(1.8d))); @@ -117,16 +110,13 @@ void testComputeMeedExchangeRate() { exchangeService.computeMeedExchangeRate(); Duration between = Duration.between(exchangeService.firstMeedTokenDate().atStartOfDay(), LocalDate.now().atStartOfDay()); - verify(meedExchangeRateRepository, times((int) between.toDays() + 1)).save(argThat(new ArgumentMatcher() { - @Override - public boolean matches(MeedExchangeRate argument) { - return argument != null && argument.getDate() != null - && BigDecimal.valueOf(300).equals(argument.getEthReserve()) - && BigDecimal.valueOf(200).equals(argument.getMeedReserve()) - && BigDecimal.valueOf(2).equals(argument.getMeedEthPrice()) - && BigDecimal.valueOf(3).equals(argument.getEthUsdPrice()); - } - })); + verify(meedExchangeRateRepository, + times((int) between.toDays() + 1)).save( + argThat(rate -> rate != null && rate.getDate() != null + && BigDecimal.valueOf(300).equals(rate.getEthReserve()) + && BigDecimal.valueOf(200).equals(rate.getMeedReserve()) + && BigDecimal.valueOf(2).equals(rate.getMeedEthPrice()) + && BigDecimal.valueOf(3).equals(rate.getEthUsdPrice()))); verify(meedExchangeRateRepository, times(1)).save(new MeedExchangeRate(exchangeService.firstMeedTokenDate(), BigDecimal.valueOf(3), @@ -195,7 +185,7 @@ void testGetExchangeRate() { void testGetMeedUsdPrice() { assertNotNull(exchangeService); - List meedExchangeRates = new ArrayList(); + List meedExchangeRates = new ArrayList<>(); when(meedExchangeRateRepository.save(any())).thenAnswer(invocation -> { MeedExchangeRate exchangeRate = invocation.getArgument(0, MeedExchangeRate.class); @@ -213,7 +203,7 @@ void testGetMeedUsdPrice() { || meedExchangeRate.getDate().isEqual(fromDate)) && (meedExchangeRate.getDate().isBefore(toDate) || meedExchangeRate.getDate().isEqual(toDate))) - .collect(Collectors.toList()); + .toList(); }); BigDecimal price = exchangeService.getMeedUsdPrice(); @@ -221,8 +211,8 @@ void testGetMeedUsdPrice() { } private void mockExchangeRates() { - List currencyExchangeRates = new ArrayList(); - List meedExchangeRates = new ArrayList(); + List currencyExchangeRates = new ArrayList<>(); + List meedExchangeRates = new ArrayList<>(); when(meedExchangeRateRepository.save(any())).thenAnswer(invocation -> { MeedExchangeRate exchangeRate = invocation.getArgument(0, MeedExchangeRate.class); @@ -246,7 +236,7 @@ private void mockExchangeRates() { || currencyExchangeRate.getDate().isEqual(fromDate)) && (currencyExchangeRate.getDate().isBefore(toDate) || currencyExchangeRate.getDate().isEqual(toDate))) - .collect(Collectors.toList()); + .toList(); }); when(meedExchangeRateRepository.findByDateBetween(any(), any())).thenAnswer(invocation -> { @@ -257,21 +247,18 @@ private void mockExchangeRates() { || meedExchangeRate.getDate().isEqual(fromDate)) && (meedExchangeRate.getDate().isBefore(toDate) || meedExchangeRate.getDate().isEqual(toDate))) - .collect(Collectors.toList()); + .toList(); }); } @Component public static class ExchangeServiceNoInit extends ExchangeService { + private static final String LP_TOKEN_API_URL = "LpTokenApiUrl"; + private AtomicBoolean ethPriceRequest = new AtomicBoolean(false); private AtomicBoolean simulateErrorRequest = new AtomicBoolean(false); - @Override - public void computeRates() { - // Delete @PostConstruct - } - @Override protected String executeQuery(String url, String body) { ethPriceRequest.set(StringUtils.contains(body, "ethPrice")); @@ -294,19 +281,19 @@ protected HttpsURLConnection newURLConnection(String apiUrl) throws IOException when(connection.getOutputStream()).thenReturn(mock(OutputStream.class)); when(connection.getInputStream()).thenReturn(new ByteArrayInputStream("{\"data\": {\"blocks\": [{\"number\": \"1111\"}]}}".getBytes())); return connection; - } else if (StringUtils.contains(apiUrl, "LpTokenApiUrl") && simulateErrorRequest.get()) { + } else if (StringUtils.contains(apiUrl, LP_TOKEN_API_URL) && simulateErrorRequest.get()) { HttpsURLConnection connection = mock(HttpsURLConnection.class); when(connection.getResponseCode()).thenReturn(200); when(connection.getOutputStream()).thenReturn(mock(OutputStream.class)); when(connection.getInputStream()).thenReturn(new ByteArrayInputStream("{\"errors\": [{\"message\": \"Error: up to block number 1000 .\"}]}".getBytes())); return connection; - } else if (StringUtils.contains(apiUrl, "LpTokenApiUrl") && ethPriceRequest.get()) { + } else if (StringUtils.contains(apiUrl, LP_TOKEN_API_URL) && ethPriceRequest.get()) { HttpsURLConnection connection = mock(HttpsURLConnection.class); when(connection.getResponseCode()).thenReturn(200); when(connection.getOutputStream()).thenReturn(mock(OutputStream.class)); when(connection.getInputStream()).thenReturn(new ByteArrayInputStream("{\"data\": {\"bundle\": {\"ethPrice\": \"3\"}}}".getBytes())); return connection; - } else if (StringUtils.contains(apiUrl, "LpTokenApiUrl")) { + } else if (StringUtils.contains(apiUrl, LP_TOKEN_API_URL)) { HttpsURLConnection connection = mock(HttpsURLConnection.class); when(connection.getResponseCode()).thenReturn(200); when(connection.getOutputStream()).thenReturn(mock(OutputStream.class)); diff --git a/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/portfolio.html b/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/portfolio.html deleted file mode 100644 index ca7924db6..000000000 --- a/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/portfolio.html +++ /dev/null @@ -1,15 +0,0 @@ -#{metadata.portfolio.pageTitle} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/tokenomics.html b/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/tokenomics.html deleted file mode 100644 index f510c833b..000000000 --- a/deeds-dapp-webapp/src/main/webapp/WEB-INF/metadata/tokenomics.html +++ /dev/null @@ -1,15 +0,0 @@ -#{metadata.tokenomics.pageTitle} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/sitemap.xml b/deeds-dapp-webapp/src/main/webapp/sitemap.xml index 135eee565..49672e87d 100644 --- a/deeds-dapp-webapp/src/main/webapp/sitemap.xml +++ b/deeds-dapp-webapp/src/main/webapp/sitemap.xml @@ -39,21 +39,11 @@ 2023-11-08 0.80 - - https://www.meeds.io/portfolio - 2023-04-17 - 0.80 - https://www.meeds.io/tenants 2023-04-17 0.80 - - https://www.meeds.io/tokenomics - 2023-04-17 - 0.70 - https://www.meeds.io/about-us 2023-04-17 @@ -79,11 +69,6 @@ 2023-11-06 0.90 - - https://www.meeds.io/fr/portefeuille - 2023-04-17 - 0.80 - https://www.meeds.io/fr/visite-guidee 2023-04-17 @@ -99,11 +84,6 @@ 2023-04-17 0.90 - - https://www.meeds.io/fr/tokenomics - 2023-04-17 - 0.70 - https://www.meeds.io/fr/mint 2023-04-17 diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/initComponents-dapp.js b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/initComponents-dapp.js index 0944c4612..a71bf6c9f 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/initComponents-dapp.js +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/initComponents-dapp.js @@ -22,7 +22,6 @@ import './layout/initComponents'; import './marketplace/initComponents'; import './tenants/initComponents'; import './owners/initComponents'; -import './snapshot/initComponents'; import './deeds/initComponents'; import './stake/initComponents'; import './farming/initComponents'; diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Footer.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Footer.vue index 604a6251b..4a39e7807 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Footer.vue +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Footer.vue @@ -101,15 +101,9 @@ + class="no-decoration mt-2"> {{ $t('joinHubs') }} - - {{ $t('meedsToken') }} - state.legalsURL, stakeURL: state => state.stakeURL, aboutUsURL: state => state.aboutUsURL, - tokenomicsURL: state => state.tokenomicsURL, tenantsURL: state => state.tenantsURL, mintUrl: state => state.mintUrl, whitepaperURL: state => state.whitepaperURL, diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Navbar.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Navbar.vue index 34b036fd9..a34a5fbb0 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Navbar.vue +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/components/Navbar.vue @@ -85,26 +85,6 @@ :class="positionNftIconTab"> - - -

{{ $t('page.overview') }}

- -
-
{{ $t('page.stake.menu.description') }} - - - - - - {{ $t('tokens.title') }} - {{ $t('page.token.menu.description') }} - - @@ -334,37 +290,6 @@ - - - - - - - - {{ $t('page.token') }} - - fa fa-chevron-right - - - - - {{ $t('page.token.menu.description') }} - - - - - @@ -535,18 +460,15 @@ export default { 'stake', 'mint', 'farm', - 'portfolio', ], }), computed: Vuex.mapState({ parentLocation: state => state.parentLocation, - portfolioURL: state => state.portfolioURL, marketplaceURL: state => state.marketplaceURL, mintUrl: state => state.mintUrl, stakeURL: state => state.stakeURL, ownersURL: state => state.ownersURL, tenantsURL: state => state.tenantsURL, - tokenomicsURL: state => state.tokenomicsURL, language: state => state.language, isMobile: state => state.isMobile, dark: state => state.dark, @@ -574,9 +496,6 @@ export default { selectedNftTab() { return this.selectedTab && this.selectedTab === 'nft'; }, - selectedPortfolioTab() { - return this.selectedTab && this.selectedTab === 'portfolio'; - }, positionWhyMeedsIconTab() { return this.selectedWhyMeedsTab && this.selectedWhyMeedsTab ? 'object-position-left' : 'object-position-right'; }, @@ -586,9 +505,6 @@ export default { positionNftIconTab() { return this.selectedNftTab && this.selectedNftTab ? 'object-position-left' : 'object-position-right'; }, - positionPortfolioIconTab() { - return this.selectedPortfolioTab && this.selectedPortfolioTab ? 'object-position-left' : 'object-position-right'; - }, whyMeedsTextColor() { return this.selectedWhyMeedsTab && this.selectedWhyMeedsTab ? 'secondary--text' : 'text-sub-title'; }, @@ -598,9 +514,6 @@ export default { textNftColor() { return this.selectedNftTab && this.selectedNftTab ? 'secondary--text' : 'text-sub-title'; }, - textPortfolioColor() { - return this.selectedPortfolioTab && this.selectedPortfolioTab ? 'secondary--text' : 'text-sub-title'; - }, }), watch: { isMobile() { @@ -660,7 +573,7 @@ export default { this.switchPage(this.page); } else { this.selectedTab = (this.navTabs.indexOf(this.page) >= 0) && tabToSelect || `${this.parentLocation}/static`; - if (this.isMobile && this.selectedTab !== 'why-meeds' && this.selectedTab !== 'portfolio') { + if (this.isMobile && this.selectedTab !== 'why-meeds') { if (this.selectedTab === 'stake' || this.selectedTab === 'farm' || this.selectedTab === 'tokens') { this.selectedTokensId = this.page; this.selectedTab = 'tokens'; diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/routes.js b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/routes.js index 059151f4a..5e5e550db 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/routes.js +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/layout/routes.js @@ -21,8 +21,6 @@ const Tenants = { template: '' }; const Owners = { template: '' }; const Stake = { template: '' }; const Mint = { template: '' }; -const Overview = { template: '' }; -const Tokenomics = { template: '' }; const Hubs = { template: '' }; const Buy = { template: '' }; const StaticPageContent = { template: '' }; @@ -43,14 +41,11 @@ export default { '/acheter': Buy, '/locataires': Tenants, '/proprietaires': Owners, - '/portefeuille': Overview, - '/tokenomics': Tokenomics, '/rejoindre-dao': Stake, '/mint': Mint, '/marketplace': Marketplace, '/tenants': Tenants, '/owners': Owners, - '/portfolio': Overview, '/stake': Stake, '/buy': Buy }; diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-dapp.js b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-dapp.js index 590b7e7cc..52ec37d7a 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-dapp.js +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-dapp.js @@ -291,10 +291,8 @@ const pageUriPerLanguages = { pages: [ '', 'marketplace', - 'portfolio', 'tour', 'whitepaper', - 'tokenomics', 'about-us', 'mint', 'legals', @@ -310,10 +308,8 @@ const pageUriPerLanguages = { pages: [ 'fr', 'place-de-marche', - 'portefeuille', 'visite-guidee', 'livre-blanc', - 'tokenomics', 'qui-sommes-nous', 'mint', 'mentions-legales', @@ -515,18 +511,16 @@ const store = new Vuex.Store({ openedDrawersCount: 0, homeUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].pages[0]}`, marketplaceURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[1]}`, - portfolioURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[2]}`, - tourURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[3]}`, - whitepaperURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[4]}`, - tokenomicsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[5]}`, - aboutUsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[6]}`, - mintUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[7]}`, - legalsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[8]}`, - stakeURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[9]}`, - ownersURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[10]}`, - tenantsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[11]}`, - whyMeedsUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[12]}`, - buyUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[13]}`, + tourURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[2]}`, + whitepaperURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[3]}`, + aboutUsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[4]}`, + mintUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[5]}`, + legalsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[6]}`, + stakeURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[7]}`, + ownersURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[8]}`, + tenantsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[9]}`, + whyMeedsUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[10]}`, + buyUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[11]}`, farmURL: null, formLink: 'https://s7afi1uwdjh.typeform.com/to/FkNcXC0p', buyMeedsLink: 'https://app.paraswap.io/#/0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE-0x8503a7b00b4b52692cc6c14e5b96f142e30547b7/0/SELL?network=ethereum', diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-static.js b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-static.js index 29be0d96d..d5237c2db 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-static.js +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/main-static.js @@ -80,10 +80,8 @@ const pageUriPerLanguages = { pages: [ '', 'marketplace', - 'portfolio', 'tour', 'whitepaper', - 'tokenomics', 'about-us', 'mint', 'legals', @@ -99,10 +97,8 @@ const pageUriPerLanguages = { pages: [ 'fr', 'place-de-marche', - 'portefeuille', 'visite-guidee', 'livre-blanc', - 'tokenomics', 'qui-sommes-nous', 'mint', 'mentions-legales', @@ -140,18 +136,16 @@ const store = new Vuex.Store({ whiteThemeColor: dark && 'dark-color' || 'white', homeUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].pages[0]}`, marketplaceURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[1]}`, - portfolioURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[2]}`, - tourURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[3]}`, - whitepaperURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[4]}`, - tokenomicsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[5]}`, - aboutUsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[6]}`, - mintUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[7]}`, - legalsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[8]}`, - stakeURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[9]}`, - ownersURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[10]}`, - tenantsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[11]}`, - whyMeedsUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[12]}`, - buyUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[13]}`, + tourURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[2]}`, + whitepaperURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[3]}`, + aboutUsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[4]}`, + mintUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[5]}`, + legalsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[6]}`, + stakeURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[7]}`, + ownersURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[8]}`, + tenantsURL: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[9]}`, + whyMeedsUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[10]}`, + buyUrl: `${window.parentAppLocation}/${pageUriPerLanguages[language].uriPrefix}${pageUriPerLanguages[language].pages[11]}`, farmURL: null, }, mutations: { diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Assets.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Assets.vue deleted file mode 100644 index 293b85a0f..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Assets.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/MeedsInfo.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/MeedsInfo.vue deleted file mode 100644 index 274d402e7..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/MeedsInfo.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Overview.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Overview.vue deleted file mode 100644 index 2c64968b7..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Overview.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Tokenomics.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Tokenomics.vue deleted file mode 100644 index ff6074571..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/Tokenomics.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/TradeMeeds.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/TradeMeeds.vue deleted file mode 100644 index 215f2b44b..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/TradeMeeds.vue +++ /dev/null @@ -1,350 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAsset.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAsset.vue deleted file mode 100644 index 716e38aba..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAsset.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAssets.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAssets.vue deleted file mode 100644 index d632b1e6c..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/DeedAssets.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/EmptyAssets.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/EmptyAssets.vue deleted file mode 100644 index 47d06e6cf..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/EmptyAssets.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/LiquidityPoolAsset.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/LiquidityPoolAsset.vue deleted file mode 100644 index 49a736ee6..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/LiquidityPoolAsset.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/MeedAsset.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/MeedAsset.vue deleted file mode 100644 index 3aab2cd3f..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/MeedAsset.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/PolygonMeedAsset.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/PolygonMeedAsset.vue deleted file mode 100644 index a0db03378..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/PolygonMeedAsset.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/TokenAssets.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/TokenAssets.vue deleted file mode 100644 index f62b271ef..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/TokenAssets.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/XMeedAsset.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/XMeedAsset.vue deleted file mode 100644 index 99cba8062..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/assets/XMeedAsset.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/CurrenciesChart.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/CurrenciesChart.vue deleted file mode 100644 index 7b1c8d2a0..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/CurrenciesChart.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/PriceChart.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/PriceChart.vue deleted file mode 100644 index 9a0291839..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/charts/PriceChart.vue +++ /dev/null @@ -1,257 +0,0 @@ - - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MarketCap.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MarketCap.vue deleted file mode 100644 index 2c9b73eea..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MarketCap.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MaxSupply.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MaxSupply.vue deleted file mode 100644 index 0a27e6701..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MaxSupply.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MeedPrice.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MeedPrice.vue deleted file mode 100644 index 016318f25..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/MeedPrice.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalSupply.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalSupply.vue deleted file mode 100644 index 4344ddafe..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalSupply.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalValueLocked.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalValueLocked.vue deleted file mode 100644 index c6315fda9..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/components/metrics/TotalValueLocked.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/initComponents.js b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/initComponents.js deleted file mode 100644 index 383eb6935..000000000 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/snapshot/initComponents.js +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -import Overview from './components/Overview.vue'; -import PriceChart from './components/charts/PriceChart.vue'; -import TradeMeeds from './components/TradeMeeds.vue'; -import Assets from './components/Assets.vue'; -import TokenAssets from './components/assets/TokenAssets.vue'; -import EmptyAssets from './components/assets/EmptyAssets.vue'; -import LiquidityPoolAsset from './components/assets/LiquidityPoolAsset.vue'; -import XMeedAsset from './components/assets/XMeedAsset.vue'; -import MeedAsset from './components/assets/MeedAsset.vue'; -import PolygonMeedAsset from './components/assets/PolygonMeedAsset.vue'; -import DeedAssets from './components/assets/DeedAssets.vue'; -import DeedAsset from './components/assets/DeedAsset.vue'; -import MeedsInfo from './components/MeedsInfo.vue'; -import CurrenciesChart from './components/charts/CurrenciesChart.vue'; -import MarketCap from './components/metrics/MarketCap.vue'; -import MaxSupply from './components/metrics/MaxSupply.vue'; -import TotalSupply from './components/metrics/TotalSupply.vue'; -import TotalValueLocked from './components/metrics/TotalValueLocked.vue'; -import MeedPrice from './components/metrics/MeedPrice.vue'; -import Tokenomics from './components/Tokenomics.vue'; - -const components = { - 'deeds-overview': Overview, - 'deeds-price-chart': PriceChart, - 'deeds-trade-meeds': TradeMeeds, - 'deeds-assets': Assets, - 'deeds-token-assets': TokenAssets, - 'deeds-empty-assets': EmptyAssets, - 'deeds-liquidity-pool-asset': LiquidityPoolAsset, - 'deeds-x-meed-asset': XMeedAsset, - 'deeds-meed-asset': MeedAsset, - 'deeds-polygon-meed-asset': PolygonMeedAsset, - 'deeds-deed-assets': DeedAssets, - 'deeds-deed-asset': DeedAsset, - 'deeds-meeds-info': MeedsInfo, - 'deeds-currencies-chart': CurrenciesChart, - 'deeds-market-cap': MarketCap, - 'deeds-max-supply': MaxSupply, - 'deeds-total-supply': TotalSupply, - 'deeds-total-value-locked': TotalValueLocked, - 'deeds-meed-price': MeedPrice, - 'deeds-tokenomics': Tokenomics, -}; - -for (const key in components) { - Vue.component(key, components[key]); -} \ No newline at end of file diff --git a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/staticPage/components/page/AboutUs.vue b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/staticPage/components/page/AboutUs.vue index 48216d29e..de44be598 100644 --- a/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/staticPage/components/page/AboutUs.vue +++ b/deeds-dapp-webapp/src/main/webapp/vue-app/dapp/staticPage/components/page/AboutUs.vue @@ -103,7 +103,7 @@ state.parentLocation, - portfolioURL: state => state.portfolioURL, whitepaperURL: state => state.whitepaperURL, tourURL: state => state.tourURL, dark: state => state.dark,