Skip to content

Update dev branch, make it default and add branch protection #25

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

Merged
merged 11 commits into from
Nov 27, 2022
Merged

Update dev branch, make it default and add branch protection #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53df8c0
Add renovate.json
renovate[bot] Jun 26, 2022
2f27d3c
Update package lock to v2
urlDev Oct 9, 2022
4716575
Update chart loading order
urlDev Oct 9, 2022
82dffa1
Remove indices, update stocks to render first
urlDev Oct 9, 2022
fdfa5fe
Remove indices from market types, update snapshot
urlDev Oct 9, 2022
7e50ad2
Merge pull request #3 from urlDev/fix-front-page-charts
urlDev Oct 9, 2022
d350174
Merge pull request #2 from urlDev/renovate/configure
urlDev Oct 9, 2022
2143efb
Update favorite and user redux store API URLs
urlDev Nov 23, 2022
cb3fcb3
Merge pull request #23 from urlDev/update-api-url
urlDev Nov 23, 2022
314b713
Update user.js in redux/actions
urlDev Nov 27, 2022
1b5dfcc
Update user.js in redux/actions
urlDev Nov 27, 2022
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
23,351 changes: 23,324 additions & 27 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
}
8 changes: 1 addition & 7 deletions src/components/market-components/MarketComponents.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,7 @@ import {
} from './MarketComponents.styles';

// First, I made market types array, the ones that I want to show in home page
export const marketTypes = [
'Indexes',
'Crypto',
'Forex',
'Stocks',
'Commodities',
];
export const marketTypes = ['Stocks', 'Crypto', 'Forex', 'Commodities'];

const MarketComponents = () => {
const { loadingChart, marketType, marketName } = useSelector(
Expand Down
33 changes: 16 additions & 17 deletions src/redux/actions/favorite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import axios from "axios";
import toaster from "toasted-notes";
import axios from 'axios';
import toaster from 'toasted-notes';

import NotificationComponent from "../../components/notification-component/NotificationComponent";
import NotificationComponent from '../../components/notification-component/NotificationComponent';

const url = "https://urldev-mern-react-times-api.herokuapp.com";
// const url = `http://localhost:3000`;
const url = process.env.REACT_APP_API_URL;

export const GET_FAVORITE = "GET_FAVORITE";
export const ADD_FAVORITE = "ADD_FAVORITE";
export const DELETE_FAVORITE = "DELETE_FAVORITE";
export const FETCH_FAVORITE_ERROR = "FETCH_FAVORITE_ERROR";
export const CLEAN_FAVORITE_STATE = "CLEAN_FAVORITE_STATE";
export const GET_FAVORITE = 'GET_FAVORITE';
export const ADD_FAVORITE = 'ADD_FAVORITE';
export const DELETE_FAVORITE = 'DELETE_FAVORITE';
export const FETCH_FAVORITE_ERROR = 'FETCH_FAVORITE_ERROR';
export const CLEAN_FAVORITE_STATE = 'CLEAN_FAVORITE_STATE';

export const getFavorite = (stock) => ({
type: GET_FAVORITE,
Expand All @@ -37,7 +36,7 @@ export const cleanFavoriteState = () => ({
});

export const fetchGetFavorites = () => async (dispatch) => {
const token = JSON.parse(localStorage.getItem("token"));
const token = JSON.parse(localStorage.getItem('token'));

const config = {
headers: { Authorization: `Bearer ${token}` },
Expand All @@ -56,7 +55,7 @@ export const fetchAddFavorites = (stock) => async (dispatch) => {
symbol: stock,
};

const token = JSON.parse(localStorage.getItem("token"));
const token = JSON.parse(localStorage.getItem('token'));

const config = {
headers: { Authorization: `Bearer ${token}` },
Expand All @@ -72,8 +71,8 @@ export const fetchAddFavorites = (stock) => async (dispatch) => {
<NotificationComponent
success={true}
text={`You added ${data.symbol[0].name
.split("^")
.join("")} to your favorites successfully.`}
.split('^')
.join('')} to your favorites successfully.`}
/>
),
{ duration: 1500 }
Expand All @@ -96,7 +95,7 @@ export const fetchAddFavorites = (stock) => async (dispatch) => {
};

export const fetchDeleteFavorite = (id) => async (dispatch) => {
const token = JSON.parse(localStorage.getItem("token"));
const token = JSON.parse(localStorage.getItem('token'));

const config = {
headers: { Authorization: `Bearer ${token}` },
Expand All @@ -111,8 +110,8 @@ export const fetchDeleteFavorite = (id) => async (dispatch) => {
<NotificationComponent
success={true}
text={`You deleted ${data.symbol[0].name
.split("^")
.join("")} from your favorites.`}
.split('^')
.join('')} from your favorites.`}
/>
),
{ duration: 1500 }
Expand Down
Loading