Updating Main to current stable develop

.github/workflows/backend-ci.yml

@@ -0,0 +1,82 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Backend CI
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: Lint Python Code (PEP8)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./server
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 black
+
+      - name: Run Black (Auto Formatting)
+        run: |
+          black src/ tests/
+
+      - name: Run flake8 (Linting)
+        run: |
+          flake8 src/ tests/
+
+  test:
+    name: Run Backend Tests
+    runs-on: ubuntu-latest
+    needs: lint # Ensures linting passes before running tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          cd server
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Create .env file in CI
+        run: |
+          cd server
+          touch .env
+          echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> .env
+          echo "SUPABASE_URL=${{ secrets.SUPABASE_KEY }}" >> .env
+          echo "GOOGLE_MAPS_API_KEY=${{ secrets.GOOGLE_MAPS_API_KEY }}" >> .env
+          echo "DB_HOST=${{ secrets.DB_HOST }}" >> .env
+          echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
+          echo "DB_USER=${{ secrets.DB_PASSWORD }}" >> .env
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+          echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
+
+      - name: Run Tests
+        run: |
+          cd server
+          pytest tests/

.github/workflows/frontend-ci.yml

@@ -0,0 +1,62 @@
+name: Frontend CI
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop", "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: Run Linting (ESLint & Prettier)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./client  # Removes need for cd client when running linting
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4  
+      with:
+        node-version: '20'
+
+    - name: Install dependencies
+      run: |
+        npm install
+
+      # For code quality, unused vars etc.
+    - name: Run ESLint
+      run: |
+        npm run lint 
+
+  test:
+    name: Run Frontend Tests (Jest)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./client  # Removes need for cd client when running tests
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+
+    - name: Install dependencies  # Install dependencies
+      run: |
+        npm install
+
+    - name: Run tests  # Run Jest tests
+      run: |
+        npm test  

.gitignore

@@ -2,5 +2,9 @@
 ./assets/stops.txt
 ./assets/stop_times.txt
 
+.vscode/
 *.pyc
 *.env
+
+tests/myvenv/
+**/.expo/

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "python.testing.pytestArgs": [
+        "server"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+    "[javascript]": {
+        "editor.tabSize": 2
+    }
+}

client/.eslintrc.js

@@ -0,0 +1,29 @@
+module.exports = {
+  root: true,
+  extends: ['airbnb', 'airbnb/hooks', 'prettier'],
+  plugins: ['react', 'react-hooks', 'import', 'jsx-a11y', 'prettier'],
+  parserOptions: {
+    ecmaVersion: 2021,
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+    jest: true,
+  },
+  rules: {
+    'prettier/prettier': ['warn', { endOfLine: 'auto' }],
+    'react/react-in-jsx-scope': 'off', // Not needed for React Native
+    'import/no-extraneous-dependencies': 'off',
+    'react/jsx-filename-extension': [
+      1,
+      { extensions: ['.js', '.jsx', '.tsx'] },
+    ],
+    'react/prop-types': 'off',
+    'no-console': ['warn', { allow: ['warn', 'error'] }],
+  },
+};

client/.prettierignore

@@ -0,0 +1,9 @@
+node_modules
+__mocks__
+expo
+coverage
+*.env
+package-lock.json
+package.json
+*.md
+*.bat

client/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "semi": true
+}

client/App.js

@@ -1,22 +1,47 @@
 import React from 'react';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { NavigationContainer } from '@react-navigation/native';
-import LoginScreen from './LogIn';
-import MapScreen from './Map';
-import WeatherScreen from './Weather';
+import LoginScreen from './src/LogIn';
+import MapScreen from './src/Map';
+import WeatherScreen from './src/Weather';
+import FindRouteScreen from './src/FindRoute';
+import SelectRouteScreen from './src/SelectRoute';
+import Dashboard from './src/SustainabilityDashboard';
+import PreferencesScreen from './src/Preferences';
+import AccountScreen from './src/AccountScreen';
+import SignUpScreen from './src/SignUp';
+import DisplayRouteScreen from './src/DisplayRoute';
+import FriendsScreen from './src/FriendsScreen';
 
 const Stack = createNativeStackNavigator();
 
 export default function App() {
   return (
     <NavigationContainer>
-      <Stack.Navigator initialRouteName="Map">
-        <Stack.Screen name="Map" component={MapScreen} />
+      <Stack.Navigator initialRouteName="AccountScreen">
+        <Stack.Screen
+          options={{ headerBackVisible: false }}
+          name="Map"
+          component={MapScreen}
+        />
+        <Stack.Screen
+          options={{ headerBackVisible: false }}
+          name="AccountScreen"
+          component={AccountScreen}
+        />
         <Stack.Screen name="LoginScreen" component={LoginScreen} />
+        <Stack.Screen name="SignUpScreen" component={SignUpScreen} />
         <Stack.Screen name="WeatherScreen" component={WeatherScreen} />
+        <Stack.Screen name="FindRouteScreen" component={FindRouteScreen} />
+        <Stack.Screen name="SelectRouteScreen" component={SelectRouteScreen} />
+        <Stack.Screen
+          name="DisplayRouteScreen"
+          component={DisplayRouteScreen}
+        />
+        <Stack.Screen name="Dashboard" component={Dashboard} />
+        <Stack.Screen name="PreferencesScreen" component={PreferencesScreen} />
+        <Stack.Screen name="FriendsScreen" component={FriendsScreen} />
       </Stack.Navigator>
     </NavigationContainer>
   );
 }
-
-