forked from RefugeRestrooms/refugerestrooms
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed commit of the following: commit dd5441e Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Tue Jan 28 15:47:41 2020 -0500 CSS: Center logo and brand name on narrow screens (RefugeRestrooms#611) * _mobile.scss: Lower logo/brand on narrow screens Adjust the CSS "top" property to set the logo and "brand name" ("Refuge Restrooms") slightly lower within the navbar on narrow screens. This is to adjust for the navbar being responsively taller on narrower screens. "767px screen width" happens to be the responsive threshold for that height change for the navbar. * _mobile.scss: Move 342px rules, adjust whitespace Moved the "max 342px" rules to the bottom, so all screen-width-related style rules are in descending order of the sizes that they apply to. (For consistency). Adjusted the use of newlines in this stylesheet to be more consitent. commit 61e5df4 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Sun Jan 5 12:18:29 2020 -0500 Tweak CSS a bit for narrow screens (e.g. mobile phones) (RefugeRestrooms#610) * CSS: Add some styles for narrow screens For screen widths ~340px or narrower. (Such a narrow screen is found, for example, on the original iPhone through to the iPhone 5S and iPhone SE.) - Makes the "+" icon on the "Add A Restroom" button appear in a more correct-looking position. - Fixes the overlap of the "Refuge Restrooms" text with the "hamburger" drop-down menu button in the header/nav section. - Adds a class via the haml source (.nav-column) to make applying one of the style rules easier. * CSS: No double-padding on nested `.container`s Eliminate double-padding in cases of an [element].container immediately inside another [element].container. (Doing this only directly under the header div, just to be conservative.) The 15px + 15px = 30px of padding on both sides seemed unintentionally wide. Also, I think this looks nicer. Helps with the tight fit on mobile devices, too. (Should affect the header/nav on all pages other than the home page, aka the splash page, due to the way the pages are coded.) commit 89c8355 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Sun Jan 5 11:54:01 2020 -0500 Update some dependencies, fix some deprecation warnings (RefugeRestrooms#609) * Gemfile[.lock]: Update simplecov Fixes a deprecation warning * restrooms_spec.rb: Use 'successful' not 'success' Rspec's `be_success` and `.success?` are deprecated. Rspec's `be_successful` and `.successful?` are the non-deprecated versions of this check. (This fixes the associated deprecation warning) * Gemfile.lock: Bump some dependencies Upgraded loofah, puma, rack, and rack-cors, plus their dependencies. commit 3714303 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Tue Dec 24 17:55:25 2019 -0500 restrooms_spec.rb: Fix a test (RefugeRestrooms#608) Background: The Mission Creek Cafe in San Francisco has been closed for some time. Google Maps API now resolves "Mission Creek Cafe" to a coffee shop in Washington state. Washington is too far away from our stub restroom entries; No stub restrooms are located near Washington, so no restroom results are shown on our results page for this search. The test expects to see a stub restroom entry on the reults page, but does not see it, and so the test fails. --- Fix: search the Maps API for "San Francisco," not "Mission Creek Cafe" (This returns a lat/long associated with San Francisco not Washington) commit 297980c Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Mon Dec 23 21:37:00 2019 -0500 db/schema.rb: Commit with underscores in date The date gets underscores added automatically when running migrations on the database. Committing with the underscores so the change isn't flagged by git when no code has been changed. commit da6e0e2 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Fri Dec 20 22:46:56 2019 -0500 CONTRIBUTING.md: Remove the reference to "Cmd + C" The "Cmd + C" keyboard shortcut is for copying text, not quitting programs in the terminal. The proper way to quit programs in the terminal under macOS is "Ctrl + C", the same as Linux. Referring to "Cmd + C" here was based on a mistaken assumption that "Ctrl" on Windows or Linux always gets translated to "Cmd" on macOS. (In fact, some uses of "Ctrl" on Windows/Linux are preserved as-is on macOS. It's a mixed bag.) Deleting the reference to "Ctrl + C", to make the guidance clearer. commit c6dc441 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Fri Dec 20 20:08:17 2019 -0500 PR RefugeRestrooms#607: Minor tweaks/cleanup - Adjust Gemfile[.lock] to specify webpacker within the 4.x series, rather than any version 4.0 or greater. - Delete some duplicate entries in the .gitignore file commit 01c3c21 Author: Emily Ring <emily_ring@ymail.com> Date: Fri Dec 20 19:53:08 2019 -0500 Webpack Upgrade (RefugeRestrooms#607) * Updated webpacker gem * Upgraded yarn packages * Ran webpack:install process. Working without rails-erb-loader * Added rails-erb-loader to webpack * Fixed include PgSearch warning * Added .dockerignore commit 5154cd1 Author: DeeDeeG <DeeDeeG@users.noreply.github.com> Date: Fri Nov 1 16:58:40 2019 -0400 Dockerfile: Upgrade Node from v10.x to v12.x (RefugeRestrooms#603) Node 12 "Erbium" is the newest Long Term Service release. We should either pin a version of Node in our package.json file, or stay on the latest LTS version of Node; Heroku will use the latest LTS version of Node in production if we don't have any versions pinned in our package.json commit 6c96368 Author: Jason Chen <kbtpodifo@gmail.com> Date: Fri Nov 1 16:52:29 2019 -0400 Fix Travis tests failing on distributions other than trusty (RefugeRestrooms#606) * Revert ".travis.yml: Set "dist" to "trusty" (RefugeRestrooms#600)" This reverts commit ac8f6ab. Doing this to run tests on Travis to investigate why they aren't passing. * Explicitly require locations.rb in rspec.rb Tentative fix for tests not passing in xenial but passing in trusty. This might be because different distributions load files in a different order. In xenial, `rspec.rb` might get loaded before `locations.rb`, making `Locations` uninitialized. Explicit require fixes this.
- Loading branch information
Showing
26 changed files
with
2,411 additions
and
2,227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| defaults |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| **/.DS_Store | ||
| **/.git | ||
| **/.github | ||
| **/node_modules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,5 +57,6 @@ ruby | |
| /public/packs | ||
| /public/packs-test | ||
| /node_modules | ||
| /yarn-error.log | ||
| yarn-debug.log* | ||
| .yarn-integrity | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| module.exports = function(api) { | ||
| var validEnv = ['development', 'test', 'production'] | ||
| var currentEnv = api.env() | ||
| var isDevelopmentEnv = api.env('development') | ||
| var isProductionEnv = api.env('production') | ||
| var isTestEnv = api.env('test') | ||
|
|
||
| if (!validEnv.includes(currentEnv)) { | ||
| throw new Error( | ||
| 'Please specify a valid `NODE_ENV` or ' + | ||
| '`BABEL_ENV` environment variables. Valid values are "development", ' + | ||
| '"test", and "production". Instead, received: ' + | ||
| JSON.stringify(currentEnv) + | ||
| '.' | ||
| ) | ||
| } | ||
|
|
||
| return { | ||
| presets: [ | ||
| isTestEnv && [ | ||
| '@babel/preset-env', | ||
| { | ||
| targets: { | ||
| node: 'current' | ||
| } | ||
| } | ||
| ], | ||
| (isProductionEnv || isDevelopmentEnv) && [ | ||
| '@babel/preset-env', | ||
| { | ||
| forceAllTransforms: true, | ||
| useBuiltIns: 'entry', | ||
| corejs: 3, | ||
| modules: false, | ||
| exclude: ['transform-typeof-symbol'] | ||
| } | ||
| ] | ||
| ].filter(Boolean), | ||
| plugins: [ | ||
| 'babel-plugin-macros', | ||
| '@babel/plugin-syntax-dynamic-import', | ||
| isTestEnv && 'babel-plugin-dynamic-import-node', | ||
| '@babel/plugin-transform-destructuring', | ||
| [ | ||
| '@babel/plugin-proposal-class-properties', | ||
| { | ||
| loose: true | ||
| } | ||
| ], | ||
| [ | ||
| '@babel/plugin-proposal-object-rest-spread', | ||
| { | ||
| useBuiltIns: true | ||
| } | ||
| ], | ||
| [ | ||
| '@babel/plugin-transform-runtime', | ||
| { | ||
| helpers: false, | ||
| regenerator: true, | ||
| corejs: false | ||
| } | ||
| ], | ||
| [ | ||
| '@babel/plugin-transform-regenerator', | ||
| { | ||
| async: false | ||
| } | ||
| ] | ||
| ].filter(Boolean) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| const { environment } = require('@rails/webpacker') | ||
| const erb = require('./loaders/erb') | ||
| const webpack = require("webpack") | ||
|
|
||
| environment.plugins.append('Provide', new webpack.ProvidePlugin({ | ||
| $: 'jquery', | ||
| jQuery: 'jquery', | ||
| Popper: ['popper.js', 'default'], | ||
| })) | ||
| // jQuery | ||
| const webpack = require('webpack') | ||
| environment.plugins.prepend('Provide', | ||
| new webpack.ProvidePlugin({ | ||
| $: 'jquery/src/jquery', | ||
| jQuery: 'jquery/src/jquery' | ||
| }) | ||
| ) | ||
|
|
||
| // rails-erb-loader | ||
| const erb = require('./loaders/erb') | ||
| environment.loaders.append('erb', erb) | ||
|
|
||
| module.exports = environment |
Oops, something went wrong.