Join page

lindakovacs · Jan 14, 2017 · d58191a · d58191a
1 parent 10003e6
commit d58191a
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 14 deletions.
diff --git a/app/Http/Controllers/JoinController.php b/app/Http/Controllers/JoinController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Org;
+
+class JoinController extends Controller
+{
+  public function showPage($id)
+  {
+    $org = Org::find($id);
+    if (!$org){
+      $notification = [
+      'message'    => 'Error! That organization is not in our database!',
+      'alert-type' => 'error',
+  ];
+      return redirect('')->with('notification', $notification);
+    }
+      return view('join')->with('org', $org);
+    }
+  }
diff --git a/database/migrations/2017_01_14_125908_create_orgs_table.php b/database/migrations/2017_01_14_125908_create_orgs_table.php
@@ -22,6 +22,7 @@ public function up()
             $table->integer('userid');
             $table->string('username');
             $table->string('role')->default('undefined');
+            $table->string('password')->nullable();
         });
     }
 

diff --git a/dht_feed.dat b/dht_feed.dat
@@ -0,0 +1 @@
+le
diff --git a/dht_feed.dat.old b/dht_feed.dat.old
@@ -0,0 +1 @@
+le
diff --git a/public/css/join.css b/public/css/join.css
@@ -1,11 +1,10 @@
-
-    html, body {
-        background-color: #fff;
-        color: #636b6f;
-        font-family: 'Raleway', sans-serif;
-        font-weight: 100;
-        height: 100vh;
-        margin: 0;
+html, body {
+      background-color: #fff;
+      color: #636b6f;
+      font-family: 'Raleway', sans-serif;
+      font-weight: 100;
+      height: 100vh;
+      margin: 0;
     }
 
     .full-height {

diff --git a/resources/views/join.blade.php b/resources/views/join.blade.php
@@ -16,12 +16,12 @@
     <body>
         <div class="flex-center position-ref full-height">
                 <div class="top-right links">
-                    @if (Auth::check())
-                        <a href="{{ url('/dashboard') }}">Dashboard</a>
-                    @else
-                        <a href="{{ url('/login') }}">Login</a>
-                </div>
-            @endif
+                  @if (Auth::check())
+                      <a href="{{ url('/dashboard') }}">Dashboard</a>
+                  @else
+                      <a href="{{ url('/login') }}">Login</a>
+              </div>
+          @endif
 
             <div class="content">
                 <div class="title m-b-md">

diff --git a/resume.dat b/resume.dat
@@ -0,0 +1 @@
+d10:.fileguard40:02C9EB067FCB085DBD25D0E186CFA381F8EE75BE3:recld7:aggappsle7:aggrecsle6:ourrecleeee
diff --git a/resume.dat.old b/resume.dat.old
@@ -0,0 +1 @@
+d10:.fileguard40:02C9EB067FCB085DBD25D0E186CFA381F8EE75BE3:recld7:aggappsle7:aggrecsle6:ourrecleeee
diff --git a/routes/web.php b/routes/web.php
@@ -21,3 +21,4 @@
 Route::post('logout', 'LoginController@logoutUser');
 Route::get('dashboard', 'DashboardController@showDashboard');
 Route::get('sync', 'GithubController@syncOrgs');
+Route::get('test/{id}', 'JoinController@showPage');
diff --git a/settings.dat b/settings.dat
diff --git a/settings.dat.old b/settings.dat.old
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		d10:.fileguard40:02C9EB067FCB085DBD25D0E186CFA381F8EE75BE3:recld7:aggappsle7:aggrecsle6:ourrecleeee