Dev

.github/workflows/coverage.yml

@@ -1,4 +1,4 @@
-name: Run tests and upload coverage
+name: Tests
 
 on: 
   push
@@ -16,13 +16,32 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
 
-      - name: Install dependencies
-        run: npm install vitest @vitest/coverage-v8
+      - name: Install dependencies (frontend)
+        run: |
+          cd dashboard
+          npm install
 
-      - name: Run tests
-        run: npx vitest run --coverage
+      - name: Run frontend tests
+        run: |
+          cd dashboard
+          npm run test
 
-      - name: Upload results to Codecov
+      - name: Upload frontend coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.TRACKING_SYSTEM }}
+
+      - name: Install dependencies (backend)
+        run: |
+          cd new_backend
+          npm install
+
+      - name: Run backend tests
+        run: |
+          cd new_backend
+          npm run test
+
+      - name: Upload backend coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.TRACKING_SYSTEM }}

.github/workflows/lint.yml

@@ -3,18 +3,22 @@ name: Node Lint
 on: [push]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                node-version: ['14', '16', '18']
-        steps:
-            - uses: actions/checkout@v3
-            - name: Set up Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v3
-              with:
-                  node-version: ${{ matrix.node-version }}
-            - name: Analysing the code with ESLint
-              run: |
-                  cd new_backend
-                  npx eslint index.js
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: |
+          cd new_backend
+          npm install
+      - name: Analyse the code with ESLint
+        run: |
+          cd new_backend
+          npx eslint index.js

backend/app.py

@@ -42,16 +42,16 @@ def create_app():
     CORS(app, resources={r"/*": {"origins": "http://localhost:3000"}})
 
     # get all the variables from the application.yml file
-    with open("application.yml") as f:
-        info = yaml.load(f, Loader=yaml.FullLoader)
-        GOOGLE_CLIENT_ID = info["GOOGLE_CLIENT_ID"]
-        GOOGLE_CLIENT_SECRET = info["GOOGLE_CLIENT_SECRET"]
-        CONF_URL = info["CONF_URL"]
-        app.secret_key = info['SECRET_KEY']
+    # with open("application.yml") as f:
+    #     info = yaml.load(f, Loader=yaml.FullLoader)
+    #     GOOGLE_CLIENT_ID = info["GOOGLE_CLIENT_ID"]
+    #     GOOGLE_CLIENT_SECRET = info["GOOGLE_CLIENT_SECRET"]
+    #     CONF_URL = info["CONF_URL"]
+    #     app.secret_key = info['SECRET_KEY']
 
-    app.config["CORS_HEADERS"] = "Content-Type"
+    # app.config["CORS_HEADERS"] = "Content-Type"
 
-    oauth = OAuth(app)
+    # oauth = OAuth(app)
 
     @app.errorhandler(404)
     def page_not_found():
@@ -194,6 +194,7 @@ def authorized():
                     id=get_new_user_id(),
                     fullName=full_name,
                     email=users_email,
+                    linkedinId="",
                     authTokens=[],
                     applications=[],
                     skills=[],
@@ -238,7 +239,7 @@ def sign_up():
                 return jsonify({"error": "Username already exists"}), 400
             password = data["password"]
             password_hash = hashlib.md5(password.encode())
-            user = Users(x
+            user = Users(
                 id=get_new_user_id(),
                 fullName=data["fullName"],
                 username=data["username"],
@@ -251,7 +252,8 @@ def sign_up():
                 phone_number="",
                 address="",
                 institution="",
-                email=""
+                email="",
+                linkedinId=""
             )
             # user.save()
             # del user.to_json()["password", "authTokens"]
@@ -278,6 +280,7 @@ def get_profile_data():
             profileInformation["phone_number"] = user["phone_number"]
             profileInformation["address"] = user["address"]
             profileInformation["email"] = user["email"]
+            profileInformation["linkedinId"]: user["linkedinId"]
             profileInformation["fullName"] = user["fullName"]
 
             return jsonify(profileInformation)
@@ -397,7 +400,8 @@ def login():
                 "address": user.address,
                 "locations": user.locations,
                 "jobLevels": user.job_levels,
-                "email": user.email
+                "email": user.email,
+                "linkedinId":user.linkedinId
             }
             return jsonify({"profile": profileInfo, "token": token, "expiry": expiry_str})
         except:
@@ -704,14 +708,12 @@ def _corsify_actual_response(response):
 
 
 with open("application.yml") as f:
-    info = yaml.load(f, Loader=yaml.FullLoader)
-    username = info["USERNAME"]
-    password = info["PASSWORD"]
-    cluster_url = info["CLUSTER_URL"]
+    info = yaml.safe_load(f)  
+    mongodb_uri = info["MONGODB_URI"]
     # ca=certifi.where()
     app.config["MONGODB_SETTINGS"] = {
         "db": "appTracker",
-        "host": f"mongodb+srv://{username}:{password}@{cluster_url}/",
+        "host": "mongodb_uri",
     }
 db = MongoEngine()
 db.init_app(app)
@@ -728,6 +730,7 @@ class Users(db.Document):
     password = db.StringField()
     authTokens = db.ListField()
     email = db.StringField()
+    linkedinId = db.StringField()
     applications = db.ListField()
     resume = db.FileField()
     skills = db.ListField()
@@ -743,7 +746,7 @@ def to_json(self):
 
         :return: JSON object
         """
-        return {"id": self.id, "fullName": self.fullName, "username": self.username}
+        return {"id": self.id, "fullName": self.fullName, "username": self.username, "linkedinId":self.linkedinId}
 
 
 def get_new_user_id():
@@ -793,5 +796,5 @@ def get_new_application_id(user_id):
 
 
 if __name__ == "__main__":
-    app.run(host='0.0.0.0', port=5000)
+    app.run(host='0.0.0.0', port=5002)
 

backend/requirements.txt

@@ -19,7 +19,7 @@ cycler==0.10.0
 decorator==4.4.2
 dnspython==2.4.2
 email-validator==2.0.0.post2
-fake-useragent==1.3.0
+fake-useragent==1.5.1
 Flask==2.2.2
 Flask-Cors==3.0.10
 flask-mongoengine==1.0.0
@@ -53,7 +53,7 @@ MarkupSafe==2.1.3
 matplotlib==3.3.4
 mccabe==0.6.1
 mongoengine==0.27.0
-numpy==1.26.1
+numpy==1.24.1
 oauthlib==3.1.0
 opt-einsum==3.3.0
 packaging==23.2

dashboard/jest.config.js

@@ -3,5 +3,18 @@ module.exports = {
     '^.+\\.[t|j]sx?$': 'babel-jest'
   },
   transformIgnorePatterns: ['<rootDir>/node_modules/'],
-  testEnvironment: 'jsdom'
-}; 
+  testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['./src/setupTests.js'],
+  moduleNameMapper: {
+    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
+    "\\.(scss|sass|css)$": "identity-obj-proxy"
+  },
+  collectCoverage: true,
+  coverageDirectory: "coverage",
+  collectCoverageFrom: [
+    "src/**/*.{js,jsx,ts,tsx}",
+    "!src/index.js",
+    "!src/**/*.test.{js,jsx}",
+  ],
+  coverageReporters: ["json", "lcov", "text", "clover"],
+};