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

sandy | ayesha #27

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
b304a62
Passed in card to Customer function using Materialize
Jan 20, 2021
eb842ea
Added Customers function to return array of customers
Jan 20, 2021
538c689
Created App function to fetch API data
Jan 20, 2021
0bab76c
basic Navbar complete
Jan 20, 2021
4091844
basic Navbar complete
Jan 20, 2021
ac73421
Moved search func out of Navbar.js
Jan 21, 2021
298c0ae
moved customers from App.js to Customers.js
Jan 21, 2021
33d110f
Added style.css for movie logo in navbar
Jan 21, 2021
2940811
Added MovieCard component for a movie
Jan 21, 2021
94bbbda
Added search func for movie that returns MovieCard
Jan 21, 2021
e70b91e
movie log image
Jan 21, 2021
99cb63e
Added react router to app.js
ayaseef Jan 21, 2021
ec45e7e
Added react router to app.js
ayaseef Jan 21, 2021
a447f34
added drop shadow to navbar
Jan 21, 2021
45dd92b
Added image to homepage, changed logo, changed movie card
Jan 21, 2021
58ecd7f
Fix merge issues
ayaseef Jan 21, 2021
f31ac5d
Merge branch 'master' of https://github.com/spv-hub/video-store-consu…
ayaseef Jan 21, 2021
1431b0c
added more features
Jan 21, 2021
e728c86
Merge branch 'master' of https://github.com/spv-hub/video-store-consu…
ayaseef Jan 21, 2021
c3b8251
Added styling to movie card
Jan 22, 2021
b75725c
Merge branch 'master' of https://github.com/spv-hub/video-store-consu…
ayaseef Jan 22, 2021
3867273
fixing node modules
Jan 22, 2021
55a8cfc
Merge branch 'master' of https://github.com/spv-hub/video-store-consu…
ayaseef Jan 22, 2021
6b92e27
seeded video list to video library page
Jan 22, 2021
f51d19d
Merge branch 'master' of https://github.com/spv-hub/video-store-consu…
Jan 22, 2021
74d1258
added styling
Jan 22, 2021
ee2ba9e
Add video to the library functionality
ayaseef Jan 22, 2021
1897182
card styling
Jan 25, 2021
95df20b
fixed api bug, formated date, refactored to axios
Jan 25, 2021
9f9e3cb
added responsive button
Jan 26, 2021
532cb9a
button text
Jan 26, 2021
f343c49
button text
Jan 26, 2021
56aa02b
Adding css
Jul 26, 2021
bf9025e
Fixing footer
Jul 26, 2021
a2a7c75
Fixing footer
Jul 26, 2021
631304c
Changing background color
Jul 27, 2021
02c0ee1
adding backend heroku url
Nov 23, 2021
a38cc70
adding static.json file to root directory
Nov 23, 2021
dc8d9f0
removing yarn.lock file
Nov 24, 2021
9e646cd
removing file
Nov 24, 2021
a9f1d5c
adding procfile
Nov 24, 2021
34e7a6c
troubleshooting
Nov 24, 2021
8520284
testing
Nov 24, 2021
7a8154d
adding node and npm versions
Nov 26, 2021
78e2c79
adding node and npm versions
Nov 26, 2021
2c8d2f7
adding port
Nov 26, 2021
b17e888
adding port
Nov 26, 2021
929bbc9
adding port
Nov 26, 2021
d7410e8
adding port
Nov 26, 2021
d11974b
troubleshooting port numbers
Nov 27, 2021
e8f856b
changing URLs
Nov 27, 2021
11a3959
removing files
Nov 27, 2021
de50164
removing static.json
Nov 27, 2021
78d6baa
removing static.json
Nov 27, 2021
b7fa81b
changing urls
Nov 27, 2021
28fbdfe
fixed flex-box bug for better display
Dec 1, 2021
7d0ce95
testing from new environment
Dec 17, 2021
3789a4c
adding sidenav
Dec 18, 2021
2cc776d
removing shadow on sidenav
Dec 18, 2021
e67ac3a
removing prev install
Dec 19, 2021
8c94583
video card display
Dec 20, 2021
a87573e
video card display
Dec 20, 2021
47cbd99
adding onclick video title info
Jan 3, 2022
8861bd3
changing ruby version
Jan 6, 2022
c5e5a31
working on conditional onClick for selected video
Jan 6, 2022
dbd33d2
movie card styling
Jan 7, 2022
3b4e8fc
Added dynamic BASE API URL for development and production environment
Oct 31, 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
Empty file modified .eslintrc.json
100644 → 100755
Empty file.
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See https://git-scm.com/docs/gitattributes for more about git attribute files.

# Mark the database schema as having been generated.
db/schema.rb linguist-generated

# Mark the yarn lockfile as having been generated.
yarn.lock linguist-generated

# Mark any vendored files as having been vendored.
vendor/* linguist-vendored
Empty file modified .github/PULL_REQUEST_TEMPLATE
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.6
Empty file modified Dockerfile
100644 → 100755
Empty file.
56 changes: 56 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 6.1.4', '>= 6.1.4.4'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
gem 'puma', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 5.0'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

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

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

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]
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 4.1.0'
# Display performance information such as SQL time and flame graphs for each request in your browser.
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
gem 'rack-mini-profiler', '~> 2.0'
gem 'listen', '~> 3.3'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 3.26'
gem 'selenium-webdriver'
# Easy installation and use of web drivers to run system tests with browsers
gem 'webdrivers'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
Empty file modified README.md
100644 → 100755
Empty file.
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require_relative "config/application"

Rails.application.load_tasks
6 changes: 6 additions & 0 deletions config.ru
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This file is used by Rack-based servers to start the application.

require_relative "config/environment"

run Rails.application
Rails.application.load_server
Empty file modified feedback.md
100644 → 100755
Empty file.
Empty file modified images/videstore_fullstack.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added movieBanner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added movieLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading