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

Index css #1343

Open
wants to merge 74 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
a626c00
deleted gem lock file and updated rails version in gemfile to 6.1
Feb 7, 2022
f7cc75e
File set-up
smm3000 Feb 7, 2022
207b328
Heroku setup
hannahdesmond Feb 8, 2022
00fd2ce
Merge branch 'master' into heroku
hannahdesmond Feb 8, 2022
1c421f5
Merge pull request #1 from hannahdesmond/heroku
hannahdesmond Feb 8, 2022
5c200ee
Update for Heroku
hannahdesmond Feb 8, 2022
262ff0a
installed devise
Feb 9, 2022
fa27c54
devise working
Feb 9, 2022
db7ee2a
Merge pull request #2 from hannahdesmond/devise
Alex-Jamshidi Feb 9, 2022
461bc3e
added temporary links to webpage layout html.erb
Feb 10, 2022
817b1e4
Update README.md
smm3000 Feb 10, 2022
0de3b49
Update README.md
smm3000 Feb 10, 2022
929cdf8
Add feature tests for welcome page and sign in
hannahdesmond Feb 10, 2022
1aa5122
Routing Testing
smm3000 Feb 10, 2022
0533acf
Add if/else statement to application.html.erb
hannahdesmond Feb 11, 2022
a290b73
pre-scaffold (alex)
Feb 11, 2022
e586d06
immediately after adding CRUD scaffold (alex)
Feb 11, 2022
56ebe77
Add sign up, sign in, and sign out links
hannahdesmond Feb 11, 2022
b28066b
Draft Navbar added
smm3000 Feb 11, 2022
a0a7a06
if not signed in, users will be redirected to sign-in page. and added…
Feb 11, 2022
f80247e
rubocop and simplecov added
Feb 11, 2022
3af3645
Add Nav bar with sign up, sign in and sign out
hannahdesmond Feb 11, 2022
c2c9367
ran rubocop, fixed 250ish offences
Feb 11, 2022
5bb68b7
Add feature tests for edit password and delete account
hannahdesmond Feb 13, 2022
86ac95b
Merge pull request #3 from hannahdesmond/testing-signup
hannahdesmond Feb 14, 2022
18995b5
Merge branch 'main' into alex
hannahdesmond Feb 14, 2022
cf42256
Merge pull request #4 from hannahdesmond/alex
hannahdesmond Feb 14, 2022
f0e2628
Remove duplicate show posts
hannahdesmond Feb 14, 2022
12f37e4
Update tests
hannahdesmond Feb 14, 2022
2d96908
password functionality updated to include 10 character maximum
smm3000 Feb 15, 2022
a47f5c7
Factory bot added
cmkap Feb 15, 2022
d92f06f
added user id, reduced crud functionality for non-users
TMWcodes Feb 15, 2022
fa80307
Functionality to restrict CRUD to only signed in user profiles
smm3000 Feb 15, 2022
3fa66f3
Factory bot update
cmkap Feb 15, 2022
9115d71
Add redirect to show posts after creating new posts
hannahdesmond Feb 15, 2022
f71b916
turbo links enabled
cmkap Feb 15, 2022
7e40e01
Redirects to posts if signed in
cmkap Feb 15, 2022
7bb7dc9
Re-routing so clicking logo sends user to home page
hannahdesmond Feb 15, 2022
263fa74
Merge pull request #5 from hannahdesmond/crud-test-routes
hannahdesmond Feb 15, 2022
0bd5088
Merge branch 'main' into SMTR
smm3000 Feb 16, 2022
23c54ce
Merge pull request #6 from hannahdesmond/SMTR
smm3000 Feb 16, 2022
79299ec
Added time limit functionality
smm3000 Feb 16, 2022
1e6f03f
Added Date/Time
smm3000 Feb 16, 2022
bdabb67
Added username functionality to code
smm3000 Feb 16, 2022
377b7a4
Merge pull request #7 from hannahdesmond/AJSM
Alex-Jamshidi Feb 16, 2022
351f50d
Merge branch 'main' into usernamestory
Alex-Jamshidi Feb 16, 2022
a93ba2c
Merge pull request #8 from hannahdesmond/usernamestory
Alex-Jamshidi Feb 16, 2022
d9250e8
text-area and line break added
cmkap Feb 16, 2022
4a745ef
Merge branch 'main' into line-break
cmkap Feb 16, 2022
1481ef2
Merge pull request #9 from hannahdesmond/line-break
cmkap Feb 16, 2022
9e1b117
Added comment functionality
smm3000 Feb 16, 2022
4e8d18c
Comments functionality and user name working
smm3000 Feb 17, 2022
504d2d2
Added time/date to comments and styling. Changed name to reflect actu…
smm3000 Feb 17, 2022
471dbfe
Merge branch 'main' into comments
smm3000 Feb 17, 2022
20b9489
Merge pull request #10 from hannahdesmond/comments
smm3000 Feb 17, 2022
4c79fea
comments added and post link removed
cmkap Feb 17, 2022
792b365
Continuous Development - Github Actions
smm3000 Feb 17, 2022
fb0a8c7
bundle install ran to test CI through github/heroku integration
Feb 17, 2022
1342089
bundle install ran to test CI through github/heroku integration 2
Feb 17, 2022
f2d79b5
sign up, sign in css
TMWcodes Feb 17, 2022
0197576
bundle install ran to test CI through github/heroku integration 3
Feb 17, 2022
7ca650e
bundle install ran to test CI through github/heroku integration 4
Feb 17, 2022
9a37583
bundle install ran to test CI through github/heroku integration 5
Feb 17, 2022
39129c7
changed uglifier thing
Feb 17, 2022
f0f28da
index css added
cmkap Feb 17, 2022
9e4f30e
edited posts controller to check huroku
Feb 17, 2022
17e0ad2
removed ability to see psots index page unless signed in
Feb 17, 2022
37dff45
added user names to posts
cmkap Feb 17, 2022
5e3c874
Merge branch 'main' into scss
cmkap Feb 17, 2022
054e13e
Merge pull request #11 from hannahdesmond/scss
cmkap Feb 17, 2022
65ccbc6
Read me update
cmkap Feb 17, 2022
9c94e5a
Read me update2
cmkap Feb 17, 2022
9ce00c6
index css
cmkap Feb 17, 2022
8f1c1d0
css improvements
cmkap Feb 17, 2022
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
17 changes: 17 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Deploy

on:
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: akhileshns/[email protected] # This is the action
with:
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: "Acebook-chats" #Must be unique in Heroku
heroku_email: "[email protected]"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
/yarn-error.log

.byebug_history
.env
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.0.0
30 changes: 25 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby "3.0.0"

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
"https://github.com/#{repo_name}.git"
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1'
gem 'rails', '~> 6.1.0'
# Use postgresql as the database for Active Record
gem 'pg'
# Use Puma as the app server
Expand All @@ -28,20 +31,37 @@ gem 'jbuilder', '~> 2.5'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'devise', '~> 4.8', '>= 4.8.1'


gem 'bootstrap', '~> 5.1.3'

gem 'jquery-rails'
gem 'turbolinks'

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]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'rspec-rails', '~> 4'
gem 'selenium-webdriver'
gem 'factory_bot_rails'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'rubocop', '1.20'
gem 'web-console', '>= 3.3.0'
end

group :test do
gem 'rspec'
gem 'simplecov', require: false
gem 'simplecov-console', require: false
gem 'factory_bot', '~> 4.8', '>= 4.8.2'
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