Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
41703a7
First commit
Apr 20, 2020
afa97ab
Add landing page and index route
Apr 21, 2020
aa020ae
Add landing page and index route
Apr 21, 2020
593f9c4
Add new routes and signup dumb component
Apr 21, 2020
d465443
Add new routes and signup dumb component
Apr 21, 2020
8357d3d
Make index page for product list
Apr 21, 2020
92a8ddb
Add app changes
Apr 21, 2020
cf24b07
Add app modifications
Apr 22, 2020
298d768
Add app changes
Apr 22, 2020
ad645ce
Add pg gem for production on api
Apr 24, 2020
8b8e653
Add pg gem for production on api
Apr 24, 2020
2e8d9ab
use puma via procfile
Apr 24, 2020
a9a1c0f
use puma via procfile
Apr 24, 2020
3ed1aa1
Add Procfile to root
Apr 24, 2020
50298ec
Add Procfile to root
Apr 24, 2020
5bf42de
Change sqlite gem to only development
Apr 24, 2020
fe3e0c6
Change sqlite gem to only development
Apr 24, 2020
141d432
Add foreman and 12factor gems
Apr 24, 2020
2237fec
Add foreman and 12factor gems
Apr 24, 2020
95a1443
Change location of Procfile and add heroku variable
Apr 24, 2020
308f3cd
Change location of Procfile and add heroku variable
Apr 24, 2020
f6c803e
Update database.yml for deploy
Apr 24, 2020
da8478c
Update database.yml for deploy
Apr 24, 2020
0945d75
Change production db
Apr 24, 2020
d8ed473
Change production db
Apr 24, 2020
5e09b87
Remove db form database yml production
Apr 24, 2020
3b456af
Remove db form database yml production
Apr 24, 2020
6d829e7
Add api changes
Apr 24, 2020
d9f1299
Add api changes
Apr 24, 2020
b492ad8
Add api changes
Apr 24, 2020
8da9233
Add api changes
Apr 24, 2020
00bf6a3
Add api changes
Apr 24, 2020
f4749de
Add api changes
Apr 24, 2020
0dcaf94
Add api changes
Apr 24, 2020
ba108ea
Add api changes
Apr 24, 2020
45d7c5f
Add api changes
Apr 24, 2020
4d23674
Add api changes
Apr 24, 2020
25ab315
Add app changes
Apr 24, 2020
9b64c08
Merge commit '4d23674eaf002447cbafa42d0af1a899750f503f' into app
Apr 24, 2020
28f0b64
Add api changes
Apr 24, 2020
857021d
Add api changes
Apr 24, 2020
3687ae5
Add signin and signup to client
Apr 28, 2020
e19d6c1
Add changes, broken, to try and push to heroku api
Apr 30, 2020
1fc2165
Add app and api changes
Apr 30, 2020
9b8305e
Add app change
Apr 30, 2020
8afdc81
Add readme file
Apr 30, 2020
0c505ad
Add readme file
Apr 30, 2020
223e1d9
Add api jwt changes
Apr 30, 2020
4802623
Fix seed bug
Apr 30, 2020
d1b496c
Change cors origins fro wildcard to localhost:3000 to try fixing erro…
Apr 30, 2020
a656e4e
Add app
Apr 30, 2020
c624bb5
Add credentials true to cors api config
Apr 30, 2020
3879c9b
Change origins again
Apr 30, 2020
ebeba9c
Add comment to debug jwt heroku error
Apr 30, 2020
a8a970c
Add comment to debug jwt heroku error
Apr 30, 2020
fc14240
Take out hardcoded key for test
Apr 30, 2020
2974e72
Try direct access to env key
Apr 30, 2020
647ae72
Change secret key var location to storage.yml
Apr 30, 2020
d7b4e0b
change storage production to heroku
Apr 30, 2020
d917c8e
change storage production to heroku
Apr 30, 2020
4cb6c8a
change storage production to heroku
Apr 30, 2020
6d09a31
Add direct env again to get token
Apr 30, 2020
cdb90a4
Add search route for meets
May 1, 2020
0e0f526
Add auto random image on User creation
May 4, 2020
cc74628
Add validation for UserMeet table
May 4, 2020
adab29f
Add active cable and controllers for chat
May 4, 2020
b91ab6a
Add app changes
May 4, 2020
3a937cd
Change conversation create response to test if 500 error changes
May 4, 2020
1d8aa4f
Change cable adapter
May 4, 2020
549a5ca
Configure active cable for production
May 4, 2020
bacc4dd
Change development cable
May 4, 2020
c68d7b5
Fix rubocop issues on /api
May 5, 2020
86f71eb
Add validations to models
May 5, 2020
e06b0ab
Add request tests for Meets
May 5, 2020
03c2a78
Fix tests and linting on api
May 5, 2020
7b625d5
Add app changes
May 5, 2020
6477e41
Update readme
May 5, 2020
d42adbc
Add app changes
May 6, 2020
da90886
Try changing module again
May 12, 2020
4e0678d
Add git ignore to root
May 12, 2020
93506c9
Change stateful components to container folder and remove console errors
May 13, 2020
8e69bf2
Remove console wargnings and fix visibility of apply to join button
May 13, 2020
40635d2
Update read me with live link
May 13, 2020
6e2e41a
Fix vertical scroll isssue in LandingPage
May 13, 2020
93dcc68
Fix read me link
uryelah May 13, 2020
5533e93
Change stickler file to root
May 28, 2020
bc4ff4e
Merge branch 'app' of https://github.com/uryelah/rails-react-capstone…
May 28, 2020
f80b27f
Add enable stickler
May 28, 2020
3f9c764
Fix stickler config file typo
May 28, 2020
6a65275
Fix non-nested-ternary linting issues
May 28, 2020
c851e58
Add eslint configuration to stickler yml
May 28, 2020
3c9c424
Fix LandinPage scroller and make down button work
May 29, 2020
0283e63
Exclude build from git and eslint
May 29, 2020
dccfa16
Change eslintrc location to root to be found by stickler
May 29, 2020
9f69ffc
Remove unrecognized cop from rubocop
May 29, 2020
5c66c79
Modify stickler yml eslint path
May 29, 2020
3ddc58e
Modify stickler yml eslint path
May 29, 2020
e7505c6
Remove display_cop_names: true
May 29, 2020
7f6c5a6
Re-add display_cop_names: true
May 29, 2020
192df72
Separate backend branch
Jun 2, 2020
f90aa9f
Remove unrecognized cop
Jun 2, 2020
ad4245a
Remove unrecognized cop
Jun 2, 2020
dc8cbfb
Remove unrecognized cop
Jun 2, 2020
ecb69f1
Remove unrecognized cop
Jun 2, 2020
044eec7
Fix rubocop errors
Jun 2, 2020
0ab31b4
Fix rubocop errors
Jun 2, 2020
17640b6
Fix rubocop errors
Jun 2, 2020
a1f6da1
Fix rubocop errors
Jun 2, 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
node_modules/
*/node_modules/
build
build/
*/build/
60 changes: 60 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
AllCops:
Exclude:
- "db/**/*"
- "bin/*"
- "config/**/*"
- "Guardfile"
- "Rakefile"
- "README.md"
- "node_modules/**/*"

DisplayCopNames: true

Layout/LineLength:
Max: 120
Metrics/MethodLength:
Include:
- "app/controllers/*"
- "app/models/*"
Max: 20
Metrics/AbcSize:
Include:
- "app/controllers/*"
- "app/models/*"
Max: 50
Metrics/ClassLength:
Max: 150
Metrics/BlockLength:
ExcludedMethods: ['describe']
Max: 30

Style/Documentation:
Enabled: false
Style/ClassAndModuleChildren:
Enabled: false
Style/EachForSimpleLoop:
Enabled: false
Style/AndOr:
Enabled: false
Style/DefWithParentheses:
Enabled: false
Style/FrozenStringLiteralComment:
EnforcedStyle: never

Layout/HashAlignment:
EnforcedColonStyle: key
Layout/ExtraSpacing:
AllowForAlignment: false
Layout/MultilineMethodCallIndentation:
Enabled: true
EnforcedStyle: indented
Lint/RaiseException:
Enabled: false
Lint/StructNewOverride:
Enabled: false
Style/HashEachMethods:
Enabled: false
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false
22 changes: 22 additions & 0 deletions .stickler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# add the linters you want stickler to use for this project
linters:
rubocop:
display_cop_names: true
# indicate where is the config file for rubocop
config: './rubocop.yml'

# add the files here you want to be ignored by stickler
files:
ignore:
- "bin/*"
- "db/*"
- "config/*"
- "Guardfile"
- "Rakefile"
- "README.md"
- "node_modules/**/*"

# PLEASE DO NOT enable auto fixing options
# if you need extra support from you linter - do it in your local env as described in README for this config

# find full documentation here: https://stickler-ci.com/docs
143 changes: 143 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
## [Live project](https://hosting-test-29639.firebaseapp.com/)

[![Contributors][contributors-shield]][contributors-url]
[![Forks][forks-shield]][forks-url]
[![Stargazers][stars-shield]][stars-url]
[![Issues][issues-shield]][issues-url]
[![LinkedIn][linkedin-shield]][linkedin-url]

<!-- PROJECT LOGO -->
<br />
<p align="center">
<a href="https://github.com/uryelah/rails-react-capstone-project">
<img src="./public/logo.png" alt="Logo" width="80" height="80">
</a>

<h1 align="center">
<a href="https://github.com/uryelah/rails-react-capstone-project">
Circle
</a>
</h1>

<p align="center">
A simple online groups meetup webapp
<br />
<a href="https://aqueous-wildwood-18424.herokuapp.com/"><strong>Live API »</strong></a>
<a href="https://hosting-test-29639.firebaseapp.com/"><strong>Live App »</strong></a>
<br />
<br />
<a href="https://github.com/uryelah/rails-react-capstone-project/issues">Report Bug</a>
·
<a href="https://github.com/uryelah/rails-react-capstone-project/issues">Request Feature</a>
</p>
</p>

<!-- TABLE OF CONTENTS -->
## Table of Contents

* [About](#about)
* [About the App](#about-the-app)
* [Navigation](#navigation)
* [Characters](#characters)
* [Views](#views)
* [Routes](#routes)
* [Prerequisites](#prerequisites)
* [Built With](#built-with)
* [Commands](#available-commands)
* [Contact](#contact)
* [Acknowledgements](#acknowledgements)
* [CopyRight/Attributions](#copyRight/Attributions)


## About

This project is a Meetup-like site for online only meetings.

<br/>
<img src="./public/circle.gif" width="300px">

## About The App

-------

## Navigation

-------

## API Routes

| Route | Verb | Description |
|---------|-------------|-------------|
| `/meets` | GET | Index of Meetups |
| `/meets` | POST | Cretion of new Meetup |
| `/meets/:meet_id` | GET | View Meetup by id |
| `/meets/:meet_id` | PUT | Edit Meetup |
| `/meets/:meet_id` | DELETE | Delete Meetup |
| `/meets/:meet_id/meetings` | GET | Index of Meetings from a Meetup |
| `/meets/:meet_id/meetings` | POST | Cretion of Meetup Meeting |
| `/meets/:meet_id/meetings` | PUT | Edit Meetup Meeting |
| `/meets/:meet_id/meetings` | DELETE | Delete Meetup Meeting |
| `/user_meets` | POST | Creation of new favorited Meetup relation by an User |
| `/user_meets/meets/:user_id` | GET | Index of Meetups favorited by User |
| `/user_meets/meets/:meet_id` | GET | Index of Users that favorited a Meetup |
| `/auth/login` | POST | Authentication of existing User |
| `/auth/signup` | POST | Creation of new User |
| `/users` | GET | Index of Users |
| `/users/:id` | GET | Show spedific User by id |

-------


## Client Routes

| Route | Description |
|---------|-------------|
| `/` | Landing Page |
| `/sign_up` | User Signup |
| `/sign_in` | User Login |
| `/list` | List of Meetups |
| `/details/:id` | Details of Meetup
| `/search/:term` | Search page of Meetups |
| `/favorites` | List of Favorited Meetups
| `/messages` | Chat (Not working)

-------

## Prerequisites

Run the app folder in the port 3000, and api server on port 3001.

For a better review experience run db:seeds beforehand.

-------

### Built With


## Available Commands

-------

## Contact

-------

## Acknowledgements

## CopyRight/Attributions

-------

[contributors-shield]: https://img.shields.io/github/contributors/othneildrew/Best-README-Template.svg?style=flat-square
[contributors-url]: https://github.com/uryelah/rails-react-capstone-project/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/othneildrew/Best-README-Template.svg?style=flat-square
[forks-url]: https://github.com/uryelah/rails-react-capstone-project/network/members
[stars-shield]: https://img.shields.io/github/stars/othneildrew/Best-README-Template.svg?style=flat-square
[stars-url]: https://github.com/uryelah/rails-react-capstone-project/stargazers
[issues-shield]: https://img.shields.io/github/issues/othneildrew/Best-README-Template.svg?style=flat-square
[issues-url]: https://github.com/uryelah/rails-react-capstone-project/issues
[license-shield]: https://img.shields.io/github/license/othneildrew/Best-README-Template.svg?style=flat-square
[license-url]: https://github.com/uryelah/rails-react-capstone-project/blob/master/LICENSE.txt
[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
[linkedin-url]: https://www.linkedin.com/in/uryelah/
[product-screenshot]: ./public/aokanji.gif
4 changes: 4 additions & 0 deletions api/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
RAILS_ENV=production
PUSH_HEROKU=git subtree push --prefix api heroku master
SECRET_KEY_BASE=b964b6286b88027fec9caf9fe200d8ccb219549f255877e85f905da9790fad6bc483627beaef7eb37df3f80c3f38ae040c9988c3123d561e2c6fed4607503c12
HMAC_SECRET=b964b6286b88027fec9caf9fe200d8ccb219549f255877e85f905da9790fad6bc483627beaef7eb37df3f80c3f38ae040c9988c3123d561e2c6fed4607503c12
1 change: 1 addition & 0 deletions api/.rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
34 changes: 26 additions & 8 deletions api/Gemfile
Original file line number Diff line number Diff line change
@@ -1,37 +1,55 @@
source 'https://rubygems.org'
source 'https://rubygems.org' # rubocop:disable Layout/EndOfLine
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.7'
gem 'foreman'

gem 'rails_12factor', group: 'production'

gem 'devise'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.7'

gem 'active_model_serializers', '~> 0.10.0'

gem 'jwt'
# Use Active Storage variant
# gem 'image_processing', '~> 1.2'
gem 'rubocop'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', require: false

# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
# gem 'rack-cors'
gem 'rack-cors'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'rspec-rails', '~> 3.5'
gem 'sqlite3', '~> 1.4'
end

group :test do
gem 'database_cleaner'
gem 'factory_bot_rails', '~> 4.0'
gem 'faker'
gem 'shoulda-matchers', '~> 3.1'
end

group :development do
group :production do
gem 'pg'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Loading