kblincoe / VisualGit_SE701_2

1 stars 0 forks source link

Add toolbar functionality (Issue #16) #178

Closed tmeyer-smith closed 6 years ago

tmeyer-smith commented 6 years ago

I have changed two files and added a third for fixing issue #16

index.js Here I have added a custom toolbar to be set-up outside the internal HTML. I have added functionality for changing the colour, signing-out, push, pull, commit and clean. I have also removed unnecessary default features that were on the toolbar such as learning about Electron. Each function sends an event to the internal window when clicked.

index.html There is actually only one additional line being added here, line number 24, which adds the toolbar script to the HTML. All the additional changes and deletions are because the file wasn't indented properly, and so I went through and corrected it.

toolbar.js This is where the event from each function is received and the function within the application window is called for each corresponding event.

tmeyer-smith commented 6 years ago

@softeng-701 Is my pull request all good?

softeng-701 commented 6 years ago

@tmeyer-smith Please squash your commits, needs to have 1 or 2 commits to be merged. Also, all group members should give their reviews

tmeyer-smith commented 6 years ago

There are only two team members in our group, just me and Andy Stewart. Will squash commits now

tmeyer-smith commented 6 years ago

@softeng-701 I have squashed into one commit. Code has been reviewed by @andystewart12. It is ready to be added.

softeng-701 commented 6 years ago

@tmeyer-smith Looks good! Will merge after the deadline

softeng-701 commented 6 years ago

@tmeyer-smith Please resolve conflicts, thanks

tmeyer-smith commented 6 years ago

@softeng-701 Conflicts resolved you can merge when ready