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

Wmb functions #34

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Publish on NPM
on:
push:
branches: [ master ]

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 14
- run: yarn install
- run: yarn prettier-check
- run: yarn test
- uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.NPM_TOKEN }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ node_modules

.DS_Store

gh-pages
gh-pages
/.project
/.settings
32 changes: 29 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">
<img src="https://github.com/frappe/design/blob/master/logos/gantt-logo.svg" height="128">
<img src="https://github.com/frappe/design/blob/master/logos/logo-2019/frappe-gantt-logo.png" height="128">
<h2>Frappe Gantt</h2>
<p align="center">
<p>A simple, interactive, modern gantt chart library for the web</p>
Expand Down Expand Up @@ -55,18 +55,44 @@ var gantt = new Gantt("#gantt", tasks, {
bar_corner_radius: 3,
arrow_curve: 5,
padding: 18,
view_mode: 'Day',
view_mode: 'Day',
date_format: 'YYYY-MM-DD',
custom_popup_html: null
});
```

If you want to contribute:
### Contributing
If you want to contribute enhancements or fixes:

1. Clone this repo.
2. `cd` into project directory
3. `yarn`
4. `yarn run dev`
5. Open `index.html` in your browser, make your code changes and test them.

### Publishing
If you have publishing rights (Frappe Team), follow these steps to publish a new version.

Assuming the last commit (or a couple of commits) were enhancements or fixes,

1. Run `yarn build`

This will generate files in the `dist/` folder. These files need to be committed.
1. Run `yarn publish`
1. Type the new version at the prompt

Depending on the type of change, you can either bump the patch version or the minor version.
For e.g.,
```
0.5.0 -> 0.6.0 (minor version bump)
0.5.0 -> 0.5.1 (patch version bump)
```
1. Now, there will be a commit named after the version you just entered. Include the generated files in `dist/` folder as part of this commit by running the command:
```
git add dist
git commit --amend
git push origin master
```

License: MIT

Expand Down
22 changes: 11 additions & 11 deletions dist/frappe-gantt.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
stroke-width: 1.4;
}
.gantt .arrow .hover {
stroke-width: 4;
stroke-width: 2.4;
}
.gantt .bar {
fill: #b8c2cc;
Expand All @@ -42,7 +42,7 @@
user-select: none;
}
.gantt .bar-progress {
fill: #2369b5;
fill: #a3a3ff;
}
.gantt .bar-invalid {
fill: transparent;
Expand Down Expand Up @@ -79,20 +79,20 @@
fill: #a9b5c1;
}
.gantt .bar-wrapper:hover .bar-progress {
fill: #1f5da0;
fill: #8a8aff;
}
.gantt .bar-wrapper:hover .handle {
visibility: visible;
opacity: 1;
}
.gantt .bar-wrapper.addArrow .bar {
.gantt .bar-wrapper.selected-for-dependency .bar {
stroke-width: 4px;
}
.gantt .bar-wrapper.active .bar {
fill: #a9b5c1;
}
.gantt .bar-wrapper.active .bar-progress {
fill: #1f5da0;
fill: #8a8aff;
}
.gantt .lower-text, .gantt .upper-text {
font-size: 12px;
Expand Down Expand Up @@ -123,22 +123,22 @@
border-radius: 3px;
}
.gantt-container .popup-wrapper .title {
border-bottom: 3px solid #2369b5;
border-bottom: 3px solid #a3a3ff;
padding: 10px;
}
.gantt-container .popup-wrapper .subtitle {
padding: 10px;
color: #dfe2e5;
}
.gantt-container .popup-wrapper .action {
.gantt-container .popup-wrapper .add-dependency-action {
color: #dfe2e5;
border-top: 3px solid #2369b5;
text-decoration: underline;
border-top: 3px solid #a3a3ff;
padding: 10px;
background: rgba(35, 105, 181, 0.6);
cursor: pointer;
}
.gantt-container .popup-wrapper .action:hover {
background: rgba(35, 105, 181, 0.8);
.gantt-container .popup-wrapper .add-dependency-action:hover {
color: #a3a3ff;
}
.gantt-container .popup-wrapper .pointer {
position: absolute;
Expand Down