Initial deployment graph app (#8)

* removed unnused imports * fixed spell errors on README * searchbar with logo and footer v1.0 * aligned logo with search buttons and minor styling fixes * changed analyze text, added icons to the buttons and text to footer * fixed footer margins * removed unused imports and comments unused variables * Feature/landing page (#5) * a * removed unused imports and comments unused variables * Fix everything * removed unused imports and comments unused variables * Initial deploy of graph app (#2) * removed unnused imports * fixed spell errors on README * searchbar with logo and footer v1.0 * aligned logo with search buttons and minor styling fixes * changed analyze text, added icons to the buttons and text to footer * fixed footer margins * removed unused imports and comments unused variables * removed unused imports and comments unused variables * add github action to deploy on pull request * fixed github actions to deploy app to firebase * ignore -.firebase directory --------- Co-authored-by: Pedro Ribeiro <[email protected]> * Initial deployment graph app (#7) * a * removed unused imports and comments unused variables * Fix everything * removed unused imports and comments unused variables * Initial deploy of graph app (#2) * removed unnused imports * fixed spell errors on README * searchbar with logo and footer v1.0 * aligned logo with search buttons and minor styling fixes * changed analyze text, added icons to the buttons and text to footer * fixed footer margins * removed unused imports and comments unused variables * removed unused imports and comments unused variables * add github action to deploy on pull request * fixed github actions to deploy app to firebase * ignore -.firebase directory * Revert "Initial deploy of graph app" (#6) --------- Co-authored-by: Pedro Ribeiro <[email protected]> --------- Co-authored-by: Pedro Ribeiro <[email protected]>
WardAnalytics · Jan 15, 2024 · 528ceae · 528ceae
1 parent 364524d
commit 528ceae
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 11 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: yarn install && yarn build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GRAPHAPP_BCA04 }}'
+          channelId: live
+          projectId: graphapp-bca04
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+"on": pull_request
+jobs:
+  build_and_preview:
+    if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: yarn install && yarn build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_GRAPHAPP_BCA04 }}"
+          projectId: graphapp-bca04
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ build
 .yarn/install-state.gz
 
 # Firebase
+.firebase/*
 firebase.json
 .firebaserc
 

diff --git a/package.json b/package.json
@@ -59,4 +59,4 @@
       "prettier-plugin-tailwindcss"
     ]
   }
-}
+}
diff --git a/src/components/Graph/AnalysisWindow/AnalysisWindow.tsx b/src/components/Graph/AnalysisWindow/AnalysisWindow.tsx
@@ -1,8 +1,8 @@
 import { FC, createContext, useRef } from "react";
 
 import Draggable from "react-draggable";
-import Header from "./Header";
 import Content from "./Content";
+import Header from "./Header";
 
 import { AddressAnalysis } from "../../../api/model";
 

diff --git a/src/components/Graph/Graph.tsx b/src/components/Graph/Graph.tsx
@@ -29,7 +29,7 @@ import {
 
 import {
   TransfershipEdge,
-  TransfershipEdgeStates,
+  TransfershipEdgeStates
 } from "./custom_elements/edges/TransfershipEdge";
 
 import {

diff --git a/src/components/Graph/LandingPage/LandingPage.tsx b/src/components/Graph/LandingPage/LandingPage.tsx
@@ -1,5 +1,5 @@
-import { FC } from "react";
 import { SparklesIcon } from "@heroicons/react/20/solid";
+import { FC } from "react";
 
 import logo from "../../../assets/ward-logo-blue-full.svg";
 import Searchbar from "./SearchBar";

diff --git a/src/components/Graph/custom_elements/edges/TransfershipEdge/CustomEdgePath.tsx b/src/components/Graph/custom_elements/edges/TransfershipEdge/CustomEdgePath.tsx
@@ -1,5 +1,5 @@
-import { CSSProperties } from "react";
 import clsx from "clsx";
+import { CSSProperties } from "react";
 
 import "./CustomEdgePath.css";
 

diff --git a/src/components/Graph/graph_calculations.tsx b/src/components/Graph/graph_calculations.tsx
@@ -1,12 +1,10 @@
-import { Node, Edge, XYPosition } from "reactflow";
+import { Edge, Node, XYPosition } from "reactflow";
+import { TransfershipEdgeStates, createTransfershipEdge } from "./custom_elements/edges/TransfershipEdge";
 import {
-  createAddressNode,
   AddressNodeState,
+  createAddressNode,
 } from "./custom_elements/nodes/AddressNode";
-import {
-  createTransfershipEdge,
-  TransfershipEdgeStates,
-} from "./custom_elements/edges/TransfershipEdge";
+
 
 // How much distance there should be between two nodes when calculating new address nodes positions
 const INTERSECTING_NODE_X_OFFSET = 300;