Skip to content

Commit

Permalink
final changes before deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
jalajcodes committed Oct 9, 2020
1 parent c432856 commit b34d2fc
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions craco.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
const CracoLessPlugin = require('craco-less');
const path = require('path');
// const path = require('path');
module.exports = {
plugins: [
{
plugin: CracoLessPlugin,
options: {
lessLoaderOptions: {
lessOptions: {
modifyVars: { '@primary-color': '#ff932b' },
modifyVars: { '@primary-color': '#55ec7b' },
javascriptEnabled: true,
},
},
Expand Down
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const authLink = setContext((_, { headers }) => {
});

const httpLink = createHttpLink({
uri: '/api',
uri: 'https://hsh-server.herokuapp.com/api',
});

const client = new ApolloClient({
Expand Down
2 changes: 1 addition & 1 deletion src/lib/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const displayErrorMessage = (error: string) => {
return message.error(error);
};

export const iconColor = '#ff932b';
export const iconColor = '#55ec7b';

// export const formatListingPrice = (price: number, round = true) => {
// const priceInDollars = round ? Math.floor(price / 100) : price / 100;
Expand Down
4 changes: 1 addition & 3 deletions src/sections/AppHeader/components/MenuItems/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ export const MenuItems = () => {
) : (
<Item>
<Link to="/login">
<Button shape="round" type="primary">
Login
</Button>
<Button type="primary">Login</Button>
</Link>
</Item>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Button, Divider, message, Modal, Typography } from 'antd';
import { Button, Divider, Modal, Typography } from 'antd';
import { KeyOutlined } from '@ant-design/icons';
import moment, { Moment } from 'moment';
import { CardElement, useStripe, useElements } from '@stripe/react-stripe-js';
Expand Down Expand Up @@ -70,7 +70,7 @@ export const ListingCreateBookingModal = ({
id,
source: stripeToken.id,
checkIn: moment(checkInDate).format('YYYY-MM-DD'),
checkOut: moment(checkInDate).format('YYYY-MM-DD'),
checkOut: moment(checkOutDate).format('YYYY-MM-DD'),
},
},
});
Expand Down
11 changes: 7 additions & 4 deletions src/styles/index.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
@import '~antd/dist/antd.less';
// @import url(https://fonts.googleapis.com/css?family=Sacramento);
@import url(https://fonts.googleapis.com/css?family=Sacramento);

@accent: #55ec7b;

.menu {
width: 100%;
padding: 0 20px;
Expand Down Expand Up @@ -141,7 +144,7 @@
right: 17px;
border-radius: 4px;
// box-shadow: 1px 0 10px 2px rgba(0, 0, 0, 0.2);
background: #ff932b;
background: @accent;
}
@media (max-width: 75em) {
.listing-card__dimensions--guests {
Expand Down Expand Up @@ -191,7 +194,7 @@
bottom: 0;
left: 0;
right: 0;
background: #eeac1dcb;
background: #53ec7b94;
opacity: 0.5;
-webkit-transition: all 0.3s linear;
transition: all 0.3s linear;
Expand Down Expand Up @@ -545,7 +548,7 @@
}

.guestLogin {
background-color: #ff932b;
background-color: @accent;
}

.log-in-card__google-button:last-of-type {
Expand Down

0 comments on commit b34d2fc

Please sign in to comment.