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

Water - Sophia #50

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
98a0bde
Initial Rails setup
SoCodeDo Nov 12, 2020
31df200
Wave1: Created vote, work, and user models
SoCodeDo Nov 15, 2020
45d11d1
Wave1: Created empty folders/files for Views
SoCodeDo Nov 15, 2020
72e0f7e
Wave1: Created empty folders for Controllers and made basic routes, h…
SoCodeDo Nov 15, 2020
adc6a39
Wave1: Re-created controllers & routes, made a home/works/users page …
SoCodeDo Nov 15, 2020
ad25423
Created routes for show actions, made a works show page with model da…
SoCodeDo Nov 16, 2020
b271448
Deleted models, created new work model with terminal, made seeds.rb
SoCodeDo Nov 16, 2020
893d18a
Wave1: Completed WORKS Controller, WORKS index; now has working (most…
SoCodeDo Nov 16, 2020
bd5fba3
Wave1: Created HOMEPAGES controller, HOMEPAGES index view, mostly com…
SoCodeDo Nov 16, 2020
f0a1955
Wave1: Completed WORKS controller, WORKS index (w/o buttons), WORKS s…
SoCodeDo Nov 16, 2020
b9e6d37
Wave1: Added the edit/delete feature on the SHOW WORK page, created E…
SoCodeDo Nov 16, 2020
14503f8
Wave1: Completed Navigation to include working NEW WORK link, created…
SoCodeDo Nov 16, 2020
c967d3e
Wave1: Added Spotlight section to main page(sample only), edited Work…
SoCodeDo Nov 16, 2020
2a2b6a3
Wave1: Started working on tests
SoCodeDo Nov 16, 2020
513bce9
Wave1: Tests almost complete but having 'describe' error
SoCodeDo Nov 16, 2020
18b54c7
Wave3: Added CSS Dev Tools formatting to stylesheets folder
SoCodeDo Nov 16, 2020
10b8064
Wave3: Updated CSS formatting with HTML classes, formatted DELETE button
SoCodeDo Nov 16, 2020
da0b248
Wave2: Created routes for USERS
SoCodeDo Nov 16, 2020
341086b
finally debugged my tests, still have errors but minitest works now
SoCodeDo Nov 30, 2020
b1a0b62
WAVE 1: Complete, tests arranged to be passing for now
SoCodeDo Nov 30, 2020
e9e7836
Wave2: creeated user model, controller, and routes
SoCodeDo Dec 1, 2020
278e2eb
Wave2: Started User Controller tests
SoCodeDo Dec 1, 2020
8e97c49
Wave2: Finished controller tests for logging in
SoCodeDo Dec 1, 2020
a82dbcc
Wave2: created log in/out feature, not fully functioning yet
SoCodeDo Dec 1, 2020
130cf63
Wave2: updated controller/tests for users... still broken log out fun…
SoCodeDo Dec 1, 2020
c758fcf
Wave2: Login/Logout now WORKS
SoCodeDo Dec 1, 2020
b16ca8a
Wave2: debugged edit/create, made a show all users page
SoCodeDo Dec 1, 2020
75bd12d
Wave2: Created votes controller and model
SoCodeDo Dec 1, 2020
cb97c61
Wave2: Vote is finally working. Cannot voice twice. Must be logged in…
SoCodeDo Dec 1, 2020
042e44b
Wave2: Updated all media categories to have a vote button and vote count
SoCodeDo Dec 1, 2020
69e6ecb
Wave2: successfully made spotlight by votes, but still debugging top …
SoCodeDo Dec 1, 2020
203786c
Wave2: Made basic layout for users page but vote count not working
SoCodeDo Dec 1, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:application_record" /><Generator name="application_record" /><Generator name="assets" /><Generator name="channel" /><Generator name="controller" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="mailbox" /><Generator name="mailer" /><Generator name="migration" /><Generator name="minitest:controller" /><Generator name="minitest:generator" /><Generator name="minitest:helper" /><Generator name="minitest:install" /><Generator name="minitest:integration" /><Generator name="minitest:job" /><Generator name="minitest:mailer" /><Generator name="minitest:model" /><Generator name="minitest:plugin" /><Generator name="minitest:scaffold" /><Generator name="minitest:system" /><Generator name="model" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:channel" /><Generator name="test_unit:generator" /><Generator name="test_unit:mailbox" /><Generator name="test_unit:plugin" /></GeneratorsGroup></Settings>
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
8 changes: 8 additions & 0 deletions .idea/.generators

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 136 additions & 0 deletions .idea/media-ranker.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
Loading