Skip to content
Draft
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ lib
.next

bundles

.vercel
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10.14.1
2 changes: 1 addition & 1 deletion components/AirtableContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class AirtableProvider extends React.PureComponent {
assetModels[fields['Model ID']] = {
category: fields['Category'],
name: fields['Asset'],
imageSrc: `https://s3.eu-central-1.amazonaws.com/mybit-go/assetImages:${fields['Image']}`,
imageSrc: `/assetImages/${fields['Image']}`,
location: this.getLocationFromString(fields['Location']),
files: this.getFiles(fields['Files']),
fundingGoal: fields['Funding Goal'],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import getConfig from 'next/config';
import {
CarouselSlide,
CarouselSlideMainTitle,
Expand All @@ -7,8 +6,6 @@ import {
CarouselSlideSelect,
CarouselNextButton,
} from 'components/CarouselSlide/';
import GoogleAutoComplete from 'ui/GoogleAutoComplete';
const { publicRuntimeConfig } = getConfig();

export const AssetLocationSlide = ({
maxWidthDesktop,
Expand Down Expand Up @@ -50,20 +47,13 @@ export const AssetLocationSlide = ({
>
This is where your asset is going to be once fully funded.
</CarouselSlideParagraph>
<GoogleAutoComplete
apiKey={publicRuntimeConfig.GOOGLE_PLACES_API_KEY}
input={searchAddress1}
countryCode={countryCode}
onSelectSuggest={handleSelectSuggest}
>
<CarouselSlideInput
isCentered
placeholder="Address Line 1"
name="assetAddress1"
onChange={e => handleInputChange(e)}
value={assetAddress1}
/>
</GoogleAutoComplete>
<CarouselSlideInput
isCentered
placeholder="Address Line 1"
name="assetAddress1"
onChange={e => handleInputChange(e)}
value={assetAddress1}
/>
<CarouselSlideInput
isCentered
placeholder="Address Line 2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import React from 'react';
import styled, { css } from 'styled-components';
import Router from 'next/router';
import {
InputNumber,
Button,
Select,
} from "antd";
import getConfig from 'next/config';
import GoogleAutoComplete from 'ui/GoogleAutoComplete';
import { Select } from "antd";
import AlertMessage from 'ui/AlertMessage';
import {
CarouselSlide,
Expand All @@ -28,41 +21,13 @@ import ThinkingIcon from 'static/ic_thinking.svg';
import Spin from 'static/spin.svg';
import LabelWithTooltip from 'ui/LabelWithTooltip';

const { publicRuntimeConfig } = getConfig();

const Image = styled.img`
position: relative;
margin: 10px auto;
width: 120px;
height: 120px;
margin-bottom: 40px;
}`

const ButtonWrapper = styled(Button)`
display: block;
margin: 0 auto;
margin-top: 50px;
`

const Loading = styled(Spin)`
display: block;
margin: 0 auto;
height: 32px;
width: 32px;
`

const DetectLocation = styled.p`
font-weight: 500;
font-size: 14px;
line-height: 22px;
text-align: center;
color: ${({theme}) => theme.colors.blueMain};
cursor: pointer;
width: max-content;
margin: 0 auto;
margin-bottom: 1rem;
`

const SelectedAssetValueLabel = styled.p`
width: 80%;
margin: 0 auto;
Expand Down Expand Up @@ -121,18 +86,14 @@ const AssetValueContainer = styled.div`
export const AvailableAssetsSlide = ({
handleSelectChange,
formData,
airtableContext,
maxWidthDesktop,
loadingAssets,
handleDetectLocationClicked,
countries,
handleInputChange,
handleCitySuggest,
desktopMode,
onClick,
nextButtonDisabled,
error,
autoLocationOffline,
getCategoriesForAssets,
}) => {
const {
Expand All @@ -141,8 +102,6 @@ export const AvailableAssetsSlide = ({
assetValue,
userCity,
userCountry,
searchCity,
countryCode,
cryptoPurchase,
} = formData;

Expand Down Expand Up @@ -196,7 +155,6 @@ export const AvailableAssetsSlide = ({
>
Different assets will be available to fund depending on where you are.
</CarouselSlideParagraph>
{!autoLocationOffline && <DetectLocation onClick={handleDetectLocationClicked}>Detect Your Location</DetectLocation>}
<div className="Slider__input-container">
<CarouselSlideSelect
isCentered
Expand All @@ -211,26 +169,19 @@ export const AvailableAssetsSlide = ({
value={userCountry}
>
{countries.map(country => (
<Option key={country} value={country}>
<Select.Option key={country} value={country}>
{country}
</Option>
</Select.Option>
))}
</CarouselSlideSelect>
<GoogleAutoComplete
apiKey={publicRuntimeConfig.GOOGLE_PLACES_API_KEY}
input={searchCity}
countryCode={countryCode}
onSelectSuggest={handleCitySuggest}
>
<CarouselSlideInput
isCentered
placeholder="City"
name="userCity"
onChange={e => handleInputChange(e)}
value={userCity}
disabled={!userCountry}
/>
</GoogleAutoComplete>
<CarouselSlideInput
isCentered
placeholder="City"
name="userCity"
onChange={e => handleInputChange(e)}
value={userCity}
disabled={!userCountry}
/>
</div>
<p style={{textAlign: 'center'}}>
{(!userCountry || !userCity)
Expand Down
170 changes: 0 additions & 170 deletions components/UI/CivicContext.js

This file was deleted.

4 changes: 2 additions & 2 deletions components/UI/Footer/components/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const AboutWrapper = styled.div`
const About = () => (
<AboutWrapper>
<Mybit />
<p>
<div>
MyBit is operated and maintained by a DAO
<div>DAO address:</div>
<a
Expand All @@ -33,7 +33,7 @@ const About = () => (
>
0xcD3d9b832BfF15E0a519610372c6AAC651872DdE
</a>
</p>
</div>
<a
href="https://github.com/MyBitFoundation/MyBit-Go.website/blob/develop/TOC.md"
rel="noopener noreferrer"
Expand Down
Loading