From e0abe238ebfae605522ca7e49e9d25e03d0efcb9 Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 09:32:23 +0200 Subject: [PATCH 1/9] Add links refs to navbar --- src/views/partials/_navbar.hbs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/partials/_navbar.hbs b/src/views/partials/_navbar.hbs index 21cc55d..f63a40c 100644 --- a/src/views/partials/_navbar.hbs +++ b/src/views/partials/_navbar.hbs @@ -6,18 +6,18 @@ From 57e8e3bae32b903fb721cf07fa152474b80367bf Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 09:32:35 +0200 Subject: [PATCH 2/9] Update auth forms layout --- src/views/partials/signin_form.hbs | 34 ++++++++++--------- src/views/partials/signup_form.hbs | 52 ++++++++++++++++-------------- src/views/signin_view.hbs | 4 +-- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/views/partials/signin_form.hbs b/src/views/partials/signin_form.hbs index c4529c0..d351ea4 100644 --- a/src/views/partials/signin_form.hbs +++ b/src/views/partials/signin_form.hbs @@ -1,16 +1,18 @@ -
-

Please sing in

-
- - -
-
- - -
-

- Have no account? - Register now -

- -
+
+
+

Enter your credentials

+
+ + +
+
+ + +
+ +

+ Have no account? + Register now +

+
+
diff --git a/src/views/partials/signup_form.hbs b/src/views/partials/signup_form.hbs index e1348dc..f321a8a 100644 --- a/src/views/partials/signup_form.hbs +++ b/src/views/partials/signup_form.hbs @@ -1,25 +1,27 @@ -
-

Register a new account

-
- - -
-
- - -
-
- - -
-
- - -
-

- Already have an account? - Login -

- -
+
+
+

Register a new account

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +

+ Already have an account? + Login +

+
+
diff --git a/src/views/signin_view.hbs b/src/views/signin_view.hbs index 7d55b8f..4b19706 100644 --- a/src/views/signin_view.hbs +++ b/src/views/signin_view.hbs @@ -15,9 +15,7 @@ {{>partials/_navbar}}
-
- {{>partials/signin_form}} -
+ {{>partials/signin_form}}
From 9ef4a0d935f4c792833a828ca93549c559d8402e Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 18:18:27 +0200 Subject: [PATCH 3/9] Update navbar template Remove button from create task nav link. Hide task creation and profile page from admin users. --- src/views/partials/_navbar.hbs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/partials/_navbar.hbs b/src/views/partials/_navbar.hbs index f63a40c..85cf472 100644 --- a/src/views/partials/_navbar.hbs +++ b/src/views/partials/_navbar.hbs @@ -12,8 +12,10 @@
  • Administration
    • {{/if}} {{# if is_authenticated }} {{! visible for authenticated users only }} -
  • Create new
    • -
  • Profile
    • + {{# unless is_admin }} +
  • Create new
    • +
  • Profile
    • + {{/unless}}
  • Sign Out
    • {{else}}
  • Sign Up
    • From 1dce510d60a09fdd518fb3cb25d7203df5f9c7ab Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 18:24:01 +0200 Subject: [PATCH 4/9] Update profile page layout --- src/views/partials/profile_main.hbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/partials/profile_main.hbs b/src/views/partials/profile_main.hbs index 6764ab7..75b8dc0 100644 --- a/src/views/partials/profile_main.hbs +++ b/src/views/partials/profile_main.hbs @@ -5,12 +5,12 @@

    {{email}}

    -
    +
    avatar
    -
    -
      +
      +
    - +

    Have no account? Register now diff --git a/src/views/partials/signup_form.hbs b/src/views/partials/signup_form.hbs index f321a8a..4029667 100644 --- a/src/views/partials/signup_form.hbs +++ b/src/views/partials/signup_form.hbs @@ -18,7 +18,7 @@ placeholder="Confirm Password">

    - +

    Already have an account? Login From 283a996b142ce372609d05de178e9d5c94c90846 Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 18:31:53 +0200 Subject: [PATCH 7/9] Update project version --- README.md | 5 ----- package.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 5341d61..ee1ed68 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,6 @@ This repo contains Bootstrap templates for the task tracker project. -Getting started ---------------- - -[//]: # (TODO: complete getting section) - References ---------- diff --git a/package.json b/package.json index 0f6cf76..e9795e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tasktracker-bootstrap", - "version": "0.2.0", + "version": "1.0.0", "description": "Task tracker site bootstrap5 templates", "private": true, "scripts": { From 72e6d748c06567c74701a7cd12309957d175ad07 Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 18:53:02 +0200 Subject: [PATCH 8/9] Add on-release workflow to upload assets --- .github/workflows/upload_to_release.yml | 50 +++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/upload_to_release.yml diff --git a/.github/workflows/upload_to_release.yml b/.github/workflows/upload_to_release.yml new file mode 100644 index 0000000..227058c --- /dev/null +++ b/.github/workflows/upload_to_release.yml @@ -0,0 +1,50 @@ +name: Upload distribution to release + +on: + release: + types: + - published + +jobs: + upload: + runs-on: ubuntu-latest + + steps: + - name: Checkout the code + uses: actions/checkout@v4 + + - name: Setup NodeJS + uses: actions/setup-node@v4 + with: + node-version: 18 + + - name: Install dependencies + run: npm install + + - name: Build the dist + run: npm run build:dev + + - name: Create archives + run: | + zip -r dist.zip ./dist + zip -r handlebars.zip ./src/views + + - name: Upload release asset (dist) + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ./dist.zip + asset_name: dist.zip + asset_content_type: application/zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload release asset (handlebars) + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ./handlebars.zip + asset_name: handlebars.zip + asset_content_type: application/zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0bd3496759012325cc4f2d62c65952324c034fbe Mon Sep 17 00:00:00 2001 From: Serhii Horodilov Date: Fri, 2 Feb 2024 18:57:37 +0200 Subject: [PATCH 9/9] Update project description --- README.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/README.md b/README.md index ee1ed68..cc8d01b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,36 @@ This repo contains Bootstrap templates for the task tracker project. +Getting started +--------------- + +Download the repository to your local machine. +This project uses `npm` and `nodejs` to handle builds via `webpack`. + +Install dependencies using command: + +```shell +npm install +``` + +After that other commands will be available. +You can review all commands within `scripts` section of *package.json* file. + +Create a developers' distribution: + +```shell +npm run build:dev +``` + +Run dev server: + +```shell +npm run start +``` + References ---------- - [Bootstrap v5.3](https://getbootstrap.com/docs/5.3/) +- [NodeJS](https://nodejs.org) +- [Webpack](https://webpack.js.org/)