Skip to content

Commit

Permalink
Merge branch 'Staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
ohjintech committed May 13, 2021
2 parents 61e66f3 + 731ce69 commit e76211b
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ release-builds/
dist/
node_modules/
*.compiled.*
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*

# Folder config file #
######################
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,24 @@ version.BuildInfo{Version:"v3.5.4", GitCommit:"1b5edb69df3d3a08df77c9902dc17af86
```sh
npm install
```
3. Build
```
npm run package
# then...
npm run package-mac
npm run package-windows
npm run package-linux
```
## Usage

### Setup Environment

1. Launch the Docker Daemon
2. Start a MiniKube Kubernetes Cluster `minikube start`
3. Download charts (see below for location)
4. Launch Ahoy!

### Local Helm Chart Storage Paths



Expand Down
9 changes: 4 additions & 5 deletions package-lock.json

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

9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"main": "main.js",
"author": "TEAM JYJY",
"license": "MIT",
"private": false,
"repository": {
"type": "git",
"url": "https://github.com/oslabs-beta/Ahoy-.git"
Expand Down Expand Up @@ -52,8 +51,8 @@
"@babel/runtime": "^7.13.17",
"nodejs-helm": "^0.3.0",
"postcss": "^8.2.8",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react": "^17.0.2",
"react-dom": "16.x",
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^2.0.3",
"yaml": "^1.10.2"
Expand Down Expand Up @@ -90,9 +89,5 @@
"webpack": "^5.24.4",
"webpack-cli": "^4.5.0",
"webpack-dev-server": "^3.11.2"
},
"peerDependencies": {
"react": "16.x",
"react-dom": "16.x"
}
}

0 comments on commit e76211b

Please sign in to comment.