diff --git a/src/routes/Join.js b/src/routes/Join.js new file mode 100644 index 00000000..b066565a --- /dev/null +++ b/src/routes/Join.js @@ -0,0 +1,51 @@ +import React, { Component } from 'react' + +class Join extends Component { + render = () => { + return ( +
+
+ + + +

Sign Up

+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ +
+
Don't have an access code?
Request an Invite +
+
+
+ ) + } +} + +export default Join \ No newline at end of file diff --git a/src/routes/Login.js b/src/routes/Login.js new file mode 100644 index 00000000..734598ea --- /dev/null +++ b/src/routes/Login.js @@ -0,0 +1,38 @@ +import React, { Component } from 'react' + +class Login extends Component { + render = () => { + return ( +
+
+ + +

SIGN IN

+ +
+
+
+ +
+
+ +
+ +
+ +
+ + + +
+
+
+
+ Forgot password? +
+
+
+ ) + } +} +export default Login \ No newline at end of file diff --git a/views/maps/request_access.html.erb b/src/routes/RequestAccess.js similarity index 50% rename from views/maps/request_access.html.erb rename to src/routes/RequestAccess.js index cf8aadb4..b3288099 100644 --- a/views/maps/request_access.html.erb +++ b/src/routes/RequestAccess.js @@ -1,22 +1,24 @@ -<%# -# @file -# Code to request access to a map -# /maps/:id/request_access -#%> +import React, { Component } from 'react' -<% content_for :title, 'Request Access | Metamaps' %> -<% content_for :mobile_title, 'Request Access' %> +class RequestAccess extends Component { + render = () => { + return ( +
+
+
+
+ Hmmm. This map is private, but you can request to edit it from the map creator. +
+
REQUEST ACCESS
+
+
+ ) + } +} -
-
-
-
- Hmmm. This map is private, but you can request to edit it from the map creator. -
-
REQUEST ACCESS
-
-
+export default RequestAccess +/* +*/ \ No newline at end of file diff --git a/src/routes/RequestInvite.js b/src/routes/RequestInvite.js new file mode 100644 index 00000000..daf09ba9 --- /dev/null +++ b/src/routes/RequestInvite.js @@ -0,0 +1,14 @@ +import React, { Component } from 'react' + +class RequestAccess extends Component { + render = () => { + return ( +
+
+ +
+ ) + } +} + +export default RequestAccess diff --git a/src/routes/makeRoutes.js b/src/routes/makeRoutes.js index 16595f81..d54dfb97 100644 --- a/src/routes/makeRoutes.js +++ b/src/routes/makeRoutes.js @@ -8,6 +8,10 @@ import MapView from './MapView' import Notifications from './Notifications' import TopicView from './TopicView' import LoggedOutHome from './LoggedOutHome' +import RequestAccess from './RequestAccess' +import RequestInvite from './RequestInvite' +import Login from './Login' +import Join from './Join' function nullComponent(props) { return null @@ -27,13 +31,12 @@ export default function makeRoutes (currentUser) { - - + - - - + + + diff --git a/views/main/home.html.erb b/views/main/home.html.erb deleted file mode 100644 index 16870f13..00000000 --- a/views/main/home.html.erb +++ /dev/null @@ -1,40 +0,0 @@ -<%# - # @file - # Located at / - # Shows 3 most recently created topics, synapses, and maps. - # -%> - -<% content_for :title, "Home | Metamaps" %> -<% content_for :mobile_title, "Home" %> -
-
-
Make Sense with Metamaps
-
- METAMAPS.CC is a free and open source platform that supports real-time sense-making, distributed collaboration, and the creative intelligence of individuals, organizations and communities. We are currently in an invite-only beta. -
-
-
-
- -
-

Who finds it useful?

-

Designers, inventors, artists, educators, strategists, consultants, facilitators, entrepreneurs, systems thinkers, changemakers, analysts, students, researchers... maybe you!

- - EXPLORE FEATURED MAPS - REQUEST INVITE -
-
-
-
-
-
- <% # our partners %> -
-
-
- - diff --git a/views/main/requestinvite.html.erb b/views/main/requestinvite.html.erb deleted file mode 100644 index c026911a..00000000 --- a/views/main/requestinvite.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<%# - # @file - # Located at /request - # Shows a form where people can request an invite - #%> - -<% content_for :title, "Request Invite | Metamaps" %> -<% content_for :mobile_title, "Request Invite" %> -
- diff --git a/views/maps/_mapinfobox.html.erb b/views/maps/_mapinfobox.html.erb deleted file mode 100644 index 9ded6a02..00000000 --- a/views/maps/_mapinfobox.html.erb +++ /dev/null @@ -1,96 +0,0 @@ -<%# - # Partial rendering form for a new topic on a map - # This code is called when viewing a metamap in show.html.erb in the views/maps folder - #%> -
- <%= @map && policy(@map).update? ? " canEdit" : "" %> - <%= @map && @map.permission != 'private' ? " shareable" : "" %>"> - - <% if current_user %> -
- Click here to name this map -
- <% end %> - - <% if @map %> -
- <% if policy(@map).update? %> - <%= @map.name %> - <% else %> - <%= @map.name %> - <% end %> -
- -
-
- <% relevantPeople = @map.permission == "commons" ? @map.contributors : @map.editors %> - <% if relevantPeople.count == 0 %> - - <% elsif relevantPeople.count == 1 %> - - <% elsif relevantPeople.count == 2 %> - - <% elsif relevantPeople.count > 2 %> - - <% end %> - <%= relevantPeople.count %> -
- - <% if @map.user == current_user %> -
- <% end %> -
-
-
- <%= @map.topics.count %> -
-
- <%= @map.synapses.count %> -
-
-
As the creator, you can change the permission of this map, and the permission of all the topics and synapses you have authority to change will change as well.
-
-
-
- -
- <% if policy(@map).update? %> - <%= @map.desc %> - <% else %> - <%= @map.desc %> - <% end %> -
- -
-

Created by: <%= @map.user == user ? "You" : @map.user.name %> on <%= @map.created_at.strftime("%m/%d/%Y") %>

-

Last edited: <%= @map.updated_at.strftime("%m/%d/%Y") %>

-
-
-
-
Update Thumbnail
- Thumb -
-
-
- Delete -
-
-
- Share -
-
-
- <% end %> -
diff --git a/views/maps/_newtopicsecret.html.erb b/views/maps/_newtopicsecret.html.erb deleted file mode 100644 index ffbc497a..00000000 --- a/views/maps/_newtopicsecret.html.erb +++ /dev/null @@ -1,36 +0,0 @@ -<%= form_for Topic.new, url: topics_url, remote: true do |form| %> -
-
Switch Metacodes
-
- -
- <% @metacodes = user_metacodes() - @metacodes.each do |m| %> - <%= m.name %> - <% end %> -
-
- - <%= @metacodes[0].name %> -
-
- <%= form.text_field :name, :maxlength => 140, :placeholder => "what are you thinking..." %> -
-
-
- -<% end %> \ No newline at end of file diff --git a/views/maps/conversation.html.erb b/views/maps/conversation.html.erb deleted file mode 100644 index 51d68a7a..00000000 --- a/views/maps/conversation.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -<%# -# @file -# Code to display a map -# /maps/:id -#%> - -<% content_for :title, @map.name + " | Metamaps" %> -<% content_for :mobile_title, @map.name %> - diff --git a/views/topics/_new.html.erb b/views/topics/_new.html.erb deleted file mode 100644 index 4f856a81..00000000 --- a/views/topics/_new.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -<%# - # @file - # This file contains code for rendering a new topic form. - # It's called from the show topic / radial view pages - #%> - -
-<%= form_for Topic.new, url: topics_url, remote: true do |form| %> -
-
Switch Metacodes
-
-
-
Keep Open
-
-
- <% @m = user.settings.metacodes %> - <% set = @m[0].include?("metacodeset") ? MetacodeSet.find(@m[0].sub("metacodeset-","").to_i) : false %> - <% if set %> - <% @metacodes = set.metacodes %> - <% else %> - <% @metacodes = [] %> - <% @m.each do |m| %> - <% @metacodes.push(Metacode.find(m.to_i)) %> - <% end %> - <% end %> - <% @metacodes.sort! {|m1,m2| m2.name.downcase <=> m1.name.downcase }.rotate!(-1) %> - <% @metacodes.each do |metacode| %> - <%= metacode.name %> - <% end %> -
- <%= form.text_field :name, :maxlength => 140, :placeholder => "title..." %> -
-
-<% end %> -