diff --git a/.gitmodules b/.gitmodules index 317ffad..6b10e5c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libs/BLT"] path = libs/BLT url = https://github.com/Tri11Paragon/blt.git +[submodule "libs/crow"] + path = libs/crow + url = https://github.com/CrowCpp/Crow diff --git a/CMakeLists.txt b/CMakeLists.txt index be56fd7..c8acfa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,10 @@ set(CMAKE_CXX_STANDARD 20) set(CROW_FEATURES compression) cmake_policy(SET CMP0057 NEW) -find_package(Crow) +#find_package(Crow) + +add_subdirectory(libs/crow) + find_package(CURL) find_package(OpenSSL) find_package(SQLite3) diff --git a/crow_test/static/css/bar.css b/crow_test/static/css/bar.css deleted file mode 100644 index e325d2e..0000000 --- a/crow_test/static/css/bar.css +++ /dev/null @@ -1,9 +0,0 @@ -button.bar { - border-radius: 4px; - padding: 12px 28px; - font-size: 16px; - background-color: #9a7aa0; -} -button.bar:hover { - box-shadow: 0 12px 16px 0 rgba(59, 165, 144,0.24), 0 17px 50px 0 rgba(59, 165, 144,0.19); -} \ No newline at end of file diff --git a/crow_test/static/css/home.css b/crow_test/static/css/body.css similarity index 56% rename from crow_test/static/css/home.css rename to crow_test/static/css/body.css index a3753af..d61633d 100644 --- a/crow_test/static/css/home.css +++ b/crow_test/static/css/body.css @@ -3,18 +3,27 @@ div.center { justify-content: center; } -div.body { - width: 40%; - min-height: 200px; - background-color: white; - border: 3px solid; - border-color: #000033; - border-radius: 8px; - padding: 10px; +div.center_all { + display: flex; + justify-content: center; + justify-items: center; } -div.titlebar { - display: inline-flex; +div.container { + width: 60%; +} + +div.body { + min-height: 200px; + background-color: white; + border-left: 3px solid; + border-right: 3px solid; + border-bottom: 3px solid; + border-top: 3px solid; + border-color: #000033; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + padding: 10px; } body { @@ -39,13 +48,25 @@ body { background: inherit; z-index: -1; - filter : blur(10px); - -moz-filter : blur(10px); - -webkit-filter: blur(10px); - -o-filter : blur(10px); + filter : blur(2px); + -moz-filter : blur(2px); + -webkit-filter: blur(2px); + -o-filter : blur(2px); transition : all 2s linear; -moz-transition : all 2s linear; -webkit-transition: all 2s linear; -o-transition : all 2s linear; } + +.underline { + text-decoration: underline; +} + +.overline { + text-decoration: overline; +} + +.dashed { + text-decoration: dashed; +} \ No newline at end of file diff --git a/crow_test/static/css/git.css b/crow_test/static/css/git.css new file mode 100644 index 0000000..e06164e --- /dev/null +++ b/crow_test/static/css/git.css @@ -0,0 +1,12 @@ +.card { + margin: 10px; + padding: 10px; + background-color: rgb(245, 245, 245); + box-shadow: 2px 6px 12px 2px rgba(0,0,0,0.4); + z-index: 1; +} + +div.card:hover { + background-color: rgb(240, 240, 240); + box-shadow: 2px 6px 12px 2px rgba(0,0,0,0.6); +} \ No newline at end of file diff --git a/crow_test/static/css/index.css b/crow_test/static/css/index.css new file mode 100644 index 0000000..139597f --- /dev/null +++ b/crow_test/static/css/index.css @@ -0,0 +1,2 @@ + + diff --git a/crow_test/static/css/menu_bar.css b/crow_test/static/css/menu_bar.css index 90e8e21..3ce460a 100644 --- a/crow_test/static/css/menu_bar.css +++ b/crow_test/static/css/menu_bar.css @@ -3,7 +3,7 @@ ul.menu_bar { margin: 0; padding: 0; overflow: hidden; - background-color: #333; + background-color: {{$MENU_BAR_COLOR}}; } ul.menu_bar li.left { @@ -25,10 +25,10 @@ ul.menu_bar li a { } ul.menu_bar li a.active { - background-color: #04AA6D; + background-color: {{$MENU_BAR_ACTIVE}}; } /* Change the link color to #111 (black) on hover */ ul.menu_bar li a:hover { - background-color: #111; + background-color: {{$MENU_BAR_HOVER}}; } \ No newline at end of file diff --git a/crow_test/webcontent/about.html b/crow_test/webcontent/about.html new file mode 100644 index 0000000..e5a57d4 --- /dev/null +++ b/crow_test/webcontent/about.html @@ -0,0 +1,29 @@ + + + + + + + + + + {{$SITE_TITLE}} + + {{@body_begin.part}} +
+
+

About

+
+
+ +
+
+ {{@body_end.part}} + diff --git a/crow_test/webcontent/body_begin.part b/crow_test/webcontent/body_begin.part new file mode 100644 index 0000000..a3189b2 --- /dev/null +++ b/crow_test/webcontent/body_begin.part @@ -0,0 +1,4 @@ + +
+
+ {{@menu_bar.part}} \ No newline at end of file diff --git a/crow_test/webcontent/body_end.part b/crow_test/webcontent/body_end.part new file mode 100644 index 0000000..eb00d0c --- /dev/null +++ b/crow_test/webcontent/body_end.part @@ -0,0 +1,3 @@ +
+
+ \ No newline at end of file diff --git a/crow_test/webcontent/git.html b/crow_test/webcontent/git.html new file mode 100644 index 0000000..1716758 --- /dev/null +++ b/crow_test/webcontent/git.html @@ -0,0 +1,40 @@ + + + + + + + + + + + {{$SITE_TITLE}} + + {{@body_begin.part}} +
+
+

My GitHub Profile

+
+
+
+
+ +
+
+
+
+ Link +
+
+
+
+
+
+ TODO: display pinned repos / add more then 'link' +
+
+ {{@body_end.part}} + diff --git a/crow_test/webcontent/index.html b/crow_test/webcontent/index.html index b43ebf9..acf54e4 100644 --- a/crow_test/webcontent/index.html +++ b/crow_test/webcontent/index.html @@ -1,9 +1,11 @@ - - - + + @@ -11,26 +13,11 @@ {{$SITE_TITLE}} - -
-
- {{@menu_bar.part}} - -
- HAXsdsad - {{%_admin}} -

Admin detected

- {{/_admin}} - {{%_admin && _create_posts}} -

Admin and can read!

- {{/_admin && _create_posts}} - {{%_admin}} - {{%_read_files}} - Nested time! - {{/_read_files}} - {{/_admin}} -
+ {{@body_begin.part}} +
+
+ Many cumies
- + {{@body_end.part}} diff --git a/crow_test/webcontent/login.html b/crow_test/webcontent/login.html index 9c77604..9bee1d3 100644 --- a/crow_test/webcontent/login.html +++ b/crow_test/webcontent/login.html @@ -1,33 +1,33 @@ - - - + + - - + + {{$SITE_TITLE}} - -
-
- {{@menu_bar.part}} - -
-
-
-
-
-
-
-
- -
+ {{@body_begin.part}} +
+
+
+
+
+
+
+
+
+
+ +
- + {{@body_end.part}} diff --git a/crow_test/webcontent/menu_bar.part b/crow_test/webcontent/menu_bar.part index e32f843..3ddddaf 100644 --- a/crow_test/webcontent/menu_bar.part +++ b/crow_test/webcontent/menu_bar.part @@ -1,7 +1,7 @@