deleted trash sa pages

Halalan/app/views/admin/candidates/show.html.erb

-<<<<<<< HEAD
+
 <h1><center><%= @candidate.full_name%></center></h1>
 	<center><%=link_to "Edit", edit_admin_candidate_path(@candidate.id)%>
 	<%=link_to "Delete", admin_candidate_path(@candidate.id), method: :delete%></center>
-=======
 <% provide(:candidate, "active") %>
 <% provide(:title, "#{@candidate.full_name}" ) %> 
 
@@ -10,7 +9,6 @@
 	<%=link_to "Edit", edit_admin_candidate_path(@candidate.id)%>
 	<br>
 	<%=link_to "Delete", admin_candidate_path(@candidate.id), method: :delete%>
->>>>>>> 2920b0418adc40c16be842ad29c33a2aefaa3052
 	<br>
 <h3>Position: <%= @candidate.position.name %></h3>
 	<% 

Halalan/config/secrets.yml

@@ -11,6 +11,12 @@
 # if you're sharing your code publicly.
 
 development:
+  admin_name: admin
+  admin_email: user@example.com
+  admin_password: password
+  email_provider_username: <%= ENV["GMAIL_USERNAME"] %>
+  email_provider_password: <%= ENV["GMAIL_PASSWORD"] %>
+  domain_name: example.com
   secret_key_base: a120a184be8ba8273b612eff989817990858da2d03aa1067d95b199fa1fcd284a96896274307d0b1f17ef5570ce8a18de50bacc4d80f06dd77f995db00215189
 
 test:
@@ -19,4 +25,10 @@ test:
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
+  admin_name: <%= ENV["ADMIN_NAME"] %>
+  admin_email: <%= ENV["ADMIN_EMAIL"] %>
+  admin_password: <%= ENV["ADMIN_PASSWORD"] %>
+  email_provider_username: <%= ENV["GMAIL_USERNAME"] %>
+  email_provider_password: <%= ENV["GMAIL_PASSWORD"] %>
+  domain_name: <%= ENV["DOMAIN_NAME"] %>
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

Halalan/db/seeds.rb

@@ -5,3 +5,5 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
+user = CreateAdminService.new.call
+puts 'CREATED ADMIN USER: ' << user.email
\ No newline at end of file