From 678035e51ebfe4bae3d50e24f828372127cf9f31 Mon Sep 17 00:00:00 2001 From: Immanuel Onyeka Date: Sat, 10 Apr 2021 21:46:09 -0400 Subject: [PATCH] Position hero and navbar --- .gitignore | 3 + bootstrap/cache/.gitignore | 0 package.json | 3 + public/main.js | 14 +--- public/newfile | 0 resources/build.sh | 8 ++- resources/scss/main.scss | 89 ++++++++++++++++++++++++- resources/views/home.blade.php | 4 +- resources/views/master.blade.php | 7 +- resources/views/panel.blade.php | 1 + storage/app/.gitignore | 0 storage/app/public/.gitignore | 0 storage/framework/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/sessions/.gitignore | 0 storage/framework/testing/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 19 files changed, 110 insertions(+), 19 deletions(-) mode change 100644 => 100755 bootstrap/cache/.gitignore create mode 100644 public/newfile mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/app/public/.gitignore mode change 100644 => 100755 storage/framework/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/sessions/.gitignore mode change 100644 => 100755 storage/framework/testing/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/.gitignore b/.gitignore index dbb2610..76bf7ce 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ /public/storage /storage/*.key /vendor +*.css +*.css.map .env .env.backup .phpunit.result.cache @@ -12,3 +14,4 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log +package-lock.json diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/package.json b/package.json index 00c6506..c6ef720 100644 --- a/package.json +++ b/package.json @@ -14,5 +14,8 @@ "laravel-mix": "^6.0.6", "lodash": "^4.17.19", "postcss": "^8.1.14" + }, + "dependencies": { + "browsersync": "0.0.1-security" } } diff --git a/public/main.js b/public/main.js index e931cda..3d1b7d0 100644 --- a/public/main.js +++ b/public/main.js @@ -1,19 +1,11 @@ const Counter = { - data() { - return { - counter: 0 - } - } + data() { return { counter: 0 } } } Vue.createApp(Counter).mount('#counter') const AttributeBindingApp = { - data() { - return { - message: 'You loaded this page on ' + new Date().toLocaleString() - } - } -} + data() { return { + message: 'You loaded this page on ' + new Date().toLocaleString()}}} Vue.createApp(AttributeBindingApp).mount('#bind-attribute') diff --git a/public/newfile b/public/newfile new file mode 100644 index 0000000..e69de29 diff --git a/resources/build.sh b/resources/build.sh index 236d454..d13291f 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -1,16 +1,18 @@ #!/bin/sh +project=$HOME/projects/trendplays + watch() { - npx browser-sync start --proxy 'localhost:8000' -w --files assets views sass & + npx browser-sync start --proxy 'trendplays.test' -w --files $project/resources/views $project/resources/scss & pid=$! - sass --load-path=sass --watch --error-css scss/main.scss ../public/main.css & + sass --load-path=sass --watch --error-css $project/resources/scss/main.scss $project/public/main.css & pid="$pid $!" trap "kill -TERM $pid" 0 1 2 15 wait } once() { - sass --load-path=sass scss/main.scss ../public/main.css + sass --load-path=sass $project/resources/scss/main.scss $project/public/main.css } deploy() { diff --git a/resources/scss/main.scss b/resources/scss/main.scss index c5888fa..c58dcab 100644 --- a/resources/scss/main.scss +++ b/resources/scss/main.scss @@ -15,5 +15,92 @@ h1 { color: black; } a { - // text-decoration: none; + text-decoration: none; +} + +nav { + position: absolute; + width: 100%; + top: 0; + display: flex; + flex-flow: row wrap; + align-items: center; + justify-content: space-between; + // background-color: transparent; +} + +nav h1 { + margin: 4px 10px 0; +} + +nav #logo { + margin-right: 50px; +} + +nav form { + display: flex; + flex-wrap: wrap; +} + +nav form div { + // width: 10em; + margin: 0 10px; +} + +nav form button { + min-width: 5em; +} + +nav .register-button { + // width: 5em; + display: block; + margin: 0 20px; +} + +@media (max-width: 720px) { + nav { display: block; } + + nav form { + display: block; + width: 190px; + margin-left: auto; + margin-right: auto; + align-items: center; + } + nav form div { + margin: 10px auto; + } + nav div label,input { + display: block; + } + nav .register-button { + margin: 8px 0; + } +} + +div.landing-hero { + top: 0; + height: 60vh; + background-color: orange; +} + +div.hero-filter { + width: 100%; + height: 100%; +} + +div.hero-filter h2 { + width: 10em; + font-size: 2.4em; + position: absolute; + top: 15%; + margin-left: 3%; +} + +div.errors { + background-color: red; + height: 50px; + position: absolute; + width: 100%; + top: 50px; } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 6ea6108..de6c216 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -11,12 +11,10 @@ @parent
-

The Web's #1 Content Promoter.

+

The web's #1 content promoter

-

Elit

-

Dolor molestiae quos architecto nesciunt enim! Sit corrupti voluptas aliquam aperiam maiores iure aliquam aut Voluptatem quas deserunt iure non sunt Esse laborum corporis explicabo eos numquam. Fugit ad ex?

diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 4ac6078..fb5a3b8 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -18,14 +18,19 @@ @guest Register + + @endguest diff --git a/resources/views/panel.blade.php b/resources/views/panel.blade.php index f7e64b8..e7484fc 100644 --- a/resources/views/panel.blade.php +++ b/resources/views/panel.blade.php @@ -15,6 +15,7 @@ diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755