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

Develop #170

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8cec31f
build(deps-dev): bump @types/react from 18.2.14 to 18.2.15
dependabot[bot] Jul 17, 2023
6fd51b4
build(deps-dev): bump @typescript-eslint/parser from 5.61.0 to 5.62.0
dependabot[bot] Jul 17, 2023
b72671d
feat(NET-429): make color customisable
Aceix Jul 17, 2023
e59f940
feat(NET-415): add error boundaries
Aceix Jul 18, 2023
39c1fa2
tech: fix docs link
Aceix Jul 18, 2023
ea3433e
fix readme
Aceix Jul 19, 2023
f582f06
Merge pull request #143 from gravitl/dependabot/npm_and_yarn/develop/…
Aceix Jul 19, 2023
00b6de9
Merge pull request #142 from gravitl/dependabot/npm_and_yarn/develop/…
Aceix Jul 19, 2023
5ca1bb6
Merge pull request #155 from gravitl/tech/readme
Aceix Jul 19, 2023
3f3bb9f
tech: add contributing docs
Aceix Jul 19, 2023
ba38719
tech: enhance readme docs
Aceix Jul 19, 2023
63ccbbc
tech: enhance readme docs
Aceix Jul 19, 2023
1db365f
Revert "tech: enhance readme docs"
Aceix Jul 19, 2023
82ce3d4
Revert "tech: enhance readme docs"
Aceix Jul 19, 2023
ed0b8c1
Revert "tech: add contributing docs"
Aceix Jul 19, 2023
5091575
tech: add contributing docs
Aceix Jul 19, 2023
8e0da3c
tech: enhance readme docs
Aceix Jul 19, 2023
23388d9
tech: enhance readme docs
Aceix Jul 19, 2023
d44e14a
feat(NET-278): add connect/disconnect host feature
pwilson77 Jul 21, 2023
f67a5ca
build(deps-dev): bump eslint from 8.44.0 to 8.45.0
dependabot[bot] Jul 24, 2023
13de751
build(deps): bump swr from 2.1.5 to 2.2.0
dependabot[bot] Jul 24, 2023
14ce7e3
build(deps-dev): bump @types/react-dom from 18.2.6 to 18.2.7
dependabot[bot] Jul 24, 2023
cd3f8ac
Merge pull request #156 from gravitl/tech/repo
Aceix Jul 24, 2023
1b48511
Merge pull request #159 from gravitl/dependabot/npm_and_yarn/develop/…
Aceix Jul 24, 2023
0504533
Merge pull request #162 from gravitl/dependabot/npm_and_yarn/develop/…
Aceix Jul 24, 2023
c1dee08
Merge pull request #154 from gravitl/kwesi/net-429-add-ability-to-cha…
Aceix Jul 24, 2023
4d5cd6e
add missing .goreleaser file
mattkasun Jul 24, 2023
fea7b10
fix(NET-327): remove proxy references
Aceix Jul 24, 2023
db28988
Merge pull request #160 from gravitl/dependabot/npm_and_yarn/develop/…
Aceix Jul 25, 2023
8cb8ec1
Merge pull request #158 from gravitl/NET-278
Aceix Jul 25, 2023
f8abd7e
Merge pull request #166 from gravitl/kwesi/net-415-bug-issue-graph-pa…
Aceix Jul 25, 2023
b3f0899
Merge pull request #165 from gravitl/kwesi/net-327-ui-remove-all-prox…
Aceix Jul 25, 2023
12aed8b
Merge pull request #168 from gravitl/master
Aceix Jul 25, 2023
a1bda06
feat(ACC-181): test workflow
Aceix Jul 25, 2023
dcb2822
Merge pull request #169 from gravitl/test/workflows
Aceix Jul 25, 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
14 changes: 8 additions & 6 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ VITE_IS_SAAS_BUILD=
VITE_BASE_URL=

# EE customisations/branding
ENV VITE_PRODUCT_NAME=
ENV VITE_TENANT_LOGO_DARK_URL=
ENV VITE_TENANT_LOGO_LIGHT_URL=
ENV VITE_TENANT_LOGO_DARK_SMALL_URL=
ENV VITE_TENANT_LOGO_LIGHT_SMALL_URL=
ENV VITE_TENANT_LOGO_ALT_TEXT=
VITE_PRODUCT_NAME=
VITE_TENANT_LOGO_DARK_URL=
VITE_TENANT_LOGO_LIGHT_URL=
VITE_TENANT_LOGO_DARK_SMALL_URL=
VITE_TENANT_LOGO_LIGHT_SMALL_URL=
VITE_TENANT_LOGO_ALT_TEXT=
VITE_TENANT_FAVICON_LOGO=
VITE_TENANT_PRIMARY_COLOR=

# Other vars
VITE_NETCLIENT_BIN_URL_TEMPLATE=
4 changes: 4 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
builds:
- skip: true
release:
prelease: false
51 changes: 51 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Contributing to Netmaker UI
We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:

- Reporting a bug
- Discussing the current state of the code
- Submitting a fix
- Proposing new features

## We Develop with Github
We use github to host code, to track issues and feature requests, as well as accept pull requests.

## We Use a [Github Flow variant](https://docs.github.com/en/get-started/quickstart/github-flow), So All Code Changes Happen Through Pull Requests
Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://docs.github.com/en/get-started/quickstart/github-flow)). We actively welcome your pull requests:

1. Fork the repo and create your branch from `develop`.
2. If you've added code that should be tested, add tests.
3. Ensure the PR workflows pass.
4. Issue that pull request!

## Any contributions you make will be under the SSPL License
In short, when you submit code changes, your submissions are understood to be under the same [SSPL License](LICENSE.txt) that covers the project, and requires you to sign a consent. Feel free to contact the maintainers if that's a concern.

## Report bugs using Github's [issues](https://github.com/gravitl/netmaker-ui-2/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/gravitl/netmaker-ui-2/issues/new); it's that easy!

## Write bug reports with detail, background, steps to reporduce and if possible sample code
[This is an example](http://stackoverflow.com/q/12488905/180626) of a bug report, and I think it's not a bad model. Here's [another example from Craig Hockenberry](http://www.openradar.me/11905408).

**Great Bug Reports** tend to have:

- A quick summary and/or background
- Steps to reproduce
- Be specific!
- Give sample code if you can. [This stackoverflow question](http://stackoverflow.com/q/12488905/180626) includes sample code that *anyone* with a base R setup can run to reproduce what I was seeing
- What you expected would happen
- What actually happens
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)

People *love* thorough bug reports. I'm not even kidding.

## Use a Consistent Coding Style
I'm borrowing these from [Facebook's Guidelines](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md)

* 2 spaces for indentation rather than tabs
* You can try running `npm run lint` for style unification

## License
By contributing, you agree that your contributions will be licensed under the [project's license](LICENSE.txt).

## References
This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md) and [this gist](https://gist.github.com/briandk/3d2e8b3ec8daf5a27a62)
1 change: 1 addition & 0 deletions Dockerfile.standalone
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ENV VITE_TENANT_LOGO_DARK_SMALL_URL=
ENV VITE_TENANT_LOGO_LIGHT_SMALL_URL=
ENV VITE_TENANT_LOGO_ALT_TEXT=
ENV VITE_TENANT_FAVICON_LOGO=
ENV VITE_TENANT_PRIMARY_COLOR=


# Other vars
Expand Down
33 changes: 30 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,36 @@

## v0.20.4

#### For more information, visit the official documentation site: [docs.netmaker.org](https://docs.netmaker.io)
**For more information, visit the official documentation site: [docs.netmaker.io](https://docs.netmaker.io)**


#### LICENSE
## LICENSE

Netmaker UI's source code and all artifacts in this repository are freely available. All versions are published under the Server Side Public License (SSPL), version 1, which can be found under in [LICENSE.txt](LICENSE.txt).

## Contributing

We welcome contributions to Netmaker UI. Please see our [contributing guidelines](CONTRIBUTING.md) for more information.

### Development

#### Prerequisites

- [Node.js](https://nodejs.org/)

#### Getting Started

1. Clone the repository
2. Install dependencies: `npm install`
3. Run the development server: `npm run dev`
4. Open [http://localhost:5173](http://localhost:5173) with your browser to see the result. The port might be different depending on your environment.

#### Building

1. Run the build script: `npm run build`
2. The build artifacts will be stored in the `dist/` directory.

#### Testing

1. Run the test script: `npm run test`

Netmaker UI's source code and all artifacts in this repository are freely available. All versions are published under the Server Side Public License (SSPL), version 1, which can be found under the "licensing" directory: [LICENSE.txt](licensing/LICENSE.txt).
157 changes: 133 additions & 24 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
"react-router-dom": "^6.14.1",
"react-window": "^1.8.9",
"sigma": "^2.4.0",
"swr": "^2.1.5",
"swr": "^2.2.0",
"zustand": "^4.3.9"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/react-window": "^1.8.5",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-react": "^4.0.1",
"eslint": "^8.44.0",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
Expand Down
Loading
Loading