feat: update gitattributes and fix versionin docker

jbatalle · Aug 23, 2022 · e186afe · e186afe
1 parent 7bc21e8
commit e186afe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,3 @@
-*.vue linguist-detectable=false
+*.vue linguist-detectable=false
+*.css linguist-detectable=false
+*.scss linguist-detectable=false
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ https://queds-api.herokuapp.com/overview
 * Automatic read from exchanges: Bitstamp, Kraken, Bittrex and Binance
 
 ## In progress
+* Set price alerts
 * Include dividends
 * Allow to import broker/crypto data from CSV
 * Set default portfolio currency

diff --git a/api/api/crypto/views.py b/api/api/crypto/views.py
@@ -55,7 +55,7 @@ def get(self):
 
         # wallet_items = ExchangeWallet.query.filter(ExchangeWallet.user_id == user_id).all()
         if len(wallet_items) == 0:
-            return {'message': "Unable to detect tickers in open transactions. Recalculate the wallet!"}, 400
+            return [], 400
 
         c = CryptoCompareClient()
         currencies = [p.currency for p in wallet_items]
@@ -92,11 +92,6 @@ def get(self):
                 oo_item['order'] = oo.order.json
                 item['open_orders'].append(oo_item)
 
-
-            # item['market'] = {}
-            # if r.ticker.ticker in tickers_by_ticker:
-                # item['market'] = tickers_by_ticker[r.ticker.ticker]
-            # item['transaction'] = r.transaction.json
             items.append(item)
         return jsonify(items)
 

diff --git a/api/api/stock/views.py b/api/api/stock/views.py
@@ -120,7 +120,7 @@ def get(self):
         tickers_yahoo = {t.ticker.ticker_yahoo: t.ticker.ticker for t in wallet_items if t.ticker.ticker_yahoo}
         symbols = ",".join(list(tickers_yahoo.keys()))
         if len(wallet_items) == 0:
-            return {'message': "Unable to detect tickers in open transactions. Recalculate wallet"}, 400
+            return [], 200
 
         if len(symbols) == 0:
             log.error("Unable to detect tickers in open transactions")

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
       - ./api:/usr/src
       - ./config:/usr/src/config
       - ./models:/usr/src/models
+      - ./VERSION:/usr/VERSION
     ports:
       - 5001:5000
     environment:
@@ -100,7 +101,7 @@ services:
       - api_bridge
 
   db:
-    image: timescale/timescaledb:2.7.1-pg12
+    image: timescale/timescaledb:2.7.2-pg12
     restart: always
     environment:
       POSTGRES_DB: queds

diff --git a/frontend/.gitattributes b/frontend/.gitattributes
@@ -1,6 +1,6 @@
 # Auto detect text files and perform LF normalization
-*.scss linguist-language=Vue
-*.css linguist-language=Vue
+#*.scss linguist-language=Vue
+#*.css linguist-language=Vue
 
 # Standard to msysgit
 *.doc	 diff=astextplain