Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#73 Graph MVP #78

Merged
merged 51 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
95d0f0d
#49 updating submodule i think
Oct 10, 2023
bf32c97
Merge branch 'main' of https://github.com/Northeastern-Electric-Racin…
Oct 18, 2023
6fcda14
#69 getting some buttons on the page
Oct 29, 2023
84e18ee
#72-graph-data-graph-caption
RadiantBunny633 Nov 1, 2023
2442b69
#72: added the background color
RadiantBunny633 Nov 1, 2023
0e7a132
#69 adding carousel, setting up getallruns
Nov 1, 2023
e936c41
#69 fixing build
Nov 1, 2023
5f54050
Some more changes
RadiantBunny633 Nov 2, 2023
36ceb22
Cleaning up
RadiantBunny633 Nov 2, 2023
9a4a51d
#69 adjusting ui, moving carousel
Nov 7, 2023
0020f3f
#72: Need to commit this real quick before i merge
RadiantBunny633 Nov 12, 2023
2ef31a2
#73 Graph MVP
Peyton-McKee Nov 13, 2023
7e1ba8c
#73 Update Submodule
Peyton-McKee Nov 13, 2023
bec953c
#73 fix build and tests
Peyton-McKee Nov 14, 2023
99785d2
end me
RadiantBunny633 Nov 14, 2023
b9101ec
Merge branch 'main' of https://github.com/Northeastern-Electric-Racin…
RadiantBunny633 Nov 15, 2023
174846e
#72: The placeholders are in this commit
RadiantBunny633 Nov 16, 2023
0f5c89d
#72 Move Caption to Graph Page
Peyton-McKee Nov 21, 2023
ea0a3cb
Merge branch '#73-graph' into #72-graph-data-graph-caption
Peyton-McKee Nov 21, 2023
e3de6f6
#72 Update Submodule
Peyton-McKee Nov 21, 2023
73df5a9
#72 Dynamically sizing graph
Peyton-McKee Nov 22, 2023
557c5a5
#72 UI Updates + Linking Runs to Frontend
Peyton-McKee Nov 27, 2023
f16e88c
#72 Update Submodule
Peyton-McKee Nov 27, 2023
f872f73
Merge pull request #75 from Northeastern-Electric-Racing/#72-graph-da…
Peyton-McKee Nov 27, 2023
ae05f6a
#73 Prettier
Peyton-McKee Nov 27, 2023
b3733ab
#73 Fix Tests
Peyton-McKee Nov 27, 2023
10d8e8b
#73 Fix Rendering Issues
Peyton-McKee Nov 27, 2023
feb8bf8
#73 Large Headers
Peyton-McKee Nov 27, 2023
8062f69
#73 Rename for Docker Hub Push
Peyton-McKee Nov 27, 2023
d2a01b2
#73 Fix Deployment Settings
Peyton-McKee Nov 27, 2023
fa44dc7
#73 Update Submodule
Peyton-McKee Nov 27, 2023
84f28ae
Merge branch 'main' of https://github.com/Northeastern-Electric-Racin…
Nov 28, 2023
270bf34
Merge branch 'main' into 69-landing-page-historical-and-more-data-but…
Nov 28, 2023
4ea34be
Merge remote-tracking branch 'origin/69-landing-page-historical-and-m…
Nov 28, 2023
35ccf25
im alive
Nov 28, 2023
154709d
oops did stuff on wrong branch now need to merge
Nov 28, 2023
3197b8f
i am not dead (real)
Nov 28, 2023
7e6850a
Merge branch '#73-graph' into 69-landing-page-historical-and-more-dat…
Peyton-McKee Nov 28, 2023
41f0349
#69 Working Router + Hooking Everything Up on Frontend
Peyton-McKee Nov 28, 2023
993c5f9
#69 Update Submodule
Peyton-McKee Nov 28, 2023
bee966b
Merge pull request #76 from Northeastern-Electric-Racing/69-landing-p…
Peyton-McKee Nov 28, 2023
4260e56
#73 Prettier
Peyton-McKee Nov 28, 2023
7d25e11
#73 Update Prod Connection Information
Peyton-McKee Nov 30, 2023
3a4f3ee
#73 Working Commit for Connecting to Car
Peyton-McKee Nov 30, 2023
ff018ba
#73 Update Submodule
Peyton-McKee Nov 30, 2023
0f6598c
#73 Mobile Graph Page
Peyton-McKee Dec 3, 2023
2c618cd
#73 Add Pointer Cursor
Peyton-McKee Dec 3, 2023
2572d90
#73 Lots of Cleanup
Peyton-McKee Dec 14, 2023
cff3eb9
#73 Carousel Cleanup
Peyton-McKee Dec 16, 2023
f959a10
#73 Feedback
Peyton-McKee Dec 17, 2023
98907b4
#73 Add Dev Env
Peyton-McKee Dec 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions angular-client/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"tsConfig": "tsconfig.app.json",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["@angular/material/prebuilt-themes/deeppurple-amber.css", "src/styles.css"],
"scripts": []
"scripts": ["node_modules/apexcharts/dist/apexcharts.min.js"]
RChandler234 marked this conversation as resolved.
Show resolved Hide resolved
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
Expand Down
149 changes: 146 additions & 3 deletions angular-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions angular-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,37 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"start:production": "ng serve --configuration production",
"start:production": "ng serve --configuration production --host 0.0.0.0",
"install-dependencies": "npm install",
"watch": "ng build --watch --configuration development",
"test": "ng test"
},
"private": true,
"dependencies": {
"@angular-devkit/build-angular": "^16.2.4",
"@angular/animations": "^16.2.0",
"@angular/cdk": "^16.2.6",
"@angular/cli": "^16.2.4",
"@angular/common": "^16.2.0",
"@angular/compiler": "^16.2.0",
"@angular/compiler-cli": "^16.2.0",
"@angular/core": "^16.2.0",
"@angular/forms": "^16.2.0",
"@angular/material": "^16.2.6",
"@angular/platform-browser": "^16.2.0",
"@angular/platform-browser-dynamic": "^16.2.0",
"@angular/router": "^16.2.0",
"@angular-devkit/build-angular": "^16.2.4",
"@angular/cli": "^16.2.4",
"@angular/compiler-cli": "^16.2.0",
"apexcharts": "^3.44.0",
"ng-apexcharts": "^1.8.0",
"primeng": "^16.7.0",
"rxjs": "~7.8.0",
"socket.io-client": "^4.7.2",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
},
"devDependencies": {
"@types/jasmine": "~4.3.0",
"@types/node": "^20.10.4",
"jasmine-core": "~4.6.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
Expand Down
5 changes: 5 additions & 0 deletions angular-client/src/api/data.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { urls } from './urls';

export const getDataByDataTypeName = async (dataTypeName: string) => {
Peyton-McKee marked this conversation as resolved.
Show resolved Hide resolved
return await fetch(urls.getDataByDataTypeName(dataTypeName));
};
2 changes: 1 addition & 1 deletion angular-client/src/api/node.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import { urls } from './urls';
* @returns A promise containing the response from the server
*/
export const getAllNodes = (): Promise<Response> => {
return fetch(urls.getAllNodes);
return fetch(urls.getAllNodes());
};
18 changes: 18 additions & 0 deletions angular-client/src/api/run.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { urls } from './urls';

/**
* Fetches all runs from the server
* @returns A promise containing the response from the server
*/
export const getAllRuns = (): Promise<Response> => {
return fetch(urls.getAllRuns());
};

/**
* Fetches the run with the given id
* @param id The id of the run to request
* @returns The requested run
*/
export const getRunById = (id: number): Promise<Response> => {
return fetch(urls.getRunById(id));
};
23 changes: 19 additions & 4 deletions angular-client/src/api/urls.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
const baseURL = 'http://localhost:8000';
import { environment } from 'src/environment/environment';

const baseURL = environment.url;

/* Nodes */
const getAllNodes = `${baseURL}/nodes`;
const getAllNodes = () => `${baseURL}/nodes`;

/* Systems */
const getAllSystems = `${baseURL}/systems`;
const getAllSystems = () => `${baseURL}/systems`;

/* Data */
const getDataByDataTypeName = (dataTypeName: string) => `${baseURL}/data/${dataTypeName}`;

/* Runs */
const getRunById = (id: number) => `${baseURL}/runs/${id}`;
const getAllRuns = () => `${baseURL}/runs`;

export const urls = {
getAllNodes,
getAllSystems

getAllSystems,

getDataByDataTypeName,

getAllRuns,
getRunById
};
8 changes: 7 additions & 1 deletion angular-client/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import GraphPage from 'src/pages/graph-page/graph-page.component';
import LandingPage from 'src/pages/landing-page/landing-page.component';

const routes: Routes = [];
const routes: Routes = [
RChandler234 marked this conversation as resolved.
Show resolved Hide resolved
{ path: 'landing', component: LandingPage },
{ path: 'graph/:realTime/:runId', component: GraphPage },
{ path: '', redirectTo: '/landing', pathMatch: 'full' }
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
Expand Down
Loading