Browse Source

Rename themes -> flavours ? ?

master
kibigo! 1 year ago
parent
commit
bc4fa6b198
100 changed files with 165 additions and 180 deletions
  1. 0
    3
      .gitmodules
  2. 14
    22
      app/controllers/application_controller.rb
  3. 1
    1
      app/javascript/core/settings.js
  4. 1
    1
      app/javascript/flavours/glitch/actions/accounts.js
  5. 0
    0
      app/javascript/flavours/glitch/actions/alerts.js
  6. 1
    1
      app/javascript/flavours/glitch/actions/blocks.js
  7. 0
    0
      app/javascript/flavours/glitch/actions/bundles.js
  8. 1
    1
      app/javascript/flavours/glitch/actions/cards.js
  9. 0
    0
      app/javascript/flavours/glitch/actions/columns.js
  10. 2
    2
      app/javascript/flavours/glitch/actions/compose.js
  11. 1
    1
      app/javascript/flavours/glitch/actions/domain_blocks.js
  12. 0
    0
      app/javascript/flavours/glitch/actions/emojis.js
  13. 1
    1
      app/javascript/flavours/glitch/actions/favourites.js
  14. 0
    0
      app/javascript/flavours/glitch/actions/height_cache.js
  15. 1
    1
      app/javascript/flavours/glitch/actions/interactions.js
  16. 0
    0
      app/javascript/flavours/glitch/actions/local_settings.js
  17. 0
    0
      app/javascript/flavours/glitch/actions/modal.js
  18. 2
    2
      app/javascript/flavours/glitch/actions/mutes.js
  19. 1
    1
      app/javascript/flavours/glitch/actions/notifications.js
  20. 0
    0
      app/javascript/flavours/glitch/actions/onboarding.js
  21. 2
    2
      app/javascript/flavours/glitch/actions/pin_statuses.js
  22. 0
    0
      app/javascript/flavours/glitch/actions/push_notifications.js
  23. 1
    1
      app/javascript/flavours/glitch/actions/reports.js
  24. 1
    1
      app/javascript/flavours/glitch/actions/search.js
  25. 0
    0
      app/javascript/flavours/glitch/actions/settings.js
  26. 1
    1
      app/javascript/flavours/glitch/actions/statuses.js
  27. 0
    0
      app/javascript/flavours/glitch/actions/store.js
  28. 1
    1
      app/javascript/flavours/glitch/actions/streaming.js
  29. 1
    1
      app/javascript/flavours/glitch/actions/timelines.js
  30. 1
    1
      app/javascript/flavours/glitch/components/account.js
  31. 0
    0
      app/javascript/flavours/glitch/components/attachment_list.js
  32. 1
    1
      app/javascript/flavours/glitch/components/autosuggest_emoji.js
  33. 2
    2
      app/javascript/flavours/glitch/components/autosuggest_textarea.js
  34. 0
    0
      app/javascript/flavours/glitch/components/avatar.js
  35. 0
    0
      app/javascript/flavours/glitch/components/avatar_overlay.js
  36. 0
    0
      app/javascript/flavours/glitch/components/button.js
  37. 1
    1
      app/javascript/flavours/glitch/components/collapsable.js
  38. 1
    1
      app/javascript/flavours/glitch/components/column.js
  39. 0
    0
      app/javascript/flavours/glitch/components/column_back_button.js
  40. 0
    0
      app/javascript/flavours/glitch/components/column_back_button_slim.js
  41. 1
    2
      app/javascript/flavours/glitch/components/column_header.js
  42. 0
    0
      app/javascript/flavours/glitch/components/display_name.js
  43. 1
    1
      app/javascript/flavours/glitch/components/dropdown_menu.js
  44. 0
    0
      app/javascript/flavours/glitch/components/extended_video_player.js
  45. 1
    1
      app/javascript/flavours/glitch/components/icon_button.js
  46. 2
    2
      app/javascript/flavours/glitch/components/intersection_observer_article.js
  47. 0
    0
      app/javascript/flavours/glitch/components/load_more.js
  48. 0
    0
      app/javascript/flavours/glitch/components/loading_indicator.js
  49. 2
    2
      app/javascript/flavours/glitch/components/media_gallery.js
  50. 0
    0
      app/javascript/flavours/glitch/components/missing_indicator.js
  51. 0
    0
      app/javascript/flavours/glitch/components/notification_purge_buttons.js
  52. 0
    0
      app/javascript/flavours/glitch/components/permalink.js
  53. 0
    0
      app/javascript/flavours/glitch/components/relative_timestamp.js
  54. 3
    3
      app/javascript/flavours/glitch/components/scrollable_list.js
  55. 0
    0
      app/javascript/flavours/glitch/components/setting_text.js
  56. 2
    2
      app/javascript/flavours/glitch/components/status.js
  57. 2
    5
      app/javascript/flavours/glitch/components/status_action_bar.js
  58. 1
    1
      app/javascript/flavours/glitch/components/status_content.js
  59. 0
    0
      app/javascript/flavours/glitch/components/status_header.js
  60. 1
    1
      app/javascript/flavours/glitch/components/status_list.js
  61. 0
    0
      app/javascript/flavours/glitch/components/status_prepend.js
  62. 0
    0
      app/javascript/flavours/glitch/components/status_visibility_icon.js
  63. 6
    6
      app/javascript/flavours/glitch/containers/account_container.js
  64. 1
    1
      app/javascript/flavours/glitch/containers/card_container.js
  65. 4
    4
      app/javascript/flavours/glitch/containers/compose_container.js
  66. 3
    3
      app/javascript/flavours/glitch/containers/dropdown_menu_container.js
  67. 2
    2
      app/javascript/flavours/glitch/containers/intersection_observer_article_container.js
  68. 6
    6
      app/javascript/flavours/glitch/containers/mastodon.js
  69. 1
    1
      app/javascript/flavours/glitch/containers/media_gallery_container.js
  70. 3
    3
      app/javascript/flavours/glitch/containers/notification_purge_buttons_container.js
  71. 10
    10
      app/javascript/flavours/glitch/containers/status_container.js
  72. 5
    5
      app/javascript/flavours/glitch/containers/timeline_container.js
  73. 1
    1
      app/javascript/flavours/glitch/containers/video_container.js
  74. 2
    2
      app/javascript/flavours/glitch/features/account/components/action_bar.js
  75. 5
    5
      app/javascript/flavours/glitch/features/account/components/header.js
  76. 1
    1
      app/javascript/flavours/glitch/features/account_gallery/components/media_item.js
  77. 8
    8
      app/javascript/flavours/glitch/features/account_gallery/index.js
  78. 3
    3
      app/javascript/flavours/glitch/features/account_timeline/components/header.js
  79. 8
    8
      app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js
  80. 2
    2
      app/javascript/flavours/glitch/features/account_timeline/index.js
  81. 5
    5
      app/javascript/flavours/glitch/features/blocks/index.js
  82. 1
    1
      app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js
  83. 1
    1
      app/javascript/flavours/glitch/features/community_timeline/containers/column_settings_container.js
  84. 6
    6
      app/javascript/flavours/glitch/features/community_timeline/index.js
  85. 0
    0
      app/javascript/flavours/glitch/features/compose/components/advanced_options.js
  86. 0
    0
      app/javascript/flavours/glitch/features/compose/components/advanced_options_toggle.js
  87. 2
    2
      app/javascript/flavours/glitch/features/compose/components/attach_options.js
  88. 2
    2
      app/javascript/flavours/glitch/features/compose/components/autosuggest_account.js
  89. 0
    0
      app/javascript/flavours/glitch/features/compose/components/character_counter.js
  90. 6
    6
      app/javascript/flavours/glitch/features/compose/components/compose_form.js
  91. 1
    1
      app/javascript/flavours/glitch/features/compose/components/dropdown.js
  92. 2
    2
      app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.js
  93. 3
    3
      app/javascript/flavours/glitch/features/compose/components/navigation_bar.js
  94. 2
    2
      app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.js
  95. 3
    3
      app/javascript/flavours/glitch/features/compose/components/reply_indicator.js
  96. 1
    1
      app/javascript/flavours/glitch/features/compose/components/search.js
  97. 2
    2
      app/javascript/flavours/glitch/features/compose/components/search_results.js
  98. 0
    0
      app/javascript/flavours/glitch/features/compose/components/text_icon_button.js
  99. 2
    2
      app/javascript/flavours/glitch/features/compose/components/upload.js
  100. 0
    0
      app/javascript/flavours/glitch/features/compose/components/upload_button.js

+ 0
- 3
.gitmodules View File

@@ -1,3 +0,0 @@
1
-[submodule "app/javascript/themes/mastodon-go"]
2
-	path = app/javascript/themes/mastodon-go
3
-	url = https://github.com/marrus-sh/mastodon-go

+ 14
- 22
app/controllers/application_controller.rb View File

@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base
12 12
 
13 13
   helper_method :current_account
14 14
   helper_method :current_session
15
-  helper_method :current_theme
15
+  helper_method :current_flavour
16 16
   helper_method :current_skin
17 17
   helper_method :single_user_mode?
18 18
 
@@ -57,8 +57,8 @@ class ApplicationController < ActionController::Base
57 57
   def pack(data, pack_name, skin = 'default')
58 58
     return nil unless pack?(data, pack_name)
59 59
     pack_data = {
60
-      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common'),
61
-      name: data['name'],
60
+      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common'),
61
+      flavour: data['name'],
62 62
       pack: pack_name,
63 63
       preload: nil,
64 64
       skin: nil,
@@ -88,8 +88,8 @@ class ApplicationController < ActionController::Base
88 88
 
89 89
   def nil_pack(data, pack_name, skin = 'default')
90 90
     {
91
-      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common', skin),
92
-      name: data['name'],
91
+      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common', skin),
92
+      flavour: data['name'],
93 93
       pack: nil,
94 94
       preload: nil,
95 95
       skin: nil,
@@ -102,23 +102,23 @@ class ApplicationController < ActionController::Base
102 102
       if data['name'] && data.key?('fallback')
103 103
         if data['fallback'].nil?
104 104
           return nil_pack(data, pack_name, skin)
105
-        elsif data['fallback'].is_a?(String) && Themes.instance.get(data['fallback'])
106
-          return resolve_pack(Themes.instance.get(data['fallback']), pack_name, skin)
105
+        elsif data['fallback'].is_a?(String) && Themes.instance.flavour(data['fallback'])
106
+          return resolve_pack(Themes.instance.flavour(data['fallback']), pack_name, skin)
107 107
         elsif data['fallback'].is_a?(Array)
108 108
           data['fallback'].each do |fallback|
109
-            return resolve_pack(Themes.instance.get(fallback), pack_name, skin) if Themes.instance.get(fallback)
109
+            return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
110 110
           end
111 111
         end
112 112
         return nil_pack(data, pack_name, skin)
113 113
       end
114
-      return data.key?('name') && data['name'] != default_theme ? resolve_pack(Themes.instance.get(default_theme), pack_name, skin) : nil_pack(data, pack_name, skin)
114
+      return data.key?('name') && data['name'] != Setting.default_settings['flavour'] ? resolve_pack(Themes.instance.flavour(Setting.default_settings['flavour']), pack_name, skin) : nil_pack(data, pack_name, skin)
115 115
     end
116 116
     result
117 117
   end
118 118
 
119 119
   def use_pack(pack_name)
120 120
     @core = resolve_pack(Themes.instance.core, pack_name)
121
-    @theme = resolve_pack(Themes.instance.get(current_theme), pack_name, current_skin)
121
+    @theme = resolve_pack(Themes.instance.flavour(current_flavour), pack_name, current_skin)
122 122
   end
123 123
 
124 124
   protected
@@ -151,21 +151,13 @@ class ApplicationController < ActionController::Base
151 151
     @current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
152 152
   end
153 153
 
154
-  def default_theme
155
-    Setting.default_settings['theme']
156
-  end
157
-
158
-  def current_theme
159
-    return default_theme unless Themes.instance.names.include? current_user&.setting_theme
160
-    current_user.setting_theme
161
-  end
162
-
163
-  def default_skin
164
-    'default'
154
+  def current_flavour
155
+    return Setting.default_settings['flavour'] unless Themes.instance.flavours.include? current_user&.setting_flavour
156
+    current_user.setting_flavour
165 157
   end
166 158
 
167 159
   def current_skin
168
-    return default_skin unless Themes.instance.skins_for(current_theme).include? current_user&.setting_skin
160
+    return 'default' unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin
169 161
     current_user.setting_skin
170 162
   end
171 163
 

+ 1
- 1
app/javascript/core/settings.js View File

@@ -3,7 +3,7 @@
3 3
 const { length } = require('stringz');
4 4
 const { delegate } = require('rails-ujs');
5 5
 
6
-import { processBio } from 'themes/glitch/util/bio_metadata';
6
+import { processBio } from 'flavours/glitch/util/bio_metadata';
7 7
 
8 8
 delegate(document, '.account_display_name', 'input', ({ target }) => {
9 9
   const nameCounter = document.querySelector('.name-counter');

app/javascript/themes/glitch/actions/accounts.js → app/javascript/flavours/glitch/actions/accounts.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 
3 3
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
4 4
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/alerts.js → app/javascript/flavours/glitch/actions/alerts.js View File


app/javascript/themes/glitch/actions/blocks.js → app/javascript/flavours/glitch/actions/blocks.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 import { fetchRelationships } from './accounts';
3 3
 
4 4
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';

app/javascript/themes/glitch/actions/bundles.js → app/javascript/flavours/glitch/actions/bundles.js View File


app/javascript/themes/glitch/actions/cards.js → app/javascript/flavours/glitch/actions/cards.js View File

@@ -1,4 +1,4 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 
3 3
 export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
4 4
 export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/columns.js → app/javascript/flavours/glitch/actions/columns.js View File


app/javascript/themes/glitch/actions/compose.js → app/javascript/flavours/glitch/actions/compose.js View File

@@ -1,6 +1,6 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 import { throttle } from 'lodash';
3
-import { search as emojiSearch } from 'themes/glitch/util/emoji/emoji_mart_search_light';
3
+import { search as emojiSearch } from 'flavours/glitch/util/emoji/emoji_mart_search_light';
4 4
 import { useEmoji } from './emojis';
5 5
 
6 6
 import {

app/javascript/themes/glitch/actions/domain_blocks.js → app/javascript/flavours/glitch/actions/domain_blocks.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 
3 3
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
4 4
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';

app/javascript/themes/glitch/actions/emojis.js → app/javascript/flavours/glitch/actions/emojis.js View File


app/javascript/themes/glitch/actions/favourites.js → app/javascript/flavours/glitch/actions/favourites.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 
3 3
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
4 4
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/height_cache.js → app/javascript/flavours/glitch/actions/height_cache.js View File


app/javascript/themes/glitch/actions/interactions.js → app/javascript/flavours/glitch/actions/interactions.js View File

@@ -1,4 +1,4 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 
3 3
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
4 4
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';

app/javascript/themes/glitch/actions/local_settings.js → app/javascript/flavours/glitch/actions/local_settings.js View File


app/javascript/themes/glitch/actions/modal.js → app/javascript/flavours/glitch/actions/modal.js View File


app/javascript/themes/glitch/actions/mutes.js → app/javascript/flavours/glitch/actions/mutes.js View File

@@ -1,6 +1,6 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 import { fetchRelationships } from './accounts';
3
-import { openModal } from 'themes/glitch/actions/modal';
3
+import { openModal } from 'flavours/glitch/actions/modal';
4 4
 
5 5
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
6 6
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/notifications.js → app/javascript/flavours/glitch/actions/notifications.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 import { List as ImmutableList } from 'immutable';
3 3
 import IntlMessageFormat from 'intl-messageformat';
4 4
 import { fetchRelationships } from './accounts';

app/javascript/themes/glitch/actions/onboarding.js → app/javascript/flavours/glitch/actions/onboarding.js View File


app/javascript/themes/glitch/actions/pin_statuses.js → app/javascript/flavours/glitch/actions/pin_statuses.js View File

@@ -1,10 +1,10 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 
3 3
 export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
4 4
 export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
5 5
 export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';
6 6
 
7
-import { me } from 'themes/glitch/util/initial_state';
7
+import { me } from 'flavours/glitch/util/initial_state';
8 8
 
9 9
 export function fetchPinnedStatuses() {
10 10
   return (dispatch, getState) => {

app/javascript/themes/glitch/actions/push_notifications.js → app/javascript/flavours/glitch/actions/push_notifications.js View File


app/javascript/themes/glitch/actions/reports.js → app/javascript/flavours/glitch/actions/reports.js View File

@@ -1,4 +1,4 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 import { openModal, closeModal } from './modal';
3 3
 
4 4
 export const REPORT_INIT   = 'REPORT_INIT';

app/javascript/themes/glitch/actions/search.js → app/javascript/flavours/glitch/actions/search.js View File

@@ -1,4 +1,4 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 
3 3
 export const SEARCH_CHANGE = 'SEARCH_CHANGE';
4 4
 export const SEARCH_CLEAR  = 'SEARCH_CLEAR';

app/javascript/themes/glitch/actions/settings.js → app/javascript/flavours/glitch/actions/settings.js View File


app/javascript/themes/glitch/actions/statuses.js → app/javascript/flavours/glitch/actions/statuses.js View File

@@ -1,4 +1,4 @@
1
-import api from 'themes/glitch/util/api';
1
+import api from 'flavours/glitch/util/api';
2 2
 
3 3
 import { deleteFromTimelines } from './timelines';
4 4
 import { fetchStatusCard } from './cards';

app/javascript/themes/glitch/actions/store.js → app/javascript/flavours/glitch/actions/store.js View File


app/javascript/themes/glitch/actions/streaming.js → app/javascript/flavours/glitch/actions/streaming.js View File

@@ -1,4 +1,4 @@
1
-import { connectStream } from 'themes/glitch/util/stream';
1
+import { connectStream } from 'flavours/glitch/util/stream';
2 2
 import {
3 3
   updateTimeline,
4 4
   deleteFromTimelines,

app/javascript/themes/glitch/actions/timelines.js → app/javascript/flavours/glitch/actions/timelines.js View File

@@ -1,4 +1,4 @@
1
-import api, { getLinks } from 'themes/glitch/util/api';
1
+import api, { getLinks } from 'flavours/glitch/util/api';
2 2
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
3 3
 
4 4
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';

app/javascript/themes/glitch/components/account.js → app/javascript/flavours/glitch/components/account.js View File

@@ -7,7 +7,7 @@ import Permalink from './permalink';
7 7
 import IconButton from './icon_button';
8 8
 import { defineMessages, injectIntl } from 'react-intl';
9 9
 import ImmutablePureComponent from 'react-immutable-pure-component';
10
-import { me } from 'themes/glitch/util/initial_state';
10
+import { me } from 'flavours/glitch/util/initial_state';
11 11
 
12 12
 const messages = defineMessages({
13 13
   follow: { id: 'account.follow', defaultMessage: 'Follow' },

app/javascript/themes/glitch/components/attachment_list.js → app/javascript/flavours/glitch/components/attachment_list.js View File


app/javascript/themes/glitch/components/autosuggest_emoji.js → app/javascript/flavours/glitch/components/autosuggest_emoji.js View File

@@ -1,6 +1,6 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3
-import unicodeMapping from 'themes/glitch/util/emoji/emoji_unicode_mapping_light';
3
+import unicodeMapping from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light';
4 4
 
5 5
 const assetHost = process.env.CDN_HOST || '';
6 6
 

app/javascript/themes/glitch/components/autosuggest_textarea.js → app/javascript/flavours/glitch/components/autosuggest_textarea.js View File

@@ -1,9 +1,9 @@
1 1
 import React from 'react';
2
-import AutosuggestAccountContainer from 'themes/glitch/features/compose/containers/autosuggest_account_container';
2
+import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container';
3 3
 import AutosuggestEmoji from './autosuggest_emoji';
4 4
 import ImmutablePropTypes from 'react-immutable-proptypes';
5 5
 import PropTypes from 'prop-types';
6
-import { isRtl } from 'themes/glitch/util/rtl';
6
+import { isRtl } from 'flavours/glitch/util/rtl';
7 7
 import ImmutablePureComponent from 'react-immutable-pure-component';
8 8
 import Textarea from 'react-textarea-autosize';
9 9
 import classNames from 'classnames';

app/javascript/themes/glitch/components/avatar.js → app/javascript/flavours/glitch/components/avatar.js View File


app/javascript/themes/glitch/components/avatar_overlay.js → app/javascript/flavours/glitch/components/avatar_overlay.js View File


app/javascript/themes/glitch/components/button.js → app/javascript/flavours/glitch/components/button.js View File


app/javascript/themes/glitch/components/collapsable.js → app/javascript/flavours/glitch/components/collapsable.js View File

@@ -1,5 +1,5 @@
1 1
 import React from 'react';
2
-import Motion from 'themes/glitch/util/optional_motion';
2
+import Motion from 'flavours/glitch/util/optional_motion';
3 3
 import spring from 'react-motion/lib/spring';
4 4
 import PropTypes from 'prop-types';
5 5
 

app/javascript/themes/glitch/components/column.js → app/javascript/flavours/glitch/components/column.js View File

@@ -1,7 +1,7 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import detectPassiveEvents from 'detect-passive-events';
4
-import { scrollTop } from 'themes/glitch/util/scroll';
4
+import { scrollTop } from 'flavours/glitch/util/scroll';
5 5
 
6 6
 export default class Column extends React.PureComponent {
7 7
 

app/javascript/themes/glitch/components/column_back_button.js → app/javascript/flavours/glitch/components/column_back_button.js View File


app/javascript/themes/glitch/components/column_back_button_slim.js → app/javascript/flavours/glitch/components/column_back_button_slim.js View File


app/javascript/themes/glitch/components/column_header.js → app/javascript/flavours/glitch/components/column_header.js View File

@@ -4,8 +4,7 @@ import classNames from 'classnames';
4 4
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
5 5
 import ImmutablePropTypes from 'react-immutable-proptypes';
6 6
 
7
-// Glitch imports
8
-import NotificationPurgeButtonsContainer from 'themes/glitch/containers/notification_purge_buttons_container';
7
+import NotificationPurgeButtonsContainer from 'flavours/glitch/containers/notification_purge_buttons_container';
9 8
 
10 9
 const messages = defineMessages({
11 10
   show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },

app/javascript/themes/glitch/components/display_name.js → app/javascript/flavours/glitch/components/display_name.js View File


app/javascript/themes/glitch/components/dropdown_menu.js → app/javascript/flavours/glitch/components/dropdown_menu.js View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4 4
 import IconButton from './icon_button';
5 5
 import Overlay from 'react-overlays/lib/Overlay';
6
-import Motion from 'themes/glitch/util/optional_motion';
6
+import Motion from 'flavours/glitch/util/optional_motion';
7 7
 import spring from 'react-motion/lib/spring';
8 8
 import detectPassiveEvents from 'detect-passive-events';
9 9
 

app/javascript/themes/glitch/components/extended_video_player.js → app/javascript/flavours/glitch/components/extended_video_player.js View File


app/javascript/themes/glitch/components/icon_button.js → app/javascript/flavours/glitch/components/icon_button.js View File

@@ -1,5 +1,5 @@
1 1
 import React from 'react';
2
-import Motion from 'themes/glitch/util/optional_motion';
2
+import Motion from 'flavours/glitch/util/optional_motion';
3 3
 import spring from 'react-motion/lib/spring';
4 4
 import PropTypes from 'prop-types';
5 5
 import classNames from 'classnames';

app/javascript/themes/glitch/components/intersection_observer_article.js → app/javascript/flavours/glitch/components/intersection_observer_article.js View File

@@ -1,7 +1,7 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3
-import scheduleIdleTask from 'themes/glitch/util/schedule_idle_task';
4
-import getRectFromEntry from 'themes/glitch/util/get_rect_from_entry';
3
+import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
4
+import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry';
5 5
 import { is } from 'immutable';
6 6
 
7 7
 // Diff these props in the "rendered" state

app/javascript/themes/glitch/components/load_more.js → app/javascript/flavours/glitch/components/load_more.js View File


app/javascript/themes/glitch/components/loading_indicator.js → app/javascript/flavours/glitch/components/loading_indicator.js View File


app/javascript/themes/glitch/components/media_gallery.js → app/javascript/flavours/glitch/components/media_gallery.js View File

@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
4 4
 import { is } from 'immutable';
5 5
 import IconButton from './icon_button';
6 6
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
7
-import { isIOS } from 'themes/glitch/util/is_mobile';
7
+import { isIOS } from 'flavours/glitch/util/is_mobile';
8 8
 import classNames from 'classnames';
9
-import { autoPlayGif } from 'themes/glitch/util/initial_state';
9
+import { autoPlayGif } from 'flavours/glitch/util/initial_state';
10 10
 
11 11
 const messages = defineMessages({
12 12
   toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },

app/javascript/themes/glitch/components/missing_indicator.js → app/javascript/flavours/glitch/components/missing_indicator.js View File


app/javascript/themes/glitch/components/notification_purge_buttons.js → app/javascript/flavours/glitch/components/notification_purge_buttons.js View File


app/javascript/themes/glitch/components/permalink.js → app/javascript/flavours/glitch/components/permalink.js View File


app/javascript/themes/glitch/components/relative_timestamp.js → app/javascript/flavours/glitch/components/relative_timestamp.js View File


app/javascript/themes/glitch/components/scrollable_list.js → app/javascript/flavours/glitch/components/scrollable_list.js View File

@@ -1,13 +1,13 @@
1 1
 import React, { PureComponent } from 'react';
2 2
 import { ScrollContainer } from 'react-router-scroll-4';
3 3
 import PropTypes from 'prop-types';
4
-import IntersectionObserverArticleContainer from 'themes/glitch/containers/intersection_observer_article_container';
4
+import IntersectionObserverArticleContainer from 'flavours/glitch/containers/intersection_observer_article_container';
5 5
 import LoadMore from './load_more';
6
-import IntersectionObserverWrapper from 'themes/glitch/util/intersection_observer_wrapper';
6
+import IntersectionObserverWrapper from 'flavours/glitch/util/intersection_observer_wrapper';
7 7
 import { throttle } from 'lodash';
8 8
 import { List as ImmutableList } from 'immutable';
9 9
 import classNames from 'classnames';
10
-import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'themes/glitch/util/fullscreen';
10
+import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen';
11 11
 
12 12
 export default class ScrollableList extends PureComponent {
13 13
 

app/javascript/themes/glitch/components/setting_text.js → app/javascript/flavours/glitch/components/setting_text.js View File


app/javascript/themes/glitch/components/status.js → app/javascript/flavours/glitch/components/status.js View File

@@ -6,9 +6,9 @@ import StatusHeader from './status_header';
6 6
 import StatusContent from './status_content';
7 7
 import StatusActionBar from './status_action_bar';
8 8
 import ImmutablePureComponent from 'react-immutable-pure-component';
9
-import { MediaGallery, Video } from 'themes/glitch/util/async-components';
9
+import { MediaGallery, Video } from 'flavours/glitch/util/async-components';
10 10
 import { HotKeys } from 'react-hotkeys';
11
-import NotificationOverlayContainer from 'themes/glitch/features/notifications/containers/overlay_container';
11
+import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
12 12
 
13 13
 // We use the component (and not the container) since we do not want
14 14
 // to use the progress bar to show download progress

app/javascript/themes/glitch/components/status_action_bar.js → app/javascript/flavours/glitch/components/status_action_bar.js View File

@@ -1,14 +1,11 @@
1
-//  THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
2
-//  SEE INSTEAD : glitch/components/status/action_bar
3
-
4 1
 import React from 'react';
5 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
6 3
 import PropTypes from 'prop-types';
7 4
 import IconButton from './icon_button';
8
-import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container';
5
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
9 6
 import { defineMessages, injectIntl } from 'react-intl';
10 7
 import ImmutablePureComponent from 'react-immutable-pure-component';
11
-import { me } from 'themes/glitch/util/initial_state';
8
+import { me } from 'flavours/glitch/util/initial_state';
12 9
 import RelativeTimestamp from './relative_timestamp';
13 10
 
14 11
 const messages = defineMessages({

app/javascript/themes/glitch/components/status_content.js → app/javascript/flavours/glitch/components/status_content.js View File

@@ -1,7 +1,7 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import { isRtl } from 'themes/glitch/util/rtl';
4
+import { isRtl } from 'flavours/glitch/util/rtl';
5 5
 import { FormattedMessage } from 'react-intl';
6 6
 import Permalink from './permalink';
7 7
 import classnames from 'classnames';

app/javascript/themes/glitch/components/status_header.js → app/javascript/flavours/glitch/components/status_header.js View File


app/javascript/themes/glitch/components/status_list.js → app/javascript/flavours/glitch/components/status_list.js View File

@@ -1,7 +1,7 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import StatusContainer from 'themes/glitch/containers/status_container';
4
+import StatusContainer from 'flavours/glitch/containers/status_container';
5 5
 import ImmutablePureComponent from 'react-immutable-pure-component';
6 6
 import ScrollableList from './scrollable_list';
7 7
 

app/javascript/themes/glitch/components/status_prepend.js → app/javascript/flavours/glitch/components/status_prepend.js View File


app/javascript/themes/glitch/components/status_visibility_icon.js → app/javascript/flavours/glitch/components/status_visibility_icon.js View File


app/javascript/themes/glitch/containers/account_container.js → app/javascript/flavours/glitch/containers/account_container.js View File

@@ -1,8 +1,8 @@
1 1
 import React from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
4
-import { makeGetAccount } from 'themes/glitch/selectors';
5
-import Account from 'themes/glitch/components/account';
4
+import { makeGetAccount } from 'flavours/glitch/selectors';
5
+import Account from 'flavours/glitch/components/account';
6 6
 import {
7 7
   followAccount,
8 8
   unfollowAccount,
@@ -10,10 +10,10 @@ import {
10 10
   unblockAccount,
11 11
   muteAccount,
12 12
   unmuteAccount,
13
-} from 'themes/glitch/actions/accounts';
14
-import { openModal } from 'themes/glitch/actions/modal';
15
-import { initMuteModal } from 'themes/glitch/actions/mutes';
16
-import { unfollowModal } from 'themes/glitch/util/initial_state';
13
+} from 'flavours/glitch/actions/accounts';
14
+import { openModal } from 'flavours/glitch/actions/modal';
15
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
16
+import { unfollowModal } from 'flavours/glitch/util/initial_state';
17 17
 
18 18
 const messages = defineMessages({
19 19
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/containers/card_container.js → app/javascript/flavours/glitch/containers/card_container.js View File

@@ -1,6 +1,6 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3
-import Card from 'themes/glitch/features/status/components/card';
3
+import Card from 'flavours/glitch/features/status/components/card';
4 4
 import { fromJS } from 'immutable';
5 5
 
6 6
 export default class CardContainer extends React.PureComponent {

app/javascript/themes/glitch/containers/compose_container.js → app/javascript/flavours/glitch/containers/compose_container.js View File

@@ -1,12 +1,12 @@
1 1
 import React from 'react';
2 2
 import { Provider } from 'react-redux';
3 3
 import PropTypes from 'prop-types';
4
-import configureStore from 'themes/glitch/store/configureStore';
5
-import { hydrateStore } from 'themes/glitch/actions/store';
4
+import configureStore from 'flavours/glitch/store/configureStore';
5
+import { hydrateStore } from 'flavours/glitch/actions/store';
6 6
 import { IntlProvider, addLocaleData } from 'react-intl';
7 7
 import { getLocale } from 'mastodon/locales';
8
-import Compose from 'themes/glitch/features/standalone/compose';
9
-import initialState from 'themes/glitch/util/initial_state';
8
+import Compose from 'flavours/glitch/features/standalone/compose';
9
+import initialState from 'flavours/glitch/util/initial_state';
10 10
 
11 11
 const { localeData, messages } = getLocale();
12 12
 addLocaleData(localeData);

app/javascript/themes/glitch/containers/dropdown_menu_container.js → app/javascript/flavours/glitch/containers/dropdown_menu_container.js View File

@@ -1,7 +1,7 @@
1
-import { openModal, closeModal } from 'themes/glitch/actions/modal';
1
+import { openModal, closeModal } from 'flavours/glitch/actions/modal';
2 2
 import { connect } from 'react-redux';
3
-import DropdownMenu from 'themes/glitch/components/dropdown_menu';
4
-import { isUserTouching } from 'themes/glitch/util/is_mobile';
3
+import DropdownMenu from 'flavours/glitch/components/dropdown_menu';
4
+import { isUserTouching } from 'flavours/glitch/util/is_mobile';
5 5
 
6 6
 const mapStateToProps = state => ({
7 7
   isModalOpen: state.get('modal').modalType === 'ACTIONS',

app/javascript/themes/glitch/containers/intersection_observer_article_container.js → app/javascript/flavours/glitch/containers/intersection_observer_article_container.js View File

@@ -1,6 +1,6 @@
1 1
 import { connect } from 'react-redux';
2
-import IntersectionObserverArticle from 'themes/glitch/components/intersection_observer_article';
3
-import { setHeight } from 'themes/glitch/actions/height_cache';
2
+import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article';
3
+import { setHeight } from 'flavours/glitch/actions/height_cache';
4 4
 
5 5
 const makeMapStateToProps = (state, props) => ({
6 6
   cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]),

app/javascript/themes/glitch/containers/mastodon.js → app/javascript/flavours/glitch/containers/mastodon.js View File

@@ -1,16 +1,16 @@
1 1
 import React from 'react';
2 2
 import { Provider } from 'react-redux';
3 3
 import PropTypes from 'prop-types';
4
-import configureStore from 'themes/glitch/store/configureStore';
5
-import { showOnboardingOnce } from 'themes/glitch/actions/onboarding';
4
+import configureStore from 'flavours/glitch/store/configureStore';
5
+import { showOnboardingOnce } from 'flavours/glitch/actions/onboarding';
6 6
 import { BrowserRouter, Route } from 'react-router-dom';
7 7
 import { ScrollContext } from 'react-router-scroll-4';
8
-import UI from 'themes/glitch/features/ui';
9
-import { hydrateStore } from 'themes/glitch/actions/store';
10
-import { connectUserStream } from 'themes/glitch/actions/streaming';
8
+import UI from 'flavours/glitch/features/ui';
9
+import { hydrateStore } from 'flavours/glitch/actions/store';
10
+import { connectUserStream } from 'flavours/glitch/actions/streaming';
11 11
 import { IntlProvider, addLocaleData } from 'react-intl';
12 12
 import { getLocale } from 'locales';
13
-import initialState from 'themes/glitch/util/initial_state';
13
+import initialState from 'flavours/glitch/util/initial_state';
14 14
 
15 15
 const { localeData, messages } = getLocale();
16 16
 addLocaleData(localeData);

app/javascript/themes/glitch/containers/media_gallery_container.js → app/javascript/flavours/glitch/containers/media_gallery_container.js View File

@@ -2,7 +2,7 @@ import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import { IntlProvider, addLocaleData } from 'react-intl';
4 4
 import { getLocale } from 'mastodon/locales';
5
-import MediaGallery from 'themes/glitch/components/media_gallery';
5
+import MediaGallery from 'flavours/glitch/components/media_gallery';
6 6
 import { fromJS } from 'immutable';
7 7
 
8 8
 const { localeData, messages } = getLocale();

app/javascript/themes/glitch/containers/notification_purge_buttons_container.js → app/javascript/flavours/glitch/containers/notification_purge_buttons_container.js View File

@@ -3,13 +3,13 @@ import { connect } from 'react-redux';
3 3
 import { defineMessages, injectIntl } from 'react-intl';
4 4
 
5 5
 //  Our imports.
6
-import NotificationPurgeButtons from 'themes/glitch/components/notification_purge_buttons';
6
+import NotificationPurgeButtons from 'flavours/glitch/components/notification_purge_buttons';
7 7
 import {
8 8
   deleteMarkedNotifications,
9 9
   enterNotificationClearingMode,
10 10
   markAllNotifications,
11
-} from 'themes/glitch/actions/notifications';
12
-import { openModal } from 'themes/glitch/actions/modal';
11
+} from 'flavours/glitch/actions/notifications';
12
+import { openModal } from 'flavours/glitch/actions/modal';
13 13
 
14 14
 const messages = defineMessages({
15 15
   clearMessage: { id: 'notifications.marked_clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all selected notifications?' },

app/javascript/themes/glitch/containers/status_container.js → app/javascript/flavours/glitch/containers/status_container.js View File

@@ -1,11 +1,11 @@
1 1
 import React from 'react';
2 2
 import { connect } from 'react-redux';
3
-import Status from 'themes/glitch/components/status';
4
-import { makeGetStatus } from 'themes/glitch/selectors';
3
+import Status from 'flavours/glitch/components/status';
4
+import { makeGetStatus } from 'flavours/glitch/selectors';
5 5
 import {
6 6
   replyCompose,
7 7
   mentionCompose,
8
-} from 'themes/glitch/actions/compose';
8
+} from 'flavours/glitch/actions/compose';
9 9
 import {
10 10
   reblog,
11 11
   favourite,
@@ -13,14 +13,14 @@ import {
13 13
   unfavourite,
14 14
   pin,
15 15
   unpin,
16
-} from 'themes/glitch/actions/interactions';
17
-import { blockAccount } from 'themes/glitch/actions/accounts';
18
-import { muteStatus, unmuteStatus, deleteStatus } from 'themes/glitch/actions/statuses';
19
-import { initMuteModal } from 'themes/glitch/actions/mutes';
20
-import { initReport } from 'themes/glitch/actions/reports';
21
-import { openModal } from 'themes/glitch/actions/modal';
16
+} from 'flavours/glitch/actions/interactions';
17
+import { blockAccount } from 'flavours/glitch/actions/accounts';
18
+import { muteStatus, unmuteStatus, deleteStatus } from 'flavours/glitch/actions/statuses';
19
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
20
+import { initReport } from 'flavours/glitch/actions/reports';
21
+import { openModal } from 'flavours/glitch/actions/modal';
22 22
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
23
-import { boostModal, deleteModal } from 'themes/glitch/util/initial_state';
23
+import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';
24 24
 
25 25
 const messages = defineMessages({
26 26
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },

app/javascript/themes/glitch/containers/timeline_container.js → app/javascript/flavours/glitch/containers/timeline_container.js View File

@@ -1,13 +1,13 @@
1 1
 import React from 'react';
2 2
 import { Provider } from 'react-redux';
3 3
 import PropTypes from 'prop-types';
4
-import configureStore from 'themes/glitch/store/configureStore';
5
-import { hydrateStore } from 'themes/glitch/actions/store';
4
+import configureStore from 'flavours/glitch/store/configureStore';
5
+import { hydrateStore } from 'flavours/glitch/actions/store';
6 6
 import { IntlProvider, addLocaleData } from 'react-intl';
7 7
 import { getLocale } from 'mastodon/locales';
8
-import PublicTimeline from 'themes/glitch/features/standalone/public_timeline';
9
-import HashtagTimeline from 'themes/glitch/features/standalone/hashtag_timeline';
10
-import initialState from 'themes/glitch/util/initial_state';
8
+import PublicTimeline from 'flavours/glitch/features/standalone/public_timeline';
9
+import HashtagTimeline from 'flavours/glitch/features/standalone/hashtag_timeline';
10
+import initialState from 'flavours/glitch/util/initial_state';
11 11
 
12 12
 const { localeData, messages } = getLocale();
13 13
 addLocaleData(localeData);

app/javascript/themes/glitch/containers/video_container.js → app/javascript/flavours/glitch/containers/video_container.js View File

@@ -2,7 +2,7 @@ import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import { IntlProvider, addLocaleData } from 'react-intl';
4 4
 import { getLocale } from 'mastodon/locales';
5
-import Video from 'themes/glitch/features/video';
5
+import Video from 'flavours/glitch/features/video';
6 6
 
7 7
 const { localeData, messages } = getLocale();
8 8
 addLocaleData(localeData);

app/javascript/themes/glitch/features/account/components/action_bar.js → app/javascript/flavours/glitch/features/account/components/action_bar.js View File

@@ -1,10 +1,10 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container';
4
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
5 5
 import { Link } from 'react-router-dom';
6 6
 import { defineMessages, injectIntl, FormattedMessage, FormattedNumber } from 'react-intl';
7
-import { me } from 'themes/glitch/util/initial_state';
7
+import { me } from 'flavours/glitch/util/initial_state';
8 8
 
9 9
 const messages = defineMessages({
10 10
   mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },

app/javascript/themes/glitch/features/account/components/header.js → app/javascript/flavours/glitch/features/account/components/header.js View File

@@ -4,12 +4,12 @@ import PropTypes from 'prop-types';
4 4
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
5 5
 import ImmutablePureComponent from 'react-immutable-pure-component';
6 6
 
7
-import Avatar from 'themes/glitch/components/avatar';
8
-import IconButton from 'themes/glitch/components/icon_button';
7
+import Avatar from 'flavours/glitch/components/avatar';
8
+import IconButton from 'flavours/glitch/components/icon_button';
9 9
 
10
-import emojify from 'themes/glitch/util/emoji';
11
-import { me } from 'themes/glitch/util/initial_state';
12
-import { processBio } from 'themes/glitch/util/bio_metadata';
10
+import emojify from 'flavours/glitch/util/emoji';
11
+import { me } from 'flavours/glitch/util/initial_state';
12
+import { processBio } from 'flavours/glitch/util/bio_metadata';
13 13
 
14 14
 const messages = defineMessages({
15 15
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/features/account_gallery/components/media_item.js → app/javascript/flavours/glitch/features/account_gallery/components/media_item.js View File

@@ -1,7 +1,7 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import ImmutablePureComponent from 'react-immutable-pure-component';
4
-import Permalink from 'themes/glitch/components/permalink';
4
+import Permalink from 'flavours/glitch/components/permalink';
5 5
 
6 6
 export default class MediaItem extends ImmutablePureComponent {
7 7
 

app/javascript/themes/glitch/features/account_gallery/index.js → app/javascript/flavours/glitch/features/account_gallery/index.js View File

@@ -2,18 +2,18 @@ import React from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4 4
 import PropTypes from 'prop-types';
5
-import { fetchAccount } from 'themes/glitch/actions/accounts';
6
-import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from 'themes/glitch/actions/timelines';
7
-import LoadingIndicator from 'themes/glitch/components/loading_indicator';
8
-import Column from 'themes/glitch/features/ui/components/column';
9
-import ColumnBackButton from 'themes/glitch/components/column_back_button';
5
+import { fetchAccount } from 'flavours/glitch/actions/accounts';
6
+import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
7
+import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
8
+import Column from 'flavours/glitch/features/ui/components/column';
9
+import ColumnBackButton from 'flavours/glitch/components/column_back_button';
10 10
 import ImmutablePureComponent from 'react-immutable-pure-component';
11
-import { getAccountGallery } from 'themes/glitch/selectors';
11
+import { getAccountGallery } from 'flavours/glitch/selectors';
12 12
 import MediaItem from './components/media_item';
13
-import HeaderContainer from 'themes/glitch/features/account_timeline/containers/header_container';
13
+import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
14 14
 import { FormattedMessage } from 'react-intl';
15 15
 import { ScrollContainer } from 'react-router-scroll-4';
16
-import LoadMore from 'themes/glitch/components/load_more';
16
+import LoadMore from 'flavours/glitch/components/load_more';
17 17
 
18 18
 const mapStateToProps = (state, props) => ({
19 19
   medias: getAccountGallery(state, props.params.accountId),

app/javascript/themes/glitch/features/account_timeline/components/header.js → app/javascript/flavours/glitch/features/account_timeline/components/header.js View File

@@ -1,9 +1,9 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import InnerHeader from 'themes/glitch/features/account/components/header';
5
-import ActionBar from 'themes/glitch/features/account/components/action_bar';
6
-import MissingIndicator from 'themes/glitch/components/missing_indicator';
4
+import InnerHeader from 'flavours/glitch/features/account/components/header';
5
+import ActionBar from 'flavours/glitch/features/account/components/action_bar';
6
+import MissingIndicator from 'flavours/glitch/components/missing_indicator';
7 7
 import ImmutablePureComponent from 'react-immutable-pure-component';
8 8
 
9 9
 export default class Header extends ImmutablePureComponent {

app/javascript/themes/glitch/features/account_timeline/containers/header_container.js → app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js View File

@@ -1,6 +1,6 @@
1 1
 import React from 'react';
2 2
 import { connect } from 'react-redux';
3
-import { makeGetAccount } from 'themes/glitch/selectors';
3
+import { makeGetAccount } from 'flavours/glitch/selectors';
4 4
 import Header from '../components/header';
5 5
 import {
6 6
   followAccount,
@@ -8,14 +8,14 @@ import {
8 8
   blockAccount,
9 9
   unblockAccount,
10 10
   unmuteAccount,
11
-} from 'themes/glitch/actions/accounts';
12
-import { mentionCompose } from 'themes/glitch/actions/compose';
13
-import { initMuteModal } from 'themes/glitch/actions/mutes';
14
-import { initReport } from 'themes/glitch/actions/reports';
15
-import { openModal } from 'themes/glitch/actions/modal';
16
-import { blockDomain, unblockDomain } from 'themes/glitch/actions/domain_blocks';
11
+} from 'flavours/glitch/actions/accounts';
12
+import { mentionCompose } from 'flavours/glitch/actions/compose';
13
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
14
+import { initReport } from 'flavours/glitch/actions/reports';
15
+import { openModal } from 'flavours/glitch/actions/modal';
16
+import { blockDomain, unblockDomain } from 'flavours/glitch/actions/domain_blocks';
17 17
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
18
-import { unfollowModal } from 'themes/glitch/util/initial_state';
18
+import { unfollowModal } from 'flavours/glitch/util/initial_state';
19 19
 
20 20
 const messages = defineMessages({
21 21
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/features/account_timeline/index.js → app/javascript/flavours/glitch/features/account_timeline/index.js View File

@@ -2,8 +2,8 @@ import React from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4 4
 import PropTypes from 'prop-types';
5
-import { fetchAccount } from 'themes/glitch/actions/accounts';
6
-import { refreshAccountTimeline, expandAccountTimeline } from 'themes/glitch/actions/timelines';
5
+import { fetchAccount } from 'flavours/glitch/actions/accounts';
6
+import { refreshAccountTimeline, expandAccountTimeline } from 'flavours/glitch/actions/timelines';
7 7
 import StatusList from '../../components/status_list';
8 8
 import LoadingIndicator from '../../components/loading_indicator';
9 9
 import Column from '../ui/components/column';

app/javascript/themes/glitch/features/blocks/index.js → app/javascript/flavours/glitch/features/blocks/index.js View File

@@ -2,12 +2,12 @@ import React from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4 4
 import PropTypes from 'prop-types';
5
-import LoadingIndicator from 'themes/glitch/components/loading_indicator';
5
+import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
6 6
 import { ScrollContainer } from 'react-router-scroll-4';
7
-import Column from 'themes/glitch/features/ui/components/column';
8
-import ColumnBackButtonSlim from 'themes/glitch/components/column_back_button_slim';
9
-import AccountContainer from 'themes/glitch/containers/account_container';
10
-import { fetchBlocks, expandBlocks } from 'themes/glitch/actions/blocks';
7
+import Column from 'flavours/glitch/features/ui/components/column';
8
+import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
9
+import AccountContainer from 'flavours/glitch/containers/account_container';
10
+import { fetchBlocks, expandBlocks } from 'flavours/glitch/actions/blocks';
11 11
 import { defineMessages, injectIntl } from 'react-intl';
12 12
 import ImmutablePureComponent from 'react-immutable-pure-component';
13 13
 

app/javascript/themes/glitch/features/community_timeline/components/column_settings.js → app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js View File

@@ -2,7 +2,7 @@ import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4 4
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
5
-import SettingText from 'themes/glitch/components/setting_text';
5
+import SettingText from 'flavours/glitch/components/setting_text';
6 6
 
7 7
 const messages = defineMessages({
8 8
   filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },

app/javascript/themes/glitch/features/community_timeline/containers/column_settings_container.js → app/javascript/flavours/glitch/features/community_timeline/containers/column_settings_container.js View File

@@ -1,6 +1,6 @@
1 1
 import { connect } from 'react-redux';
2 2
 import ColumnSettings from '../components/column_settings';
3
-import { changeSetting } from 'themes/glitch/actions/settings';
3
+import { changeSetting } from 'flavours/glitch/actions/settings';
4 4
 
5 5
 const mapStateToProps = state => ({
6 6
   settings: state.getIn(['settings', 'community']),

app/javascript/themes/glitch/features/community_timeline/index.js → app/javascript/flavours/glitch/features/community_timeline/index.js View File

@@ -1,17 +1,17 @@
1 1
 import React from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 import PropTypes from 'prop-types';
4
-import StatusListContainer from 'themes/glitch/features/ui/containers/status_list_container';
5
-import Column from 'themes/glitch/components/column';
6
-import ColumnHeader from 'themes/glitch/components/column_header';
4
+import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
5
+import Column from 'flavours/glitch/components/column';
6
+import ColumnHeader from 'flavours/glitch/components/column_header';
7 7
 import {
8 8
   refreshCommunityTimeline,
9 9
   expandCommunityTimeline,
10
-} from 'themes/glitch/actions/timelines';
11
-import { addColumn, removeColumn, moveColumn } from 'themes/glitch/actions/columns';
10
+} from 'flavours/glitch/actions/timelines';
11
+import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
12 12
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
13 13
 import ColumnSettingsContainer from './containers/column_settings_container';
14
-import { connectCommunityStream } from 'themes/glitch/actions/streaming';
14
+import { connectCommunityStream } from 'flavours/glitch/actions/streaming';
15 15
 
16 16
 const messages = defineMessages({
17 17
   title: { id: 'column.community', defaultMessage: 'Local timeline' },

app/javascript/themes/glitch/features/compose/components/advanced_options.js → app/javascript/flavours/glitch/features/compose/components/advanced_options.js View File


app/javascript/themes/glitch/features/compose/components/advanced_options_toggle.js → app/javascript/flavours/glitch/features/compose/components/advanced_options_toggle.js View File


app/javascript/themes/glitch/features/compose/components/attach_options.js → app/javascript/flavours/glitch/features/compose/components/attach_options.js View File

@@ -6,10 +6,10 @@ import { injectIntl, defineMessages } from 'react-intl';
6 6
 
7 7
 //  Our imports  //
8 8
 import ComposeDropdown from './dropdown';
9
-import { uploadCompose } from 'themes/glitch/actions/compose';
9
+import { uploadCompose } from 'flavours/glitch/actions/compose';
10 10
 import ImmutablePropTypes from 'react-immutable-proptypes';
11 11
 import ImmutablePureComponent from 'react-immutable-pure-component';
12
-import { openModal } from 'themes/glitch/actions/modal';
12
+import { openModal } from 'flavours/glitch/actions/modal';
13 13
 
14 14
 const messages = defineMessages({
15 15
   upload :

app/javascript/themes/glitch/features/compose/components/autosuggest_account.js → app/javascript/flavours/glitch/features/compose/components/autosuggest_account.js View File

@@ -1,6 +1,6 @@
1 1
 import React from 'react';
2
-import Avatar from 'themes/glitch/components/avatar';
3
-import DisplayName from 'themes/glitch/components/display_name';
2
+import Avatar from 'flavours/glitch/components/avatar';
3
+import DisplayName from 'flavours/glitch/components/display_name';
4 4
 import ImmutablePropTypes from 'react-immutable-proptypes';
5 5
 import ImmutablePureComponent from 'react-immutable-pure-component';
6 6
 

app/javascript/themes/glitch/features/compose/components/character_counter.js → app/javascript/flavours/glitch/features/compose/components/character_counter.js View File


app/javascript/themes/glitch/features/compose/components/compose_form.js → app/javascript/flavours/glitch/features/compose/components/compose_form.js View File

@@ -1,12 +1,12 @@
1 1
 import React from 'react';
2 2
 import CharacterCounter from './character_counter';
3
-import Button from 'themes/glitch/components/button';
3
+import Button from 'flavours/glitch/components/button';
4 4
 import ImmutablePropTypes from 'react-immutable-proptypes';
5 5
 import PropTypes from 'prop-types';
6 6
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
7
-import AutosuggestTextarea from 'themes/glitch/components/autosuggest_textarea';
7
+import AutosuggestTextarea from 'flavours/glitch/components/autosuggest_textarea';
8 8
 import { defineMessages, injectIntl } from 'react-intl';
9
-import Collapsable from 'themes/glitch/components/collapsable';
9
+import Collapsable from 'flavours/glitch/components/collapsable';
10 10
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
11 11
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
12 12
 import ComposeAdvancedOptionsContainer from '../containers/advanced_options_container';
@@ -14,12 +14,12 @@ import SensitiveButtonContainer from '../containers/sensitive_button_container';
14 14
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
15 15
 import UploadFormContainer from '../containers/upload_form_container';
16 16
 import WarningContainer from '../containers/warning_container';
17
-import { isMobile } from 'themes/glitch/util/is_mobile';
17
+import { isMobile } from 'flavours/glitch/util/is_mobile';
18 18
 import ImmutablePureComponent from 'react-immutable-pure-component';
19 19
 import { length } from 'stringz';
20
-import { countableText } from 'themes/glitch/util/counter';
20
+import { countableText } from 'flavours/glitch/util/counter';
21 21
 import ComposeAttachOptions from './attach_options';
22
-import initialState from 'themes/glitch/util/initial_state';
22
+import initialState from 'flavours/glitch/util/initial_state';
23 23
 
24 24
 const maxChars = initialState.max_toot_chars;
25 25
 

app/javascript/themes/glitch/features/compose/components/dropdown.js → app/javascript/flavours/glitch/features/compose/components/dropdown.js View File

@@ -3,7 +3,7 @@ import React from 'react';
3 3
 import PropTypes from 'prop-types';
4 4
 
5 5
 //  Our imports.
6
-import IconButton from 'themes/glitch/components/icon_button';
6
+import IconButton from 'flavours/glitch/components/icon_button';
7 7
 
8 8
 const iconStyle = {
9 9
   height     : null,

app/javascript/themes/glitch/features/compose/components/emoji_picker_dropdown.js → app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.js View File

@@ -1,12 +1,12 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import { defineMessages, injectIntl } from 'react-intl';
4
-import { EmojiPicker as EmojiPickerAsync } from 'themes/glitch/util/async-components';
4
+import { EmojiPicker as EmojiPickerAsync } from 'flavours/glitch/util/async-components';
5 5
 import Overlay from 'react-overlays/lib/Overlay';
6 6
 import classNames from 'classnames';
7 7
 import ImmutablePropTypes from 'react-immutable-proptypes';
8 8
 import detectPassiveEvents from 'detect-passive-events';
9
-import { buildCustomEmojis } from 'themes/glitch/util/emoji';
9
+import { buildCustomEmojis } from 'flavours/glitch/util/emoji';
10 10
 
11 11
 const messages = defineMessages({
12 12
   emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },

app/javascript/themes/glitch/features/compose/components/navigation_bar.js → app/javascript/flavours/glitch/features/compose/components/navigation_bar.js View File

@@ -1,9 +1,9 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import ImmutablePropTypes from 'react-immutable-proptypes';
4
-import Avatar from 'themes/glitch/components/avatar';
5
-import IconButton from 'themes/glitch/components/icon_button';
6
-import Permalink from 'themes/glitch/components/permalink';
4
+import Avatar from 'flavours/glitch/components/avatar';
5
+import IconButton from 'flavours/glitch/components/icon_button';
6
+import Permalink from 'flavours/glitch/components/permalink';
7 7
 import { FormattedMessage } from 'react-intl';
8 8
 import ImmutablePureComponent from 'react-immutable-pure-component';
9 9
 

app/javascript/themes/glitch/features/compose/components/privacy_dropdown.js → app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.js View File

@@ -1,9 +1,9 @@
1 1
 import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import { injectIntl, defineMessages } from 'react-intl';
4
-import IconButton from 'themes/glitch/components/icon_button';
4
+import IconButton from 'flavours/glitch/components/icon_button';
5 5
 import Overlay from 'react-overlays/lib/Overlay';
6
-import Motion from 'themes/glitch/util/optional_motion';
6
+import Motion from 'flavours/glitch/util/optional_motion';
7 7
 import spring from 'react-motion/lib/spring';
8 8
 import detectPassiveEvents from 'detect-passive-events';
9 9
 import classNames from 'classnames';

app/javascript/themes/glitch/features/compose/components/reply_indicator.js → app/javascript/flavours/glitch/features/compose/components/reply_indicator.js View File

@@ -1,9 +1,9 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import Avatar from 'themes/glitch/components/avatar';
5
-import IconButton from 'themes/glitch/components/icon_button';
6
-import DisplayName from 'themes/glitch/components/display_name';
4
+import Avatar from 'flavours/glitch/components/avatar';
5
+import IconButton from 'flavours/glitch/components/icon_button';
6
+import DisplayName from 'flavours/glitch/components/display_name';
7 7
 import { defineMessages, injectIntl } from 'react-intl';
8 8
 import ImmutablePureComponent from 'react-immutable-pure-component';
9 9
 

app/javascript/themes/glitch/features/compose/components/search.js → app/javascript/flavours/glitch/features/compose/components/search.js View File

@@ -2,7 +2,7 @@ import React from 'react';
2 2
 import PropTypes from 'prop-types';
3 3
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
4 4
 import Overlay from 'react-overlays/lib/Overlay';
5
-import Motion from 'themes/glitch/util/optional_motion';
5
+import Motion from 'flavours/glitch/util/optional_motion';
6 6
 import spring from 'react-motion/lib/spring';
7 7
 
8 8
 const messages = defineMessages({

app/javascript/themes/glitch/features/compose/components/search_results.js → app/javascript/flavours/glitch/features/compose/components/search_results.js View File

@@ -1,8 +1,8 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import { FormattedMessage } from 'react-intl';
4
-import AccountContainer from 'themes/glitch/containers/account_container';
5
-import StatusContainer from 'themes/glitch/containers/status_container';
4
+import AccountContainer from 'flavours/glitch/containers/account_container';
5
+import StatusContainer from 'flavours/glitch/containers/status_container';
6 6
 import { Link } from 'react-router-dom';
7 7
 import ImmutablePureComponent from 'react-immutable-pure-component';
8 8
 

app/javascript/themes/glitch/features/compose/components/text_icon_button.js → app/javascript/flavours/glitch/features/compose/components/text_icon_button.js View File


app/javascript/themes/glitch/features/compose/components/upload.js → app/javascript/flavours/glitch/features/compose/components/upload.js View File

@@ -1,8 +1,8 @@
1 1
 import React from 'react';
2 2
 import ImmutablePropTypes from 'react-immutable-proptypes';
3 3
 import PropTypes from 'prop-types';
4
-import IconButton from 'themes/glitch/components/icon_button';
5
-import Motion from 'themes/glitch/util/optional_motion';
4
+import IconButton from 'flavours/glitch/components/icon_button';
5
+import Motion from 'flavours/glitch/util/optional_motion';
6 6
 import spring from 'react-motion/lib/spring';
7 7
 import ImmutablePureComponent from 'react-immutable-pure-component';
8 8
 import { defineMessages, injectIntl } from 'react-intl';

app/javascript/themes/glitch/features/compose/components/upload_button.js → app/javascript/flavours/glitch/features/compose/components/upload_button.js View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save