moving frontend-react onto main

.gitignore

@@ -1,3 +1,4 @@
 .vscode
 .mypy_cache
 docker-stack.yml
+.dir-locals.el

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: tiangolo/docker-with-compose
+image: tiangolo/docker-with-compose:2021-09-18
 
 before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -26,7 +26,7 @@ build-stag:
   tags:
     - build
     - test
-    
+
 build-prod:
   stage: build
   script:
@@ -41,14 +41,14 @@ deploy-stag:
   stage: deploy
   script: 
     - >
-      DOMAIN=stag.collide.com
-      TRAEFIK_TAG=stag.collide.com
-      STACK_NAME=stag-collide-com
+      DOMAIN=stag.lobbyradar.io
+      TRAEFIK_TAG=stag.lobbyradar.io
+      STACK_NAME=stag-lobbyradar-io
       TAG=stag
       sh ./scripts/deploy.sh
   environment:
     name: staging
-    url: https://stag.collide.com
+    url: https://stag.lobbyradar.io
   only:
     - master
   tags:
@@ -59,14 +59,14 @@ deploy-prod:
   stage: deploy
   script:
     - >
-      DOMAIN=collide.com
-      TRAEFIK_TAG=collide.com
-      STACK_NAME=collide-com
+      DOMAIN=lobbyradar.io
+      TRAEFIK_TAG=lobbyradar.io
+      STACK_NAME=lobbyradar-io
       TAG=prod
       sh ./scripts/deploy.sh
   environment:
     name: production
-    url: https://collide.com
+    url: https://lobbyradar.io
   only:
     - production
   tags:

README.md

@@ -1,4 +1,4 @@
-# collide
+# lobbyradar
 
 ## Backend Requirements
 
@@ -307,36 +307,36 @@ Check all the corresponding available URLs in the section at the end.
 
 If you are running Docker in an IP address different than `127.0.0.1` (`localhost`) and `192.168.99.100` (the default of Docker Toolbox), you will need to perform some additional steps. That will be the case if you are running a custom Virtual Machine, a secondary Docker Toolbox or your Docker is located in a different machine in your network.
 
-In that case, you will need to use a fake local domain (`dev.collide.com`) and make your computer think that the domain is is served by the custom IP (e.g. `192.168.99.150`).
+In that case, you will need to use a fake local domain (`dev.lobbyradar.io`) and make your computer think that the domain is is served by the custom IP (e.g. `192.168.99.150`).
 
-If you used the default CORS enabled domains, `dev.collide.com` was configured to be allowed. If you want a custom one, you need to add it to the list in the variable `BACKEND_CORS_ORIGINS` in the `.env` file.
+If you used the default CORS enabled domains, `dev.lobbyradar.io` was configured to be allowed. If you want a custom one, you need to add it to the list in the variable `BACKEND_CORS_ORIGINS` in the `.env` file.
 
 * Open your `hosts` file with administrative privileges using a text editor:
   * **Note for Windows**: If you are in Windows, open the main Windows menu, search for "notepad", right click on it, and select the option "open as Administrator" or similar. Then click the "File" menu, "Open file", go to the directory `c:\Windows\System32\Drivers\etc\`, select the option to show "All files" instead of only "Text (.txt) files", and open the `hosts` file.
   * **Note for Mac and Linux**: Your `hosts` file is probably located at `/etc/hosts`, you can edit it in a terminal running `sudo nano /etc/hosts`.
 
-* Additional to the contents it might have, add a new line with the custom IP (e.g. `192.168.99.150`) a space character, and your fake local domain: `dev.collide.com`.
+* Additional to the contents it might have, add a new line with the custom IP (e.g. `192.168.99.150`) a space character, and your fake local domain: `dev.lobbyradar.io`.
 
 The new line might look like:
 
 ```
-192.168.99.100    dev.collide.com
+192.168.99.100    dev.lobbyradar.io
 ```
 
 * Save the file.
   * **Note for Windows**: Make sure you save the file as "All files", without an extension of `.txt`. By default, Windows tries to add the extension. Make sure the file is saved as is, without extension.
 
-...that will make your computer think that the fake local domain is served by that custom IP, and when you open that URL in your browser, it will talk directly to your locally running server when it is asked to go to `dev.collide.com` and think that it is a remote server while it is actually running in your computer.
+...that will make your computer think that the fake local domain is served by that custom IP, and when you open that URL in your browser, it will talk directly to your locally running server when it is asked to go to `dev.lobbyradar.io` and think that it is a remote server while it is actually running in your computer.
 
-To configure it in your stack, follow the section **Change the development "domain"** below, using the domain `dev.collide.com`.
+To configure it in your stack, follow the section **Change the development "domain"** below, using the domain `dev.lobbyradar.io`.
 
-After performing those steps you should be able to open: http://dev.collide.com and it will be server by your stack in `localhost`.
+After performing those steps you should be able to open: http://dev.lobbyradar.io and it will be server by your stack in `localhost`.
 
 Check all the corresponding available URLs in the section at the end.
 
 ### Change the development "domain"
 
-If you need to use your local stack with a different domain than `localhost`, you need to make sure the domain you use points to the IP where your stack is set up. See the different ways to achieve that in the sections above (i.e. using Docker Toolbox with `local.dockertoolbox.tiangolo.com`, using `localhost.tiangolo.com` or using `dev.collide.com`).
+If you need to use your local stack with a different domain than `localhost`, you need to make sure the domain you use points to the IP where your stack is set up. See the different ways to achieve that in the sections above (i.e. using Docker Toolbox with `local.dockertoolbox.tiangolo.com`, using `localhost.tiangolo.com` or using `dev.lobbyradar.io`).
 
 To simplify your Docker Compose setup, for example, so that the API docs (Swagger UI) knows where is your API, you should let it know you are using that domain for development. You will need to edit 1 line in 2 files.
 
@@ -475,7 +475,7 @@ Then you need to have those constraints in your `docker-compose.yml` file for th
 To be able to use different environments, like `prod` and `stag`, you should pass the name of the stack as an environment variable. Like:
 
 ```bash
-STACK_NAME=stag-collide-com sh ./scripts/deploy.sh
+STACK_NAME=stag-lobbyradar-io sh ./scripts/deploy.sh
 ```
 
 To use and expand that environment variable inside the `docker-compose.yml` files you can add the constraints to the services like:
@@ -503,7 +503,7 @@ services:
     deploy:
       placement:
         constraints:
-          - node.labels.collide-com.app-db-data == true
+          - node.labels.lobbyradar-io.app-db-data == true
 ```
 
 **Note**: The `${STACK_NAME?Variable not set}` means "use the environment variable `STACK_NAME`, but if it is not set, show an error `Variable not set`".
@@ -555,13 +555,13 @@ then chose a node from the list. For example, `dog.example.com`.
 * Add the label to that node. Use as label the name of the stack you are deploying followed by a dot (`.`) followed by the named volume, and as value, just `true`, e.g.:
 
 ```bash
-docker node update --label-add collide-com.app-db-data=true dog.example.com
+docker node update --label-add lobbyradar-io.app-db-data=true dog.example.com
 ```
 
 * Then you need to do the same for each stack version you have. For example, for staging you could do:
 
 ```bash
-docker node update --label-add stag-collide-com.app-db-data=true cat.example.com
+docker node update --label-add stag-lobbyradar-io.app-db-data=true cat.example.com
 ```
 
 ### Deploy to a Docker Swarm mode cluster
@@ -605,16 +605,16 @@ TAG=prod FRONTEND_ENV=production bash ./scripts/build-push.sh
 3. **Deploy your stack**
 
 * Set these environment variables:
-  * `DOMAIN=collide.com`
-  * `TRAEFIK_TAG=collide.com`
-  * `STACK_NAME=collide-com`
+  * `DOMAIN=lobbyradar.io`
+  * `TRAEFIK_TAG=lobbyradar.io`
+  * `STACK_NAME=lobbyradar-io`
   * `TAG=prod`
 * Use the provided `scripts/deploy.sh` file with those environment variables:
 
 ```bash
-DOMAIN=collide.com \
-TRAEFIK_TAG=collide.com \
-STACK_NAME=collide-com \
+DOMAIN=lobbyradar.io \
+TRAEFIK_TAG=lobbyradar.io \
+STACK_NAME=lobbyradar-io \
 TAG=prod \
 bash ./scripts/deploy.sh
 ```
@@ -703,33 +703,33 @@ These are the URLs that will be used and generated by the project.
 
 Production URLs, from the branch `production`.
 
-Frontend: https://collide.com
+Frontend: https://lobbyradar.io
 
-Backend: https://collide.com/api/
+Backend: https://lobbyradar.io/api/
 
-Automatic Interactive Docs (Swagger UI): https://collide.com/docs
+Automatic Interactive Docs (Swagger UI): https://lobbyradar.io/docs
 
-Automatic Alternative Docs (ReDoc): https://collide.com/redoc
+Automatic Alternative Docs (ReDoc): https://lobbyradar.io/redoc
 
-PGAdmin: https://pgadmin.collide.com
+PGAdmin: https://pgadmin.lobbyradar.io
 
-Flower: https://flower.collide.com
+Flower: https://flower.lobbyradar.io
 
 ### Staging URLs
 
 Staging URLs, from the branch `master`.
 
-Frontend: https://stag.collide.com
+Frontend: https://stag.lobbyradar.io
 
-Backend: https://stag.collide.com/api/
+Backend: https://stag.lobbyradar.io/api/
 
-Automatic Interactive Docs (Swagger UI): https://stag.collide.com/docs
+Automatic Interactive Docs (Swagger UI): https://stag.lobbyradar.io/docs
 
-Automatic Alternative Docs (ReDoc): https://stag.collide.com/redoc
+Automatic Alternative Docs (ReDoc): https://stag.lobbyradar.io/redoc
 
-PGAdmin: https://pgadmin.stag.collide.com
+PGAdmin: https://pgadmin.stag.lobbyradar.io
 
-Flower: https://flower.stag.collide.com
+Flower: https://flower.stag.lobbyradar.io
 
 ### Development URLs
 
@@ -771,19 +771,19 @@ Traefik UI: http://local.dockertoolbox.tiangolo.com:8090
 
 Development URLs, for local development.
 
-Frontend: http://dev.collide.com
+Frontend: http://dev.lobbyradar.io
 
-Backend: http://dev.collide.com/api/
+Backend: http://dev.lobbyradar.io/api/
 
-Automatic Interactive Docs (Swagger UI): https://dev.collide.com/docs
+Automatic Interactive Docs (Swagger UI): https://dev.lobbyradar.io/docs
 
-Automatic Alternative Docs (ReDoc): https://dev.collide.com/redoc
+Automatic Alternative Docs (ReDoc): https://dev.lobbyradar.io/redoc
 
-PGAdmin: http://dev.collide.com:5050
+PGAdmin: http://dev.lobbyradar.io:5050
 
-Flower: http://dev.collide.com:5555
+Flower: http://dev.lobbyradar.io:5555
 
-Traefik UI: http://dev.collide.com:8090
+Traefik UI: http://dev.lobbyradar.io:8090
 
 ### Development in localhost with a custom domain URLs
 

backend/app/.gitignore

@@ -1,3 +1,4 @@
 .mypy_cache
 .coverage
 htmlcov
+search.ipynb

backend/app/app/api/api_v1/api.py

@@ -1,9 +1,35 @@
 from fastapi import APIRouter
 
-from app.api.api_v1.endpoints import items, login, users, utils
+# from app.api.api_v1.endpoints import items, resfresh
+from app.api.api_v1.endpoints import resfresh
+from app.core.users import auth_backend, fastapi_users
+from app.schemas.user import UserCreate, UserRead, UserUpdate
 
 api_router = APIRouter()
-api_router.include_router(login.router, tags=["login"])
-api_router.include_router(users.router, prefix="/users", tags=["users"])
-api_router.include_router(utils.router, prefix="/utils", tags=["utils"])
-api_router.include_router(items.router, prefix="/items", tags=["items"])
+api_router.include_router(resfresh.router, prefix="/auth", tags=["auth"])
+
+api_router.include_router(
+    fastapi_users.get_auth_router(auth_backend), prefix="/auth/jwt", tags=["auth"]
+)
+api_router.include_router(
+    fastapi_users.get_register_router(UserRead, UserCreate),
+    prefix="/auth",
+    tags=["auth"],
+)
+api_router.include_router(
+    fastapi_users.get_reset_password_router(),
+    prefix="/auth",
+    tags=["auth"],
+)
+api_router.include_router(
+    fastapi_users.get_verify_router(UserRead),
+    prefix="/auth",
+    tags=["auth"],
+)
+api_router.include_router(
+    fastapi_users.get_users_router(UserRead, UserUpdate),
+    prefix="/users",
+    tags=["users"],
+)
+
+# api_router.include_router(items.router, prefix="/items", tags=["items"])

backend/app/app/api/api_v1/endpoints/items.py

@@ -9,6 +9,7 @@
 router = APIRouter()
 
 
+
 @router.get("/", response_model=List[schemas.Item])
 def read_items(
     db: Session = Depends(deps.get_db),