Compare commits
No commits in common. "ae82024e944694f33f38afdcfade254ef21d41ca" and "deecf9ccad49d758e7ec0c0fbfe5af9187812e4c" have entirely different histories.
ae82024e94
...
deecf9ccad
6 changed files with 9 additions and 21 deletions
|
@ -4,8 +4,6 @@ WORKDIR /app
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|
||||||
RUN apk install sqlite3
|
|
||||||
|
|
||||||
RUN pip install -r requirements.txt
|
RUN pip install -r requirements.txt
|
||||||
|
|
||||||
COPY /src .
|
COPY /src .
|
||||||
|
|
|
@ -6,8 +6,6 @@ RUN apt-get -y update && apt-get -y upgrade
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|
||||||
RUN apk install sqlite3
|
|
||||||
|
|
||||||
RUN pip install -r requirements.txt
|
RUN pip install -r requirements.txt
|
||||||
|
|
||||||
COPY /src .
|
COPY /src .
|
||||||
|
|
|
@ -8,8 +8,6 @@ services:
|
||||||
backend-prod:
|
backend-prod:
|
||||||
image: caminsha/bt-backend
|
image: caminsha/bt-backend
|
||||||
container_name: backend-prod
|
container_name: backend-prod
|
||||||
volumes:
|
|
||||||
- "./database.db:/app/database.db:z"
|
|
||||||
environment:
|
environment:
|
||||||
DEBUG: "no"
|
DEBUG: "no"
|
||||||
PORT: 5050
|
PORT: 5050
|
||||||
|
@ -22,6 +20,6 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- MONGO_URI=mongodb://mongodb:27017/behametrics
|
- MONGO_URI=mongodb://mongodb:27017/behametrics
|
||||||
mongodb:
|
mongodb:
|
||||||
image: mongo:4.0.25
|
image: mongo:4.0.1
|
||||||
container_name: "behametrics-mongo"
|
container_name: "behametrics-mongo"
|
||||||
command: mongod --smallfiles
|
command: mongod --smallfiles
|
||||||
|
|
|
@ -35,6 +35,6 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- MONGO_URI=mongodb://mongodb:27017/behametrics
|
- MONGO_URI=mongodb://mongodb:27017/behametrics
|
||||||
mongodb:
|
mongodb:
|
||||||
image: mongo:4.0.25
|
image: mongo:4.0.1
|
||||||
container_name: "behametrics-mongo"
|
container_name: "behametrics-mongo"
|
||||||
command: mongod --smallfiles
|
command: mongod --smallfiles
|
||||||
|
|
|
@ -110,9 +110,11 @@ export default function Study() {
|
||||||
setState(STATES.NORMAL);
|
setState(STATES.NORMAL);
|
||||||
handleLoggerOn();
|
handleLoggerOn();
|
||||||
// map username and session with the logs
|
// map username and session with the logs
|
||||||
_logger.current.logCustomEvent({
|
_logger.current.logCustomEvent(
|
||||||
name: serverUsername,
|
{
|
||||||
});
|
name: serverUsername,
|
||||||
|
},
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const resetInputValues = () => {
|
const resetInputValues = () => {
|
||||||
|
|
12
requests.sh
12
requests.sh
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
ACTION=$1
|
ACTION=$1
|
||||||
VALUE=$2
|
VALUE=$2
|
||||||
ACTIONS=(login register rcvpw username data csv prod_data prod_csv)
|
ACTIONS=(login register rcvpw username data csv)
|
||||||
|
|
||||||
print_help(){
|
print_help(){
|
||||||
echo "Usage: $0 ACTION [TOKEN|INPUT_TYPE]"
|
echo "Usage: $0 ACTION [TOKEN|INPUT_TYPE]"
|
||||||
|
@ -41,17 +41,9 @@ case $ACTION in
|
||||||
curl localhost:5000/data
|
curl localhost:5000/data
|
||||||
;;
|
;;
|
||||||
"${ACTIONS[5]}") # get all data from behametricsserver
|
"${ACTIONS[5]}") # get all data from behametricsserver
|
||||||
echo "get csv from input action"
|
echo "get data action"
|
||||||
curl localhost:5000/data/csv/"${VALUE}"
|
curl localhost:5000/data/csv/"${VALUE}"
|
||||||
;;
|
;;
|
||||||
"${ACTIONS[6]}") # get all data from behametricsserver
|
|
||||||
echo "get prod data action"
|
|
||||||
curl behavior.marcocamenzind.ch:5000/data
|
|
||||||
;;
|
|
||||||
"${ACTIONS[7]}") # get all data from behametricsserver
|
|
||||||
echo "get prod csv from input action"
|
|
||||||
curl behavior.marcocamenzind.ch:5000/data/csv/"${VALUE}"
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "Error: Action not available"
|
echo "Error: Action not available"
|
||||||
echo
|
echo
|
||||||
|
|
Loading…
Reference in a new issue