Skip to content

Commit

Permalink
Added ESLint and new Prettier Config + Pipeline (#222)
Browse files Browse the repository at this point in the history
* added linting and prettier config

* added github pipeline for linting

* hot fix: finally added main.yaml changes
  • Loading branch information
AlexanderWangY authored Apr 15, 2024
1 parent 178446a commit 5091f05
Show file tree
Hide file tree
Showing 37 changed files with 3,836 additions and 730 deletions.
125 changes: 73 additions & 52 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,88 @@ name: Unit Tests
on: [pull_request]

jobs:
test:
runs-on: ubuntu-latest

lint:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [21.x]

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm ci
working-directory: server/

- name: Create subdirectory for service account JSON
run: |
mkdir private_key
working-directory: server/src

- name: Create service account JSON
id: create-service-account-json
uses: jsdaniell/[email protected]
with:
name: "private.json"
json: ${{ secrets.SERVICE_ACCOUNT_SECRET }}
dir: 'server/src/private_key/'

- name: Compile TypeScript files
run: npx tsc
working-directory: server/

- name: Start index.ts in background
run: npm start &
working-directory: server/

- name: Wait for server to start
run: sleep 5 # Adjust sleep time as needed to allow the server to start
timeout-minutes: 1

- name: Run tests
run: npm test
working-directory: server/
- name: Checkout repository
uses: actions/checkout@v2

file_existence:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm ci
working-directory: client/

- name: Lint with ESLint
run: npm run lint
working-directory: client/

test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [21.x]

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v2

- name: Check for private.json and .env files
run: |
if [ -e "server/firebase-secret.json" ] || [ -e ".env"]; then
echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging.";
exit 1;
fi
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm ci
working-directory: server/

- name: Create subdirectory for service account JSON
run: |
mkdir private_key
working-directory: server/src

- name: Create service account JSON
id: create-service-account-json
uses: jsdaniell/[email protected]
with:
name: "private.json"
json: ${{ secrets.SERVICE_ACCOUNT_SECRET }}
dir: 'server/src/private_key/'

- name: Compile TypeScript files
run: npx tsc
working-directory: server/

- name: Start index.ts in background
run: npm start &
working-directory: server/

- name: Wait for server to start
run: sleep 5 # Adjust sleep time as needed to allow the server to start
timeout-minutes: 1

- name: Run tests
run: npm test
working-directory: server/

file_existence:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Check for private.json and .env files
run: |
if [ -e "server/firebase-secret.json" ] || [ -e ".env" ]; then
echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."
exit 1
fi
3 changes: 3 additions & 0 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: "universe/native",
};
9 changes: 8 additions & 1 deletion client/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"bracketSpacing": true,
"jsxBracketSameLine": true,
"singleQuote": false,
"endofline": "lf",
"semi": true,
"tabWidth": 2,
"useTabs": false
"useTabs": false,
"printWidth": 80,
"trailingComma": "all"
}
25 changes: 7 additions & 18 deletions client/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React from "react";
import { StyleSheet, Text } from "react-native";
import { AuthStore } from "./src/services/AuthStore";
import { NavigationContainer } from "@react-navigation/native";
import React from "react";
import { Text } from "react-native";

// Navigation
import AppNavigator from "./src/navigation/AppNavigator";
import AuthNavigator from "./src/navigation/AuthNavigator";
// Services/Hooks/Styles
import { AuthStore } from "./src/services/AuthStore";
import { useGlobalFonts } from "./src/styles/fonts";


const App = () => {
const { initialized, isLoggedin } = AuthStore.useState();
const { fontsLoaded, fontError } = useGlobalFonts();
Expand All @@ -17,22 +19,9 @@ const App = () => {

return (
<NavigationContainer>
{isLoggedin ? (
<AppNavigator />
) : (
<AuthNavigator />
)}
{isLoggedin ? <AppNavigator /> : <AuthNavigator />}
</NavigationContainer>
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: "#fff",
alignItems: "center",
justifyContent: "center",
},
});

export default App;
Loading

0 comments on commit 5091f05

Please sign in to comment.