Bringing changes downstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,6 +30,7 @@ If applicable, add logs that you may have gathered as well.
  - Node version [e.g. 18, 20]
  - npm version [e.g. 10]
  - App version [e.g. 0.2.0(can usually be found in the <a href="">package.json</a> file, first line)]
+NB: The above is optional if it's applicable and as such may be removed if it's not useful
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.

.github/workflows/lint-test-build-golang.yml

@@ -0,0 +1,79 @@
+name: Lint, Test and Build golang
+
+on:
+  pull_request:
+    branches: ["develop"]
+    paths: [
+      "occupi-backend/cmd/**",
+      "occupi-backend/configs/**",
+      "occupi-backend/pkg/**",
+      "occupi-backend/.golangci.yml",
+      "occupi-backend/tests/**",
+    ]
+
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: occupi-backend
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'  # Specify the Go version you are using
+
+    - name: Install golangci-lint
+      run: |
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+
+    - name: Run golangci-lint
+      run: |
+        golangci-lint run
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'  # Specify the Go version you are using
+
+    - name: Run tests
+      run: |
+        go test ./tests/... -race -coverprofile=coverage.out -covermode=atomic
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/[email protected]
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'  # Specify the Go version you are using
+
+    - name: Build the code
+      run: |
+        go build -v cmd/occupi-backend/main.go

.github/workflows/lint-test-build-web.yml

@@ -0,0 +1,63 @@
+name: Lint, Test, Build Web
+
+on:
+  pull_request:
+    branches: ["develop"]
+    paths: [
+        "frontend/occupi-web/**",
+    ]
+
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: frontend/occupi-web
+
+jobs:
+  # Lint job
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest # or "latest", "canary", <sha>
+
+      - name: Lint with ESLint
+        run: bun run lint
+
+  # Test job
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest # or "latest", "canary", <sha>
+
+      - name: Test with Jest
+        run: bun run test
+
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest # or "latest", "canary", <sha>
+
+      - name: Install dependencies with Bun
+        run: bun install
+
+      - name: Build with Next.js
+        run: bun run build

.github/workflows/test-mobile.yml

@@ -0,0 +1,34 @@
+name: Test Mobile
+
+on:
+  pull_request:
+    branches:
+      - develop
+    paths: [
+      "frontend/occupi-mobile3/**"
+    ]
+
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: frontend/occupi-mobile3
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18
+
+    - name: Install Dependencies
+      run: npm install --legacy-peer-deps
+
+    - name: Run Tests
+      run: npm run test-ci

.gitignore

@@ -0,0 +1 @@
+node_modules

CONTRIBUTING.md

@@ -24,12 +24,6 @@ Please note that this project is released with a <a href="./CODE_OF_CONDUCT.md">
       - [Before Submitting an Enhancement](#before-submitting-an-enhancement)
       - [How Do I Submit a Good Enhancement Suggestion?](#how-do-i-submit-a-good-enhancement-suggestion)
     - [Your First Code Contribution](#your-first-code-contribution)
-      - [Frontend](#frontend)
-        - [Mobile](#mobile)
-        - [Web and Desktop](#web-and-desktop)
-        - [Landing page](#landing-page)
-      - [Backend](#backend)
-      - [AI model](#ai-model)
     - [Improving The Documentation](#improving-the-documentation)
   - [Attribution](#attribution)
 
@@ -99,6 +93,9 @@ This section guides you through submitting an enhancement suggestion for CONTRIB
 - Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
 - Perform a [search](/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 - Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
+- Understand that we use trunk based development with short lived branches that get merged into develop. Here is a nice visual to help you understand
+![branching strategy](https://github.com/COS301-SE-2024/occupi/assets/93211335/10e3757f-0505-480c-bd4b-ca9366676b58)
+
 
 
 #### How Do I Submit a Good Enhancement Suggestion?
@@ -115,20 +112,14 @@ Enhancement suggestions are tracked as [GitHub issues](/issues).
 
 Choose a section you want to contribute to and navigate to the appropriate readme's
 
-#### Frontend
-
-##### Mobile
-
-##### Web and Desktop
-
-##### Landing page
-
-#### Backend
-
-#### AI model
+[Mobile](https://github.com/COS301-SE-2024/occupi/tree/develop/frontend/occupi-mobile3)
+[Web and Desktop](https://github.com/COS301-SE-2024/occupi/tree/develop/frontend/occupi-web)
+[Landing page](https://github.com/COS301-SE-2024/occupi/tree/develop/frontend/occupi)
+[Backend](https://github.com/COS301-SE-2024/occupi/tree/develop/occupi-backend)
+[AI model]()
 
 
 ### Improving The Documentation
 
 ## Attribution
-This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!
+This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!