aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Micieli <micieli@laposte.net>2019-08-19 04:50:34 +0200
committerWilly Micieli <micieli@laposte.net>2019-08-19 04:50:34 +0200
commit0f7266d2955724f380cb5e0c2f67f57d838d1c8d (patch)
treebc583c2fd4b4230b385c3669d1ae9f71bf01cca8
parentc7833b23fb6e000866f84baf1ea3a9e3beb6910b (diff)
downloadshaolin-0f7266d2955724f380cb5e0c2f67f57d838d1c8d.zip
shaolin-0f7266d2955724f380cb5e0c2f67f57d838d1c8d.tar.gz
clean repo
-rw-r--r--.gitignore3
-rw-r--r--.phpunit.result.cache1
-rw-r--r--app/Views/Welcome/welcome.twig10
-rw-r--r--app/Views/admin.twig8
-rw-r--r--app/Views/layout.twig9
-rw-r--r--assets/js/app.js3
-rw-r--r--assets/sass/_variables.scss2
-rw-r--r--assets/sass/app.scss45
-rw-r--r--composer.json1
-rw-r--r--config.rb2
-rw-r--r--design/js/app.js3
-rw-r--r--design/sass/app.scss3
-rw-r--r--web/css/app.css2
13 files changed, 79 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index aceb347..51d116c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ tmp
cache
.idea
.phpunit.result.cache
-.sass-cache \ No newline at end of file
+.sass-cache
+.vscode
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
deleted file mode 100644
index 6957a26..0000000
--- a/.phpunit.result.cache
+++ /dev/null
@@ -1 +0,0 @@
-C:37:"PHPUnit\Runner\DefaultTestResultCache":215:{a:2:{s:7:"defects";a:1:{s:45:"Testing\Feature\ExampleFeatureTest::test_root";i:4;}s:5:"times";a:2:{s:41:"Tests\Unit\ExampleUnitTest::testBasicTest";d:0;s:45:"Testing\Feature\ExampleFeatureTest::test_root";d:0.053;}}} \ No newline at end of file
diff --git a/app/Views/Welcome/welcome.twig b/app/Views/Welcome/welcome.twig
index 0ee627e..472c83d 100644
--- a/app/Views/Welcome/welcome.twig
+++ b/app/Views/Welcome/welcome.twig
@@ -1,6 +1,6 @@
{% extends 'layout.twig' %}
-{% block title '' %}
+{% block title 'welcome' %}
{% block description '' %}
@@ -10,7 +10,13 @@
{% block content %}
-
+ <div class="flex-center position-ref full-height">
+ <div class="content">
+ <div class="title m-b-md">
+ Shaolin
+ </div>
+ </div>
+ </div>
{% endblock %}
diff --git a/app/Views/admin.twig b/app/Views/admin.twig
index 97959f3..6505a3f 100644
--- a/app/Views/admin.twig
+++ b/app/Views/admin.twig
@@ -24,5 +24,13 @@
{{ display('failure') }}
{% block content %} {% endblock %}
</main>
+
+ <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+
+ <script src="{{ js('admin.js') }}"></script>
+
+ {% block js %}
+
+ {% endblock %}
</body>
</html> \ No newline at end of file
diff --git a/app/Views/layout.twig b/app/Views/layout.twig
index 97959f3..c167b6d 100644
--- a/app/Views/layout.twig
+++ b/app/Views/layout.twig
@@ -17,6 +17,7 @@
<title>{% block title %}{% endblock %}</title>
<meta name="description" content="{% block description %} {% endblock %}">
+
</head>
<body>
<main class="container">
@@ -24,5 +25,13 @@
{{ display('failure') }}
{% block content %} {% endblock %}
</main>
+
+ <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+
+ {{ js('app.js') }}
+
+ {% block js %}
+
+ {% endblock %}
</body>
</html> \ No newline at end of file
diff --git a/assets/js/app.js b/assets/js/app.js
new file mode 100644
index 0000000..93c9f89
--- /dev/null
+++ b/assets/js/app.js
@@ -0,0 +1,3 @@
+$(function(){
+
+}); \ No newline at end of file
diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss
new file mode 100644
index 0000000..843b7f9
--- /dev/null
+++ b/assets/sass/_variables.scss
@@ -0,0 +1,2 @@
+@import "compass";
+
diff --git a/assets/sass/app.scss b/assets/sass/app.scss
new file mode 100644
index 0000000..ac3845b
--- /dev/null
+++ b/assets/sass/app.scss
@@ -0,0 +1,45 @@
+@import "variables";
+
+
+html, body {
+ background-color: #fff;
+ color: #636b6f;
+ font-family: 'Nunito', sans-serif;
+ font-weight: 200;
+ height: 100vh;
+ margin: 0;
+}
+.full-height {
+ height: 100vh;
+}
+.flex-center {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+}
+.position-ref {
+ position: relative;
+}
+.top-right {
+ position: absolute;
+ right: 10px;
+ top: 18px;
+}
+.content {
+ text-align: center;
+}
+.title {
+ font-size: 84px;
+}
+.links > a {
+ color: #636b6f;
+ padding: 0 25px;
+ font-size: 13px;
+ font-weight: 600;
+ letter-spacing: .1rem;
+ text-decoration: none;
+ text-transform: uppercase;
+}
+.m-b-md {
+ margin-bottom: 30px;
+} \ No newline at end of file
diff --git a/composer.json b/composer.json
index 8330dfd..e71a7e5 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
"post-create-project-cmd": [
"cp .env.example .env",
"cp config/db.example.yaml config/db.yaml",
- "@php shaolin route:generate",
"@php shaolin hello"
]
},
diff --git a/config.rb b/config.rb
index 0cefde6..6e21d9a 100644
--- a/config.rb
+++ b/config.rb
@@ -4,7 +4,7 @@ require 'compass/import-once/activate'
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "web/css"
-sass_dir = "design/sass"
+sass_dir = "assets/sass"
images_dir = "web/img"
javascripts_dir = "web/js"
diff --git a/design/js/app.js b/design/js/app.js
deleted file mode 100644
index 8e224cc..0000000
--- a/design/js/app.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$(function () {
-
-}); \ No newline at end of file
diff --git a/design/sass/app.scss b/design/sass/app.scss
deleted file mode 100644
index c2a635b..0000000
--- a/design/sass/app.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-body{
- background-color: #fff;
-} \ No newline at end of file
diff --git a/web/css/app.css b/web/css/app.css
index 653ef80..57b29e1 100644
--- a/web/css/app.css
+++ b/web/css/app.css
@@ -1 +1 @@
-body{background-color:#fff}
+html,body{background-color:#fff;color:#636b6f;font-family:'Nunito', sans-serif;font-weight:200;height:100vh;margin:0}.full-height{height:100vh}.flex-center{align-items:center;display:flex;justify-content:center}.position-ref{position:relative}.top-right{position:absolute;right:10px;top:18px}.content{text-align:center}.title{font-size:84px}.links>a{color:#636b6f;padding:0 25px;font-size:13px;font-weight:600;letter-spacing:.1rem;text-decoration:none;text-transform:uppercase}.m-b-md{margin-bottom:30px}