Current section

37 Versions

Jump to

Compare versions

39 files changed
+756 additions
-912 deletions
  @@ -14,6 +14,10 @@ adding content editing to any page on a Phoenix website, as well as creating new
14 14 dynamically routed pages. It's ideal for either adding limited editing support to
15 15 existing Phoenix websites or building dynamic websites.
16 16
17 + _Thesis is currently considered *Alpha-quality*, but is in production on several
18 + websites, including [Infinite Red](https://infinite.red). The API is unstable and
19 + changing but we are committed to providing a clear upgrade path and documentation._
20 +
17 21 _See also the Thesis [Rails gem](https://github.com/infinitered/thesis-rails)._
18 22
19 23 ![screen capture on 2016-04-20 at 15-11-10 copy](https://cloud.githubusercontent.com/assets/1775841/14692261/d4734d3a-070a-11e6-866b-eebbc40e6157.gif)
  @@ -38,7 +42,7 @@ _If you are having problems, view `README_INSTALL.md` for manual instructions._
38 42
39 43 ```elixir
40 44 def deps do
41 - [{:thesis, "~> 0.0.23"}]
45 + [{:thesis, "~> 0.0.24"}]
42 46 end
43 47
44 48 def application do
  @@ -256,6 +260,7 @@ choice.
256 260
257 261 ```elixir
258 262 # web/router.ex
263 + # should be added as the last route
259 264
260 265 get "/*path", <MyApp>.PageController, :dynamic
261 266
  @@ -379,9 +384,10 @@ websites. Please help us improve!
379 384 4. Run `brunch watch -p` during development
380 385 5. Use the `apps/example` Phoenix app to manually test your feature
381 386 6. Write tests for your new feature
382 - 7. Run `mix test` in the root directory to ensure that all tests pass.
383 - 8. Push to the branch (`git push origin my-new-feature`)
384 - 9. Create new Pull Request
387 + 7. Run `mix test && npm test` in the root directory to ensure that Thesis tests pass.
388 + 8. Run `mix test` in the `apps/example` directory to ensure the example app passes
389 + 9. Push to the branch (`git push origin my-new-feature`)
390 + 10. Create new Pull Request
385 391
386 392 ### Key Contributors
  @@ -6,7 +6,7 @@ For automatic setup, see `README.md`.
6 6
7 7 ```elixir
8 8 def deps do
9 - [{:thesis, "~> 0.0.23"}]
9 + [{:thesis, "~> 0.0.24"}]
10 10 end
11 11
12 12 def application do
  @@ -12,11 +12,13 @@
12 12 <<"lib/thesis/router.ex">>,<<"lib/thesis/stores/ecto_store.ex">>,
13 13 <<"lib/thesis/stores/store.ex">>,
14 14 <<"lib/thesis/uploaders/ospry_uploader.ex">>,
15 + <<"lib/thesis/uploaders/s3_uploader.ex">>,
15 16 <<"lib/thesis/uploaders/uploader.ex">>,<<"lib/thesis/view.ex">>,
16 - <<"priv/static/thesis-editor.js">>,<<"priv/static/thesis.css">>,
17 + <<"priv/static/thesis.css">>,<<"priv/static/thesis.js">>,
17 18 <<"priv/templates/thesis.install/add_indexes_to_tables.exs">>,
18 19 <<"priv/templates/thesis.install/add_meta_to_thesis_page_contents.exs">>,
19 20 <<"priv/templates/thesis.install/add_template_and_redirect_url_to_thesis_pages.exs">>,
21 + <<"priv/templates/thesis.install/change_content_default_for_page_content.exs">>,
20 22 <<"priv/templates/thesis.install/create_thesis_tables.exs">>,
21 23 <<"priv/templates/thesis.install/thesis_auth.exs">>,
22 24 <<"web/static/css/_extends/_extends.sass">>,
  @@ -121,23 +123,24 @@
121 123 <<"web/static/js/components/save_button.js">>,
122 124 <<"web/static/js/components/settings_button.js">>,
123 125 <<"web/static/js/components/settings_tray.js">>,
126 + <<"web/static/js/components/thesis-editor.js">>,
124 127 <<"web/static/js/content_types/html_editor.js">>,
125 128 <<"web/static/js/content_types/image_editor.js">>,
126 129 <<"web/static/js/content_types/image_tray.js">>,
127 130 <<"web/static/js/content_types/raw_html_editor.js">>,
128 131 <<"web/static/js/content_types/raw_html_tray.js">>,
129 132 <<"web/static/js/content_types/text_editor.js">>,
130 - <<"web/static/js/thesis-editor.js">>,<<"web/static/js/utilities/net.js">>,
131 - <<"web/static/js/utilities/ospry.js">>,
133 + <<"web/static/js/external.js">>,<<"web/static/js/thesis.js">>,
134 + <<"web/static/js/utilities/net.js">>,<<"web/static/js/utilities/ospry.js">>,
132 135 <<"web/templates/test/test.html.eex">>,<<"mix.exs">>,<<"README.md">>,
133 136 <<"README_INSTALL.md">>,<<"LICENSE.md">>,<<"package.json">>]}.
134 137 {<<"licenses">>,[<<"MIT">>]}.
135 138 {<<"links">>,
136 - [{<<"Docs">>,<<"https://hexdocs.pm/thesis/0.0.23/api-reference.html">>},
139 + [{<<"Docs">>,<<"https://hexdocs.pm/thesis/0.0.24/api-reference.html">>},
137 140 {<<"GitHub">>,<<"https://github.com/infinitered/thesis">>}]}.
138 141 {<<"maintainers">>,
139 - [<<"Jamon Holmgren">>,<<"Ken Miller">>,<<"Daniel Berkompas">>,
140 - <<"Yulian Glukhenko">>]}.
142 + [<<"Jamon Holmgren">>,<<"Yulian Glukhenko">>,<<"Ken Miller">>,
143 + <<"Daniel Berkompas">>]}.
141 144 {<<"name">>,<<"thesis">>}.
142 145 {<<"requirements">>,
143 146 [[{<<"app">>,<<"phoenix">>},
  @@ -164,4 +167,4 @@
164 167 {<<"name">>,<<"html_sanitize_ex">>},
165 168 {<<"optional">>,false},
166 169 {<<"requirement">>,<<">= 1.0.1">>}]]}.
167 - {<<"version">>,<<"0.0.23">>}.
170 + {<<"version">>,<<"0.0.24">>}.
  @@ -6,7 +6,8 @@ defmodule Mix.Tasks.Thesis.Install do
6 6 "create_thesis_tables",
7 7 "add_meta_to_thesis_page_contents",
8 8 "add_indexes_to_tables",
9 - "add_template_and_redirect_url_to_thesis_pages"
9 + "add_template_and_redirect_url_to_thesis_pages",
10 + "change_content_default_for_page_content"
10 11 ]
11 12 @template_files [
12 13 {"priv/templates/thesis.install/thesis_auth.exs", "lib/thesis_auth.ex"}
  @@ -42,8 +43,9 @@ defmodule Mix.Tasks.Thesis.Install do
42 43 |> Enum.filter(&migration_missing?/1)
43 44 |> Enum.with_index
44 45 |> Enum.map(&migration_tuple/1)
46 + all_templates = @template_files ++ migration_files
45 47
46 - (@template_files ++ migration_files)
48 + all_templates
47 49 |> Stream.map(&render_eex/1)
48 50 |> Stream.map(&copy_to_target/1)
49 51 |> Stream.run
  @@ -38,7 +38,7 @@ defmodule Thesis.Config do
38 38 end
39 39
40 40 def thesis_js_source_path do
41 - Path.join(Application.app_dir(:thesis), "priv/static/thesis-editor.js")
41 + Path.join(Application.app_dir(:thesis), "priv/static/thesis.js")
42 42 end
43 43
44 44 def controller_missing_text do
Loading more files…