ishapi 0.1.8.188 → 0.1.8.189
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e7b88652fb9949a0f69a25a7a2972f569ebeb2353014464aee3622de87c0ba5f
|
|
4
|
+
data.tar.gz: 175c76708f9cd360743a0752d22dcb8fc2a47dcc022e4ea1be7bec30044b5d97
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5b16b8d679909aea31a2bf1fefd6e325b350d8f3acf326190e595c4aab8a229cab56a9f5914c9603cd21fa94501362c8507ef8f0d6584ace1d5f187db2fa5b78
|
|
7
|
+
data.tar.gz: ca30eabd8eeb8f25476f2ee400ce1a278e6e738bc5bf28714da8caeeeca700c12906c48211e3b51d2520f6a997561dc9891211f0378eb678cd5264f645da276a
|
|
@@ -12,7 +12,7 @@ class Ishapi::MapsController < Ishapi::ApplicationController
|
|
|
12
12
|
authorize! :show, @map
|
|
13
13
|
@newsitems = @location.newsitems
|
|
14
14
|
|
|
15
|
-
@markers = @map.markers.permitted_to(@current_user.profile)
|
|
15
|
+
@markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
|
|
16
16
|
|
|
17
17
|
@tags = @map.tags
|
|
18
18
|
|
|
@@ -23,14 +23,6 @@ class Ishapi::MapsController < Ishapi::ApplicationController
|
|
|
23
23
|
# @markers = @markers.order_by( ordering: :asc )
|
|
24
24
|
# end
|
|
25
25
|
|
|
26
|
-
# ## @TODO: figure this out eventually
|
|
27
|
-
# if city = City.where( cityname: @map.slug ).first
|
|
28
|
-
# # @newsitems = city.newsitems
|
|
29
|
-
# @galleries = city.galleries
|
|
30
|
-
# @reports = city.reports
|
|
31
|
-
# @videos = city.videos
|
|
32
|
-
# end
|
|
33
|
-
|
|
34
26
|
end
|
|
35
27
|
|
|
36
28
|
def show_marker
|
|
@@ -10,6 +10,7 @@ class Ishapi::Users::SessionsController < Devise::SessionsController
|
|
|
10
10
|
# respond_with resource, location: after_sign_in_path_for(resource)
|
|
11
11
|
|
|
12
12
|
## Send the jwt to client
|
|
13
|
+
@current_user = resource
|
|
13
14
|
@jwt_token = encode(user_id: @current_user.id.to_s)
|
|
14
15
|
@profile = @current_user.profile
|
|
15
16
|
render 'ishapi/users/login', format: :json, layout: false
|
|
@@ -20,6 +20,7 @@ json.markers do
|
|
|
20
20
|
|
|
21
21
|
## @TODO: this is copy-pasted and should be abstracted.
|
|
22
22
|
destination = marker.destination
|
|
23
|
+
json.destination_slug destination.slug
|
|
23
24
|
json.premium_tier destination.premium_tier
|
|
24
25
|
json.is_premium destination.is_premium
|
|
25
26
|
json.id destination.id.to_s
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ishapi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.8.
|
|
4
|
+
version: 0.1.8.189
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- piousbox
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-09-
|
|
11
|
+
date: 2022-09-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|