Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Content/ Design for site. #43

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4dee7d7
Mirgated most of the site to scss rather than react styles
Hellrungj Mar 2, 2020
4c54fd1
Added an update to the README file
Hellrungj Mar 4, 2020
c79cf36
Added React-bootstrap
Hellrungj Mar 5, 2020
a23d0d9
Added the rest of the page style along with writing out more of the i…
Hellrungj Mar 7, 2020
9eb103a
Add more content to readme file
Hellrungj Mar 7, 2020
c1dbe43
Create a quick contribuing.md file with possible ideas
Hellrungj Mar 7, 2020
100c0bc
Add new pages
Hellrungj Mar 7, 2020
50c022e
Merge pull request #10 from nashvillefcc/styles_change
lapinell Mar 9, 2020
4014911
Merge pull request #13 from nashvillefcc/readme_update
lapinell Mar 9, 2020
3ae2b0f
Trimmed dwon the content
Hellrungj Mar 13, 2020
ea264ef
Add a note about comparing branch when making PR
Hellrungj Mar 13, 2020
a553b98
Add the fonts, color to _Base SCSS file
Hellrungj Mar 13, 2020
d56719d
initial navbar
Josh-Webb Mar 14, 2020
574b875
inserting logo
Josh-Webb Mar 14, 2020
a7ff7d9
links to available pages
Josh-Webb Mar 14, 2020
29a7533
Add Images to project
Hellrungj Mar 15, 2020
40a5e6c
gatsby link
Josh-Webb Mar 15, 2020
02e3122
styling and stickied to top
Josh-Webb Mar 16, 2020
017953c
Merge pull request #37 from nashvillefcc/36_Adding_Web_Assists
lnbailey Mar 16, 2020
220bd63
Add more grays to the _bass file
Hellrungj Mar 16, 2020
05cb282
Merge pull request #35 from nashvillefcc/29_Define_Base_SCSS_styles
lnbailey Mar 16, 2020
d9db395
Merge pull request #34 from nashvillefcc/Ticket_#14_contributing_update
lnbailey Mar 16, 2020
98f1966
show class
Josh-Webb Mar 16, 2020
882485c
Merge branch 'master' into joshW-Navbar
Josh-Webb Mar 16, 2020
0fa1508
text is proper color. Active color is next.
Josh-Webb Mar 16, 2020
c5db703
feature complete, just want to clean margins/padding
Josh-Webb Mar 16, 2020
12b0b83
Padding better than it was. Need further instruction
Josh-Webb Mar 16, 2020
46c452a
Added Helmet and Fonts using SASS imports
Hellrungj Mar 17, 2020
aa0e8bb
Adding Font-Sizes
Hellrungj Mar 17, 2020
feeae48
Merge pull request #39 from nashvillefcc/gatsby-plugin-react-helmet
lapinell Mar 17, 2020
7b116e8
button more or less working
MCaldwell-42 Mar 17, 2020
0734275
merged with master
MCaldwell-42 Mar 17, 2020
8c9a09b
final button version with speakers and tickets implemented in index
MCaldwell-42 Mar 17, 2020
a6235e7
added button.scss and styles options
MCaldwell-42 Mar 17, 2020
87d5312
styles adjustments
MCaldwell-42 Mar 18, 2020
aff3a3f
updated logo margin and navbar padding
Josh-Webb Mar 18, 2020
64b4581
checking master
Josh-Webb Mar 18, 2020
c3ee1c7
Merge branch 'master' into joshW-Navbar
Josh-Webb Mar 18, 2020
5f1a0cd
margin on logo.
Josh-Webb Mar 18, 2020
d8a28c1
Merge pull request #40 from nashvillefcc/mc_button
Hellrungj Mar 23, 2020
2fa7abe
Merge pull request #41 from nashvillefcc/joshW-Navbar
Hellrungj Mar 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Contributing to Underground JS

#### Table Of Contents

[Code of Conduct](CODE_OF_CONDUCT.md)

[What should I know before I get started?](#what-should-i-know-before-i-get-started?)

[How Can I Contribute?](#how-can-i-contribute?)

* [Questions about the source code?](#questions-about-the-source-code?)

* [Branches](#branches)

* [Pull Requests](#pull-requests)

[List of Contributors](README.md)

---

## What should I know before I get started?

- [React](https://reactjs.org/)
- [Gatsby](https://www.gatsbyjs.org/)

### Note: This done mean you need to expect but basic understanding and experience will work.

## How Can I Contribute?

Notifed [Hellrung](https://github.com/Hellrungj) or [lapinell](https://github.com/lapinell)

OR

Join us at [FFC Mentor Night Group](https://www.meetup.com/freeCodeCamp-Nashville/)

### Questions about the source code?

Feel free to ask [Hellrung](https://github.com/Hellrungj) or [lapinell](https://github.com/lapinell)

### Branches

Branches name should be named with the follow standard:
```
Ticket Number -> Ticket Name

Examle: 01_Update_README
```

### Pull Requests

There must be a Pull Request or every change to repo.

#### Note: Make sure you compare the nashvillefcc/UndergroundJS-Website Master Branch to Your Branch

Assign [Hellrungj](https://github.com/Hellrungj) as Pull Request Reviewer

---

Thank you for taking the time to contribute! :heart:

UndergroundJS Team
61 changes: 61 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,64 @@
[![Netlify Status](https://api.netlify.com/api/v1/badges/d90806bd-c6e6-494d-91fd-2effac0beeb1/deploy-status)](https://app.netlify.com/sites/eager-blackwell-c3d9cd/deploys)

Site is built using [Gatsby](https://www.gatsbyjs.org) and [Netlify](http://netlify.com).

- [Introduction](#introduction)
- [Getting Started](#getting-started)
+ [Prerequisites](#prerequisites)
- [Helpful Resources](#helpful-resources)
- [Contributing](#contributing)
+ [Contributors](#contributors)

## Introduction

## Getting Started

### Prerequisites

- [Git](https://git-scm.com/)
- [Node.js](https://nodejs.org/)

1. To get started copy the repo:

```
git clone <Repo URL>.git
```

2. Install the project packages:

```
npm install
```

3. Run the server:

```
npm start
```

## Helpful Resources

- [React Docs](https://reactjs.org/docs/getting-started.html)
- [Gatsby Docs](https://www.gatsbyjs.org/docs/)
- [Bootstrap Docs](https://getbootstrap.com/docs/4.4/getting-started/introduction/)
- [React-Feather](https://github.com/feathericons/react-feather)
- [React-Bootstrap Docs](https://react-bootstrap.github.io/getting-started/introduction/)
- [Netlify Docs](http://docs.netlify.com)

## Contributing

Review the following docs before diving in:
- [CONTRIBUTING.md](CONTRIBUTING.md)
- [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md)

### Contributors

| Image | Name | Role | Github |
|--------------------------------------------------------|----------------|-----------------------------------------------------------------|--------------------------------------------|
| <img src="https://github.com/lapinell.png?size=72" /> | Laura Pinell | FFC Organizer / Project Manager | [lapinell](https://github.com/lapinell) |
| <img src="https://github.com/Hellrungj.png?size=72" /> | John Hellrung | FFC UGJS Assistant Project Manager/ FFC UGJS Lead Developer | [Hellrungj](https://github.com/Hellrungj/) |
| <img src="https://github.com/lnbailey.png?size=72" /> | Ellen Bailey | FFC UGJS Assistant Project Manager / FFC UGJS Lead UI/UX Design | [lnbailey](https://github.com/lnbailey) |
| <img src="https://github.com/kwelch.png?size=72" /> | Kyle Welch | UGJS Owner / UGJS Organizer | [kwelch](https://github.com/kwelch) |
| <img src="https://github.com/beelarr.png?size=72" /> | uoʎɹq ǝɔuɐɹɹɐl | UGJS Contributor | [beelarr](https://github.com/beelarr) |
| <img src="https://github.com/itzsaga.png?size=72" /> | Seth | UGJS Contributor | [itzsaga](https://github.com/itzsaga) |
| <img src="https://github.com/matthamil.png?size=72" /> | Matt Hamil | UGJS Contributor | [matthamil](https://github.com/matthamil) |
19 changes: 15 additions & 4 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,21 @@ module.exports = {
twitter: 'https://twitter.com/undergroundjs',
instagram: '',
},
__experimentalThemes: ['gatsby-theme-conference'],
plugins: [
{
resolve: 'gatsby-source-filesystem',
resolve: `gatsby-source-filesystem`,
options: {
path: `${__dirname}/src/images`,
name: 'images',
},
name: 'images'
}
},
{
resolve: "gatsby-plugin-react-svg",
options: {
rule: {
include: /svgs/
}
}
},
{
resolve: `gatsby-plugin-google-analytics`,
Expand All @@ -30,6 +37,10 @@ module.exports = {
'gatsby-transformer-sharp',
'gatsby-plugin-sharp',
'gatsby-plugin-offline',
`gatsby-plugin-react-helmet`,
'gatsby-plugin-netlify', // make sure to keep it last in the array
{
resolve: `gatsby-plugin-sass`,
},
],
};
Loading