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

Final pull request from working CI/CD fork #23

Merged
merged 65 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
5223b82
Add or update the Azure App Service build and deployment workflow config
cmaloney111 Jun 6, 2024
8e93509
Delete .github/workflows/azure-static-web-apps-red-field-0505d1e1e.yml
cmaloney111 Jun 6, 2024
55d9363
Delete .github/workflows/main_safehaven307.yml
cmaloney111 Jun 6, 2024
a87329f
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
41197b9
ci: add Azure Static Web Apps workflow file
cmaloney111 Jun 6, 2024
5ad94fa
Update azure-static-web-apps-lively-ground-0cd068c1e.yml
cmaloney111 Jun 6, 2024
134d705
Make deploy work
cmaloney111 Jun 6, 2024
1b8d407
Update azure-static-web-apps-lively-ground-0cd068c1e.yml
cmaloney111 Jun 6, 2024
b6ed0f1
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
5de27d9
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
27f0905
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
669bf47
Fun
cmaloney111 Jun 6, 2024
de102b5
Fun
cmaloney111 Jun 6, 2024
57143ef
Clean install
cmaloney111 Jun 6, 2024
c79d8c1
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
8e9a9d3
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
9e18629
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
795f55d
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
fca33ad
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
ea2178d
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
3b00c3c
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
0a71339
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
34d61f9
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
da8469c
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
0f180f6
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
a845b0c
FINALLY
cmaloney111 Jun 6, 2024
a1b3a5a
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
ddb0a15
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
ad56154
Update main_safehaven2.yml
cmaloney111 Jun 6, 2024
f06b740
web config
cmaloney111 Jun 6, 2024
ada0ddd
web config
cmaloney111 Jun 6, 2024
ad987e3
SEE DIRECTORY
cmaloney111 Jun 6, 2024
c58e1d9
Who knows at this point
cmaloney111 Jun 6, 2024
66f6e9c
PLEASE
cmaloney111 Jun 6, 2024
fd83b4b
OMG
cmaloney111 Jun 6, 2024
9c4bbb5
rename
cmaloney111 Jun 6, 2024
9139082
PLEASE AGAIN
cmaloney111 Jun 6, 2024
c9c42db
OMGOMGOMG
cmaloney111 Jun 6, 2024
3c71c87
OK
cmaloney111 Jun 6, 2024
6be570c
Delete .github/workflows/main_safehaven2.yml
cmaloney111 Jun 7, 2024
b759fa5
PLEASE WOKR
cmaloney111 Jun 7, 2024
b5e3d4b
Update azure-static-web-apps-lively-ground-0cd068c1e.yml
cmaloney111 Jun 7, 2024
e351cd2
ASSETS
cmaloney111 Jun 7, 2024
eec55d4
NO ASSETS
cmaloney111 Jun 7, 2024
af98a4e
Update azure-static-web-apps-lively-ground-0cd068c1e.yml
cmaloney111 Jun 7, 2024
ed0289e
HOMEPAGE
cmaloney111 Jun 7, 2024
6b6f604
VITRE
cmaloney111 Jun 7, 2024
3bc2f60
Update azure-static-web-apps-lively-ground-0cd068c1e.yml
cmaloney111 Jun 7, 2024
f8aa833
WORKPLS
cmaloney111 Jun 7, 2024
661d5a0
GET VITE
cmaloney111 Jun 7, 2024
14a82f8
YES PNG
cmaloney111 Jun 7, 2024
98b7a0e
CAPS
cmaloney111 Jun 7, 2024
cded0f5
PUSH
cmaloney111 Jun 7, 2024
9790e75
WESTWARLINESSES
cmaloney111 Jun 7, 2024
1cedcc4
WHY NON ADD
cmaloney111 Jun 7, 2024
40e5949
products not product
cmaloney111 Jun 7, 2024
36c0fd3
EASTWARD
cmaloney111 Jun 7, 2024
2366bc6
NO LOADING
cmaloney111 Jun 7, 2024
d4749f1
LEVELSTEIN
cmaloney111 Jun 7, 2024
84c987a
..
cmaloney111 Jun 7, 2024
6f945d0
trust me bro
cmaloney111 Jun 7, 2024
00c7e4a
Sync product and order names
cmaloney111 Jun 7, 2024
8959ee9
MEGA COMMIT!
cmaloney111 Jun 7, 2024
c763db2
Update README.md
cmaloney111 Jun 7, 2024
acc7940
Merge branch 'main' into main
cmaloney111 Jun 7, 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
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
with:
submodules: true
lfs: false
- name: Install dependencies
run: npm ci
- run: npm ci
- run: npm run build
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RED_FIELD_0505D1E1E }}
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_GROUND_0CD068C1E }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
Expand All @@ -34,6 +34,7 @@ jobs:
api_location: "" # Api source code path - optional
output_location: "dist" # Built app content directory - optional
###### End of Repository/Build Configurations ######
- run: cd packages/react-frontend && tree

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
Expand All @@ -44,5 +45,5 @@ jobs:
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RED_FIELD_0505D1E1E }}
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_GROUND_0CD068C1E }}
action: "close"
76 changes: 0 additions & 76 deletions .github/workflows/main_safehaven307.yml

This file was deleted.

31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,36 @@ Project Description:
SafeHaven is a company dedicated to optimizing storage management solutions for businesses. Our product scales easily, displays critical order insights, and is affordably priced.
We offer a seamless inventory and order tracking system, suiting the needs of businesses in many industries.


Note for grader: Sequence Diagrams are the two '.png' files in the root of the repo

To run from the repository's root folder, install concurrently with:

```
npm install concurrently
```

Then simply run with:

```
npm start
```

or run the development mode with

```
npm run dev
```

Also, make sure to create a .env file in express-backend and add
`MONGODB_URI = "your_connection_string"`
and
`TOKEN_SECRET = 1234`

Project Description:
SafeHaven is a company dedicated to optimizing storage management solutions for businesses. Our product scales easily, displays critical order insights, and is affordably priced.
We offer a seamless inventory and order tracking system, suiting the needs of businesses in many industries.


CSC307 Safe Haven Demo Video:
https://youtu.be/EfknrWC4x_U
Loading
Loading