[ImgBot] Optimize images

.flake8

@@ -1,2 +1,3 @@
 [flake8]
-exclude = ghi,docs,journals,sample_service/migrations
+exclude = ghi,docs,journals,**/migrations/**,
+ignore=E402,W503

.gitignore

@@ -4,7 +4,7 @@ new_keys.py
 __pycache__/
 *.py[cod]
 *$py.class
-
+.DS_Store
 # C extensions
 *.so
 

.gitlab-ci.yml

@@ -3,38 +3,39 @@ stages:
   - build
   - deploy
 
-# Run flake8 to check for code quality
 lint-test-job:
-  image: python:3-bullseye
+  image: "python:3-bullseye"
   stage: test
   script:
     - pip install flake8
-    - flake8 sample_service
+    - flake8 letters_service
+    - flake8 users_service
 
-# Run the unit tests
-# api-unit-test-job:
-#   image: python:3-bullseye
-#   stage: test
-#   needs:
-#     - lint-test-job
-#   script:
-#     - cd sample_service
-#     - pip install -r requirements.txt
-#     - python -m pytest
+user-service-test-job:
+  image: "python:3-bullseye"
+  stage: test
+  script:
+    - cd users_service
+    - pip install -r requirements.txt
+    - python -m pytest
+
+letters-service-test-job:
+  image: "python:3-bullseye"
+  stage: test
+  script:
+    - cd letters_service
+    - pip install -r requirements.txt
+    - python -m pytest
 
-# Build the React/JavaScript front-end
 build-front-end-job:
   stage: build
-  image: node:lts-bullseye
+  image: "node:lts-bullseye"
   needs:
     - lint-test-job
   variables:
-    # If either of these variables is defined in the GitLab
-    # CI/CD variables, that value will override the value here.
-    # You need to substitute in your real values for
-    # GROUP_NAME, PROJECT_NAME, & WEBSERVICE_NAME below.
-    PUBLIC_URL: https://GROUP_NAME.gitlab.io/PROJECT_NAME/
-    REACT_APP_SAMPLE_SERVICE_API_HOST: https://WEBSERVICE_NAME.onrender.com
+    PUBLIC_URL: "https://directrep.gitlab.io/direct-rep"
+    REACT_APP_LETTERS_API_HOST: "https://letters-service-u1pb.onrender.com"
+    REACT_APP_USERS_API_HOST: "https://users-service-57wg.onrender.com"
   script:
     - cd ghi
     - npm install
@@ -43,8 +44,6 @@ build-front-end-job:
   artifacts:
     paths:
       - ghi/build/
-
-# Deploy the React/JavaScript front-end to GitLab pages
 pages:
   stage: deploy
   rules:

.vscode/settings.json

@@ -1,15 +1,3 @@
 {
-  "editor.formatOnPaste": true,
-  "python.formatting.provider": "black",
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "files.autoSave": "afterDelay",
-  "cSpell.words": [
-    "Excalidraw",
-    "labeltext",
-    "Mittal",
-    "Signup",
-    "wireframes",
-    "zipcode"
-  ]
+    "python.analysis.typeCheckingMode": "basic"
 }

docker-compose.yaml

@@ -14,38 +14,34 @@ services:
       - POSTGRES_PASSWORD=password
     ports:
       - 15432:5432
-  fastapi:
+  users_service:
     build:
-      context: sample_service
-      dockerfile: Dockerfile.dev
-    ports:
-      - 8000:8000
-    volumes:
-      - ./sample_service:/app
-  users-service:
-    build:
-      context: ./users-service
+      context: ./users_service
       dockerfile: ./Dockerfile.dev
     ports:
       - 8080:8000
     volumes:
-      - ./users-service:/app
+      - ./users_service:/app
     environment:
-      SIGNING_KEY: 7ea8f8c1d636b6f92b59a46326d9f59da1e09f0c986fbaeacaad64fed817ce6d
-      DATABASE_URL: postgresql://users:password@postgres/users
+      SIGNING_KEY: ${SIGNING_KEY}
+      USERS_DATABASE_URL: ${USERS_DATABASE_URL}
       WAIT_HOSTS: postgres:5432
-  letters-service:
+  letters_service:
     build:
-      context: ./letters-service
+      context: ./letters_service
       dockerfile: ./Dockerfile.dev
     ports:
       - 8090:8000
     volumes:
-      - ./letters-service:/app
+      - ./letters_service:/app
     environment:
-      SIGNING_KEY: 7ea8f8c1d636b6f92b59a46326d9f59da1e09f0c986fbaeacaad64fed817ce6d
-      DATABASE_URL: postgresql://letters:password@postgres/letters
+      SIGNING_KEY: ${SIGNING_KEY}
+      LETTERS_DATABASE_URL: ${LETTERS_DATABASE_URL}
       WAIT_HOSTS: postgres:5432
+      OPENAI_API_KEY: ${OPENAI_API_KEY}
+      GOOGLE_CIVICS_KEY: ${GOOGLE_CIVICS_KEY}
+      OPENAI_URL: ${OPENAI_URL}
+      GOOGLE_CIVICS_URL: ${GOOGLE_CIVICS_URL}
   ghi:
     image: node:lts-bullseye
     command: /bin/bash run.sh

docs/.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+  "editor.formatOnPaste": true,
+  "python.formatting.provider": "black",
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "files.autoSave": "off",
+  "cSpell.words": [
+    "Excalidraw",
+    "labeltext",
+    "Mittal",
+    "Signup",
+    "wireframes",
+    "zipcode"
+  ]
+}

docs/README.MD

@@ -1,38 +1,53 @@
 # Direct Rep
+
 ## Who are your customers?
+
 People residing in the United States of America.
 
 ## What needs/desires does your application satisfy for your customers?
+
 Making contacting your elected officials more accessible
 
 ## What features/functionality do you plan to have in the application that helps your customers?
+
 - List of representatives with their details.
 - List of issues.
 - Open AI to draft an automated AI generated letter.
-- Login / logout feature (Gmail API).
+- Login / logout feature.
 - Email template sent to user’s email with letter draft and rep’s emails list.
 - Keep track of past letter templates / requests
 
 ## Design
- [API Design](api-design.md)
- ![API Design](wireframes/wo.png)
- ![API Design](wireframes/direct-rep-wireframe.png)
- ![API Design](wireframes/user-service-endpoints.png)
- ![API Design](wireframes/letter-service-endpoints.png)
+
+### Users endpoints
+
+[API Design Users](api-design-users.md)
+
+### Letters endpoints
+
+[API Design Letters](api-design-letters.md)
+
+### Wireframe and endpoints diagrams
+
+![API Design](wireframes/direct-rep-wireframe-overview.png)
+![API Design](wireframes/users-microservice-wireframe.png)
+![API Design](wireframes/letters-microservice-wireframe.png)
+![API Design](wireframes/users-microservice-endpoints.png)
+![API Design](wireframes/letters-microservice-endpoints.png)
 
 ## Stretch Goals
+
 - Info about upcoming elections
 - “Am I registered?” function to check user voter registration
 - “When’s the next election?” function
 - Direct Rep uses your location and the Google Civic Information API to gather information about your representatives.
 
-
-
 ## The Team
- - Aaryan Mittal- Developer 💻
 
- - John Gardner - Developer 💻
+- Aaryan Mittal- Developer 💻
+
+- John Gardner - Developer 💻
 
- - Kim Geraghty - Developer 💻
+- Kim Geraghty - Developer 💻
 
- - Vincent Phung - Developer 💻
+- Vincent Phung - Developer 💻