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

Created for review #21

Open
wants to merge 159 commits into
base: review2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
7294b31
first commit
mm1123452 Jun 12, 2020
7e8d33f
feat: complete page block
julieg18 Jun 13, 2020
85a4b44
feat: complete header
julieg18 Jun 14, 2020
d58a67c
creating html
mm1123452 Jun 14, 2020
5af162d
Merge pull request #1 from MabelM1/feature/header
julieg18 Jun 14, 2020
15e3858
implementing section styles
mm1123452 Jun 14, 2020
a0492dd
after merging updates
mm1123452 Jun 14, 2020
3b164a3
Merge pull request #2 from MabelM1/feature/links
mm1123452 Jun 14, 2020
20ac1b5
creating section html
mm1123452 Jun 14, 2020
df68330
feat: complete hello-there block
julieg18 Jun 14, 2020
ad4f629
Merge pull request #3 from MabelM1/feature/hello-there
julieg18 Jun 14, 2020
8817b19
feature: added new blocks: statistics, content-title, content-subtitle
tantany Jun 15, 2020
0270d79
feature: added new blocks - statistics, content-title, content-subtit…
tantany Jun 15, 2020
d1227cd
merging updates from dev branch
mm1123452 Jun 15, 2020
ce0323e
feat: added about section
mm1123452 Jun 15, 2020
f91f553
fix:deleted commented code
mm1123452 Jun 16, 2020
47d117b
Merge pull request #5 from MabelM1/feature/about
mm1123452 Jun 16, 2020
57cb2cd
feat: added ability for multiple carousels and not just one
tantany Jun 16, 2020
72b60c6
Merge pull request #6 from MabelM1/feature/carousel
tantany Jun 17, 2020
aa50ddc
feat: add divider line to hello-there block
julieg18 Jun 17, 2020
a44e68e
Merge pull request #7 from MabelM1/feature/hello-there-divider
julieg18 Jun 17, 2020
5d45458
feature: add donations and footer sections
Av1sa Jun 18, 2020
b8b7867
hotfix: carousel fixs and added change in cursor when hovering over a…
tantany Jun 18, 2020
82a5469
hotfix: carousel fixs, button-hover and typo fix
tantany Jun 18, 2020
871ee19
hotfix: carousel fixs, button-hover and typo fix.
tantany Jun 18, 2020
32bf2b7
hotfix: carousel fixs, button-hover and typo fix..
tantany Jun 18, 2020
320ffb0
Merge pull request #11 from MabelM1/feature/carousel
julieg18 Jun 18, 2020
989385f
refactor: correct inconsistencies in files
julieg18 Jun 18, 2020
94998b4
Merge pull request #12 from MabelM1/feature/correct-inconsistencies
julieg18 Jun 18, 2020
39f3b2f
feat: add event listener to screen change for carousel
tantany Jun 18, 2020
8e5327f
Merge pull request #13 from MabelM1/feature/carousel
tantany Jun 18, 2020
a6af9d5
fix: fix broken "help us" link
julieg18 Jun 18, 2020
7ebffb8
Merge pull request #14 from MabelM1/bugfix/header-link
julieg18 Jun 18, 2020
5fd51c8
feat: add link block
julieg18 Jun 19, 2020
37805b8
Merge pull request #15 from MabelM1/feature/link
julieg18 Jun 19, 2020
faf5e90
feat: created README
mm1123452 Jun 19, 2020
940ef31
merging changes
mm1123452 Jun 19, 2020
35dc4eb
fix:typo
mm1123452 Jun 19, 2020
265db2d
Merge pull request #16 from MabelM1/feature/README
mm1123452 Jun 19, 2020
757b4ee
merge from develop to master
mm1123452 Jun 19, 2020
57c2491
hotfix: added remove and create again to indicators in resize screen
tantany Jun 19, 2020
1618d38
Merge pull request #17 from MabelM1/develop
tantany Jun 19, 2020
19d9e21
merging from master branch
mm1123452 Jun 20, 2020
c72de24
Merge pull request #18 from MabelM1/master
mm1123452 Jun 20, 2020
ed38c0d
updating dev and master branch
mm1123452 Jun 20, 2020
ec45667
Merge pull request #19 from MabelM1/develop
mm1123452 Jun 20, 2020
e1ac6b8
Merge pull request #20 from MabelM1/master
mm1123452 Jun 20, 2020
da0f670
fix: README
Av1sa Jun 22, 2020
ad82355
fix: README
Av1sa Jun 22, 2020
505822f
Merge pull request #22 from MabelM1/hotfix
Av1sa Jun 22, 2020
dbb580d
refactor: change header imgs into 1 background img
julieg18 Jun 29, 2020
5b93cee
Merge pull request #23 from MabelM1/hotfix/header
julieg18 Jun 29, 2020
3f59743
fix: nth-of-child, marging on block, margings and font size
tantany Jun 30, 2020
ae8269a
Delete settings.json
tantany Jun 30, 2020
e1d6c84
Merge pull request #25 from MabelM1/bugfix/about
tantany Jun 30, 2020
1455992
refactor: move arrow-icon images
julieg18 Jul 1, 2020
f278903
Merge pull request #26 from MabelM1/hotfix/arrow-icon
julieg18 Jul 1, 2020
8a84dcc
fix: auto width to carousel
tantany Jul 1, 2020
cfd45ba
fix: auto width to carousel plus deleted mistake
tantany Jul 1, 2020
81b8ea5
fix: auto width to carousel plus deleted mistake plus deleted comments
tantany Jul 1, 2020
e9cd7a0
Merge pull request #28 from MabelM1/bugfix/carousel
tantany Jul 1, 2020
cf888c5
Merge pull request #29 from MabelM1/master
tantany Jul 1, 2020
c30c259
feat: update page width
julieg18 Jul 1, 2020
2225c2f
feat: update header screen sizes
julieg18 Jul 1, 2020
74a1203
fix: change header bg image at 425px
julieg18 Jul 1, 2020
2c855fa
Merge pull request #30 from MabelM1/feature/update-header-media-queries
julieg18 Jul 1, 2020
f6de8e9
feat: update hello-there sizes
julieg18 Jul 1, 2020
a84cb4d
Merge pull request #31 from MabelM1/feature/update-hello-there-sizes
julieg18 Jul 1, 2020
d0c786d
change to be ignored
tantany Jul 1, 2020
936756e
Merge branch 'develop' of https://github.com/MabelM1/Out-of-bounds in…
tantany Jul 1, 2020
14835c6
feature: reactive carousel and js cosmetic changes
tantany Jul 1, 2020
c38ba5c
feature: reactive carousel and js cosmetic changes.
tantany Jul 1, 2020
6274e96
feature: reactive carousel and js cosmetic changes and comment delete
tantany Jul 1, 2020
419e797
feat:implement responsive addition-info section
mm1123452 Jul 2, 2020
ce2c917
feature: unity of code and distinguishing the slides
tantany Jul 2, 2020
b3759a3
fix: about carousel didn't work
tantany Jul 2, 2020
c3039c7
fix: delete console.log and export default
tantany Jul 3, 2020
ffa55bb
Merge pull request #33 from MabelM1/feature/carousel
tantany Jul 3, 2020
10ae255
hotfix: correct sizing and updates
mm1123452 Jul 3, 2020
7feb291
merge branch develop
mm1123452 Jul 3, 2020
1e8e654
Merge pull request #34 from MabelM1/feature/learn-more-responsive
mm1123452 Jul 4, 2020
ad99edd
Merge branch 'develop' of github.com:MabelM1/Out-of-bounds into develop
Av1sa Jul 9, 2020
c899b57
feat: update footer for new screen sizes
Av1sa Jul 9, 2020
57120df
Merge pull request #35 from MabelM1/footer-update
julieg18 Jul 9, 2020
2098ab6
feat:update about responsive sizes
mm1123452 Jul 9, 2020
c595b75
Merge pull request #37 from MabelM1/feature/about-responsive
mm1123452 Jul 10, 2020
3c43ec9
fix: donation button padding
Av1sa Jul 22, 2020
8e82ba7
fix: update hello-there media queries
julieg18 Jul 23, 2020
3bd9c40
fix: edit hello there width to match other blocks
julieg18 Jul 23, 2020
decd2a8
Merge pull request #39 from MabelM1/feature/update-hello-there-size
julieg18 Jul 23, 2020
ea54f4e
fix: various elements in different media queries
Av1sa Jul 24, 2020
eb1921c
feat: form validation added
Av1sa Jul 24, 2020
eaa1090
fix: form validation small fixes
Av1sa Jul 25, 2020
ea458f5
fix: formatting
Av1sa Jul 25, 2020
b2f54ec
fix: formatting and small issues
Av1sa Jul 25, 2020
ba5eb59
Merge pull request #41 from MabelM1/donations-fixes
Av1sa Jul 25, 2020
4ad7eb3
feat: set up webpack
julieg18 Jul 25, 2020
09a2883
Merge pull request #42 from MabelM1/feature/set-up-webpack
julieg18 Jul 25, 2020
fc68f42
feat: update donation input errors
julieg18 Jul 25, 2020
090eb41
feat: api request
mm1123452 Jul 25, 2020
580c363
Merge pull request #43 from MabelM1/feature/improve-form-errors
julieg18 Jul 25, 2020
328cfd2
feat: read values from input
mm1123452 Jul 25, 2020
0354efc
fix: remove console.log
mm1123452 Jul 25, 2020
eb06b61
fix: switch to single quotes
mm1123452 Jul 26, 2020
06d96ac
Merge pull request #44 from MabelM1/feature/api
mm1123452 Jul 26, 2020
6ff1737
feat: work on making donations radio btn editable
julieg18 Jul 26, 2020
6f716db
feat: complete making donations radio btn editable
julieg18 Jul 27, 2020
a673f5b
feat: improve formatting on JS code
julieg18 Jul 28, 2020
dde92d1
refactor: update api postPledge parameters
julieg18 Jul 28, 2020
0c7570f
Merge pull request #45 from MabelM1/feature/make-custom-donations-btn…
julieg18 Jul 28, 2020
4e6c9e9
fix: change donations radio button text
julieg18 Jul 28, 2020
c5feaca
Merge pull request #46 from MabelM1/feature/change-donations-radio-text
julieg18 Jul 28, 2020
cb29f92
fix: delete extra padding in hello-there block
julieg18 Jul 28, 2020
bf8efbd
fix: fix additional-info link design and href
julieg18 Jul 28, 2020
592fc8c
Merge pull request #47 from MabelM1/feature/update-additional-info
julieg18 Jul 28, 2020
edf4fe3
feat: complete code for dropdown menu
julieg18 Jul 28, 2020
ad5a4d6
feat: carousel buttons painted yellow on hover
tantany Jul 28, 2020
4f2191a
Merge pull request #49 from MabelM1/feature/carousel
tantany Jul 28, 2020
eecd470
fix: delete unneeded class in dropdown-menu html
julieg18 Jul 28, 2020
6a210c7
feat: change dropdown menu to side menu
julieg18 Jul 28, 2020
23342c7
Merge pull request #48 from MabelM1/feature/dropdown-menu
julieg18 Jul 28, 2020
c82967f
fix: fix padding on hello-there
julieg18 Jul 29, 2020
25b025f
fix: fix margin in additional-info
julieg18 Jul 29, 2020
08b4e00
Merge pull request #50 from MabelM1/feature/fix-hello-there-padding
julieg18 Jul 30, 2020
d67c969
Merge pull request #51 from MabelM1/feature/fix-additional-info-margin
julieg18 Jul 30, 2020
3dd16c8
fix: delete unneeded image
julieg18 Jul 30, 2020
6479c1d
refactor: correct inconsistencies in CSS files
julieg18 Jul 30, 2020
72d7bc9
Merge pull request #52 from MabelM1/feature/correct-css-inconsistency
julieg18 Jul 30, 2020
9af2071
Merge pull request #53 from MabelM1/develop
tantany Jul 31, 2020
9ff1383
fix(build): change assets paths in bundle
poalrom Aug 1, 2020
af77b12
trigger rebuild
mm1123452 Aug 1, 2020
2e63e92
Merge pull request #54 from MabelM1/trigger-rebuild
mm1123452 Aug 1, 2020
dcf6ade
trigger rebuild
mm1123452 Aug 1, 2020
aee8a34
Merge pull request #55 from MabelM1/trigger-rebuild
mm1123452 Aug 1, 2020
d2d143a
update path in package.json
mm1123452 Aug 1, 2020
f8589e0
Merge pull request #56 from MabelM1/fix/homepage-path
mm1123452 Aug 1, 2020
7279f4a
fix relative path
mm1123452 Aug 1, 2020
b8c144e
fix typo
mm1123452 Aug 1, 2020
71bdfce
Merge pull request #57 from MabelM1/fix/file-path
mm1123452 Aug 1, 2020
2b7284d
fix:remove publicpath from webpack
mm1123452 Aug 1, 2020
bde7a25
Merge pull request #58 from MabelM1/fix/webpack-remove-publicpath
mm1123452 Aug 1, 2020
12f4be3
update header bg
poalrom Aug 14, 2020
efef404
move text styles to text block
poalrom Aug 14, 2020
3348511
change texts
poalrom Aug 14, 2020
b9512b9
add new colors to pledge buttons
poalrom Aug 14, 2020
5a76206
add possibility to make second pledge clearly
poalrom Aug 14, 2020
151372a
add new link to references
poalrom Aug 14, 2020
d53d018
change images in slider
poalrom Aug 18, 2020
b7169ee
remove unnecessary text
poalrom Aug 18, 2020
27564c4
return color for statistics slides
poalrom Aug 18, 2020
0b25c37
add background color for references block
poalrom Aug 18, 2020
6906971
change hovered arrow image
poalrom Aug 18, 2020
0d3a752
change sizes of images in slider
poalrom Aug 18, 2020
cddba34
change color of hovered arrow
poalrom Aug 18, 2020
7da72ed
fix slides height
poalrom Aug 18, 2020
ad7495e
add inverted link
poalrom Aug 18, 2020
377d065
change copyright text
poalrom Aug 18, 2020
5042c99
actualize email
poalrom Sep 2, 2020
06f675b
change api url to production
poalrom Sep 7, 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
46 changes: 46 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

# http://editorconfig.org


# A special property that should be specified at the top of the file outside of

# any sections. Set to true to stop .editor config file search on current file

root = true

[*]
# Indentation style

# Possible values - tab, space

indent_style = space

# Indentation size in single-spaced characters

# Possible values - an integer, tab

indent_size = 2

# Line ending file format

# Possible values - lf, crlf, cr

end_of_line = lf

# File character encoding

# Possible values - latin1, utf-8, utf-16be, utf-16le

charset = utf-8

# Denotes whether to trim whitespace at the end of lines

# Possible values - true, false

trim_trailing_whitespace = true

# Denotes whether file should end with a newline

# Possible values - true, false

insert_final_newline = true
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
dist
Empty file added .nojekyll
Empty file.
21 changes: 20 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
# Out-of-bounds
# Out of Bounds

![out of bounds website](https://i.imgur.com/mcqGs4M.png)

## Mission
*Out of Bounds* is an organization whose mission is to provide support to children of incarcerated parents through support groups and creative coping skill workshops and special bonding projects.

This website was created to bring attention to cause, raise awareness of the organization and get donation pledges.

## Technology Used
* JavaScript (ES6)
* HTML5
* CSS3

## Team

* [Mabel] (https://github.com/MabelM1)
* [Tanya] (https://github.com/tantany)
* [Julie] (https://github.com/julieg18/)
* [Marina] (https://github.com/Av1sa)
17 changes: 17 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const presets = [
[
'@babel/env',
{
targets: {
edge: '17',
ie: '11',
firefox: '50',
chrome: '64',
safari: '11.1',
},
useBuiltIns: 'entry',
},
],
];

module.exports = { presets };
Loading