Cover Photo: Barbara Nowak

How to use Git?

Git is very useful tool for version control and files uploading. It's very easy to setup all the configuration. I have successfully uploaded files from Ubuntu and Mac.

Git in Ubuntu

First thing is to set the SSH. Our TA Anders sent us a very useful guide. I will list them and add some of my error experience.

Use this command to generate a new SSH key.

ssh-keygen -t rsa -C "$your_email"

Replace "your_email" with your email. This command will prompt you for a location and filename to store the key pair and for a password. When prompted for the location and filename, just press enter to use the default. If you use a different name, the key will not be used automatically.

Use the command below to show your public key:

cat ~/.ssh/id_rsa.pub

Then you need to copy it into the Git web. Mostly we use xclip to copy the command line in terminal. But we should first install it.

sudo apt-get install xclip

And install the git tool too.

sudo apt-get install git

Don't forget to upgrade it. Then we can use command to copy SSH keys.

xclip -sel clip ~/.ssh/id_rsa.pub

Then you need to set up the SSH keys on Gitlab. It takes me really a long time to find where it is!!! First click your avatar in the lift side bar. Then click the people icon to go to the profile setting webpage. Finally you can see a key icon in the left side bar. That is the SSH setting. Click and add the SSH keys you haved copied.

Now it's time to use Git in the terminal. First set the user name and email.

git config --global user.name "Your Name"
git config --global user.email "email@example.com"

Then clone the git. Before cloning you must "cd" to the folder you wanted to upload.

git@git.fabacademy.org:fabacademy2016/reponame.git

After create the files. Use add to add the files. For example, I have created a file named "Barry.html".

git add Barry.html

Then commit it.

git commit -m 'First upload'

The word in the single quote is the explaination of this commit.
Finally, push it to the master branch.

git push origin master

GUI Git

To tell the truth, I think GUI git is much easier to use. After I used "SourceTree", I don't want to use terminal any more.

I have setup sourcetree on Mac. Just search it from Google and install it. Set your Git account and now you can clone and commit project by clicking the buttons.

How to build my web

I have no experiences about web building. I take about 2 hours to learn the html language. Thanks to Anders, I have found a very useful tool:Brackets. It can build the web with the code as you can see the web immediately. Very easy!

Html is an interesting language. I have just learned how to build the basic web such as typing paragraph, adding image and setting URL. I am working on to add much more function.

<<<<<<< HEAD =======

To start with making a website, you need to type something first. This is the start of HTML language, including the name of the page and name showed in the browser.
Then you can start with you pages. Just using ‹p› and ‹/p› to paragraph. ‹h› and ‹/h› to make the head.

>>>>>>> bf43f989302d863e70424ac6930882189f8773c7

Color-mixed Light

This is my final project image.

This design is set to allow people to visually experience the fusion of light color that can interact with modular lighting. People can understand the rules of the color change of light and get new visual experience and enjoyable interactive experience. This set consists of three basic modular lighting modules, each independently luminous colors are red, green and blue. Between the light module can be split from each other by a magnetic force and can be integrated in the color of light flattened state.

(1) Design innovations

The characteristics of the magnet and the fusion process of imparting color to the lighting, to allow people to experience the combination, the joy of creating. And pigment mixed feelings transferred to the light.

(2) Design source

The method of thinking toy building blocks form a new shape by the application of a combination of changes in the color of light through red, green, and blue. In accordance with the process of mixing the pigment, the association through surface contact and the lamp for color fusion, we can have a more colorful life.

Basic Function

  1. Color mixing when proximity
  2. When the light module performing color integration, internal light colors will show a gradual process. On one side is in contact with the first color mixing that color mixing one side without contact. This can form an overall feeling. The gradient effect, not just in between the two lamps, light color change is also reflected in a single fixture.

  3. Mechanism interrupted at any time
  4. Fusion is the process of color gradient, color changed from the original color after mixing take some time. In the color of the two modules not yet fully integrated into the same time, separate them will get a new color blend between color and color combination before the completion of the integration.