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

Lauren version0 #2

Open
wants to merge 157 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
4783bd0
added material ui version 0
lauren-mieczkowski Nov 21, 2023
34e1d23
Update README.md
lauren-mieczkowski Nov 21, 2023
29572c6
Update README.md
lauren-mieczkowski Nov 21, 2023
c9ee3c8
Update package.json
lauren-mieczkowski Nov 29, 2023
8e24b99
connect page
lauren-mieczkowski Nov 29, 2023
d2a24ab
connect page, device form
lauren-mieczkowski Nov 29, 2023
a71a915
added on click to form
lauren-mieczkowski Nov 29, 2023
b5fde73
dynamic form creation
lauren-mieczkowski Nov 30, 2023
f6f7122
fixed dynamic form and simplified
lauren-mieczkowski Nov 30, 2023
b16a8ec
api call changes
lauren-mieczkowski Nov 30, 2023
1e89a4e
connect page added into src
lauren-mieczkowski Dec 6, 2023
f638a11
removed mock behav, 2 submit buttons, added wkflw
lauren-mieczkowski Dec 18, 2023
c44f201
changed file names
lauren-mieczkowski Dec 19, 2023
4e50d9e
changed deviceName to deviceId
lauren-mieczkowski Dec 19, 2023
02027fc
altered dockerfile name
lauren-mieczkowski Dec 19, 2023
bb865a4
rename dockerfile
lauren-mieczkowski Dec 19, 2023
ccb8351
dockerfile test
lauren-mieczkowski Dec 19, 2023
36d7886
switch from npm to yarn
lauren-mieczkowski Dec 19, 2023
abd7b13
change node options
lauren-mieczkowski Dec 19, 2023
678d972
added dependencies
lauren-mieczkowski Dec 19, 2023
2eb26ae
cache clean
lauren-mieczkowski Dec 19, 2023
499ca5b
skip build to test
lauren-mieczkowski Dec 19, 2023
06cf59f
start only
lauren-mieczkowski Dec 19, 2023
dc06a11
changed port
lauren-mieczkowski Dec 21, 2023
3dca327
change to port 7000
lauren-mieczkowski Dec 21, 2023
180065c
yarn installed differently
lauren-mieczkowski Dec 28, 2023
65b80d3
changing order of installation
lauren-mieczkowski Dec 28, 2023
d042579
changed working directory
lauren-mieczkowski Dec 28, 2023
c486d63
changed working directory
lauren-mieczkowski Dec 28, 2023
af2585b
removed build command
lauren-mieczkowski Dec 28, 2023
9d56561
removed yarn install with npm
lauren-mieczkowski Dec 28, 2023
9c5ec2c
copying packages to container differently
lauren-mieczkowski Dec 28, 2023
653fcf6
added yarn as dependency
lauren-mieczkowski Dec 28, 2023
6e3354e
changed port to 7000 from the default 3000
lauren-mieczkowski Dec 28, 2023
59fb015
removed global install of yarn
lauren-mieczkowski Dec 28, 2023
1bf22b6
removed cleaning the node modules and package lock
lauren-mieczkowski Dec 28, 2023
b29492b
removed yarn from cmd
lauren-mieczkowski Dec 28, 2023
807f20a
added node modules to be copied
lauren-mieczkowski Dec 28, 2023
446352b
switch to add
lauren-mieczkowski Dec 28, 2023
adc99b9
remove node modules from copy
lauren-mieczkowski Dec 28, 2023
b7d8810
force global install of yarn
lauren-mieczkowski Dec 28, 2023
b35b747
add yarn to path instead, before workdir
lauren-mieczkowski Dec 28, 2023
6b92422
forgot run
lauren-mieczkowski Dec 28, 2023
e81697b
symlink added
lauren-mieczkowski Dec 29, 2023
85b2eeb
symlink
lauren-mieczkowski Dec 29, 2023
1a029b7
add yarn to path after install
lauren-mieczkowski Dec 29, 2023
93c6dd3
adding yarn to path from usr/local/bin
lauren-mieczkowski Dec 29, 2023
0010dad
change copying of files
lauren-mieczkowski Dec 29, 2023
728f034
env path for yarn
lauren-mieczkowski Dec 29, 2023
092554f
debugging yarn
lauren-mieczkowski Dec 29, 2023
4cc05d8
added run
lauren-mieczkowski Dec 29, 2023
b0de8cb
remove chmod
lauren-mieczkowski Dec 29, 2023
faba933
copy tsconfig file
lauren-mieczkowski Dec 29, 2023
42e517c
changed tag
lauren-mieczkowski Dec 29, 2023
0a5fa15
updated endpoint to oracle elb
lauren-mieczkowski Dec 29, 2023
4237e80
changed image version to 2
lauren-mieczkowski Dec 29, 2023
7ff28c2
changed to http and added /oracle
lauren-mieczkowski Dec 29, 2023
2c0970a
changed to version 3
lauren-mieczkowski Dec 29, 2023
ce5dac3
added logging and loading button to test
lauren-mieczkowski Dec 29, 2023
eae3afc
changed dockerfile to not have version tag
lauren-mieczkowski Dec 29, 2023
0a8719f
changed base URL
lauren-mieczkowski Dec 29, 2023
a0b8491
make the device template consistent
lauren-mieczkowski Dec 29, 2023
caa0817
added 6000 port number
lauren-mieczkowski Dec 29, 2023
008600e
changed oracle port to 9000
lauren-mieczkowski Dec 29, 2023
cf928b8
change oracle port to 9000
lauren-mieczkowski Dec 29, 2023
7e78baa
change to alternative handle1
lauren-mieczkowski Dec 29, 2023
3dad4dd
device hooks changed to use crudUtilsDevice
lauren-mieczkowski Dec 29, 2023
0573c67
added throw exception
lauren-mieczkowski Dec 29, 2023
724a210
switch to handlesubmit
lauren-mieczkowski Dec 29, 2023
456a2b8
json stringify
lauren-mieczkowski Dec 29, 2023
7e0c130
added oracle mock
lauren-mieczkowski Dec 29, 2023
5f4f0ae
increased timeout
lauren-mieczkowski Dec 29, 2023
9166fc3
switch to https
lauren-mieczkowski Dec 29, 2023
2ebf61d
switch to https
lauren-mieczkowski Jan 2, 2024
888a1d5
updated mock
lauren-mieczkowski Jan 2, 2024
fc22cee
removed mock.reset
lauren-mieczkowski Jan 2, 2024
db42ceb
remove mock.reset
lauren-mieczkowski Jan 2, 2024
5cb1c08
change to http
lauren-mieczkowski Jan 2, 2024
e8d4476
testing handlesubmit1
lauren-mieczkowski Jan 2, 2024
a2e2303
switch back to handlesubmit
lauren-mieczkowski Jan 2, 2024
de30588
remove loading button
lauren-mieczkowski Jan 2, 2024
8e8d621
testthandle submit1
lauren-mieczkowski Jan 2, 2024
42ab076
switch to handlesubmit
lauren-mieczkowski Jan 2, 2024
9c81bbc
changed to toggle button, new logos and color form
lauren-mieczkowski Jan 3, 2024
305eddf
altered logo size and dark template colors
lauren-mieczkowski Jan 3, 2024
c747824
added Access-Control-Allow-Origin header
lauren-mieczkowski Jan 3, 2024
39f677a
endpoint change
lauren-mieczkowski Jan 3, 2024
1b63346
added environment variables
lauren-mieczkowski Jan 8, 2024
c83be01
updated oracle service endpoint
lauren-mieczkowski Jan 8, 2024
83d54ab
changed to port 7001
lauren-mieczkowski Jan 8, 2024
333a1f4
updated endpoint to a52 elb
lauren-mieczkowski Jan 9, 2024
4034101
increased timeout
lauren-mieczkowski Jan 9, 2024
7622ec8
added certificate field
lauren-mieczkowski Jan 9, 2024
8b7abd3
remove onclick
lauren-mieczkowski Jan 9, 2024
35eb452
changed dynamodb parameters
lauren-mieczkowski Jan 9, 2024
51400fe
updated http parameters
lauren-mieczkowski Jan 10, 2024
33b0bba
changed address to oracle ip address
lauren-mieczkowski Jan 11, 2024
d40d73d
fixed oracle endpoint
lauren-mieczkowski Jan 11, 2024
6e9e3f6
updated mock endpoint to match real
lauren-mieczkowski Jan 11, 2024
00b1475
increased timeout
lauren-mieczkowski Jan 11, 2024
7355970
enriched log responses, removed timeout
lauren-mieczkowski Jan 11, 2024
68378b2
switch button to onclick instead of type submit
lauren-mieczkowski Jan 11, 2024
77b7c72
added timeout
lauren-mieczkowski Jan 11, 2024
7f57c1e
switch back to submit button of type submit
lauren-mieczkowski Jan 11, 2024
6ae554a
change to sync call from async
lauren-mieczkowski Jan 11, 2024
764c937
200 error
lauren-mieczkowski Jan 11, 2024
56e585a
change to port 3000
lauren-mieczkowski Jan 11, 2024
8dd5406
change to 7001
lauren-mieczkowski Jan 11, 2024
87d4283
changed to port 7001
lauren-mieczkowski Jan 11, 2024
07c5bdf
removed timeout
lauren-mieczkowski Jan 11, 2024
161477e
json stringify submit and added cors headers
lauren-mieczkowski Jan 12, 2024
2734771
try fetch for api call
lauren-mieczkowski Jan 12, 2024
9d9c107
json response
lauren-mieczkowski Jan 12, 2024
1aa42f5
fetch error handling
lauren-mieczkowski Jan 12, 2024
2147a87
remove .json
lauren-mieczkowski Jan 12, 2024
f2e6186
UI fetch error handling
lauren-mieczkowski Jan 15, 2024
6b1bac2
updated error handling
lauren-mieczkowski Jan 15, 2024
317470e
test error handling
lauren-mieczkowski Jan 15, 2024
91e2e64
test loading button, change adddevice to mock
lauren-mieczkowski Jan 15, 2024
8e7cc5c
loading button
lauren-mieczkowski Jan 15, 2024
d0e8ad6
changed error message
lauren-mieczkowski Jan 15, 2024
f12bca6
switch to loading button only
lauren-mieczkowski Jan 15, 2024
3316dba
loading button only
lauren-mieczkowski Jan 15, 2024
f46158c
added deviceID validation
lauren-mieczkowski Jan 15, 2024
0699cfb
bug in activity logs
lauren-mieczkowski Jan 15, 2024
84f1b93
adding documentation page
lauren-mieczkowski Jan 15, 2024
acb8ff7
added documentation page routing
lauren-mieczkowski Jan 15, 2024
d9f536e
adding instructions into guide
lauren-mieczkowski Jan 15, 2024
e05e9ce
add environment variables for form
lauren-mieczkowski Jan 15, 2024
3420c00
updated environment variables
lauren-mieczkowski Jan 16, 2024
69f212d
added env variable to docker file test
lauren-mieczkowski Jan 16, 2024
f81f3e1
test oracle url env var
lauren-mieczkowski Jan 16, 2024
1b6bfd8
needed backticks
lauren-mieczkowski Jan 16, 2024
6dc7837
remove quotes from url
lauren-mieczkowski Jan 16, 2024
01bf8b8
/oracle URL is added in terraform instead
lauren-mieczkowski Jan 16, 2024
2d9fe06
updated homepage to findr, not findr-ui
lauren-mieczkowski Jan 16, 2024
06daee0
testing dockerbuild
lauren-mieczkowski Jan 16, 2024
69178ed
testing docker build. github pages with repo name
lauren-mieczkowski Jan 16, 2024
190685e
test docker build
lauren-mieczkowski Jan 16, 2024
4bcf369
update dockerfile
lauren-mieczkowski Jan 16, 2024
984c995
comment about curl in dockerfile
lauren-mieczkowski Jan 16, 2024
899a433
Revert "updated homepage to findr, not findr-ui"
lauren-mieczkowski Jan 16, 2024
81c5c44
change to findr, not findr-ui
lauren-mieczkowski Jan 16, 2024
a7665d4
dish blaze red as red accent color
lauren-mieczkowski Jan 16, 2024
ea36d60
centered help page, added apollo routing, removed db widgets
lauren-mieczkowski Jan 17, 2024
5c38149
updated read.me
lauren-mieczkowski Jan 17, 2024
8d315bf
updated read.me
lauren-mieczkowski Jan 17, 2024
98d3764
updated read.me
lauren-mieczkowski Jan 17, 2024
a75d891
added comments, removed unneccessary imports
lauren-mieczkowski Jan 17, 2024
aa67301
removed extra ;
lauren-mieczkowski Jan 17, 2024
398ffc9
updated readme
lauren-mieczkowski Jan 17, 2024
aa326ca
changed certificate label to uppercase
lauren-mieczkowski Jan 17, 2024
711347a
updated mock email
lauren-mieczkowski Jan 17, 2024
d0d9635
updated iot mock payload and mock email
lauren-mieczkowski Jan 17, 2024
2aca912
removed unnecessary imports
lauren-mieczkowski Jan 17, 2024
afa4654
moved logging earlier
lauren-mieczkowski Jan 18, 2024
8188fbd
added menu bar back into connect page
lauren-mieczkowski Jan 19, 2024
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
Prev Previous commit
Next Next commit
removed mock behav, 2 submit buttons, added wkflw
  • Loading branch information
lauren-mieczkowski committed Dec 18, 2023
commit f638a11f892bea945fa595b963ce85cd85d6802a
39 changes: 39 additions & 0 deletions .github/workflows/docker-build-push.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Docker-Push

on:
push:
branches:
- 'lauren-version0'

jobs:
docker:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Debug Info
run: |
node -v
npm -v

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push adapters
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile_adapters
push: true
tags: pravnreddy429/findr_ui:v0
23 changes: 23 additions & 0 deletions docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Use an official Node.js image as the base image
FROM node:14-alpine

# Set the working directory inside the container
WORKDIR /app

# Copy package.json and package-lock.json to the working directory
COPY package*.json ./

# Install project dependencies
RUN npm install

# Copy the rest of the application code to the working directory
COPY . .

# Build the React app (assumes you have a build script in your package.json)
RUN npm run build

# Expose port 80 for the web server to listen on
EXPOSE 80

# Command to run the web server when the container starts
CMD ["npm", "start"]
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
"@material-ui/icons": "^5.0.0-alpha.35",
"@material-ui/lab": "5.0.0-alpha.35",
"@mui/icons-material": "^5.14.16",
"@mui/joy": "^5.0.0-beta.17",
"@mui/material": "^5.14.17",
"@sentry/react": "^6.4.1",
"@testing-library/jest-dom": "^5.11.4",
3 changes: 2 additions & 1 deletion src/admin/hooks/useActivityLogs.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import axios from "axios";
import { mock } from "../../mocks/server";
import { useQuery } from "react-query";
import { ActivityLog } from "../types/activityLog";

const fetchActivityLogs = async (): Promise<ActivityLog[]> => {
const { data } = await axios.get("/api/activity-logs");
const { data } = await mock.get("/api/activity-logs");
return data;
};

2 changes: 1 addition & 1 deletion src/connect/assets/amazon-s3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/connect/assets/aws-dynamodb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/connect/assets/http_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/connect/assets/mqtt_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading