diff --git a/app/ImportData.php b/app/ImportData.php index d309f4df6..d4cdbb4d3 100644 --- a/app/ImportData.php +++ b/app/ImportData.php @@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model; class ImportData extends Model { - // + protected $table = 'import_datas'; } diff --git a/config/pixelfed.php b/config/pixelfed.php index 64db6fea8..295ae058a 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.8.0', + 'version' => '0.8.1', /* |-------------------------------------------------------------------------- diff --git a/public/img/landing/android_1.jpg b/public/img/landing/android_1.jpg new file mode 100644 index 000000000..40a7a9c32 Binary files /dev/null and b/public/img/landing/android_1.jpg differ diff --git a/public/img/landing/ios_1.jpg b/public/img/landing/ios_1.jpg new file mode 100644 index 000000000..a6efa2ebf Binary files /dev/null and b/public/img/landing/ios_1.jpg differ diff --git a/public/img/landing/ios_2.jpg b/public/img/landing/ios_2.jpg new file mode 100644 index 000000000..18b7d1fd3 Binary files /dev/null and b/public/img/landing/ios_2.jpg differ diff --git a/public/img/landing/ios_3.jpg b/public/img/landing/ios_3.jpg new file mode 100644 index 000000000..edc269096 Binary files /dev/null and b/public/img/landing/ios_3.jpg differ diff --git a/public/img/landing/ios_4.jpg b/public/img/landing/ios_4.jpg new file mode 100644 index 000000000..e166891d0 Binary files /dev/null and b/public/img/landing/ios_4.jpg differ diff --git a/public/js/landing.js b/public/js/landing.js new file mode 100644 index 000000000..d40e11890 Binary files /dev/null and b/public/js/landing.js differ diff --git a/public/js/status.js b/public/js/status.js index acebb75bb..a18c4283b 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9fabbd485..b7f1c0362 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/LandingPage.vue b/resources/assets/js/components/LandingPage.vue new file mode 100644 index 000000000..995f5ab38 --- /dev/null +++ b/resources/assets/js/components/LandingPage.vue @@ -0,0 +1,316 @@ + + + + + diff --git a/resources/assets/js/landing.js b/resources/assets/js/landing.js new file mode 100644 index 000000000..8c8772a41 --- /dev/null +++ b/resources/assets/js/landing.js @@ -0,0 +1,10 @@ +window.Vue = require('vue'); + +Vue.component( + 'landing-page', + require('./components/LandingPage.vue').default +); + +new Vue({ + el: '#content' +}); \ No newline at end of file diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index 50ce20627..a6e085ad3 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -1,172 +1,49 @@ -@extends('layouts.app') + + + + + + + + -@section('content') + + {{ config('app.name', 'Laravel') }} -
-
-

Image Sharing for Everyone

-

A free and ethical photo sharing platform.

-
-
-
-
-
-
-
-
-

- Ad Free -

-

No Ads or Trackers

-
-
-
-
-
-
-

- Chronological -

-

Timelines in order

-
-
-
-
-
-
-

- Federated -

-

A network of millions

-
-
-
-
-
-
-

- Discover -

-

Discover popular posts

-
-
-
-
-
-
-

- Photo Filters -

-

Add an optional filter

-
-
-
-
-
-
-

- Stories -

-

Coming Soon!

-
-
-
-
-
-
-
-
-
- - - username - -
-
- -
- -
-
-
-
-
-
- -
-
-

Create. Discover. Share.

-

- A feature rich photo sharing experience
-

-
-
-
-
-
- -
-
-
- -
-

Powered by People

-

- Pixelfed is an open-source, federated platform.
- You can run your own instance or join one.
-

-{{--

- About this Instance - Login -

--}} -
+ + + + + + + + + + + + +
+ +
+ + -
-
-
-
-@endsection + + + -@push('meta') - - -@endpush diff --git a/webpack.mix.js b/webpack.mix.js index cb80543cc..68a31ea77 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -14,6 +14,7 @@ let mix = require('laravel-mix'); mix.js('resources/assets/js/app.js', 'public/js') .js('resources/assets/js/activity.js', 'public/js') .js('resources/assets/js/components.js', 'public/js') +//.js('resources/assets/js/embed.js', 'public') // Discover component .js('resources/assets/js/discover.js', 'public/js') @@ -30,6 +31,9 @@ mix.js('resources/assets/js/app.js', 'public/js') // MicroUI component .js('resources/assets/js/micro.js', 'public/js') +// LandingPage component +.js('resources/assets/js/landing.js', 'public/js') + .sass('resources/assets/sass/app.scss', 'public/css', { implementation: require('node-sass') })