Merge pull request #1 from konstantin-it-lysenko/init-config

init
konstantin-it-lysenko · Oct 18, 2023 · ff497b8 · ff497b8
2 parents e6f5aa2 + 5884ad2
commit ff497b8
Show file tree

Hide file tree

Showing 48 changed files with 105 additions and 57 deletions.
diff --git a/src/css/categories.css b/src/css/categories.css
diff --git a/src/css/common.css b/src/css/common.css
@@ -0,0 +1,15 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color: #242424;
+  background-color: rgba(255, 255, 255, 0.87);
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
diff --git a/src/css/favourites.css b/src/css/favourites.css
diff --git a/src/css/loader.css b/src/css/loader.css
diff --git a/src/css/modal-exercise.css b/src/css/modal-exercise.css
diff --git a/src/css/modal-form.css b/src/css/modal-form.css
diff --git a/src/css/modal-team.css b/src/css/modal-team.css
diff --git a/src/css/quote.css b/src/css/quote.css
diff --git a/src/css/reset.css b/src/css/reset.css
@@ -1,4 +1,3 @@
-/* Reset styles */
 h1,
 h2,
 h3,
@@ -8,28 +7,50 @@ h6,
 p {
   margin: 0;
 }
-
-p:last-child {
-  margin-bottom: 0;
+a {
+  text-decoration: none;
 }
-
-ul {
-  margin: 0;
-  padding: 0;
+ul,
+ol {
   list-style: none;
+  padding-left: 0;
+  margin: 0;
 }
 
-a {
-  color: currentColor;
-  text-decoration: none;
+img {
+  display: block;
+  max-width: 100%;
+  height: auto;
 }
 
 button {
   cursor: pointer;
+  border: none;
+  padding: 0;
 }
 
-img {
-  display: block;
-  max-width: 100%;
-  height: auto;
+input {
+  font-family: inherit;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: none;
+}
+
+/*-------------Не обнуляючі але треба задати ці властивості(приклад того що потрібно вказати)---------------------*/
+body {
+  font-family: 'Helvetica Neue', 'Roboto', 'Verdana', sans-serif;
+  color: #2a2a2a;
+  background-color: #fafafa;
+  line-height: 1.5;
+}
+/*-------------Якщо шрифти різні-------------------*/
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: 'Tahoma';
 }
diff --git a/src/css/scroll-up.css b/src/css/scroll-up.css
diff --git a/src/css/styles.css b/src/css/styles.css
@@ -1,26 +1,4 @@
-/**
-  |============================
-  | include css partials with
-  | default @import url()
-  |============================
-*/
 @import url('./reset.css');
 @import url('./header.css');
 @import url('./hero.css');
 @import url('./footer.css');
-
-:root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 24px;
-  font-weight: 400;
-
-  color: #242424;
-  background-color: rgba(255, 255, 255, 0.87);
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-text-size-adjust: 100%;
-}
diff --git a/src/favourites.html b/src/favourites.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Page 2</title>
+  </head>
+  <body>
+    <load ="partials/header.html" />
+    <!-- <header class="header">
+      <nav class="nav">
+        <ul class="nav-list">
+          <li class="nav-item">
+            <a href="../index.html" class="nav-link">Home</a>
+            <a href="#" class="nav-link">Fav</a>
+          </li>
+        </ul>
+      </nav>
+    </header> -->
+  </body>
+</html>
diff --git a/src/index.html b/src/index.html
@@ -12,6 +12,8 @@
 
     <load ="partials/hero.html" />
 
+    <load ="partials/categories.html" />
+
     <load ="partials/footer.html" />
     <script type="module" src="/main.js"></script>
   </body>

diff --git a/src/js/additional.js b/src/js/additional.js
diff --git a/src/js/api-service/categories-api.js b/src/js/api-service/categories-api.js
diff --git a/src/js/api-service/favourites-api.js b/src/js/api-service/favourites-api.js
diff --git a/src/js/api-service/footer-api.js b/src/js/api-service/footer-api.js
diff --git a/src/js/api-service/modal-exercise-api.js b/src/js/api-service/modal-exercise-api.js
diff --git a/src/js/api-service/modal-form-api.js b/src/js/api-service/modal-form-api.js
diff --git a/src/js/api-service/quote-api.js b/src/js/api-service/quote-api.js
diff --git a/src/js/api/api.js b/src/js/api/api.js
@@ -0,0 +1,14 @@
+export const API_PROPS = Object.freeze({
+    BASE_URL: 'https://your-energy.b.goit.study/api',
+    EXERCISE_ENDPOINT: '/exercises',
+    RATING_ENDPOINT: '/rating',
+    FILTERS_ENDPOINT: '/filters',
+    QUOTE_ENDPOINT: '/quote',
+    SUBSCR_EDPOINT: '/subscription'
+});
+
+/*
+import { API_PROPS } from './api/api';
+
+const { BASE_URL, QUOTE_ENDPOINT } = API_PROPS;
+*/
diff --git a/src/js/burger-menu.js b/src/js/burger-menu.js
diff --git a/src/js/categories.js b/src/js/categories.js
diff --git a/src/js/exercises-filter.js b/src/js/exercises-filter.js
diff --git a/src/js/favourites.js b/src/js/favourites.js
diff --git a/src/js/footer.js b/src/js/footer.js
diff --git a/src/js/header.js b/src/js/header.js
diff --git a/src/js/loader.js b/src/js/loader.js
diff --git a/src/js/modal-exercise.js b/src/js/modal-exercise.js
diff --git a/src/js/modal-form.js b/src/js/modal-form.js
diff --git a/src/js/modal-team.js b/src/js/modal-team.js
diff --git a/src/js/quote.js b/src/js/quote.js
@@ -0,0 +1,5 @@
+import { API_PROPS } from './api/api';
+
+const { BASE_URL, QUOTE_ENDPOINT } = API_PROPS;
+
+console.log(BASE_URL, 'HELLLO', QUOTE_ENDPOINT);
diff --git a/src/js/scroll-up.js b/src/js/scroll-up.js
diff --git a/src/js/templates/categories-markup.js b/src/js/templates/categories-markup.js
diff --git a/src/js/templates/exercises-markup.js b/src/js/templates/exercises-markup.js
diff --git a/src/js/templates/favourites-markup.js b/src/js/templates/favourites-markup.js
diff --git a/src/js/templates/quote-markup.js b/src/js/templates/quote-markup.js
diff --git a/src/main.js b/src/main.js
@@ -1 +1,4 @@
-console.log('test');
+import './js/quote';
+import './js/additional';
+import './js/burger-menu';
+import './js/burger-menu';
diff --git a/src/page-2.html b/src/page-2.html
diff --git a/src/partials/catalog.html b/src/partials/catalog.html
@@ -0,0 +1 @@
+
diff --git a/src/partials/categories.html b/src/partials/categories.html
@@ -0,0 +1,4 @@
+<section class="exercises">
+  <load ="./quote.html" />
+  <load ="./catalog.html" />
+</section>
diff --git a/src/partials/header.html b/src/partials/header.html
@@ -2,10 +2,8 @@
   <nav class="nav">
     <ul class="nav-list">
       <li class="nav-item">
-        <a href="#" class="nav-link">1</a>
-      </li>
-      <li class="nav-item">
-        <a href="#" class="nav-link">2</a>
+        <a href="../index.html" class="nav-link">Home</a>
+        <a href="../favourites.html" class="nav-link">Fav</a>
       </li>
     </ul>
   </nav>

diff --git a/src/partials/loader.html b/src/partials/loader.html
diff --git a/src/partials/modal-exercise.html b/src/partials/modal-exercise.html
diff --git a/src/partials/modal-form.html b/src/partials/modal-form.html
diff --git a/src/partials/modal-team.html b/src/partials/modal-team.html
diff --git a/src/partials/quote.html b/src/partials/quote.html
diff --git a/src/partials/scroll-up.html b/src/partials/scroll-up.html