Merge pull request #26 from CodeLog-Development/feature/profile

Merge feature/profile into dev

Author: JacoMalan1

.gitignore

@@ -1,6 +1,6 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-firebase-debug.log
+*-debug.log
 .firebase/*.cache
 # api/firebase-service-account.json
 

README.md

@@ -1,57 +1,16 @@
-# Gatekeeper
-
-<a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
-
-✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨
-
-## Generate code
-
-If you happen to use Nx plugins, you can leverage code generators that might come with it.
-
-Run `nx list` to get a list of available plugins and whether they have generators. Then run `nx list <plugin-name>` to see what generators are available.
-
-Learn more about [Nx generators on the docs](https://nx.dev/plugin-features/use-code-generators).
-
-## Running tasks
-
-To execute tasks with Nx use the following syntax:
-
-```
-nx <target> <project> <...options>
-```
+[![Build and test](https://github.com/CodeLog-Development/gatekeeper/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/CodeLog-Development/gatekeeper/actions/workflows/build-and-test.yml)
 
-You can also run multiple targets:
-
-```
-nx run-many -t <target1> <target2>
-```
-
-..or add `-p` to filter specific projects
-
-```
-nx run-many -t <target1> <target2> -p <proj1> <proj2>
-```
-
-Targets can be defined in the `package.json` or `projects.json`. Learn more [in the docs](https://nx.dev/core-features/run-tasks).
-
-## Want better Editor Integration?
-
-Have a look at the [Nx Console extensions](https://nx.dev/nx-console). It provides autocomplete support, a UI for exploring and running tasks & generators, and more! Available for VSCode, IntelliJ and comes with a LSP for Vim users.
-
-## Ready to deploy?
-
-Just run `nx build demoapp` to build the application. The build artifacts will be stored in the `dist/` directory, ready to be deployed.
-
-## Set up CI!
+# Gatekeeper
 
-Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
+## Building
 
-- [Set up remote caching](https://nx.dev/core-features/share-your-cache)
-- [Set up task distribution across multiple machines](https://nx.dev/core-features/distribute-task-execution)
-- [Learn more how to setup CI](https://nx.dev/recipes/ci)
+1. The first step is to run `yarn install` in the project root to download and build
+   all dependencies.
+2. Next, you can run `yarn nx run app:build:production` and `yarn nx run api:build:production`
+   to build the projects.
 
-## Connect with us!
+## Development
 
-- [Join the community](https://nx.dev/community)
-- [Subscribe to the Nx Youtube Channel](https://www.youtube.com/@nxdevtools)
-- [Follow us on Twitter](https://twitter.com/nxdevtools)
+- To run the backend and frontend in a dev environment, start up the emulators for the backend using
+  `yarn nx run api:emulators`.
+- You can then start the frontend with `yarn nx serve app`

api/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@gatekeeper/api",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "dependencies": {
-    "@aws-sdk/client-ec2": "3.422.0",
+    "@aws-sdk/client-ec2": "^3.422.0",
     "@nestjs/common": "^10.2.6",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.2.6",
@@ -16,7 +16,8 @@
     "tslib": "^2.3.0"
   },
   "scripts": {
-    "serve": "cd .. && yarn nx build api && yarn firebase serve"
+    "serve": "cd .. && yarn nx build api && yarn firebase serve",
+    "emulators": "cd .. && yarn nx build api && yarn firebase emulators:start"
   },
   "type": "commonjs",
   "main": "./src/index.js",

api/project.json

@@ -6,9 +6,7 @@
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/api",
         "tsConfig": "api/tsconfig.lib.json",
@@ -27,21 +25,14 @@
     },
     "lint": {
       "executor": "@nx/linter:eslint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
+      "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": [
-          "api/**/*.ts",
-          "api/package.json"
-        ]
+        "lintFilePatterns": ["api/**/*.ts", "api/package.json"]
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}"
-      ],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "api/jest.config.ts",
         "passWithNoTests": true
@@ -58,6 +49,12 @@
       "options": {
         "script": "serve"
       }
+    },
+    "emulators": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "emulators"
+      }
     }
   },
   "tags": []

api/src/index.ts

@@ -17,11 +17,7 @@ const createFunction = async (
     new ExpressAdapter(expressInstance),
     {
       cors: {
-        origin: [
-          'https://codelog-mc.web.app',
-          'https://us-central1-codelog-mc.cloudfunctions.net',
-          'http://localhost',
-        ],
+        origin: true,
         methods: ['GET', 'POST', 'OPTIONS', 'PUT', 'DELETE'],
         credentials: true,
       },
@@ -31,7 +27,9 @@ const createFunction = async (
   await app.init();
 };
 
-export const api = functions.https.onRequest(async (request, response) => {
+export const api = new functions.FunctionBuilder({
+  regions: ['europe-west2'],
+}).https.onRequest(async (request, response) => {
   await createFunction(expressServer);
   expressServer(request, response);
 });