Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
23c54d4
Added popperjs
SheetalProshore Apr 27, 2022
741692d
feat: list all the invited members
asimnp May 16, 2022
93f3e30
refactor: invite member component to components
asimnp May 16, 2022
57ae88b
fix merge conflicts while merging QA/test branch
asimnp May 22, 2022
ef8a58c
fix: invite member component path
asimnp May 22, 2022
a98d6e9
refactor: teams list style
asimnp May 22, 2022
e3d1f61
refactor: base heading style
asimnp May 22, 2022
b908764
refactor: sidebar style
asimnp May 22, 2022
73cc9f0
display role name & create global color
asimnp May 22, 2022
6fa25a1
feat: display logged in user name
asimnp May 22, 2022
7e62318
create settings popup
asimnp May 22, 2022
7cb0b20
remove logout link
asimnp May 22, 2022
34687cc
feat: user can re-invite user
asimnp May 23, 2022
d3cfde0
Merge pull request #24 from rabirajkhadka/feat/list-members
asimnp May 23, 2022
bd3713a
remove logout option from sidebar
asimnp May 25, 2022
2918050
Merge pull request #26 from rabirajkhadka/fix/logout-placement
asimnp May 25, 2022
bb85971
fix: bootstrap container toggle
asimnp May 28, 2022
175c96a
Merge pull request #28 from rabirajkhadka/fix/container
asimnp May 28, 2022
7d4f855
action button with toggle table
Binita-subedi May 29, 2022
9fdc45f
added search functionality in alluserlist
Binita-subedi May 30, 2022
09ffc0a
create: services to list projects
asimnp Jun 3, 2022
ea4439c
added sort function and changes on design
Binita-subedi Jun 4, 2022
b380571
added revoke function and worked on design
Binita-subedi Jun 4, 2022
395cddd
feat: user can time log
asimnp Jun 5, 2022
7adea82
Merge pull request #34 from rabirajkhadka/feat/time-tracker
asimnp Jun 5, 2022
a990513
Merge branch 'merge-teams' into feat/member-action
asimnp Jun 5, 2022
0dda3d5
Merge branch 'feat/member-action' of github.com:rabirajkhadka/TickerP…
asimnp Jun 5, 2022
6cd23a6
feat: show list of invited and register users
asimnp Jun 5, 2022
0ade4e8
Merge pull request #36 from rabirajkhadka/merge-feat/member-action
asimnp Jun 5, 2022
f6985b0
feat: list time logs
Rznjoc Jun 6, 2022
eec1819
merge: feat/add-project branch
asimnp Jun 6, 2022
b12a0df
refactor: projects directory structure
asimnp Jun 6, 2022
3f8c1eb
Merge pull request #38 from rabirajkhadka/merge-add-project
asimnp Jun 6, 2022
1feb9c2
merge: feat/timelog branch
asimnp Jun 6, 2022
e69b0b4
Merge pull request #39 from rabirajkhadka/merge-time-log
asimnp Jun 6, 2022
f9faa17
added search bar in project and edit in timelog
Binita-subedi Jun 6, 2022
ca17158
build files for deployment
asimnp Jun 7, 2022
b7dd156
modified billable status in project
Binita-subedi Jun 7, 2022
93d3247
build: change backend api url
asimnp Jun 8, 2022
516ffaf
change on input field and s.no
Binita-subedi Jun 8, 2022
d8de52d
Merge pull request #40 from rabirajkhadka/feat/edit-timelognew
asimnp Jun 8, 2022
087a767
change favicon icon, tab title, README.md file
asimnp Jun 9, 2022
039fab7
change logo to proshore
asimnp Jun 9, 2022
80de398
refactor: create separate files to convert times & get total time
asimnp Jun 9, 2022
4596aab
refactor: projectId default value
asimnp Jun 9, 2022
6855f95
fix: loading message
asimnp Jun 9, 2022
17fe135
refactor: code placement
asimnp Jun 9, 2022
b07bf81
display timer on UI
asimnp Jun 10, 2022
7370c96
Merge pull request #41 from praveengitsit-pro/fix/errors
asimnp Jun 10, 2022
d765bfc
build v0.0.1
asimnp Jun 10, 2022
309af95
change proshore logo
asimnp Jun 10, 2022
528e6ed
build: v0.0.2
asimnp Jun 10, 2022
079cbc4
change name to Proshore Time Tracker
asimnp Jun 10, 2022
f4a47aa
fix: margin on button
asimnp Jun 10, 2022
e420d33
build: v0.0.3
asimnp Jun 10, 2022
336ddfb
conflict resolved
shrestharikesh Aug 3, 2022
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lerna-debug.log*

node_modules
.DS_Store
dist
# dist
dist-ssr
coverage
*.local
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ticker
# Proshore Time Tracker

> Track your valuable time.

Expand All @@ -19,7 +19,7 @@
| vue-router | ^4.0.12 | production |
| bootstrap | ^5.1.3 | production |
| @popperjs/core | ^2.11.5 | production |
| bootstrap-icons | ^1.8.1 | production |
| pinia | ^2.0.14 | production |
| axios | ^0.26.1 | production |
| @rushstack/eslint-patch | ^1.1.0 | development |
| @vitejs/plugin-vue | ^2.2.2 | development |
Expand Down
1 change: 1 addition & 0 deletions dist/assets/BaseAlert.0f1cd026.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.required-asterisk{color:red}.alert-message{display:block;font-weight:400;padding:.4rem 1.2rem;margin:.8rem 0;border-radius:5px}
1 change: 1 addition & 0 deletions dist/assets/BaseAlert.aa8ad542.js

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

1 change: 1 addition & 0 deletions dist/assets/BaseFormHeading.311de2d3.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.form-heading-title{margin-top:1em;font-weight:600}.form-heading-description{margin-bottom:1em;color:#9e9c9c}
1 change: 1 addition & 0 deletions dist/assets/BaseFormHeading.6d95ab93.js

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

1 change: 1 addition & 0 deletions dist/assets/BaseHeading.09d44225.css

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

1 change: 1 addition & 0 deletions dist/assets/BaseHeading.7358d9eb.js

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

1 change: 1 addition & 0 deletions dist/assets/DashboardView.e92555d9.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import{_ as r}from"./plugin-vue_export-helper.21dcd24c.js";import{o as e,c as o}from"./index.fc24babe.js";const a={};function c(t,n){return e(),o("h1",null,"Dashboard")}var f=r(a,[["render",c]]);export{f as default};
1 change: 1 addition & 0 deletions dist/assets/ViewClients.99826ba6.js

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

1 change: 1 addition & 0 deletions dist/assets/ViewLogin.0dad9951.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.forgot-password{font-size:.8rem;color:#9e9c9c;display:block;margin-bottom:1em}
1 change: 1 addition & 0 deletions dist/assets/ViewLogin.b978aa55.js

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

1 change: 1 addition & 0 deletions dist/assets/ViewPageNotFound.a4da0fd0.js

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

1 change: 1 addition & 0 deletions dist/assets/ViewPageNotFound.c954fab9.css

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

1 change: 1 addition & 0 deletions dist/assets/ViewPasswordForgot.3c690bab.js

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

1 change: 1 addition & 0 deletions dist/assets/ViewPasswordReset.aa61f8b5.js

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

1 change: 1 addition & 0 deletions dist/assets/ViewPasswordResetSent.b6c206c8.js

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

Loading