Week 13: 5/2 + 5/4

Monday 5/2

Collaborating on Code

We will look more into how to collaborate with Git and GitHub by learning about branching and how to add your teammates to a single repository.

Learning to work with other people in Git and GitHub is a valuable skill. Branches are what make this possible. What we learn today will help you to do your Final Projects and help you if you get a job at a company that uses Git/GitHub to do their work (many do now and even UI/UX folks need to learn the basics).

Test Example

In your groups we will learn branching hands-on. We will follow these steps:

Pick a Repository Owner

Pick one person who will create the repository. There will only be one for the whole group.

Create Branch Example Repo

ONLY the Repo Owner you chose does this.

Use this Branch Example Template

Add Other Members to the Repo

  1. Click Settings
  2. Click Collaborators
  3. Click Invite a collaborator

Rest of group accept Collab invite

You will need to check the email you used with GitHub for the invite.

Double-Check

Make sure everyone is now a member of the shared repository.

Open the Repo in Gitpod

EVERYONE should do this.

Create a branch with your name

You can do in terminal:

git checkout -b yourName

If you want to use the visual interface you can do that too.

EVERYONE does this.

Create a File for you in the people folder

For example I would create chris.md file in the people folder.

Put whatever content you want in the file (it will be public).

EVERYONE does this.

Commit your change

You can use the visual interface or keep workign in the terminal

git commit -m “added file for chris”

EVERYONE should do this.

Checkout the main branch

You can do in terminal:

git checkout main

If you want to use the visual interface you can do that too.

EVERYONE does this.

pull changes

This is more for practice. If you are the first person there may be nothing to pull.

git pull

EVERYONE does this.

Merge your branch into main

For example if my branch was named chris then I would type this in the terminal

git merge chris

EVERYONE should do this.

Push your changes to GitHub

This makes your changes available to your teammates.

git push

EVERYONE should do this.

Let me know if there are problems.

If everyone chose different file names then there should be no problems. If merge conflicts or other issues arise, let me know.

Resources

Group Work

Finish Project Briefs

The remainder of class time you will be able to finish up your project brief.

Wednesday 5/4

Branching Recap

We will recap branching and then also make sure all of the groups have your repositories and all members have been made collaborators.

Base Repository

After we’ve done the example you should create your group’s repository.

  1. One person will create a repository based on the Eleventy Sass repository
    1. Go to the Eleventy Sass Repo and click the green Use This Template button.
  2. The same person will then share with everyone else in the group (as shown in the Collaborate on GitHub post).
  3. Everyone else in the group will check email and accept the invitation
  4. Remember to post the link to the repository in your Group Miro Board.

Image Resizing

Angelica will show some methods for resizing images so that they fit the same aspect ratio and work better in grid layouts.

https://www.dropbox.com/s/s8qo0lt8m7h5qjk/Re-sizing%20images.mov?dl=0

JavaScript Intro

If we have time today, we will do a brief introduction to JavaScript. We will look at the JavaScript Resource page and maybe get into a tutorial site.

Leave a comment