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.

Sign up for GitHub

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

Jump to bottom

Copy the correct link from the contribution page and insert it on the Recent Spectra Section for the contributor's name that currently has a broken link #810

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Copy the correct link from the contribution page and insert it on the Recent Spectra Section for the contributor's name that currently has a broken link #810

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4e238af
Remove typo to fix spectra author link
Georjane Dec 20, 2021
97ac51f
Run mysql query to fix errors
Georjane Dec 20, 2021
d7746c1
Run yarn check to fix errors
Georjane Dec 20, 2021
70c7858
Check if tests are working
Georjane Dec 21, 2021
d91edb2
Try to break test to see if it fails
Georjane Dec 21, 2021
5ea172c
Add test to check for RSS on author profile
Georjane Dec 21, 2021
deffe05
Edit test to check for RSS on author profile
Georjane Dec 21, 2021
f505e55
Edit test to check for RSS on author profile
Georjane Dec 21, 2021
5e7b1fd
Add first to test to check for RSS on author profile
Georjane Dec 21, 2021
388f91f
Add first to test to check for RSS on author profile
Georjane Dec 21, 2021
820d1f2
Add first to test to check for RSS on author profile
Georjane Dec 21, 2021
58d6c43
Fix test
Georjane Dec 21, 2021
9fa1392
Fix test
Georjane Dec 21, 2021
28e568f
Update home_test.rb
Georjane Jan 6, 2022
ad1293d
Comment out test to check for merge conflicts
Georjane Jan 10, 2022
3eefc09
Remove gemfile.lock to fix merge conflict
Georjane Jan 10, 2022
0660475
Fix merge conflict in package.json and yarn.lock
Georjane Jan 19, 2022
444fcf7
Fix merge conflict in package.json and yarn.lock
Georjane Jan 19, 2022
7e78a6f
Edit spectrum.author link and write test
Georjane Jan 19, 2022
53f3378
Edit failing test
Georjane Jan 19, 2022
6a90577
Try to debug test error
Georjane Jan 19, 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
278 changes: 0 additions & 278 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/controllers/spectrums_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ def edit
# replacing this with capture/save soon
def create # rubocop:disable Metrics/AbcSize
if logged_in? || params[:token] && User.find_by_token(params[:token])

user = current_user || User.find_by_token(params[:token])
params[:spectrum][:json] = params[:spectrum][:data] if params[:spectrum] && params[:spectrum][:data]

Expand Down
4 changes: 2 additions & 2 deletions app/views/spectrums/_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</a>
<% end %>
<a class="image visible-phone" style="float:left;width:50%;margin-right:10px;" href="<%= spectrum_path(spectrum.id) %>"><img src="<%= spectrum.photo.url(:thumb) %>" class="image" style="background:#ccc;"></a>
<h4><a data-transition="slide" href="<%= spectrum_path(spectrum.id) %>"><%=h truncate(spectrum.title,:length => 18) %></a></h4>
<p><a data-transition="slide" href="<%=h profile_path(spectrum.author) %>"><%=h spectrum.author %></a> | <%= time_ago_in_words(spectrum.created_at) %> ago<% if spectrum.like_count.positive? %> <i class="fa fa-star"></i> <%= spectrum.like_count %><% end %></p>
<h4><a data-transition="slide" href="<%= spectrum_path(spectrum.id) %>"><%= truncate(spectrum.title,:length => 18) %></a></h4>
<p><a data-transition="slide" href="<%= profile_path(spectrum.author) %>"><%= spectrum.author %></a> | <%= time_ago_in_words(spectrum.created_at) %> ago<% if spectrum.like_count.positive? %> <i class="fa fa-star"></i> <%= spectrum.like_count %><% end %></p>
</div>
<% if ((i+1)/4.0).to_i == ((i+1)/4.0) %>
</div>
Expand Down
25 changes: 20 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@
"name": "spectral-workbench",
"version": "1.0.0",
"private": "true",
"repository": "https://github.com/publiclab/spectral-workbench/",
"repository": {
"type": "git",
"url": "git+https://github.com/publiclab/spectral-workbench.git"
},
"author": "Public Lab contributors <[email protected]>",
"license": "GPL-3.0",
"dependencies": {
"ace-builds": "jywarren/ace-builds#v1.2.4",
"ace-builds": "github:jywarren/ace-builds#v1.2.4",
"adapterjs": "^0.15.5",
"bootstrap-css": "jozefizso/bower-bootstrap-css#~2.3.2",
"bootstrap": "^5.1.3",
"bootstrap-css": "github:jozefizso/bower-bootstrap-css#~2.3.2",
"bs-stepper": "^1.7.0",
"d3": "^3.5.4",
"flot": "~0.8.0-alpha",
"getusermedia-js": "^1.0.0",
"jasmine": "^3.7.0",
"jasmine-ajax": "^4.0.0",
"jfeed": "mattmarcum/jFeed#*",
"jfeed": "github:mattmarcum/jFeed#*",
"jquery.steps": "^1.0.3",
"junction": "theleagueof/junction#*",
"junction": "github:theleagueof/junction#*",
"leaflet": "^1.7.1",
"moment": "~2.10.6",
"nvd3": "~1.7.1",
Expand All @@ -28,5 +32,16 @@
},
"scripts": {
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\""
},
"description": "Copyright Public Lab publiclab.org | spectralworkbench.org",
"bugs": {
"url": "https://github.com/publiclab/spectral-workbench/issues"
},
"homepage": "https://github.com/publiclab/spectral-workbench#readme",
"main": "index.js",
"directories": {
"doc": "doc",
"lib": "lib",
"test": "test"
}
}
Loading