├── .gitignore
├── CONTRIBUTING.md
├── LICENSE
├── README.md
├── Workflow.md
├── accessories.html
├── asset-gathering.md
├── audio.html
├── computers.html
├── css
├── computers.css
├── global_styles.css
├── products.css
├── sidebar_styles.css
├── styles.css
└── variables.css
├── favicon.ico
├── img
├── boy_review.png
├── carousel_img
│ ├── caraousel_comp_01.jpg
│ ├── caraousel_drone_01.jpg
│ ├── caraousel_drone_02.jpg
│ ├── caraousel_headphones_01.jpg
│ ├── caraousel_headphones_02.jpg
│ ├── elects_banner.png
│ └── home-banner.jpg
├── computer-home.jpg
├── computer-travel.jpg
├── computer-work.jpg
├── favicon.ico
├── friends_01.jpg
├── friends_02.jpg
├── friends_03.png
├── friends_04.jpg
├── labels
│ ├── big-sale-offers.png
│ ├── discount_01.png
│ ├── discount_02.png
│ ├── discount_03.png
│ ├── discount_04.png
│ ├── discount_05.png
│ ├── free_01.png
│ ├── free_02.png
│ ├── free_03.png
│ ├── sale_01.png
│ ├── sale_02.png
│ ├── sale_03.png
│ ├── sale_04.png
│ ├── sale_05.png
│ └── sale_06.png
├── products
│ ├── Computer-Pc-Monitor-Imac-Screen-Personal-Computer-2493287.png
│ ├── accessories
│ │ ├── tech_access_01.jpg
│ │ ├── tech_access_02.jpg
│ │ ├── tech_access_03.png
│ │ ├── tech_access_04.png
│ │ ├── tech_access_05.png
│ │ └── tech_access_06.jpg
│ ├── audio
│ │ ├── a12b50ml8.jpg
│ │ ├── bfs-900.jpg
│ │ ├── bfs-99x.jpg
│ │ ├── h-402m-blk.jpg
│ │ ├── h7902.jpg
│ │ ├── headphones_01.jpg
│ │ ├── headphones_02.png
│ │ ├── headphones_03.jpeg
│ │ ├── headphones_04.png
│ │ ├── headphones_05.png
│ │ ├── headphones_06.jpg
│ │ ├── headphones_07.jpg
│ │ ├── headphones_08.jpg
│ │ ├── headphones_09.jpg
│ │ ├── headphones_10.jpg
│ │ ├── headphones_11.jpg
│ │ ├── headphones_11.png
│ │ ├── headphones_12.png
│ │ ├── headphones_13.png
│ │ ├── headphones_14.png
│ │ ├── headphones_15.png
│ │ ├── headphones_16.png
│ │ ├── headphones_17.png
│ │ ├── headphones_18.png
│ │ └── speaker_01.png
│ ├── audio_setup.jpg
│ ├── club-back.jpg
│ ├── computer_options.jpg
│ ├── consumer-electronics.png
│ ├── controller_01.jpeg
│ ├── cooldj.png
│ ├── dj.png
│ ├── drone_01.jpg
│ ├── drone_02.png
│ ├── drone_03.png
│ ├── ecommerce-store.jpg
│ ├── ecommerce_sales.jpg
│ ├── electronics.png
│ ├── electronics_01.png
│ ├── electronics_02.png
│ ├── family_01.png
│ ├── girl-laptop1.png
│ ├── girl-laptop2.png
│ ├── girl-laptop3.png
│ ├── girl.png
│ ├── girl_01.png
│ ├── hp-pavilion.jpg
│ ├── imac.png
│ ├── images.jpg
│ ├── img0677.png
│ ├── kids_busy.png
│ ├── laptop_01.jpg
│ ├── laptop_01.png
│ ├── laptop_02.jpg
│ ├── laptop_02.png
│ ├── laptop_03.png
│ ├── male_01.png
│ ├── male_02.png
│ ├── phone_01.png
│ ├── product.png
│ ├── products.png
│ ├── ps4.png
│ ├── screens.png
│ ├── tablet_01.jpg
│ ├── tablet_02.jpg
│ ├── tablet_03.jpg
│ ├── tablet_04.jpg
│ ├── tablet_05.jpg
│ ├── tablet_06.jpg
│ └── tablet_07.jpg
├── rating-star.png
├── site-so-far.jpg
├── team
│ └── clone_download.jpg
├── tech_family.png
├── user_female_01.jpg
├── user_male_01.jpg
└── user_male_02.jpg
├── inc
├── content.php
├── footer.php
├── header.php
├── home.php
└── nav.php
├── index.html
├── index.php
├── js
├── checkout.js
├── main.js
├── products.js
└── ratings.js
├── onsale.html
├── product.html
├── product.php
├── ratings.html
├── rb
├── .gitignore
├── 1-24.png
├── 2-16.png
├── 2-6.png
├── 2-7.png
├── README.md
├── css
│ ├── bootstrap.min.css
│ ├── fa-all.css
│ ├── main.css
│ └── style.css
├── data
│ ├── data.csv
│ ├── data.json
│ ├── data.ods
│ └── data.txt
├── demo.html
├── home.html
├── index.html
├── js
│ ├── app.js
│ ├── bootstrap.min.js
│ ├── csv-parse.js
│ ├── functions.js
│ ├── index.js
│ ├── jquery-3.3.1.js
│ ├── jquery-3.3.1.slim.min.js
│ ├── nav.js
│ ├── products.js
│ ├── rb-demo.js
│ ├── useful.js
│ ├── vm-app.js
│ ├── vue-app.js
│ └── vue.js
├── product.html
├── rb-logo.jpg
└── vm.html
└── wireframes
├── categories.jpg
├── proto.png
└── single-product.png
/.gitignore:
--------------------------------------------------------------------------------
1 | *.old
2 |
3 | # General
4 | .DS_Store
5 | .AppleDouble
6 | .LSOverride
7 |
8 |
9 | # Editors
10 | .vscode
11 | .code-workspace
12 |
13 |
14 | # Local Servers
15 | dashboard
16 | webalizer
17 | xampp
18 | config.php
19 | connection.php
20 |
21 |
22 | # Icon must end with two \r
23 | Icon
24 |
25 |
26 | # Thumbnails
27 | ._*
28 |
29 | # Files that might appear in the root of a volume
30 | .DocumentRevisions-V100
31 | .fseventsd
32 | .Spotlight-V100
33 | .TemporaryItems
34 | .Trashes
35 | .VolumeIcon.icns
36 | .com.apple.timemachine.donotpresent
37 |
38 | # Directories potentially created on remote AFP share
39 | .AppleDB
40 | .AppleDesktop
41 | Network Trash Folder
42 | Temporary Items
43 | .apdisk
44 | phpsandbox
45 |
--------------------------------------------------------------------------------
/CONTRIBUTING.md:
--------------------------------------------------------------------------------
1 | # CONTRIBUTING
2 |
3 | Below are details on how to contribute to the project. If you have any questions, you can always ask by creating an **Issue** here in the repository.
4 |
5 |
6 | Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue, assessing changes, and helping you finalize your pull requests.
7 |
8 | ## Your First Contribution
9 |
10 | ### Getting started
11 | If you are a first time contributor, acknowledge that a healthy understanding of the fundamentals of git and collaborating on Github are necessary and required. There are helpful tutorials on both in the [README](https://github.com/GWGweb-projectgroup/practice-project/blob/master/README.md) file.
12 |
13 | Here are a couple of friendly tutorials to look over
14 |
15 | * [Make A Pull Request](http://makeapullrequest.com/)
16 | * [First Timers Only](http://www.firsttimersonly.com/)
17 | * Free tutorial series: [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
18 |
19 | ### The workflow
20 |
21 | >If you have time, also refer to the [GitHub Flow](https://guides.github.com/introduction/flow/) workflow, which is similar and recommended
22 |
23 | 1. Fork this repository **GWGweb-projectgroup/practice-project** into your own GitHub account
24 |
25 | 2. Clone that forked copy of the **practice-project** repo onto your local machine
26 |
27 | 3. On your machine, add an upstream to the main repo to help pull our master branch to your machine
28 |
29 | ```
30 | git remote add upstream https://github.com/GWGweb-projectgroup/practice-project.git
31 | ```
32 |
33 | Whenever you want to pull our latest changes
34 |
35 | ```
36 | git pull upstream master
37 | ```
38 |
39 | 4. Create a separate branch in your repository to begin the work, preferably using **yourname-dev** syntax, I would write
40 |
41 | ```
42 | git checkout -b chrisvneal-dev
43 | ```
44 |
45 | 5. Push your commits to your GitHub repository
46 |
47 | ```
48 | git push -u origin [name-of-your-branch]
49 | ```
50 |
51 | The **-u** is to indicate that that branch will be an "upstream" branch: so that now whenever you want to push changes you can just type ```git push```
52 |
53 | 6. Make the pull request to the necessary branch on our main repo and the **Git Assistance** team will handle everything from there _(reviewing and merging code)_
54 |
55 |
56 |
57 | > NOTE: Making a pull request for the **[master]** branch is ok for now, however when we begin adding more files and merging code, please pull request for the **[dev]** branch!
58 |
59 |
60 |
61 | >NOTE: We will aslo be using the pull request feature as a means of discussing code issues during review and going over ideas. Even if you have a feature you want to discuss with others, make a pull request and explain your feature and we can take it from there!
62 |
63 |
64 |
65 | ## Code review process
66 | Members of the **Git Assistance** team will be reviewing code to be merged into our branches, especially the master. If you have experience with this, [join the team](https://github.com/GWGweb-projectgroup/practice-project#project-team-sign-up)!
67 |
68 | As we all have varying time constraints, someone will get to your pull request and review in a timely manner. We are all here to help each other and get your code through!
69 |
70 | After feedback has been given, we expect responses and any changes to be made within a few days from feedback. After that period, we may close the pull request if it isn't showing any activity or isn't something we can fix ourselves.
71 |
72 |
73 |
74 | ## Commit message & branch naming conventions
75 |
76 | * We really don't have any conventions on commit messages, but I heard it was useful to use an "imperative" tone.
77 | "```add stylesheet link to index.html```" would be a good commit message if you added a link in the index.html file, for example. Other than, it really doesn't matter. Come up with a style that is meaningful to you.
78 |
79 | * To reiterate branch naming, branches you create from **[master]** could be
80 | ```yourname-dev```
81 | Or whatever you like, just make sure you push to the right branch.
82 |
83 |
84 |
85 | Thank you for reviewing the CONTRIBUTING.md file, if you are a contributor and have feedback or issues, make a pull request with your changes or ask myself **@chrisvneal** using an Issue.
86 |
87 |
88 |
89 |
90 |
91 |
92 |
93 |
94 |
95 |
96 |
--------------------------------------------------------------------------------
/LICENSE:
--------------------------------------------------------------------------------
1 | BSD 2-Clause License
2 |
3 | Copyright (c) 2018, GwG Web Project Group
4 | All rights reserved.
5 |
6 | Redistribution and use in source and binary forms, with or without
7 | modification, are permitted provided that the following conditions are met:
8 |
9 | * Redistributions of source code must retain the above copyright notice, this
10 | list of conditions and the following disclaimer.
11 |
12 | * Redistributions in binary form must reproduce the above copyright notice,
13 | this list of conditions and the following disclaimer in the documentation
14 | and/or other materials provided with the distribution.
15 |
16 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 | DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
20 | FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 | DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
22 | SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
23 | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 | OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | # Welcome!
2 |
3 | Welcome to the **GWGweb-projectgroup** _practice project_ repository!
4 |
5 | The purpose of this **practice repository** is to get comfortable using the front end skills we've learned so far. Also to gain experience using & collaborating with **git** and the **GitHub** online repository service. If you don't have one already, please [create a GitHub account](http://www.github.com) as it is required to contribute to the project.
6 |
7 | :warning: **IMPORTANT: Please fork this repository to _your_ account and work as you would locally from there.** Please refer to the [CONTRIBUTING](https://github.com/GWGweb-projectgroup/practice-project/blob/master/CONTRIBUTING.md) file for more information.
8 |
9 | ## Progress
10 | This section will be updated so that any newcomers can quickly view the progress of our project!
11 |
12 | [view the website](https://gwgweb-projectgroup.github.io/practice-project/) _(in progress)_
13 |
14 | 
15 |
16 |
17 | ### Table of Contents
18 |
19 | [Learning Git and GitHub](#learning-git-and-github)
20 |
21 | [Current Group Tasks and Deadlines](#current-group-tasks-and-deadlines)
22 |
23 | [Project Goals](#project-goals)
24 |
25 | [Project Team Sign Up](#project-team-sign-up)
26 |
27 | [Teams](#teams)
28 |
29 |
30 | ## Learning Git and Github
31 | If you haven't already, please begin learning **the fundamentals of git** and **collaborating on GitHub**. Most of the fundamental learning will involve using git on your local machine and we will be using GitHub's collaborative features to build together.
32 |
33 | > #### This is necessary, especially if you plan to contribute code to the project.
34 |
35 |
36 | ### Git and GitHub Learning Resources
37 | Here's some links that were passed around in the forums that I believe are some of the best and I added some that really got me on track with making pull requests and stuff (**SPOILER**: it's easy!).
38 |
39 | * [Udacity Course: How To Use Git and GitHub](https://www.udacity.com/course/how-to-use-git-and-github--ud775) *(course)*
40 |
41 | * [How Not To F- Up Your Local Files w/ Git pt 1](https://medium.com/@francesco.agnoletto/how-to-not-f-up-your-local-files-with-git-part-1-e0756c88fd3c) *(article)*
42 | * [GitHub Help Guide: Forking Projects](https://guides.github.com/activities/forking/) *(article)*
43 | * [YouTube: Creating A Simple Github Pull Request](https://www.youtube.com/watch?v=rgbCcBNZcdQ) *(video)*
44 | * [Youtube: Git & GitHub Tutorial for Beginners #11 - Collaborating on GitHub](https://www.youtube.com/watch?v=MnUd31TvBoU&t=402s) *(#12, too! video)*
45 | * [How To Collaborate on GitHub](https://code.tutsplus.com/tutorials/how-to-collaborate-on-github--net-34267) *(article)*
46 | * [Git Forks and Upstreams](https://www.atlassian.com/git/articles/git-forks-and-upstreams) *(article)*
47 |
48 |
49 |
50 | [[back to top]](#readme)
51 |
52 |
53 | ## Current Group Tasks and Deadlines
54 |
55 | * We have **1 week** *(by March 10th or 11th)* to [choose a team](#project-team-sign-up) to contribute with. How would you like to contribute? **More details below.**
56 |
57 | * Take as much time as you need to understand the basics of git and collaborating, but I'm hoping in about a week or so we will
58 | * Know and understand the fundamentals of git and collaborating on GitHub
59 | * Establish main idea for website
60 | * Create somewhat of an initial layout/design of the main page
61 |
62 | ## Project Goals
63 | * Learn git/GitHub & web development in a "remote group environment"
64 | * Create a simple project; **1-2 pages** *w/ room to expand*
65 | * Practice what we've learned so far in the course
66 | * Be challenged! Not overwhelmed
67 | * Work in small teams, hoping everyone will have a meaningful role
68 |
69 |
70 | ## Project Team Sign Up
71 |
72 | > **Instruction:** Let's keep this process simple!
73 | >
74 | >The only change you will be making for now is adding your name to whichever team you'd like to contribute with using the format below. Add your name to a team and push your changes to the main repo's **dev** branch, creating a pull request. Once approved, the changes will be merged
75 |
76 | **This syntax creates a table in Markdown, all you have to do is edit/insert your information like so:**
77 |
78 | ```
79 | Name | Disc Forum @ | Slack @ | Link (optional)
80 | ----- | ----- | ----- | -----
81 | (your name) | (your @) | your @ | optional link
82 | ```
83 | You'll get it when you see how others have done it. If not, just ask someone. This list will determine who the contributors are for this project. Adding your name to a table is as easy as separating your info with the **pipe** character like this:
84 |
85 | ```name | disc forum name | slack name | (optional link) ```
86 |
87 |
88 | >#### You can be on more than one team, just make sure there are enough duties for everyone to contribute meaningfully.
89 |
90 | [[back to top]](#readme)
91 |
92 | ---
93 |
94 | ### Teams
95 |
96 | * [Wireframe and layout design](#wireframe-and-layout-design)
97 | * [Initial HTML Development](#initial-html-development)
98 | * [HTML refactoring and optimization](#html-refactoring-and-optimization)
99 | * [CSS refactoring and optimization](#css-refactoring-and-optimization)
100 | * [JavaScript refactoring and optimization](#javascript-refactoring-and-optimization)
101 | * [Asset Gathering](#asset-gathering)
102 | * [Copy and grammar editing](#copy-and-grammar-editing)
103 | * [Git assistance](#git-assistance)
104 |
105 | ### Wireframe and layout design
106 | Contributors in this group will create a mockup/wireframe/sketch of what the site would look like and would most likely be **initiating CSS styling**.
107 |
108 | Name | Disc Forum @ | Slack @ | Link (optional)
109 | ----- | ----- | ----- | -----
110 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
111 |
112 | ### Initial HTML development
113 | Contributors in this group will work with the wireframe and layout design team to create the initial *index.html* file.
114 |
115 | Name | Disc Forum @ | Slack @ | Link (optional)
116 | ----- | ----- | ----- | -----
117 | Dionne Petty | | @Dionne | [github/ddpetty](https://github.com/ddpetty)
118 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
119 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
120 |
121 |
122 | ### HTML refactoring and optimization
123 | Contributors in this group will refactor and optimize the structure and semantics of the ***index.html*** file *(checking syntax errors, etc.)*
124 |
125 | Name | Disc Forum @ | Slack @ | Link (optional)
126 | ----- | ----- | ----- | -----
127 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
128 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
129 | Dionne Petty | | @Dionne | [github/ddpetty](https://github.com/ddpetty)
130 |
131 |
132 | ### CSS refactoring and optimization
133 | Contributors in this group will refactor and optimize the structure and semantics of the ***stylesheet*** file *(checking syntax errors, etc.)*
134 |
135 | Name | Disc Forum @ | Slack @ | Link (optional)
136 | ----- | ----- | ----- | -----
137 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
138 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
139 | Cynthia Clinton | cclinc2005jz5kd | @Cynthia | [github/Cynth42](https://github.com/Cynth42)
140 | Dionne Petty | | @Dionne | [github/ddpetty](https://github.com/ddpetty)
141 | Megan Spaulding | | @Megan Spaulding | [github/meganspauldingcreative](https://github.com/meganspauldingcreative)
142 |
143 | ### JavaScript refactoring and optimization
144 | Contributors in this group will refactor and optimize the structure and semantics of the ***.js*** file, ensuring best practices *(checking syntax errors, etc.)* Contributors may also choose to **initiate interactivity scripting** when necessary.
145 |
146 | Name | Disc Forum @ | Slack @ | Link (optional)
147 | ----- | ----- | ----- | -----
148 | Cynthia Clinton | cclinc2005jz5kd | @Cynthia | [github/Cynth42](https://github.com/Cynth42)
149 | Dionne Petty | | @Dionne | [github/ddpetty](https://github.com/ddpetty)
150 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
151 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
152 |
153 | ### Asset gathering
154 | Contributors in this group will gather resources for images, icons, and media pertaining to the main concept while working closely with the ***wireframe layout*** and ***index.html*** teams for guidance.
155 |
156 | Name | Disc Forum @ | Slack @ | Link (optional)
157 | ----- | ----- | ----- | -----
158 | Ivan Huddleston | taskmaster | taskmaster | [github/elementWebDev](https://github.com/elementWebDev)
159 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
160 |
161 | ### Copy and grammar editing
162 | Contributors in this group will help spot grammatical and spelling errors within the site's body & content.
163 |
164 | Name | Disc Forum @ | Slack @ | Link (optional)
165 | ----- | ----- | ----- | -----
166 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
167 |
168 | ### Git Assistance
169 | Contributors in this group will
170 |
171 | * help manage the main project repo *practice-project*
172 | * help others with git and pull requests on Github and
173 | * *help with code review* of any code before it gets merged into the main project branch, **master**.
174 |
175 | Name | Disc Forum @ | Slack @ | Link (optional)
176 | ----- | :-----: | :-----: | :-----
177 | Chris Neal | chrisneal | Chris N | [github/chrisvneal](https://github.com/chrisvneal/GWGpractice)
178 |
179 | [[back to top]](#readme)
180 |
--------------------------------------------------------------------------------
/Workflow.md:
--------------------------------------------------------------------------------
1 | Short of a full tutorial, I'd like to explain how a pull request would work for us. If you don't understand the basics of _git/version control_ and using **GitHub** to collaborate, please refer to [these resources in the README file](https://github.com/chrisvneal/practice-project#learning-git-and-github) to get up to speed.
2 |
3 | Here is a quick run down of how to contribute to this project.
4 |
5 | ## 1. Fork the main project repo
6 |
7 | 1. **Do not fork my copy!** lol Visit [GWGweb-projectgroup/practice-project](https://github.com/GWGweb-projectgroup/practice-project)
8 |
9 | 2. **"Fork the repo"**. This means you have to click the fork icon at the top right of the page. This will make a copy of our project, take you back to _your own GitHub account_ and copy it there. Same project, same files, same everything. Now you can work on the project from your own environment!
10 |
11 |
12 |
13 | ## 2. Clone your copy
14 | 1. Click the **"Clone or download"** button. This will give you options for dowloading all the files to your local machine.
15 |
16 | 
17 |
18 | 2. If you want to clone using your terminal, open the terminal, navigate to where you want to dump the files. It will create its own folder so putting it in your _[open-source_projects]_ folder is fine. Copy the link, https://github.com/GWGweb-projectgroup/practice-project.git
19 | and in your terminal where you want to put the project type
20 |
21 | ```git clone https://github.com/GWGweb-projectgroup/practice-project.git``` and pess Enter. You should now be on the **[master]** branch of your copy of the project.
22 |
23 |
24 |
25 | ## 3. Create an "upstream" to the main repo
26 | In order to stay up to date with what's going on and keeping your **master** code current, create an _upstream_ to the main project repository so that you can easily pull in the latest changes to your local copy. Doing this will allow you to create a separate branch and work from the most current project state avoiding a lot of complications down the road.
27 |
28 | 1. In your terminal type
29 |
30 | ```git remote add upstream https://github.com/GWGweb-projectgroup/practice-project.git```
31 |
32 | 2. Whenever you feel there's been changes to our **master**, just type
33 |
34 | ```git pull upstream master``` and that should pull the current code down from our **[master]** branch.
35 |
36 |
37 |
38 | ## 4. Make a separate branch to work on
39 | 1. To always have a clean copy to work from, leave your copy's **[master]** branch alone and create a separate branch to work on by typing
40 |
41 | ```git checkout -b [yourname-dev]```
42 |
43 | >_That branch syntax is preferred, but call it whatever you like_!
44 |
45 | 2. Now you're free to play around and make changes as you see fit
46 |
47 | >IMPORTANT: Pull the main repo's **[master]** branch onto your machine everytime before you begin working on additions, ensuring your working with the latest changes.
48 |
49 |
50 |
51 | ## 5. Push your separate branch up to your GitHub account
52 | 1. Any serious changes should be committed and pushed to your online GitHub copy of the project repo by typing in the terminal
53 |
54 | ```git push -u origin [this branch name]```
55 |
56 | The ```origin``` was already created when you cloned this repo and the ```-u``` is creating an upstream to that repo.
57 |
58 | 2. Now whenever you want to push your changes, just type ```git push``` in that branch and it will do just that
59 |
60 |
61 |
62 | ## 6. Make a pull request
63 | This part usually trips people up, but it's easy
64 |
65 | 1. When you go back to your copy of the repo on GitHub, it will prompt you to **make a pull request** and allow you to add some message.
66 |
67 | >IMPORTANT: Make sure your changes are going into to our **[dev]** branch and not the **[master]** branch.
68 |
69 | 2. When you click to make the pull request, it will take you to the main repo's copy to compare if you need to and confirm the request. If everything is good to go, you'll see green text confirming that a merge would be successful!
70 |
71 |
72 |
73 |
74 | ### Conclusion
75 | After this, members of the [**Git Assistance** team](https://github.com/GWGweb-projectgroup/practice-project#git-assistance) will review and accept the merge to the **[dev]** branch. I can help with any part of this process as I am also still learning git and GitHub so bear with me. All I ask is that you either refer to the resources mentioned earlier or get through this quick rundown for making a basic pul request.
76 |
77 | #### most used git commands
78 | * ```git pull upstream master```
79 |
80 | * ```git checkout -b [yourname-dev]```
81 |
82 | * ```git push -u origin [this branch name]```
83 |
84 | * ```git push```
85 |
86 | * On your branch separate from master, ```git merge master``` to copy the latest changes after you pull from the **_upstream_** _(main project repo)_
87 |
88 |
--------------------------------------------------------------------------------
/accessories.html:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
5 |
6 |
7 |
8 | GwG eCommerce
9 |
10 |
11 |
12 |
13 |
14 |
15 |
16 |
17 |
18 |
19 |
20 |
21 |
22 |
23 |
24 |
25 |
26 |
27 |
28 |
64 |
65 |
66 |
67 |
68 |
69 |
70 |
It doesn't matter where you are in the world.
71 |
We offer many audio choices you can hear for miles.