|
|
|
Table Of Contents
|
|
|
|
|
|
|
|
- [September](#sept)
|
|
|
|
- [October](#oct)
|
|
|
|
[September](#sept)<br>
|
|
|
|
[October](#oct)<br>
|
|
|
|
[November](#nov)
|
|
|
|
|
|
|
|
# Sept 13, 2021 <a name="sept"></a>
|
|
|
|
----------------------------
|
|
|
|
|
|
|
|
7:04 AM - Started work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Cloned work to my machine
|
| ... | ... | @@ -70,12 +69,8 @@ from GraphicalInsights.js. This looks like it was a copy-paste mistake |
|
|
|
> 3) Potetial bug is that Not all projects are shown for C_Course_Test for s5test student. I don't think the server is retrieving all the data.
|
|
|
|
<br>
|
|
|
|
|
|
|
|
4:25pm - Finished Work
|
|
|
|
|
|
|
|
# Sept 14, 2021
|
|
|
|
|
|
|
|
8:05 AM - started work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Fixed some bugs
|
| ... | ... | @@ -139,12 +134,8 @@ Error thrown on compilation |
|
|
|
variable being modified both in the if statement and out of it.
|
|
|
|
- Since it was complaining about key not being used on line 42, I simply disabled the warning for that line by setting the comment `//eslint-disable-next-line no-unused-vars` above it. I tried setting the variable to `const [value]` however, when I did a console.log test, I got different results. Plus, logically, there is a big difference between a key value pair and an array therefore I don't want to risk making the code dangerous. It's not the greatest fix, but keep in mind that this warning is basically harmless and all other solutions may clutter the code.
|
|
|
|
|
|
|
|
3:24 AM - Finished Work
|
|
|
|
|
|
|
|
# Sept 15, 2021
|
|
|
|
|
|
|
|
8:15 AM - Started work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Spent most of the day in the client/src/student/components folder.
|
| ... | ... | @@ -152,9 +143,6 @@ variable being modified both in the if statement and out of it. |
|
|
|
- Came up with 2 UI ideas for implementing a "add project" button.
|
|
|
|
- did a deep dive in React api
|
|
|
|
|
|
|
|
1:36 PM - stepped away for a bit.<br>
|
|
|
|
2:09 PM - restarted working
|
|
|
|
|
|
|
|
## Features
|
|
|
|
|
|
|
|
### Add Repo Button
|
| ... | ... | @@ -176,12 +164,8 @@ variable being modified both in the if statement and out of it. |
|
|
|
- The page will ask the user to input the `project ID` of the repo they want to add.
|
|
|
|
- There should also be a help button to tell the student how to find the `projectID` (but this isn't necessary)
|
|
|
|
|
|
|
|
3:56 PM - Done work
|
|
|
|
|
|
|
|
# Sept 16, 2021
|
|
|
|
|
|
|
|
12:43 PM - Started work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Had to deal with covid related stuff so I started late, sigh.
|
| ... | ... | @@ -206,12 +190,8 @@ variable being modified both in the if statement and out of it. |
|
|
|
- The solution was to make sure the PrivateRoute component in App.js was not on one line
|
|
|
|
- IDK why this is an issue, but it works
|
|
|
|
|
|
|
|
4:28 PM - Finished work
|
|
|
|
|
|
|
|
# Sept 17, 2021
|
|
|
|
|
|
|
|
10:22 AM - Started work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- created merge request for add repo button.
|
| ... | ... | @@ -248,13 +228,9 @@ feedbackTypes: Array |
|
|
|
- For example, rather than a "Personal" "Course:" dropdown option, students can organize their projects into their own personal created groups
|
|
|
|
- Keep in mind that not all projects have groups, therefore some items in the student DB will have NULL groupId's and groupName's
|
|
|
|
- this can be validated at: `https://gitlab.socs.uoguelph.ca/api/v4/projects/`
|
|
|
|
|
|
|
|
1:47 PM - Finished Work
|
|
|
|
|
|
|
|
|
|
|
|
# Sept 20, 2021
|
|
|
|
|
|
|
|
9:42 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Worked on some coop learning goals (not done yet)
|
| ... | ... | @@ -317,12 +293,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- All branches will go through the CI/CD pipe, and, only if they pass build, test and deploy pipes will they be merged.
|
|
|
|
- The above Example should be documented in a readme in the project (I need to talk with Judi first to see what she thinks)
|
|
|
|
|
|
|
|
4:18 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 21, 2021
|
|
|
|
|
|
|
|
9:54 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Spent two hours trying to fix a bug, turns out I wrote "fata" instead of "data"... sigh, waste of time over such a small mistake... rip
|
| ... | ... | @@ -363,12 +335,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- Finished developing the naming convention we will use
|
|
|
|
- Updated wiki to add this.
|
|
|
|
|
|
|
|
4:07 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 22, 2021
|
|
|
|
|
|
|
|
9:44 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Did some reading on react coding conventions
|
| ... | ... | @@ -444,12 +412,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- The initial solution is preferred
|
|
|
|
- The second solution will make the code nicer, but I don't want to modify it too much so that we can get a first version functioning first
|
|
|
|
|
|
|
|
3:57 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 23, 2021
|
|
|
|
|
|
|
|
9:54 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Note, The "parentId" represents the class group, the "groupId" represents the student Sub group. In gitlab, they are all "groupId".
|
| ... | ... | @@ -492,12 +456,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- create tests for epic 3
|
|
|
|
- mark epic 3 as done :D
|
|
|
|
|
|
|
|
3:08 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 24, 2021
|
|
|
|
|
|
|
|
9:57 AM - Started Work
|
|
|
|
|
|
|
|
10:16 AM - stepped away for a bit
|
|
|
|
10:45 AM - back
|
|
|
|
|
| ... | ... | @@ -537,11 +497,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- Once this is all done, we can launch the new feature
|
|
|
|
- I wanted to launch this week, but I guess I didn't have enough time to finish. I'm almost done though :D
|
|
|
|
|
|
|
|
2:45 - Finished Work
|
|
|
|
|
|
|
|
# Sept 27, 2021
|
|
|
|
|
|
|
|
9:33 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
| ... | ... | @@ -604,12 +561,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- react component api https://reactjs.org/docs/react-component.html
|
|
|
|
- jsx api https://reactjs.org/docs/jsx-in-depth.html
|
|
|
|
|
|
|
|
4:30 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 28, 2021
|
|
|
|
|
|
|
|
10:24 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Finished epic 3
|
| ... | ... | @@ -622,12 +575,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- and this: https://dev.to/abrahamlawson/react-style-guide-24pp
|
|
|
|
- refactored client side comments
|
|
|
|
|
|
|
|
2:48 - Finished Work
|
|
|
|
|
|
|
|
# Sept 29, 2021
|
|
|
|
|
|
|
|
9:24 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Did a bit of comment refactoring
|
| ... | ... | @@ -654,13 +603,9 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- I need to figure out the best way to make the code readable while following best practice
|
|
|
|
- I'm still focusing on how methods should be commented
|
|
|
|
- Method documentation is important, I personally can tell you that the comments added to this project helped me <b>a lot</b>. Especially when the comments documented return values
|
|
|
|
|
|
|
|
4:55 PM - Finished Work
|
|
|
|
|
|
|
|
# Sept 30, 2021
|
|
|
|
|
|
|
|
11:48 PM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- I have a lot of stuff to do today, so I'm going to be working all night tonight...
|
| ... | ... | @@ -675,12 +620,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
- We need to set a coding style standard for the project
|
|
|
|
- While the project is still relatively small, we need to do some refactoring
|
|
|
|
|
|
|
|
4:55 AM - Finished Work
|
|
|
|
|
|
|
|
# October 1, 2021<a name="oct"></a>
|
|
|
|
|
|
|
|
9:59 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Finished reading what I planned to read
|
| ... | ... | @@ -700,12 +641,8 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
- Finish refactoring epic (&8) next week
|
|
|
|
|
|
|
|
4:26 PM - Finished Work
|
|
|
|
|
|
|
|
# Octoer 4, 2021
|
|
|
|
|
|
|
|
10:00 AM - Started Work
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Finished refactoring comments
|
| ... | ... | @@ -717,14 +654,10 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 5
|
|
|
|
|
|
|
|
9:25 AM - Started Work
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
|
|
|
|
- Read some more api's
|
|
|
|
|
|
|
|
3:00 PM - Finished Work
|
|
|
|
|
|
|
|
# October 6
|
|
|
|
|
|
|
|
## Overview
|
| ... | ... | @@ -742,7 +675,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 7
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Refactored imports
|
|
|
|
- Beautified code
|
| ... | ... | @@ -790,7 +723,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 11
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Refactored server side project structure
|
|
|
|
- Planned how to refactor async/await functions
|
| ... | ... | @@ -799,7 +732,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 12
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Modified async/await functions to conform with code review
|
|
|
|
- The suggestion in the code review was actually really good
|
| ... | ... | @@ -838,7 +771,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 13
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Started working on QA document (it's taking longer than I thought)
|
|
|
|
- Fixed some issues
|
| ... | ... | @@ -857,7 +790,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 14
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Worked on QA Dcument. Finished Server and Client commenting conventions
|
|
|
|
- Began on coding conventions
|
| ... | ... | @@ -866,14 +799,14 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 15
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Was tasked with trying to fix the `invalid redirect URI` error in gitlab when running on the socs server
|
|
|
|
- Spent the whole time on this and couldn't figure it out... sigh
|
|
|
|
|
|
|
|
# October 18
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Figured out what was wrong with the link. I didn't add the port number and the cookie was stored in a different section in the inspect element.
|
|
|
|
- Finished the QA Document. It's kinda big and may need to be boken into seperate pages but at least all the content is there. I hope I didn't miss anything.
|
| ... | ... | @@ -881,7 +814,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 19
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Were migrating the project from VM to Docker
|
|
|
|
- Needed to do some reading up on [how to use Docker](https://docker-curriculum.com/)
|
| ... | ... | @@ -895,14 +828,14 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 20
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Came up with soloution to instructor branching problem. Will need to do code later since I'm focusing on the kubernetes migration
|
|
|
|
- Working on finishing docker file. This is taking a while since I'm new to Docker
|
|
|
|
|
|
|
|
# October 21
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Still working on docker file
|
|
|
|
- There were some issues with the latest master merge that I need to fix, it's hindering my docker image from running
|
| ... | ... | @@ -920,7 +853,7 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 25
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Got set up on Rancher, we will be using Rancher for our Kubernetes stuff since Kyle has it set up on there
|
|
|
|
- Needed to get familiar with Rancher
|
| ... | ... | @@ -930,17 +863,36 @@ Master A-<name> B-<name> C-<name> D-<name> |
|
|
|
|
|
|
|
# October 26
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- I think I finished the Kubernetes manifest file after a lot of headache, I'm now quite sure if it works yet since I want to test it on Rancher.
|
|
|
|
- Problem is, I need to figure out how to add the manifest file to Rancher and run it. I'll do that tomorrow
|
|
|
|
|
|
|
|
# October 27
|
|
|
|
|
|
|
|
# Overview
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- Figured out how to add the Kubernetes manifest file to Rancher and did it
|
|
|
|
- The manifest file won't pull the created feedback image
|
|
|
|
- I stored the feedback image in gitlab in the `Package & Registries` section
|
|
|
|
- Kyle said I need to add a Gitlab agent to Rancher
|
|
|
|
- I'm struggling to get the GitLab agent set up on Rancher, I'm working with a lot of new stuff, I think I almost have it done but today was awful, I feel like I didn't get anything productive done cause I was stuck on this all day. If I can't figure this out tomorrow, I'll ask for help |
|
|
\ No newline at end of file |
|
|
|
- I'm struggling to get the GitLab agent set up on Rancher, I'm working with a lot of new stuff, I think I almost have it done but today was awful, I feel like I didn't get anything productive done cause I was stuck on this all day. If I can't figure this out tomorrow, I'll ask for help
|
|
|
|
|
|
|
|
# November 1-18<a name="nov"></a>
|
|
|
|
|
|
|
|
## Overview
|
|
|
|
|
|
|
|
- I have not been keeping up with my journal as I have been vehemebtly focusing on getting the Kubernetes cluster functioning
|
|
|
|
- We have decided to port the IFS from a VM to Kubernetes using Docker as our container runtime environment.
|
|
|
|
- I never used any of these tools before so I spent a lot of time reading into how docker and kubernetes works
|
|
|
|
|
|
|
|
### Docker
|
|
|
|
|
|
|
|
I have made a docker file and a docker-compose file. The docker-compose may come in handy in the future for quick and easy local development. However, Right now it isn't fully functional.
|
|
|
|
|
|
|
|
The Dockerfile builds the IFS container and it is optimized to use cache to the best of it's ability. The Docker image will be used by Kubernetes
|
|
|
|
|
|
|
|
### Kubernetes
|
|
|
|
|
|
|
|
The hardest part here was writing the yaml files for the different resources. For every resource, it is required that you right manifest files so that we can have a way to recreate all of the resources we have (in case something goes drastically wrong). You can create resources from the rancher UI, but that is bad QA as you have to remember the configurations wheras with a yaml file you can just run `kubectl apply -f <file>`.
|
|
|
|
|
