Fix assets build

package.json

@@ -2,16 +2,12 @@
   "private": true,
   "scripts": {
     "dev": "npm run development",
-    "development":
-      "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch":
-      "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "watch-poll": "npm run watch -- --watch-poll",
-    "hot":
-      "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
     "prod": "npm run production",
-    "production":
-      "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
     "cross-env": "5.1.4",
@@ -20,12 +16,12 @@
     "tailwindcss": "0.4.3"
   },
   "dependencies": {
-    "bootstrap-sass": "3.3.7",
-    "bootstrap-social": "5.1.1",
-    "bootswatch": "4.0.0",
+    "bootstrap": "4.1.3",
+    "bootswatch": "4.1.3",
     "jquery": "3.3.1",
-    "less": "3.0.2",
+    "less": "3.8.1",
     "less-loader": "4.1.0",
+    "popper.js": "^1.14.4",
     "primer-alerts": "1.5.5",
     "primer-avatars": "1.5.2",
     "primer-blankslate": "1.4.5",

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=df3a063d817a212db628",
-    "/css/app.css": "/css/app.css?id=5e5999a709718feaa356",
-    "/css/new.css": "/css/new.css?id=a7bab205848c1876c0d6",
-    "/js/landing.js": "/js/landing.js?id=09c681c66c556384a075"
+    "/js/app.js": "/js/app.js",
+    "/css/app.css": "/css/app.css",
+    "/css/new.css": "/css/new.css",
+    "/js/landing.js": "/js/landing.js"
 }

resources/assets/js/bootstrap.js

@@ -8,4 +8,4 @@ window._ = require("lodash");
 
 window.$ = window.jQuery = require("jquery");
 
-require("bootstrap-sass");
+require("bootstrap");

resources/assets/less/new.less

@@ -12,6 +12,7 @@
  * See: https://github.com/tailwindcss/tailwindcss/issues/53#issuecomment-341413622
  */
 @tailwind preflight;
+@import "resets";
 
 /**
   * Here you would add any of your custom component classes; stuff that you'd

resources/assets/less/resets.less

@@ -0,0 +1,3 @@
+.cf-wrapper {
+  margin: 0 !important;
+}

resources/assets/sass/app.scss

@@ -1,8 +1,7 @@
-@import "~bootswatch/flatly/variables";
-@import "~bootstrap-sass/assets/stylesheets/bootstrap";
-@import "~bootswatch/flatly/bootswatch";
+@import "~bootswatch/dist/flatly/variables";
+@import "~bootstrap/scss/bootstrap";
+@import "~bootswatch/dist/flatly/bootswatch";
 @import "~sweetalert2/dist/sweetalert2.min.css";
-@import "~bootstrap-social/bootstrap-social";
 @import "~primer-alerts/build/build.css";
 @import "~primer-avatars/build/build.css";
 @import "~primer-blankslate/build/build.css";

resources/views/join.blade.php

@@ -29,6 +29,7 @@ function onSubmit(token) {
 
                 <h1 class="font-bold text-2xl mb-2 text-center text-grey-darkest">Join <a class="no-underline text-inherit link-shadow link-transition" href="https://github.com/{{ $org->name }}" target="_blank" rel="noopener noreferrer">{{ $org->pretty_name or $org->name }}</a></h1>
 
+
                 @if (optional($org->team)->exists)
                     @if ($org->team->privacy == 'closed')
                         <h1 class="text-sm mb-4 text-center text-grey-darker font-medium">You will also join the <a href="https://github.com/orgs/{{ $org->name }}/teams/{{ str_slug($org->team->name) }}" target="_blank" rel="noopener noreferrer" class="no-underline text-inherit link-shadow link-transition">{{ $org->team->name }}</a> team</h1>
@@ -61,9 +62,11 @@ function onSubmit(token) {
                     </button>
                 </div>
             </form>
+            <div id="codefund_ad"></div>
         </div>
     </div>
     <script src="{{ mix('js/landing.js') }}"></script>
+    <script src="https://codefund.io/scripts/e9d802da-6c58-4907-b8a2-079a78adfc64/embed.js"></script>
     @if (count($errors) > 0)
         <script>
             swal("Oops...", "{{ $errors->first() }}", "error");