Skip to content

Commit 737e65f

Browse files
authored
Merge pull request #20 from AdamXweb/feature/categories
2 parents a30f439 + 5f657dc commit 737e65f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+516
-377
lines changed

CONTRIBUTING.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Contributing to HuTasker
2+
Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
3+
4+
- Before jumping into a PR be sure to search [existing PRs](https://github.com/AdamXweb/HuTasker/pulls) or [issues](https://github.com/AdamXweb/HuTasker/issues) for an open or closed item that relates to your submission.
5+
6+
## Developing
7+
8+
The development branch is `main`. This is the branch that all pull
9+
requests should be made against. The changes on the `main`
10+
branch are tagged into a release monthly.
11+
12+
To develop locally, follow the [Developing guide](https://github.com/AdamXweb/HuTasker/wiki/Developing)
13+
14+
## Commit Guidelines
15+
16+
HuTasker uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
17+
specification. The automatic changelog tool uses these to automatically generate
18+
a changelog based on the commit messages. Here's a guide to writing a commit message
19+
to allow this:
20+
21+
### Format
22+
23+
```
24+
type(scope)!: subject
25+
```
26+
27+
- `type`: the type of the commit is one of the following:
28+
29+
- `feat`: new features.
30+
- `fix`: bug fixes.
31+
- `docs`: documentation changes.
32+
- `refactor`: refactor of a particular code section without introducing
33+
new features or bug fixes.
34+
- `style`: code style improvements.
35+
- `perf`: performance improvements.
36+
- `test`: changes to the test suite.
37+
- `ci`: changes to the CI system.
38+
- `build`: changes to the build system (we don't yet have one so this shouldn't apply).
39+
- `chore`: for other changes that don't match previous types. This doesn't appear
40+
in the changelog.
41+
- It is encouraged to add the Github issue to the commit message e.g. `fix: #1 etc`
42+
43+
## Making a Pull Request
44+
45+
- Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) while creating you PR.
46+
- If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. Se more about [Linking a pull request to an issue
47+
](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
48+
- Be sure to fill the PR Template accordingly.

README.MD

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</p>
77

88
<p align="center">
9-
<i>HuTasker is a sample site showing potential for integration between AirTable & their API and Hugo, presented as a task tracker app</i>
9+
<i>HuTasker is a sample site showing potential for integration between AirTable's API and Hugo, presented as a task tracker app</i>
1010
<br/>
1111
</p>
1212

@@ -37,7 +37,7 @@
3737

3838
<details>
3939
<summary>
40-
<h2>Motivation 👩‍💻</h2>
40+
<h2>👩‍💻 Motivation</h2>
4141
</summary>
4242
Static Site Generators (SSG) have great potential to build a dynamic site minus a lot of javascript bloat. This makes them quick to load, hugely configurable and able to be hosted anywhere.
4343

@@ -61,52 +61,35 @@ It doesn't really make sense in a real life application due to so many factors.
6161

6262
</details>
6363

64-
## Features 🌈
65-
- Pulls Data from AirTable's API on a CRON, that can populate the pages
66-
TBC Features viewable in the [Project tab.](https://github.com/users/AdamXweb/projects/1?query=is%3Aopen+sort%3Aupdated-desc).
64+
## 🌈 Features
65+
- Pulls Data from AirTable's API on a schedule (CRON with Github workflow), that can populate the pages
66+
- View the roadmap of features in the [Project tab.](https://github.com/users/AdamXweb/projects/1/views/2?query=is%3Aopen+sort%3Aupdated-desc).
6767

68-
## Getting Started 🚀
68+
## 🚀 Getting Started
6969
For more in-depth information, [check out the wiki](https://github.com/AdamXweb/HuTasker/wiki)
7070

71-
- Clone repo
72-
- npm install
73-
start app with
74-
- npm start
75-
### 1. Install Node
71+
- Clone [repo](https://github.com/AdamXweb/HuTasker.git)
72+
- Get a copy of the [AirTable data](https://airtable.com/shrCcwZGJUVRv0MzP/tblSHzrj6JvrCd070/viw5gDPSuXekYXbfR?blocks=hide)
73+
- Read the [HuTasker Wiki](https://github.com/adamxweb/hutasker/wiki) to get the project configured and up and running
7674

77-
Download and install [Node.js](https://nodejs.org/) (it includes npm) for your platform.
78-
79-
### 2. Install dependencies
80-
81-
```bash
82-
npm install
83-
```
84-
85-
### 3. Start development server
86-
87-
```bash
88-
npm run start
89-
```
90-
91-
## Documentation
92-
- [Hugo](https://gohugo.io/documentation/)
75+
## 📖 Documentation
9376
- [HuTasker](https://github.com/adamxweb/hutasker/wiki)
77+
- [Hugo](https://gohugo.io/documentation/)
9478
- [AirTable API](https://airtable.com/api)
9579

96-
### Dependencies
97-
- [Airtable](https://airtable.com/) or [Referral link](https://airtable.com/invite/r/lottIZti)
98-
- Bootstrap
99-
- Mapbox
100-
101-
## Demo Data ⚡
80+
### Demo Data ⚡
10281
View [sample data on Airtable](https://airtable.com/shrCcwZGJUVRv0MzP/tblSHzrj6JvrCd070/viw5gDPSuXekYXbfR?blocks=hide)
10382

104-
# Future
105-
[creating pages](https://github.com/kidsil/hugo-data-to-pages)
83+
## Supporting this project
84+
You can support this project by sponsoring, or simply signing up with the Airtable Referral link below!
85+
- [Airtable Referral link](https://airtable.com/invite/r/lottIZti)
86+
10687

10788
# Acknowledgements
108-
CSV-Json
109-
data to pages
110-
Theme looseley based on h-enk's Doks
89+
See the [full list on the acknowledgements page](htps://hutasker.netlify.app)
11190

11291
# Contributing
92+
See the [Contributing Guide](https://github.com/AdamXweb/HuTasker/blob/main/CONTRIBUTING.md)
93+
94+
# LICENSE
95+
[MIT License](https://github.com/AdamXweb/HuTasker/blob/main/LICENSE)

assets/scss/common/_dark.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ body.dark .navbar-light .navbar-text {
8585
color: $navbar-dark-color;
8686
}
8787

88-
body.dark .alert-primary a {
88+
body.dark .alert-primary, body.dark .alert-primary a {
8989
color: $body-bg-dark !important;
9090
}
9191

assets/scss/common/_global.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ h6,
2727
@include media-breakpoint-up(md) {
2828
body {
2929
font-size: $font-size-md;
30-
padding-top: 5.5rem !important;
30+
padding-top: 4.7625rem !important;
31+
max-width: 100%;
32+
overflow-x: hidden;
3133
}
3234

3335
h1,

assets/scss/components/_alerts.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
.alert .alert-link {
1515
text-decoration: underline;
16+
color: $white;
17+
}
18+
.alert-primary a {
19+
color: $white ;
20+
text-decoration: underline;
21+
1622
}
1723

1824
.alert-dark {
@@ -21,7 +27,7 @@
2127
}
2228

2329
.alert-dark .alert-link {
24-
color: $white;
30+
color: $white !important;
2531
}
2632

2733
.alert-light {

assets/scss/layouts/_pages.scss

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,29 @@ text-decoration: none;
317317
text-decoration: underline;
318318
}
319319
}
320-
320+
}
321+
.categorytask{
322+
height:50px;
323+
position: relative;
324+
display: inline-block;
325+
width: 300px;
326+
margin: 10px;
327+
background: #e9ecef none repeat scroll 0% 0%;
328+
border-radius: 4px;
329+
box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 5px;
330+
text-decoration: none;
331+
box-shadow: 6px 6px 0 0 $task-blue,10px 10px 0 0 $task-blue-lighter;
332+
mix-blend-mode: normal;
333+
& .card-body{
334+
margin: 0;
335+
position: absolute;
336+
top: 50%;
337+
transform: translateY(-50%);
338+
}
339+
&:hover{
340+
box-shadow: 6px 6px 4px 0 $task-blue,10px 10px 2px 0 $task-blue-lighter;
341+
border: 2px dotted $black;
342+
}
321343
}
322344

323345
.offer{
@@ -340,6 +362,16 @@ text-decoration: none;
340362
margin-top:1rem;
341363
text-align: center;
342364
}
365+
366+
.bi {
367+
vertical-align: -.125em;
368+
fill: currentColor;
369+
}
370+
371+
.catimage{
372+
max-height:50vh;
373+
padding:2em;
374+
}
343375
@keyframes taskUp {
344376
0% {
345377
transform:scale(.8) translateY(1000px);

assets/scss/layouts/_posts.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@
2626
.blog-footer {
2727
text-align: center;
2828
}
29+
.headerg{
30+
background-image: linear-gradient(102deg, #4a2379, #321852 80%);padding:2em;
31+
color:$white;
32+
}

config/_default/menus.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
url = "/categories/"
99
weight = 3
1010

11-
[[main]]
12-
name = "Blog"
13-
url = "/blog/"
14-
weight = 4
1511

1612
[[social]]
1713
name = "GitHub"
@@ -30,3 +26,8 @@
3026
name = "Privacy"
3127
url = "/privacy/"
3228
weight = 10
29+
30+
[[footer]]
31+
name = "Acknowledgements"
32+
url = "/acknowledgements/"
33+
weight = 11

config/_default/params.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ RepoLicense = "https://github.com/AdamXweb/HuTasker/blob/main/LICENSE"
6060
RepoWiki = "https://github.com/AdamXweb/HuTasker/wiki"
6161
editPage = false
6262

63-
63+
# airtable
64+
AirtableEmbed = "https://airtable.com/embed/shrCcwZGJUVRv0MzP?backgroundColor=orange"
6465
[options]
6566
lazySizes = true
6667
instantPage = true

config/production/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
baseurl = "/"
1+
baseurl = "/public"
22
canonifyURLs = false
33

44
disableKinds = ["sitemap"]

0 commit comments

Comments
 (0)