AI weirdness website
For our AI weirdness project, we decided after talking with Pim, on using NuxtJS for the website. We did this because it would fit the best with our needs of it having to be dynamic and having to be able to add an API down the line.
During the development phase of our project, we each decided to pick a page and work on this. This is the list of pages & components I've worked on.
- Home page, Profile page, Login page, Voting page (I finished it), Login component, Mobile menu component, Navbar component, Username component, UserScore component
Merge conflicts & our workaround
The pages I've worked on are the home page, login page and profile page. The profile and login page branches have been deleted after merging them into the main branch but the home page branch is still available. The reason we decided to delete them is because when Bart and I were merging everything to the main branch we had some issues with merge conflicts. Brams branch, for some reason, decided to ignore the .gitignore file and wanted to merge over 1000 files. This caused a lot of issues and we decided to take a drastic measure.
Over the course of 2 days, I copied every bit of code we had and pasted it in a fresh new project in order to get everything running. The problem with this approach was that I was the only one who could do the coding at this point.
During this time I did spend a few hours talking with Pim about how we would connect the database he made and eventually we did get this working but again, I had to do the coding for this.
Since I was doing all the coding and we were a bit short on time (it was in the last week of the project), I decided to just use the main branch and not use any branches. I wasn't worried about any merge conflicts since, again, I was the only one working on it. The rest of the group was working on starting the presentation we were going to give in the next week.