Site for dental clinic
Note: except for the Project (Root) Folder all files and folders should be (a) lower case, (b) have no spaces in the name, (c) start with a letter or number and not a special character.
Project (Root) Folder: This is the main folder for the project and contains ALL other files and folders. On the web it’s called the root folder. It’s not shown in the image above; consider it the grey box around everything.
HTML files: these are all the files that end with .html. These should be directly in the Project/Root folder and not in any sub folders. Doing that makes it easy to see all of your files and makes all of the paths to resources (images, css files) the same. The only required file is index.html but your sites will all have more .html files.
CSS Folder: all .css files go here. In this class we will not write css either in style elements on the web page or in attributes of elements. Instead all CSS will go in external stylesheets and those will be put in the css folder. You will need to have at least one stylesheet called either main.css or style.css. I will generally use main, but some of my tutorials and others use style.css so it’s OK if you use that. But don’t use both. Other CSS files should have names referring to what they are styling.
Images Folder: all images go here (.jpg, .png, .gif, etc). You can name the folder images or img.
JavaScript Folder: all JavaScript files go here. They end in .js. You can name the folder javascript or js.
- Main branch is master, it should be stable
- Developing should be in separate branches for small features
- After finishing feature, branch should be merged to master branch
- For next feature should be used new branch, created from actual master
- It is easier if separate developers work on different features in different branches
- git pull, before changes - it needed to get all updates
- git add . , to add all
- git commit -m "commit message"
- git push
- git checkout -b "branch-name"
- usual commits and push to branch
- git push –set-upstream origin branchName*, on first push
- when feature of branch is finished it should be merged to main branch
- git checkout branch
- git merge master
- maybe fix merge conflicts and commit and push them (in branch)
- git checkout master
- git merge branch