diff --git a/api/app/blueprints/portfolio.py b/api/app/blueprints/portfolio.py index 9ead66b..386e83b 100644 --- a/api/app/blueprints/portfolio.py +++ b/api/app/blueprints/portfolio.py @@ -33,20 +33,23 @@ def get_portfolio(): # Otherwise calculate portfolio if transactions is not None: for row in transactions: - data = { - "isin": row[0], - "comment": row[1], - "count": row[2], - # "calculated_price": row[3], - "last_transaction": row[4], - 'current_price': 0 - } + if row[2] == 0: + continue + else: + data = { + "isin": row[0], + "comment": row[1], + "count": row[2], + # "calculated_price": row[3], + "last_transaction": row[4], + 'current_price': 0 + } - # Add current share value to portfolio - query_share_price = db.session.query(SharePrice).filter_by(isin=row[0]).order_by(SharePrice.date.desc()).first() - if query_share_price is not None: - data['current_price'] = query_share_price.as_dict()['price'] + # Add current share value to portfolio + query_share_price = db.session.query(SharePrice).filter_by(isin=row[0]).order_by(SharePrice.date.desc()).first() + if query_share_price is not None: + data['current_price'] = query_share_price.as_dict()['price'] - return_portfolio.append(data) + return_portfolio.append(data) return make_response(return_portfolio, 200, "Successfully loaded symbols") diff --git a/api/app/blueprints/transactions.py b/api/app/blueprints/transactions.py index d34c799..0759215 100644 --- a/api/app/blueprints/transactions.py +++ b/api/app/blueprints/transactions.py @@ -67,7 +67,7 @@ def get_transaction(): return_transactions = [] # Get all transactions - transactions = db.session.query(Transaction).filter_by(email=email).all() + transactions = db.session.query(Transaction).filter_by(email=email).order_by(Transaction.time.desc()).all() # Iterate over transactions and add them to return_transactions if transactions is not None: diff --git a/documentation/AktienBotPresentation.pdf b/documentation/AktienBotPresentation.pdf new file mode 100644 index 0000000..63b2570 Binary files /dev/null and b/documentation/AktienBotPresentation.pdf differ diff --git a/documentation/AktienBotPresentation.pptx b/documentation/AktienBotPresentation.pptx new file mode 100644 index 0000000..d1f76b0 Binary files /dev/null and b/documentation/AktienBotPresentation.pptx differ diff --git a/frontend/documentation/components/AppComponent.html b/documentation/frontend/components/AppComponent.html similarity index 100% rename from frontend/documentation/components/AppComponent.html rename to documentation/frontend/components/AppComponent.html diff --git a/frontend/documentation/components/BotSettingsComponent.html b/documentation/frontend/components/BotSettingsComponent.html similarity index 100% rename from frontend/documentation/components/BotSettingsComponent.html rename to documentation/frontend/components/BotSettingsComponent.html diff --git a/frontend/documentation/components/ConfirmationDialogComponent.html b/documentation/frontend/components/ConfirmationDialogComponent.html similarity index 100% rename from frontend/documentation/components/ConfirmationDialogComponent.html rename to documentation/frontend/components/ConfirmationDialogComponent.html diff --git a/frontend/documentation/components/DashboardComponent.html b/documentation/frontend/components/DashboardComponent.html similarity index 100% rename from frontend/documentation/components/DashboardComponent.html rename to documentation/frontend/components/DashboardComponent.html diff --git a/frontend/documentation/components/HeaderComponent.html b/documentation/frontend/components/HeaderComponent.html similarity index 100% rename from frontend/documentation/components/HeaderComponent.html rename to documentation/frontend/components/HeaderComponent.html diff --git a/frontend/documentation/components/HelpDialogComponent.html b/documentation/frontend/components/HelpDialogComponent.html similarity index 100% rename from frontend/documentation/components/HelpDialogComponent.html rename to documentation/frontend/components/HelpDialogComponent.html diff --git a/frontend/documentation/components/LoginComponent.html b/documentation/frontend/components/LoginComponent.html similarity index 100% rename from frontend/documentation/components/LoginComponent.html rename to documentation/frontend/components/LoginComponent.html diff --git a/frontend/documentation/components/ProfileComponent.html b/documentation/frontend/components/ProfileComponent.html similarity index 100% rename from frontend/documentation/components/ProfileComponent.html rename to documentation/frontend/components/ProfileComponent.html diff --git a/frontend/documentation/components/RegisterComponent.html b/documentation/frontend/components/RegisterComponent.html similarity index 100% rename from frontend/documentation/components/RegisterComponent.html rename to documentation/frontend/components/RegisterComponent.html diff --git a/frontend/documentation/components/UserDialogComponent.html b/documentation/frontend/components/UserDialogComponent.html similarity index 100% rename from frontend/documentation/components/UserDialogComponent.html rename to documentation/frontend/components/UserDialogComponent.html diff --git a/frontend/documentation/coverage.html b/documentation/frontend/coverage.html similarity index 100% rename from frontend/documentation/coverage.html rename to documentation/frontend/coverage.html diff --git a/frontend/documentation/dependencies.html b/documentation/frontend/dependencies.html similarity index 100% rename from frontend/documentation/dependencies.html rename to documentation/frontend/dependencies.html diff --git a/frontend/documentation/fonts/FontAwesome.otf b/documentation/frontend/fonts/FontAwesome.otf similarity index 100% rename from frontend/documentation/fonts/FontAwesome.otf rename to documentation/frontend/fonts/FontAwesome.otf diff --git a/frontend/documentation/fonts/fontawesome-webfont.eot b/documentation/frontend/fonts/fontawesome-webfont.eot similarity index 100% rename from frontend/documentation/fonts/fontawesome-webfont.eot rename to documentation/frontend/fonts/fontawesome-webfont.eot diff --git a/frontend/documentation/fonts/fontawesome-webfont.svg b/documentation/frontend/fonts/fontawesome-webfont.svg similarity index 100% rename from frontend/documentation/fonts/fontawesome-webfont.svg rename to documentation/frontend/fonts/fontawesome-webfont.svg diff --git a/frontend/documentation/fonts/fontawesome-webfont.ttf b/documentation/frontend/fonts/fontawesome-webfont.ttf similarity index 100% rename from frontend/documentation/fonts/fontawesome-webfont.ttf rename to documentation/frontend/fonts/fontawesome-webfont.ttf diff --git a/frontend/documentation/fonts/fontawesome-webfont.woff b/documentation/frontend/fonts/fontawesome-webfont.woff similarity index 100% rename from frontend/documentation/fonts/fontawesome-webfont.woff rename to documentation/frontend/fonts/fontawesome-webfont.woff diff --git a/frontend/documentation/fonts/fontawesome-webfont.woff2 b/documentation/frontend/fonts/fontawesome-webfont.woff2 similarity index 100% rename from frontend/documentation/fonts/fontawesome-webfont.woff2 rename to documentation/frontend/fonts/fontawesome-webfont.woff2 diff --git a/frontend/documentation/fonts/ionicons.eot b/documentation/frontend/fonts/ionicons.eot similarity index 100% rename from frontend/documentation/fonts/ionicons.eot rename to documentation/frontend/fonts/ionicons.eot diff --git a/frontend/documentation/fonts/ionicons.svg b/documentation/frontend/fonts/ionicons.svg similarity index 100% rename from frontend/documentation/fonts/ionicons.svg rename to documentation/frontend/fonts/ionicons.svg diff --git a/frontend/documentation/fonts/ionicons.ttf b/documentation/frontend/fonts/ionicons.ttf similarity index 100% rename from frontend/documentation/fonts/ionicons.ttf rename to documentation/frontend/fonts/ionicons.ttf diff --git a/frontend/documentation/fonts/ionicons.woff b/documentation/frontend/fonts/ionicons.woff similarity index 100% rename from frontend/documentation/fonts/ionicons.woff rename to documentation/frontend/fonts/ionicons.woff diff --git a/frontend/documentation/fonts/ionicons.woff2 b/documentation/frontend/fonts/ionicons.woff2 similarity index 100% rename from frontend/documentation/fonts/ionicons.woff2 rename to documentation/frontend/fonts/ionicons.woff2 diff --git a/frontend/documentation/fonts/roboto-v15-latin-300.eot b/documentation/frontend/fonts/roboto-v15-latin-300.eot similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-300.eot rename to documentation/frontend/fonts/roboto-v15-latin-300.eot diff --git a/frontend/documentation/fonts/roboto-v15-latin-300.svg b/documentation/frontend/fonts/roboto-v15-latin-300.svg similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-300.svg rename to documentation/frontend/fonts/roboto-v15-latin-300.svg diff --git a/frontend/documentation/fonts/roboto-v15-latin-300.ttf b/documentation/frontend/fonts/roboto-v15-latin-300.ttf similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-300.ttf rename to documentation/frontend/fonts/roboto-v15-latin-300.ttf diff --git a/frontend/documentation/fonts/roboto-v15-latin-300.woff b/documentation/frontend/fonts/roboto-v15-latin-300.woff similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-300.woff rename to documentation/frontend/fonts/roboto-v15-latin-300.woff diff --git a/frontend/documentation/fonts/roboto-v15-latin-300.woff2 b/documentation/frontend/fonts/roboto-v15-latin-300.woff2 similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-300.woff2 rename to documentation/frontend/fonts/roboto-v15-latin-300.woff2 diff --git a/frontend/documentation/fonts/roboto-v15-latin-700.eot b/documentation/frontend/fonts/roboto-v15-latin-700.eot similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-700.eot rename to documentation/frontend/fonts/roboto-v15-latin-700.eot diff --git a/frontend/documentation/fonts/roboto-v15-latin-700.svg b/documentation/frontend/fonts/roboto-v15-latin-700.svg similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-700.svg rename to documentation/frontend/fonts/roboto-v15-latin-700.svg diff --git a/frontend/documentation/fonts/roboto-v15-latin-700.ttf b/documentation/frontend/fonts/roboto-v15-latin-700.ttf similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-700.ttf rename to documentation/frontend/fonts/roboto-v15-latin-700.ttf diff --git a/frontend/documentation/fonts/roboto-v15-latin-700.woff b/documentation/frontend/fonts/roboto-v15-latin-700.woff similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-700.woff rename to documentation/frontend/fonts/roboto-v15-latin-700.woff diff --git a/frontend/documentation/fonts/roboto-v15-latin-700.woff2 b/documentation/frontend/fonts/roboto-v15-latin-700.woff2 similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-700.woff2 rename to documentation/frontend/fonts/roboto-v15-latin-700.woff2 diff --git a/frontend/documentation/fonts/roboto-v15-latin-italic.eot b/documentation/frontend/fonts/roboto-v15-latin-italic.eot similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-italic.eot rename to documentation/frontend/fonts/roboto-v15-latin-italic.eot diff --git a/frontend/documentation/fonts/roboto-v15-latin-italic.svg b/documentation/frontend/fonts/roboto-v15-latin-italic.svg similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-italic.svg rename to documentation/frontend/fonts/roboto-v15-latin-italic.svg diff --git a/frontend/documentation/fonts/roboto-v15-latin-italic.ttf b/documentation/frontend/fonts/roboto-v15-latin-italic.ttf similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-italic.ttf rename to documentation/frontend/fonts/roboto-v15-latin-italic.ttf diff --git a/frontend/documentation/fonts/roboto-v15-latin-italic.woff b/documentation/frontend/fonts/roboto-v15-latin-italic.woff similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-italic.woff rename to documentation/frontend/fonts/roboto-v15-latin-italic.woff diff --git a/frontend/documentation/fonts/roboto-v15-latin-italic.woff2 b/documentation/frontend/fonts/roboto-v15-latin-italic.woff2 similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-italic.woff2 rename to documentation/frontend/fonts/roboto-v15-latin-italic.woff2 diff --git a/frontend/documentation/fonts/roboto-v15-latin-regular.eot b/documentation/frontend/fonts/roboto-v15-latin-regular.eot similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-regular.eot rename to documentation/frontend/fonts/roboto-v15-latin-regular.eot diff --git a/frontend/documentation/fonts/roboto-v15-latin-regular.svg b/documentation/frontend/fonts/roboto-v15-latin-regular.svg similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-regular.svg rename to documentation/frontend/fonts/roboto-v15-latin-regular.svg diff --git a/frontend/documentation/fonts/roboto-v15-latin-regular.ttf b/documentation/frontend/fonts/roboto-v15-latin-regular.ttf similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-regular.ttf rename to documentation/frontend/fonts/roboto-v15-latin-regular.ttf diff --git a/frontend/documentation/fonts/roboto-v15-latin-regular.woff b/documentation/frontend/fonts/roboto-v15-latin-regular.woff similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-regular.woff rename to documentation/frontend/fonts/roboto-v15-latin-regular.woff diff --git a/frontend/documentation/fonts/roboto-v15-latin-regular.woff2 b/documentation/frontend/fonts/roboto-v15-latin-regular.woff2 similarity index 100% rename from frontend/documentation/fonts/roboto-v15-latin-regular.woff2 rename to documentation/frontend/fonts/roboto-v15-latin-regular.woff2 diff --git a/frontend/documentation/graph/dependencies.svg b/documentation/frontend/graph/dependencies.svg similarity index 100% rename from frontend/documentation/graph/dependencies.svg rename to documentation/frontend/graph/dependencies.svg diff --git a/frontend/documentation/images/compodoc-vectorise-inverted.png b/documentation/frontend/images/compodoc-vectorise-inverted.png similarity index 100% rename from frontend/documentation/images/compodoc-vectorise-inverted.png rename to documentation/frontend/images/compodoc-vectorise-inverted.png diff --git a/frontend/documentation/images/compodoc-vectorise-inverted.svg b/documentation/frontend/images/compodoc-vectorise-inverted.svg similarity index 100% rename from frontend/documentation/images/compodoc-vectorise-inverted.svg rename to documentation/frontend/images/compodoc-vectorise-inverted.svg diff --git a/frontend/documentation/images/compodoc-vectorise.png b/documentation/frontend/images/compodoc-vectorise.png similarity index 100% rename from frontend/documentation/images/compodoc-vectorise.png rename to documentation/frontend/images/compodoc-vectorise.png diff --git a/frontend/documentation/images/compodoc-vectorise.svg b/documentation/frontend/images/compodoc-vectorise.svg similarity index 100% rename from frontend/documentation/images/compodoc-vectorise.svg rename to documentation/frontend/images/compodoc-vectorise.svg diff --git a/frontend/documentation/images/compodoc.png b/documentation/frontend/images/compodoc.png similarity index 100% rename from frontend/documentation/images/compodoc.png rename to documentation/frontend/images/compodoc.png diff --git a/frontend/documentation/images/compodoc.svg b/documentation/frontend/images/compodoc.svg similarity index 100% rename from frontend/documentation/images/compodoc.svg rename to documentation/frontend/images/compodoc.svg diff --git a/frontend/documentation/images/coverage-badge-documentation.svg b/documentation/frontend/images/coverage-badge-documentation.svg similarity index 100% rename from frontend/documentation/images/coverage-badge-documentation.svg rename to documentation/frontend/images/coverage-badge-documentation.svg diff --git a/frontend/documentation/images/favicon.ico b/documentation/frontend/images/favicon.ico similarity index 100% rename from frontend/documentation/images/favicon.ico rename to documentation/frontend/images/favicon.ico diff --git a/frontend/documentation/index.html b/documentation/frontend/index.html similarity index 100% rename from frontend/documentation/index.html rename to documentation/frontend/index.html diff --git a/frontend/documentation/injectables/AuthInterceptor.html b/documentation/frontend/injectables/AuthInterceptor.html similarity index 100% rename from frontend/documentation/injectables/AuthInterceptor.html rename to documentation/frontend/injectables/AuthInterceptor.html diff --git a/frontend/documentation/injectables/AuthService.html b/documentation/frontend/injectables/AuthService.html similarity index 100% rename from frontend/documentation/injectables/AuthService.html rename to documentation/frontend/injectables/AuthService.html diff --git a/frontend/documentation/injectables/BotService.html b/documentation/frontend/injectables/BotService.html similarity index 100% rename from frontend/documentation/injectables/BotService.html rename to documentation/frontend/injectables/BotService.html diff --git a/frontend/documentation/injectables/DataService.html b/documentation/frontend/injectables/DataService.html similarity index 100% rename from frontend/documentation/injectables/DataService.html rename to documentation/frontend/injectables/DataService.html diff --git a/frontend/documentation/injectables/HelperService.html b/documentation/frontend/injectables/HelperService.html similarity index 100% rename from frontend/documentation/injectables/HelperService.html rename to documentation/frontend/injectables/HelperService.html diff --git a/frontend/documentation/injectables/ProfileService.html b/documentation/frontend/injectables/ProfileService.html similarity index 100% rename from frontend/documentation/injectables/ProfileService.html rename to documentation/frontend/injectables/ProfileService.html diff --git a/frontend/documentation/injectables/TokenStorageService.html b/documentation/frontend/injectables/TokenStorageService.html similarity index 100% rename from frontend/documentation/injectables/TokenStorageService.html rename to documentation/frontend/injectables/TokenStorageService.html diff --git a/frontend/documentation/interceptors/AuthInterceptor.html b/documentation/frontend/interceptors/AuthInterceptor.html similarity index 100% rename from frontend/documentation/interceptors/AuthInterceptor.html rename to documentation/frontend/interceptors/AuthInterceptor.html diff --git a/frontend/documentation/interfaces/Fruit.html b/documentation/frontend/interfaces/Fruit.html similarity index 100% rename from frontend/documentation/interfaces/Fruit.html rename to documentation/frontend/interfaces/Fruit.html diff --git a/frontend/documentation/interfaces/Keyword.html b/documentation/frontend/interfaces/Keyword.html similarity index 100% rename from frontend/documentation/interfaces/Keyword.html rename to documentation/frontend/interfaces/Keyword.html diff --git a/frontend/documentation/interfaces/PeriodicElement.html b/documentation/frontend/interfaces/PeriodicElement.html similarity index 100% rename from frontend/documentation/interfaces/PeriodicElement.html rename to documentation/frontend/interfaces/PeriodicElement.html diff --git a/frontend/documentation/interfaces/Share.html b/documentation/frontend/interfaces/Share.html similarity index 100% rename from frontend/documentation/interfaces/Share.html rename to documentation/frontend/interfaces/Share.html diff --git a/frontend/documentation/interfaces/Stock.html b/documentation/frontend/interfaces/Stock.html similarity index 100% rename from frontend/documentation/interfaces/Stock.html rename to documentation/frontend/interfaces/Stock.html diff --git a/frontend/documentation/interfaces/TransactionData.html b/documentation/frontend/interfaces/TransactionData.html similarity index 100% rename from frontend/documentation/interfaces/TransactionData.html rename to documentation/frontend/interfaces/TransactionData.html diff --git a/frontend/documentation/js/compodoc.js b/documentation/frontend/js/compodoc.js similarity index 100% rename from frontend/documentation/js/compodoc.js rename to documentation/frontend/js/compodoc.js diff --git a/frontend/documentation/js/lazy-load-graphs.js b/documentation/frontend/js/lazy-load-graphs.js similarity index 100% rename from frontend/documentation/js/lazy-load-graphs.js rename to documentation/frontend/js/lazy-load-graphs.js diff --git a/frontend/documentation/js/libs/EventDispatcher.js b/documentation/frontend/js/libs/EventDispatcher.js similarity index 100% rename from frontend/documentation/js/libs/EventDispatcher.js rename to documentation/frontend/js/libs/EventDispatcher.js diff --git a/frontend/documentation/js/libs/bootstrap-native.js b/documentation/frontend/js/libs/bootstrap-native.js similarity index 100% rename from frontend/documentation/js/libs/bootstrap-native.js rename to documentation/frontend/js/libs/bootstrap-native.js diff --git a/frontend/documentation/js/libs/clipboard.min.js b/documentation/frontend/js/libs/clipboard.min.js similarity index 100% rename from frontend/documentation/js/libs/clipboard.min.js rename to documentation/frontend/js/libs/clipboard.min.js diff --git a/frontend/documentation/js/libs/custom-elements-es5-adapter.js b/documentation/frontend/js/libs/custom-elements-es5-adapter.js similarity index 100% rename from frontend/documentation/js/libs/custom-elements-es5-adapter.js rename to documentation/frontend/js/libs/custom-elements-es5-adapter.js diff --git a/frontend/documentation/js/libs/custom-elements.min.js b/documentation/frontend/js/libs/custom-elements.min.js similarity index 100% rename from frontend/documentation/js/libs/custom-elements.min.js rename to documentation/frontend/js/libs/custom-elements.min.js diff --git a/frontend/documentation/js/libs/d3.v3.min.js b/documentation/frontend/js/libs/d3.v3.min.js similarity index 100% rename from frontend/documentation/js/libs/d3.v3.min.js rename to documentation/frontend/js/libs/d3.v3.min.js diff --git a/frontend/documentation/js/libs/deep-iterator.js b/documentation/frontend/js/libs/deep-iterator.js similarity index 100% rename from frontend/documentation/js/libs/deep-iterator.js rename to documentation/frontend/js/libs/deep-iterator.js diff --git a/frontend/documentation/js/libs/es6-shim.min.js b/documentation/frontend/js/libs/es6-shim.min.js similarity index 100% rename from frontend/documentation/js/libs/es6-shim.min.js rename to documentation/frontend/js/libs/es6-shim.min.js diff --git a/frontend/documentation/js/libs/highlight.pack.js b/documentation/frontend/js/libs/highlight.pack.js similarity index 100% rename from frontend/documentation/js/libs/highlight.pack.js rename to documentation/frontend/js/libs/highlight.pack.js diff --git a/frontend/documentation/js/libs/highlightjs-line-numbers.min.js b/documentation/frontend/js/libs/highlightjs-line-numbers.min.js similarity index 100% rename from frontend/documentation/js/libs/highlightjs-line-numbers.min.js rename to documentation/frontend/js/libs/highlightjs-line-numbers.min.js diff --git a/frontend/documentation/js/libs/htmlparser.js b/documentation/frontend/js/libs/htmlparser.js similarity index 100% rename from frontend/documentation/js/libs/htmlparser.js rename to documentation/frontend/js/libs/htmlparser.js diff --git a/frontend/documentation/js/libs/innersvg.js b/documentation/frontend/js/libs/innersvg.js similarity index 100% rename from frontend/documentation/js/libs/innersvg.js rename to documentation/frontend/js/libs/innersvg.js diff --git a/frontend/documentation/js/libs/lit-html.js b/documentation/frontend/js/libs/lit-html.js similarity index 100% rename from frontend/documentation/js/libs/lit-html.js rename to documentation/frontend/js/libs/lit-html.js diff --git a/frontend/documentation/js/libs/prism.js b/documentation/frontend/js/libs/prism.js similarity index 100% rename from frontend/documentation/js/libs/prism.js rename to documentation/frontend/js/libs/prism.js diff --git a/frontend/documentation/js/libs/promise.min.js b/documentation/frontend/js/libs/promise.min.js similarity index 100% rename from frontend/documentation/js/libs/promise.min.js rename to documentation/frontend/js/libs/promise.min.js diff --git a/frontend/documentation/js/libs/svg-pan-zoom.min.js b/documentation/frontend/js/libs/svg-pan-zoom.min.js similarity index 100% rename from frontend/documentation/js/libs/svg-pan-zoom.min.js rename to documentation/frontend/js/libs/svg-pan-zoom.min.js diff --git a/frontend/documentation/js/libs/tablesort.min.js b/documentation/frontend/js/libs/tablesort.min.js similarity index 100% rename from frontend/documentation/js/libs/tablesort.min.js rename to documentation/frontend/js/libs/tablesort.min.js diff --git a/frontend/documentation/js/libs/tablesort.number.min.js b/documentation/frontend/js/libs/tablesort.number.min.js similarity index 100% rename from frontend/documentation/js/libs/tablesort.number.min.js rename to documentation/frontend/js/libs/tablesort.number.min.js diff --git a/frontend/documentation/js/libs/vis.min.js b/documentation/frontend/js/libs/vis.min.js similarity index 100% rename from frontend/documentation/js/libs/vis.min.js rename to documentation/frontend/js/libs/vis.min.js diff --git a/frontend/documentation/js/libs/zepto.min.js b/documentation/frontend/js/libs/zepto.min.js similarity index 100% rename from frontend/documentation/js/libs/zepto.min.js rename to documentation/frontend/js/libs/zepto.min.js diff --git a/frontend/documentation/js/menu-wc.js b/documentation/frontend/js/menu-wc.js similarity index 100% rename from frontend/documentation/js/menu-wc.js rename to documentation/frontend/js/menu-wc.js diff --git a/frontend/documentation/js/menu-wc_es5.js b/documentation/frontend/js/menu-wc_es5.js similarity index 100% rename from frontend/documentation/js/menu-wc_es5.js rename to documentation/frontend/js/menu-wc_es5.js diff --git a/frontend/documentation/js/menu.js b/documentation/frontend/js/menu.js similarity index 100% rename from frontend/documentation/js/menu.js rename to documentation/frontend/js/menu.js diff --git a/frontend/documentation/js/routes.js b/documentation/frontend/js/routes.js similarity index 100% rename from frontend/documentation/js/routes.js rename to documentation/frontend/js/routes.js diff --git a/frontend/documentation/js/routes/routes_index.js b/documentation/frontend/js/routes/routes_index.js similarity index 100% rename from frontend/documentation/js/routes/routes_index.js rename to documentation/frontend/js/routes/routes_index.js diff --git a/frontend/documentation/js/search/lunr.min.js b/documentation/frontend/js/search/lunr.min.js similarity index 100% rename from frontend/documentation/js/search/lunr.min.js rename to documentation/frontend/js/search/lunr.min.js diff --git a/frontend/documentation/js/search/search-engine.js b/documentation/frontend/js/search/search-engine.js similarity index 100% rename from frontend/documentation/js/search/search-engine.js rename to documentation/frontend/js/search/search-engine.js diff --git a/frontend/documentation/js/search/search-lunr.js b/documentation/frontend/js/search/search-lunr.js similarity index 100% rename from frontend/documentation/js/search/search-lunr.js rename to documentation/frontend/js/search/search-lunr.js diff --git a/frontend/documentation/js/search/search.js b/documentation/frontend/js/search/search.js similarity index 100% rename from frontend/documentation/js/search/search.js rename to documentation/frontend/js/search/search.js diff --git a/frontend/documentation/js/search/search_index.js b/documentation/frontend/js/search/search_index.js similarity index 100% rename from frontend/documentation/js/search/search_index.js rename to documentation/frontend/js/search/search_index.js diff --git a/frontend/documentation/js/sourceCode.js b/documentation/frontend/js/sourceCode.js similarity index 100% rename from frontend/documentation/js/sourceCode.js rename to documentation/frontend/js/sourceCode.js diff --git a/frontend/documentation/js/svg-pan-zoom.controls.js b/documentation/frontend/js/svg-pan-zoom.controls.js similarity index 100% rename from frontend/documentation/js/svg-pan-zoom.controls.js rename to documentation/frontend/js/svg-pan-zoom.controls.js diff --git a/frontend/documentation/js/tabs.js b/documentation/frontend/js/tabs.js similarity index 100% rename from frontend/documentation/js/tabs.js rename to documentation/frontend/js/tabs.js diff --git a/frontend/documentation/js/tree.js b/documentation/frontend/js/tree.js similarity index 100% rename from frontend/documentation/js/tree.js rename to documentation/frontend/js/tree.js diff --git a/frontend/documentation/miscellaneous.html b/documentation/frontend/miscellaneous.html similarity index 100% rename from frontend/documentation/miscellaneous.html rename to documentation/frontend/miscellaneous.html diff --git a/frontend/documentation/miscellaneous/variables.html b/documentation/frontend/miscellaneous/variables.html similarity index 100% rename from frontend/documentation/miscellaneous/variables.html rename to documentation/frontend/miscellaneous/variables.html diff --git a/frontend/documentation/modules.html b/documentation/frontend/modules.html similarity index 100% rename from frontend/documentation/modules.html rename to documentation/frontend/modules.html diff --git a/frontend/documentation/modules/AppModule.html b/documentation/frontend/modules/AppModule.html similarity index 100% rename from frontend/documentation/modules/AppModule.html rename to documentation/frontend/modules/AppModule.html diff --git a/frontend/documentation/modules/AppModule/dependencies.svg b/documentation/frontend/modules/AppModule/dependencies.svg similarity index 100% rename from frontend/documentation/modules/AppModule/dependencies.svg rename to documentation/frontend/modules/AppModule/dependencies.svg diff --git a/frontend/documentation/modules/AppRoutingModule.html b/documentation/frontend/modules/AppRoutingModule.html similarity index 100% rename from frontend/documentation/modules/AppRoutingModule.html rename to documentation/frontend/modules/AppRoutingModule.html diff --git a/frontend/documentation/overview.html b/documentation/frontend/overview.html similarity index 100% rename from frontend/documentation/overview.html rename to documentation/frontend/overview.html diff --git a/frontend/documentation/properties.html b/documentation/frontend/properties.html similarity index 100% rename from frontend/documentation/properties.html rename to documentation/frontend/properties.html diff --git a/frontend/documentation/routes.html b/documentation/frontend/routes.html similarity index 100% rename from frontend/documentation/routes.html rename to documentation/frontend/routes.html diff --git a/frontend/documentation/styles/bootstrap-card.css b/documentation/frontend/styles/bootstrap-card.css similarity index 100% rename from frontend/documentation/styles/bootstrap-card.css rename to documentation/frontend/styles/bootstrap-card.css diff --git a/frontend/documentation/styles/bootstrap.min.css b/documentation/frontend/styles/bootstrap.min.css similarity index 100% rename from frontend/documentation/styles/bootstrap.min.css rename to documentation/frontend/styles/bootstrap.min.css diff --git a/frontend/documentation/styles/compodoc.css b/documentation/frontend/styles/compodoc.css similarity index 100% rename from frontend/documentation/styles/compodoc.css rename to documentation/frontend/styles/compodoc.css diff --git a/frontend/documentation/styles/dark.css b/documentation/frontend/styles/dark.css similarity index 100% rename from frontend/documentation/styles/dark.css rename to documentation/frontend/styles/dark.css diff --git a/frontend/documentation/styles/font-awesome.min.css b/documentation/frontend/styles/font-awesome.min.css similarity index 100% rename from frontend/documentation/styles/font-awesome.min.css rename to documentation/frontend/styles/font-awesome.min.css diff --git a/frontend/documentation/styles/ionicons.min.css b/documentation/frontend/styles/ionicons.min.css similarity index 100% rename from frontend/documentation/styles/ionicons.min.css rename to documentation/frontend/styles/ionicons.min.css diff --git a/frontend/documentation/styles/laravel.css b/documentation/frontend/styles/laravel.css similarity index 100% rename from frontend/documentation/styles/laravel.css rename to documentation/frontend/styles/laravel.css diff --git a/frontend/documentation/styles/material.css b/documentation/frontend/styles/material.css similarity index 100% rename from frontend/documentation/styles/material.css rename to documentation/frontend/styles/material.css diff --git a/frontend/documentation/styles/monokai-sublime.css b/documentation/frontend/styles/monokai-sublime.css similarity index 100% rename from frontend/documentation/styles/monokai-sublime.css rename to documentation/frontend/styles/monokai-sublime.css diff --git a/frontend/documentation/styles/original.css b/documentation/frontend/styles/original.css similarity index 100% rename from frontend/documentation/styles/original.css rename to documentation/frontend/styles/original.css diff --git a/frontend/documentation/styles/postmark.css b/documentation/frontend/styles/postmark.css similarity index 100% rename from frontend/documentation/styles/postmark.css rename to documentation/frontend/styles/postmark.css diff --git a/frontend/documentation/styles/prism.css b/documentation/frontend/styles/prism.css similarity index 100% rename from frontend/documentation/styles/prism.css rename to documentation/frontend/styles/prism.css diff --git a/frontend/documentation/styles/readthedocs.css b/documentation/frontend/styles/readthedocs.css similarity index 100% rename from frontend/documentation/styles/readthedocs.css rename to documentation/frontend/styles/readthedocs.css diff --git a/frontend/documentation/styles/reset.css b/documentation/frontend/styles/reset.css similarity index 100% rename from frontend/documentation/styles/reset.css rename to documentation/frontend/styles/reset.css diff --git a/frontend/documentation/styles/stripe.css b/documentation/frontend/styles/stripe.css similarity index 100% rename from frontend/documentation/styles/stripe.css rename to documentation/frontend/styles/stripe.css diff --git a/frontend/documentation/styles/style.css b/documentation/frontend/styles/style.css similarity index 100% rename from frontend/documentation/styles/style.css rename to documentation/frontend/styles/style.css diff --git a/frontend/documentation/styles/tablesort.css b/documentation/frontend/styles/tablesort.css similarity index 100% rename from frontend/documentation/styles/tablesort.css rename to documentation/frontend/styles/tablesort.css diff --git a/frontend/documentation/styles/vagrant.css b/documentation/frontend/styles/vagrant.css similarity index 100% rename from frontend/documentation/styles/vagrant.css rename to documentation/frontend/styles/vagrant.css diff --git a/frontend/src/app/Services/bot.service.ts b/frontend/src/app/Services/bot.service.ts index 954cdc6..afe1618 100644 --- a/frontend/src/app/Services/bot.service.ts +++ b/frontend/src/app/Services/bot.service.ts @@ -102,17 +102,17 @@ export class BotService { /** * Function to delete a share - * @param {string} symbol + * @param {string} isin * @returns Observable */ - public deleteShare(symbol: string): Observable { + public deleteShare(isin: string): Observable { return this.http.delete(API_URL + 'share', { headers: new HttpHeaders({ 'Content-Type': 'application/json', Authorization: 'Bearer ' + this.tokenStorage.getToken(), }), body: { - symbol, + isin, }, }); } diff --git a/frontend/src/app/Views/bot-settings/bot-settings.component.ts b/frontend/src/app/Views/bot-settings/bot-settings.component.ts index aa96424..6f752ec 100644 --- a/frontend/src/app/Views/bot-settings/bot-settings.component.ts +++ b/frontend/src/app/Views/bot-settings/bot-settings.component.ts @@ -130,6 +130,6 @@ export class BotSettingsComponent implements OnInit { use24HourTime: true, hideSeconds: true, - cronFlavor: 'quartz', //standard or quartz + cronFlavor: 'standard', //standard or quartz }; } diff --git a/frontend/src/app/Views/dashboard/dashboard.component.html b/frontend/src/app/Views/dashboard/dashboard.component.html index db59f2b..ce7401d 100644 --- a/frontend/src/app/Views/dashboard/dashboard.component.html +++ b/frontend/src/app/Views/dashboard/dashboard.component.html @@ -25,7 +25,7 @@ - ISIN + ISIN/Symbol {{ element.isin }} @@ -33,7 +33,7 @@ Price - {{ element.current_price }}$ + {{ element.current_price }}€ @@ -84,18 +84,18 @@
savings{{ depotCurrentValue.toFixed(2) }}$ + >{{ depotCurrentValue.toFixed(2) }}€
paid{{ depotCost.toFixed(2) }}$ + >{{ depotCost.toFixed(2) }}€
account_balance{{ profit.toFixed(2) }}${{ profit.toFixed(2) }}€
@@ -140,7 +140,7 @@ Price - {{ element.price }}$ + {{ element.price }}€ diff --git a/frontend/src/app/Views/dashboard/dashboard.component.ts b/frontend/src/app/Views/dashboard/dashboard.component.ts index 23d514d..e25b8a6 100644 --- a/frontend/src/app/Views/dashboard/dashboard.component.ts +++ b/frontend/src/app/Views/dashboard/dashboard.component.ts @@ -53,7 +53,7 @@ export class DashboardComponent implements OnInit { var data = JSON.parse(response); this.depotCost = 0; for (let i = 0; i < data.data.length; i++) { - this.depotCost += data.data[i].price; + this.depotCost += data.data[i].price * data.data[i].count; TRANSACTION_DATA.push({ comment: data.data[i].comment, isin: data.data[i].isin, @@ -63,9 +63,7 @@ export class DashboardComponent implements OnInit { }); } this.dataSourceTransactions = TRANSACTION_DATA; - //TODO move to helper service - - this.profit = this.depotCurrentValue - this.depotCost; + this.profit = this.depotCurrentValue + this.depotCost; }); } @@ -78,7 +76,8 @@ export class DashboardComponent implements OnInit { console.log(data); this.depotCurrentValue = 0; for (let i = 0; i < data.data.length; i++) { - this.depotCurrentValue = data.data[i].current_price; + this.depotCurrentValue += + data.data[i].current_price * data.data[i].count; STOCK_DATA.push({ count: data.data[i].count, comment: data.data[i].comment, @@ -99,7 +98,7 @@ export class DashboardComponent implements OnInit { var data = JSON.parse(response); this.depotCost = 0; for (let i = 0; i < data.data.length; i++) { - this.depotCost += data.data[i].price; + this.depotCost += data.data[i].price * data.data[i].count; TRANSACTION_DATA.push({ comment: data.data[i].comment, isin: data.data[i].isin, diff --git a/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html b/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html index 460d431..bb67392 100644 --- a/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html +++ b/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html @@ -20,7 +20,7 @@ />
- +
@@ -45,7 +45,7 @@ />
- +
- + -
+
Email is required
Email must be a valid email address diff --git a/frontend/src/app/Views/profile/profile.component.html b/frontend/src/app/Views/profile/profile.component.html index 5652f13..21c1ac9 100644 --- a/frontend/src/app/Views/profile/profile.component.html +++ b/frontend/src/app/Views/profile/profile.component.html @@ -64,13 +64,16 @@ Please enter a valid password @@ -79,12 +82,18 @@ Password is required +
+ Password does not match, make sure it is the same! +
+