From d39eda49de3d3c7f2399f5bba80274cb3a6dc05d Mon Sep 17 00:00:00 2001
From: unknown
Date: Wed, 28 Jul 2021 12:52:30 +0200
Subject: [PATCH] Added changelog. Added curl to Docker image
---
.dockerignore | 3 ++-
.gitignore | 3 ++-
CHANGELOG.md | 1 +
Dockerfile | 2 +-
Dockerfile.multiarch | 2 +-
client/src/components/Settings/AppDetails/AppDetails.tsx | 9 +++++++++
client/src/store/actions/bookmark.ts | 2 +-
7 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 5fcee18..da9bc10 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
node_modules
github
-public
\ No newline at end of file
+public
+build.sh
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2955045..98ec862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
node_modules
data
-public
\ No newline at end of file
+public
+build.sh
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ed220..56860ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
### v1.6.1 (2021-07-28)
- Added option to upload custom icons for bookmarks ([#52](https://github.com/pawelmalak/flame/issues/52))
- Fixed custom icons not updating ([#58](https://github.com/pawelmalak/flame/issues/58))
+- Added changelog file
### v1.6 (2021-07-17)
- Added support for Steam URLs ([#62](https://github.com/pawelmalak/flame/issues/62))
diff --git a/Dockerfile b/Dockerfile
index 8016d8e..fed0789 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM node:14-alpine
-RUN apk update && apk add --no-cache nano
+RUN apk update && apk add --no-cache nano curl
WORKDIR /app
diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
index 808b815..20ff6c2 100644
--- a/Dockerfile.multiarch
+++ b/Dockerfile.multiarch
@@ -1,6 +1,6 @@
FROM node:14-alpine
-RUN apk update && apk add --no-cache nano
+RUN apk update && apk add --no-cache nano curl
WORKDIR /app
diff --git a/client/src/components/Settings/AppDetails/AppDetails.tsx b/client/src/components/Settings/AppDetails/AppDetails.tsx
index 90fe2fb..50fd37f 100644
--- a/client/src/components/Settings/AppDetails/AppDetails.tsx
+++ b/client/src/components/Settings/AppDetails/AppDetails.tsx
@@ -17,6 +17,15 @@ const AppDetails = (): JSX.Element => {
{' '}
version {process.env.REACT_APP_VERSION}
+
+ See changelog {' '}
+
+ here
+
+
)
diff --git a/client/src/store/actions/bookmark.ts b/client/src/store/actions/bookmark.ts
index 8707062..b4b5831 100644
--- a/client/src/store/actions/bookmark.ts
+++ b/client/src/store/actions/bookmark.ts
@@ -72,7 +72,7 @@ export interface AddBookmarkAction {
export const addBookmark = (formData: NewBookmark | FormData) => async (dispatch: Dispatch) => {
try {
const res = await axios.post>('/api/bookmarks', formData);
- console.log(res.data.data)
+
dispatch({
type: ActionTypes.createNotification,
payload: {