New search

.github/workflows/ruby.yml

@@ -10,10 +10,10 @@ jobs:
     # https://github.com/actions/example-services/tree/master/.github/workflows
     services:
       postgres:
-        image: postgres:10.8
+        image: postgis/postgis:16-3.4
         env:
           POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ""
+          POSTGRES_PASSWORD: "password"
           POSTGRES_DB: postgres
         ports:
           - 5432:5432
@@ -36,6 +36,7 @@ jobs:
       GEMFILE_RUBY_VERSION: 3.3.0
       PGHOST: localhost
       PGUSER: postgres
+      PGPASSWORD: "password"
       # Rails verifies the time zone in DB is the same as the time zone of the Rails app
       TZ: "Europe/Warsaw"
       MAPBOX_API_KEY: pk.eyJ1IjoibWF0aGlhczIzNCIsImEiOiJja3U1N2o0MGoybGl5MnVxaDcyaHdjZDFpIn0.S-c3HtdhqhyAR6izLxY-iQ

.gitignore

@@ -45,11 +45,8 @@ yarn-debug.log*
 
 # Ignores local .env file
 .env
-
 /webdrivers
 
-/config/database.yml
-
 # Yarn, from https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
 .yarn/*
 !.yarn/cache

Gemfile

@@ -39,26 +39,28 @@ gem "omniauth-google-oauth2"
 gem "omniauth-rails_csrf_protection"
 
 gem "activerecord-import"
+gem "activerecord-postgis-adapter" # For PostGIS and Geo commands in Active record
 gem "addressable"
+gem "cssbundling-rails", "~> 1.3"
 gem "diffy"
 gem "gravtastic"
 gem "high_voltage"
 gem "http"
 gem "inline_svg"
+gem "jsbundling-rails", "~> 1.2"
 gem "kaminari"
+gem "pagy", "~> 9.0"
 gem "paper_trail"
 gem "phonelib"
 gem "rails-i18n"
+gem "rgeo-geojson" # For parsing geo json when importing from Geo Norge
 gem "simple_form"
 gem "simple_form-tailwind"
 gem "stimulus-rails"
 gem "tailwindcss-rails-webpacker"
 gem "turbo-rails"
 gem "validate_url"
 
-gem "cssbundling-rails", "~> 1.3"
-gem "jsbundling-rails", "~> 1.2"
-
 group :production do
   gem "aws-sdk-s3"
   gem "newrelic_rpm"

Gemfile.lock

@@ -61,6 +61,9 @@ GEM
       timeout (>= 0.4.0)
     activerecord-import (1.5.1)
       activerecord (>= 4.2)
+    activerecord-postgis-adapter (9.0.2)
+      activerecord (~> 7.1.0)
+      rgeo-activerecord (~> 7.0.0)
     activestorage (7.1.3)
       actionpack (= 7.1.3)
       activejob (= 7.1.3)
@@ -310,6 +313,7 @@ GEM
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
+    pagy (9.0.9)
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
@@ -406,6 +410,13 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
+    rgeo (3.0.1)
+    rgeo-activerecord (7.0.1)
+      activerecord (>= 5.0)
+      rgeo (>= 1.0.0)
+    rgeo-geojson (2.2.0)
+      multi_json (~> 1.15)
+      rgeo (>= 1.0.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -539,6 +550,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-import
+  activerecord-postgis-adapter
   addressable
   annotate
   aws-sdk-s3
@@ -571,6 +583,7 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-rails_csrf_protection
   overcommit
+  pagy (~> 9.0)
   paper_trail
   parallel_tests
   pg (~> 1.1)
@@ -583,6 +596,7 @@ DEPENDENCIES
   rails-i18n
   rails_real_favicon
   redis (~> 5.0)
+  rgeo-geojson
   rspec-benchmark
   rspec-rails
   rubocop

README.md

@@ -167,6 +167,8 @@ Run `rails db:seed` to get sample data into your app.
 
 You can also set the ENV variable ["SEED_FILE"](https://github.com/lnu-norge/lokaler.lnu.no/pull/66) to load a different seed file than the current environment dictates. Useful for deploying tests on Heroku, as Heroku always wants you to run in production mode - but you might want to seed with development data.
 
+To get geographical data for Fylker and Kommuner, run: `rails geo:import_geographical_areas_from_geonorge`. This will hit the APIs of GeoNorge and create or update any fylker and kommuner, as well as make sure all Spaces are matched with a Fylke and a Kommune.
+
 ## Sendgrid setup
 
 You need to set the right sendgrid environment variables, and to get sendgrid to work you will also need to set the ENV variable ["HOST"] to equal to the domain you are using, example: `ENV["HOST"] = "app.herokuapp.com`

app/assets/stylesheets/application.css

@@ -21,4 +21,5 @@
 @import "./space_index.css";
 @import "./space_table.css";
 @import "./star_picker.css";
+@import "./pagy.css";
 @import "./tom_select.css";

app/assets/stylesheets/autosave-while-typing.css

@@ -22,7 +22,7 @@
         display: block;
         content: "Lagrer...";
         opacity: 0;
-        @apply text-gray-500 animate-pulse;
+        @apply text-gray-500 motion-safe:animate-pulse;
     }
 }